kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

rexml: Fix XPath bug of //#{ELEMENT_NAME}[#{POSITION}]

Browse source 
The position should be counted for each nodeset but the previous
implementation counts position for union-ed nodeset.

For example, "/a/*/*[1]" should be matched to "<c1/>" and "<c2/>" with
the following XML.

    <a>
      <b>
        <c1/>
      </b>
      <b>
        <c2/>
      </b>
    </a>

But the previous implementation just returns only "<c1/>".

* lib/rexml/element.rb (REXML::Attributes#each_attribute):
  Support Enumerator for no block use.

* lib/rexml/element.rb (REXML::Attributes#each):
  Support Enumerator for no block use.

* lib/rexml/functions.rb (REXML::Functions.string):
  Support NaN again.

* lib/rexml/xpath_parser.rb: Re-implement "Step" evaluator.
  It should evaluate "AxisSpecifier", "NodeTest" and "Predicate" in one
  step to respect position for each nodeset.

* test/rexml/test_jaxen.rb: Enable more tests. Remained tests should
  be also enabled but it'll not be near future.

* test/rexml/xpath/test_base.rb: Fix expected value.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kou 2018-04-22 09:38:06 +00:00
parent 4d15e619eb
commit 7a6f34103d
5 changed files with 527 additions and 348 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/rexml/functions.rb
View file

@ -154,12 +154,16 @@ module REXML
case object
when Array
string(object[0])
when Numeric
integer = object.to_i
if object == integer
"%d" % integer
when Float
if object.nan?
"NaN"
else
object.to_s
integer = object.to_i
if object == integer
"%d" % integer
else
object.to_s
end
end
when nil
""