diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | lib/rexml/xpath.rb | 11 |
2 files changed, 18 insertions, 0 deletions
@@ -1,3 +1,10 @@ +Wed Dec 3 09:26:29 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * lib/rexml/xpath.rb (REXML::XPath.first): apply documentation + patch from Ken Bloom in [ruby-core:20213]. + + * lib/rexml/xpath.rb (REXML::XPath.each): ditto. + Wed Dec 3 02:56:34 2008 Yusuke Endoh <mame@tsg.ne.jp> * test/ruby/test_rational.rb: add a test. diff --git a/lib/rexml/xpath.rb b/lib/rexml/xpath.rb index 7c5c258ad9..b22969ec8c 100644 --- a/lib/rexml/xpath.rb +++ b/lib/rexml/xpath.rb @@ -15,10 +15,15 @@ module REXML # node matching '*'. # namespaces:: # If supplied, a Hash which defines a namespace mapping. + # variables:: + # If supplied, a Hash which maps $variables in the query + # to values. This can be used to avoid XPath injection attacks + # or to automatically handle escaping string values. # # XPath.first( node ) # XPath.first( doc, "//b"} ) # XPath.first( node, "a/x:b", { "x"=>"http://doofus" } ) + # XPath.first( node, '/book/publisher/text()=$publisher', {}, {"publisher"=>"O'Reilly"}) def XPath::first element, path=nil, namespaces=nil, variables={} raise "The namespaces argument, if supplied, must be a hash object." unless namespaces.nil? or namespaces.kind_of?(Hash) raise "The variables argument, if supplied, must be a hash object." unless variables.kind_of?(Hash) @@ -38,10 +43,16 @@ module REXML # The xpath to search for. If not supplied or nil, defaults to '*' # namespaces:: # If supplied, a Hash which defines a namespace mapping + # variables:: + # If supplied, a Hash which maps $variables in the query + # to values. This can be used to avoid XPath injection attacks + # or to automatically handle escaping string values. # # XPath.each( node ) { |el| ... } # XPath.each( node, '/*[@attr='v']' ) { |el| ... } # XPath.each( node, 'ancestor::x' ) { |el| ... } + # XPath.each( node, '/book/publisher/text()=$publisher', {}, {"publisher"=>"O'Reilly"}) \ + # {|el| ... } def XPath::each element, path=nil, namespaces=nil, variables={}, &block raise "The namespaces argument, if supplied, must be a hash object." unless namespaces.nil? or namespaces.kind_of?(Hash) raise "The variables argument, if supplied, must be a hash object." unless variables.kind_of?(Hash) |