diff options
| author | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-04-28 01:36:18 +0000 |
|---|---|---|
| committer | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-04-28 01:36:18 +0000 |
| commit | 1d67b9de288045192f34595721f0ba28ea22bb3e () | |
| tree | 2ed97c7994b9d6fdb60d58d188ae34444efab2bd /lib/rexml | |
| parent | 75f4f699fdfd8397be569a7f0cbc608387ddf7ea (diff) | |
rexml: disable XPath 1.0 compatible "#{ELEMENT_NAME}" processing by default
It breaks backward compatibility than I thought. So it's disabled by default. It means that REXML's XPath processor isn't compatible with XPath 1.0. But it will be acceptable for users. We can enable it by specifying "strict: true" to REXML::XPathParser.new explicitly. * lib/rexml/xpath.rb, lib/rexml/xpath_parser.rb: Accept "strict: true" option. * test/rexml/test_contrib.rb, test/rexml/xpath/test_base.rb: Use not XPath 1.0 compatible behavior. * test/rexml/test_jaxen.rb: Use XPath 1.0 compatible behavior. * test/rss/test_1.0.rb, test/rss/test_dublincore.rb, spec/ruby/library/rexml/element/namespace_spec.rb, spec/ruby/library/rexml/element/namespaces_spec.rb, spec/ruby/library/rexml/element/prefixes_spec.rb: Enable again. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | lib/rexml/xpath.rb | 12 | ||||
| -rw-r--r-- | lib/rexml/xpath_parser.rb | 15 |
2 files changed, 18 insertions, 9 deletions
@@ -28,10 +28,10 @@ module REXML # 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) - parser = XPathParser.new parser.namespaces = namespaces parser.variables = variables path = "*" unless path @@ -57,10 +57,10 @@ module REXML # 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) - parser = XPathParser.new parser.namespaces = namespaces parser.variables = variables path = "*" unless path @@ -69,8 +69,8 @@ module REXML end # Returns an array of nodes matching a given XPath. - def XPath::match element, path=nil, namespaces=nil, variables={} - parser = XPathParser.new parser.namespaces = namespaces parser.variables = variables path = "*" unless path @@ -47,11 +47,12 @@ module REXML include XMLTokens LITERAL = /^'([^']*)'|^"([^"]*)"/u - def initialize( ) @parser = REXML::Parsers::XPathParser.new @namespaces = nil @variables = {} @nest = 0 end def namespaces=( namespaces={} ) @@ -139,7 +140,9 @@ module REXML end private - # Returns a String namespace for a node, given a prefix # The rules are: @@ -474,7 +477,13 @@ module REXML if prefix.nil? raw_node.name == name elsif prefix.empty? - raw_node.name == name and raw_node.namespace == "" else # FIXME: This DOUBLES the time XPath searches take ns = get_namespace(raw_node, prefix) |