mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
rexml: Fix XPath string() implementation
* lib/rexml/functions.rb( REXML::Functions.string): * Support context node. * Fix implementation for document node to remove out of root nodes. * Support processing instruction node. * Improve implementation for integer to omit decimals. * test/rexml/test_jaxen.rb: Enable processing instruction test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63221 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
e044924ee5
commit
6793c0a227
2 changed files with 29 additions and 31 deletions
|
@ -136,21 +136,36 @@ module REXML
|
|||
# An object of a type other than the four basic types is converted to a
|
||||
# string in a way that is dependent on that type.
|
||||
def Functions::string( object=nil )
|
||||
#object = @context unless object
|
||||
if object.instance_of? Array
|
||||
string( object[0] )
|
||||
elsif defined? object.node_type
|
||||
if object.node_type == :attribute
|
||||
object = @@context[:node] if object.nil?
|
||||
if object.respond_to?(:node_type)
|
||||
case object.node_type
|
||||
when :attribute
|
||||
object.value
|
||||
elsif object.node_type == :element || object.node_type == :document
|
||||
when :element
|
||||
string_value(object)
|
||||
when :document
|
||||
string_value(object.root)
|
||||
when :processing_instruction
|
||||
object.content
|
||||
else
|
||||
object.to_s
|
||||
end
|
||||
elsif object.nil?
|
||||
return ""
|
||||
else
|
||||
object.to_s
|
||||
case object
|
||||
when Array
|
||||
string(object[0])
|
||||
when Numeric
|
||||
integer = object.to_i
|
||||
if object == integer
|
||||
"%d" % integer
|
||||
else
|
||||
object.to_s
|
||||
end
|
||||
when nil
|
||||
""
|
||||
else
|
||||
object.to_s
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue