diff options
| author | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-11 07:05:42 +0000 |
|---|---|---|
| committer | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-11 07:05:42 +0000 |
| commit | 80cb3351ddcfabf7ba470a098f692c378456854d (patch) | |
| tree | 21d5bd33966c7cc390cb53d9c7383f2bb3ec9819 | |
| parent | 8aecece69326b14c8797203e692f7a6d354c5fa8 (diff) | |
| download | ruby-80cb3351ddcfabf7ba470a098f692c378456854d.tar.gz | |
* lib/rexml/parsers/xpathparser.rb
(REXML::Parsers::XPathParser#parse),
test/rexml/test_elements.rb
(ElementsTester::test_each_with_frozen_condition):
don't modify original XPath. fixes #4164
Reported by Pavel Shved. Thanks!!!
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31995 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | lib/rexml/parsers/xpathparser.rb | 3 | ||||
| -rw-r--r-- | test/rexml/test_elements.rb | 9 |
3 files changed, 20 insertions, 1 deletions
@@ -1,3 +1,12 @@ +Sat Jun 11 16:04:03 2011 Kouhei Sutou <kou@cozmixng.org> + + * lib/rexml/parsers/xpathparser.rb + (REXML::Parsers::XPathParser#parse), + test/rexml/test_elements.rb + (ElementsTester::test_each_with_frozen_condition): + don't modify original XPath. fixes #4164 + Reported by Pavel Shved. Thanks!!! + Sat Jun 11 15:53:27 2011 Kouhei Sutou <kou@cozmixng.org> * test/rexml/test_elements.rb (ElementsTester): remove needless diff --git a/lib/rexml/parsers/xpathparser.rb b/lib/rexml/parsers/xpathparser.rb index 780e312671..e643d11511 100644 --- a/lib/rexml/parsers/xpathparser.rb +++ b/lib/rexml/parsers/xpathparser.rb @@ -17,8 +17,9 @@ module REXML end def parse path + path = path.dup path.gsub!(/([\(\[])\s+/, '\1') # Strip ignorable spaces - path.gsub!( /\s+([\]\)])/, '\1' ) + path.gsub!( /\s+([\]\)])/, '\1') parsed = [] path = OrExpr(path, parsed) parsed diff --git a/test/rexml/test_elements.rb b/test/rexml/test_elements.rb index b7c7c267ed..e5e209ecdc 100644 --- a/test/rexml/test_elements.rb +++ b/test/rexml/test_elements.rb @@ -84,6 +84,15 @@ class ElementsTester < Test::Unit::TestCase assert_equal 7, count end + def test_each_with_frozen_condition + doc = Document.new('<books><book name="Ruby"/><book name="XML"/></books>') + names = [] + doc.root.elements.each('book'.freeze) do |element| + names << element.attributes["name"] + end + assert_equal(["Ruby", "XML"], names) + end + def test_to_a doc = Document.new '<a>sean<b/>elliott<c/></a>' assert_equal 2, doc.root.elements.to_a.size |