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)