oga 0.3.4 → 1.0.0

data/lib/oga/xpath/evaluator.rb

@@ -58,7 +58,12 @@ module Oga
     #
     #     evaluator.evaluate('$number') # => 10
     #
+    # @api private
+    #
     class Evaluator
+      # Wildcard for node names/namespace prefixes.
+      STAR = '*'
+
       ##
       # @param [Oga::XML::Document|Oga::XML::Node] document
       # @param [Hash] variables Hash containing variables to expose to the XPath
@@ -187,7 +192,7 @@ module Oga
       # @return [Oga::XML::NodeSet]
       #
       def on_predicate(ast_node, context)
-        test, predicate = *ast_node
+        test, predicate = *ast_node.children
         final_nodes     = XML::NodeSet.new
 
         context.each do |context_node|
@@ -229,7 +234,7 @@ module Oga
       # @return [Oga::XML::NodeSet]
       #
       def on_axis(ast_node, context)
-        name, test = *ast_node
+        name, test = *ast_node.children
 
         handler = name.gsub('-', '_')
 
@@ -534,7 +539,7 @@ module Oga
           next unless context_node.respond_to?(:available_namespaces)
 
           context_node.available_namespaces.each do |_, namespace|
-            if namespace.name == name or name == '*'
+            if namespace.name == name or name == STAR
               nodes << namespace
             end
           end
@@ -551,7 +556,7 @@ module Oga
       # @return [Oga::XML::NodeSet]
       #
       def on_type_test(ast_node, context)
-        name, test = *ast_node
+        name, test = *ast_node.children
 
         handler = name.gsub('-', '_')
 
@@ -638,7 +643,7 @@ module Oga
       # @return [Oga::XML::NodeSet]
       #
       def on_pipe(ast_node, context)
-        left, right = *ast_node
+        left, right = *ast_node.children
 
         return process(left, context) + process(right, context)
       end
@@ -655,7 +660,7 @@ module Oga
       # @return [TrueClass|FalseClass]
       #
       def on_and(ast_node, context)
-        left, right = *ast_node
+        left, right = *ast_node.children
 
         return on_call_boolean(context, left) && on_call_boolean(context, right)
       end
@@ -672,7 +677,7 @@ module Oga
       # @return [TrueClass|FalseClass]
       #
       def on_or(ast_node, context)
-        left, right = *ast_node
+        left, right = *ast_node.children
 
         return on_call_boolean(context, left) || on_call_boolean(context, right)
       end
@@ -688,7 +693,7 @@ module Oga
       # @return [Float]
       #
       def on_add(ast_node, context)
-        left, right = *ast_node
+        left, right = *ast_node.children
 
         return on_call_number(context, left) + on_call_number(context, right)
       end
@@ -704,7 +709,7 @@ module Oga
       # @return [Float]
       #
       def on_div(ast_node, context)
-        left, right = *ast_node
+        left, right = *ast_node.children
 
         return on_call_number(context, left) / on_call_number(context, right)
       end
@@ -720,7 +725,7 @@ module Oga
       # @return [Float]
       #
       def on_mod(ast_node, context)
-        left, right = *ast_node
+        left, right = *ast_node.children
 
         return on_call_number(context, left) % on_call_number(context, right)
       end
@@ -736,7 +741,7 @@ module Oga
       # @return [Float]
       #
       def on_mul(ast_node, context)
-        left, right = *ast_node
+        left, right = *ast_node.children
 
         return on_call_number(context, left) * on_call_number(context, right)
       end
@@ -752,7 +757,7 @@ module Oga
       # @return [Float]
       #
       def on_sub(ast_node, context)
-        left, right = *ast_node
+        left, right = *ast_node.children
 
         return on_call_number(context, left) - on_call_number(context, right)
       end
@@ -816,7 +821,7 @@ module Oga
       # @return [TrueClass|FalseClass]
       #
       def on_lt(ast_node, context)
-        left, right = *ast_node
+        left, right = *ast_node.children
 
         return on_call_number(context, left) < on_call_number(context, right)
       end
@@ -832,7 +837,7 @@ module Oga
       # @return [TrueClass|FalseClass]
       #
       def on_gt(ast_node, context)
-        left, right = *ast_node
+        left, right = *ast_node.children
 
         return on_call_number(context, left) > on_call_number(context, right)
       end
@@ -849,7 +854,7 @@ module Oga
       # @return [TrueClass|FalseClass]
       #
       def on_lte(ast_node, context)
-        left, right = *ast_node
+        left, right = *ast_node.children
 
         return on_call_number(context, left) <= on_call_number(context, right)
       end
@@ -866,7 +871,7 @@ module Oga
       # @return [TrueClass|FalseClass]
       #
       def on_gte(ast_node, context)
-        left, right = *ast_node
+        left, right = *ast_node.children
 
         return on_call_number(context, left) >= on_call_number(context, right)
       end
@@ -885,7 +890,7 @@ module Oga
       # @return [Oga::XML::NodeSet]
       #
       def on_call(ast_node, context)
-        name, *args = *ast_node
+        name, *args = *ast_node.children
 
         handler = name.gsub('-', '_')
 
@@ -1635,16 +1640,16 @@ module Oga
       # @return [Oga::XML::NodeSet]
       #
       def node_matches?(xml_node, ast_node)
-        ns, name = *ast_node
+        ns, name = *ast_node.children
 
-        if ast_node.type == :type_test
+        if ast_node.type.equal?(:type_test)
           return type_matches?(xml_node, ast_node)
         end
 
         # If only the name is given and is a wildcard then we'll also want to
         # match the namespace as a wildcard.
-        if !ns and name == '*'
-          ns = '*'
+        if !ns and name == STAR
+          ns = STAR
         end
 
         name_matches = name_matches?(xml_node, name)
@@ -1686,7 +1691,7 @@ module Oga
       def name_matches?(xml_node, name)
         return false unless xml_node.respond_to?(:name)
 
-        return xml_node.name == name || name == '*'
+        return name == STAR ? true : xml_node.name == name
       end
 
       ##
@@ -1699,7 +1704,9 @@ module Oga
       def namespace_matches?(xml_node, ns)
         return false unless xml_node.respond_to?(:namespace)
 
-        return xml_node.namespace.to_s == ns || ns == '*'
+        return true if ns == STAR
+
+        return xml_node.namespace && xml_node.namespace.name == ns
       end
 
       ##

data/lib/oga/xpath/lexer.rb

@@ -34,9 +34,11 @@ module Oga
     # use separate instances per thread as there is no global (= class level)
     # shared state.
     #
+    # @api private
+    #
     class Lexer
       
-# line 40 "lib/oga/xpath/lexer.rb"
+# line 42 "lib/oga/xpath/lexer.rb"
 class << self
 	attr_accessor :_xpath_lexer_trans_keys
 	private :_xpath_lexer_trans_keys, :_xpath_lexer_trans_keys=
@@ -1336,7 +1338,7 @@ end
 self.xpath_lexer_en_main = 22;
 
 
-# line 37 "lib/oga/xpath/lexer.rl"
+# line 39 "lib/oga/xpath/lexer.rl"
 
       # % fix highlight
 
@@ -1430,7 +1432,7 @@ self.xpath_lexer_en_main = 22;
         _xpath_lexer_trans_targs        = self.class.send(:_xpath_lexer_trans_targs)
 
         
-# line 1434 "lib/oga/xpath/lexer.rb"
+# line 1436 "lib/oga/xpath/lexer.rb"
 begin
 	testEof = false
 	_slen, _trans, _keys, _inds, _acts, _nacts = nil
@@ -1458,7 +1460,7 @@ begin
 		begin
 ts = p
 		end
-# line 1462 "lib/oga/xpath/lexer.rb"
+# line 1464 "lib/oga/xpath/lexer.rb"
 	end
 	_keys = cs << 1
 	_inds = _xpath_lexer_index_offsets[cs]
@@ -1478,11 +1480,11 @@ ts = p
 	if _xpath_lexer_trans_actions[_trans] != 0
 	case _xpath_lexer_trans_actions[_trans]
 	when 19 then
-# line 184 "lib/oga/xpath/lexer.rl"
+# line 186 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_SLASH) 		end
 	when 34 then
-# line 296 "lib/oga/xpath/lexer.rl"
+# line 298 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_ADD) 		end
 	when 13 then
@@ -1491,12 +1493,12 @@ ts = p
 te = p+1
 		end
 	when 12 then
-# line 368 "lib/oga/xpath/lexer.rl"
+# line 370 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
 		end
 	when 9 then
-# line 349 "lib/oga/xpath/lexer.rl"
+# line 351 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
  begin 
@@ -1504,7 +1506,7 @@ te = p+1
          end
 		end
 	when 3 then
-# line 362 "lib/oga/xpath/lexer.rl"
+# line 364 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
  begin 
@@ -1512,7 +1514,7 @@ te = p+1
          end
 		end
 	when 2 then
-# line 238 "lib/oga/xpath/lexer.rl"
+# line 240 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
  begin 
@@ -1520,7 +1522,7 @@ te = p+1
          end
 		end
 	when 8 then
-# line 260 "lib/oga/xpath/lexer.rl"
+# line 262 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
  begin 
@@ -1528,7 +1530,7 @@ te = p+1
          end
 		end
 	when 21 then
-# line 272 "lib/oga/xpath/lexer.rl"
+# line 274 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
  begin 
@@ -1549,7 +1551,7 @@ te = p+1
          end
 		end
 	when 16 then
-# line 199 "lib/oga/xpath/lexer.rl"
+# line 201 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
  begin 
@@ -1557,12 +1559,12 @@ te = p+1
          end
 		end
 	when 24 then
-# line 368 "lib/oga/xpath/lexer.rl"
+# line 370 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 32 then
-# line 362 "lib/oga/xpath/lexer.rl"
+# line 364 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1570,7 +1572,7 @@ p = p - 1; begin
          end
 		end
 	when 36 then
-# line 213 "lib/oga/xpath/lexer.rl"
+# line 215 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1580,7 +1582,7 @@ p = p - 1; begin
          end
 		end
 	when 37 then
-# line 219 "lib/oga/xpath/lexer.rl"
+# line 221 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1590,7 +1592,7 @@ p = p - 1; begin
          end
 		end
 	when 38 then
-# line 272 "lib/oga/xpath/lexer.rl"
+# line 274 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1611,7 +1613,7 @@ p = p - 1; begin
          end
 		end
 	when 44 then
-# line 199 "lib/oga/xpath/lexer.rl"
+# line 201 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1619,12 +1621,12 @@ p = p - 1; begin
          end
 		end
 	when 1 then
-# line 368 "lib/oga/xpath/lexer.rl"
+# line 370 "lib/oga/xpath/lexer.rl"
 		begin
  begin p = ((te))-1; end
 		end
 	when 7 then
-# line 199 "lib/oga/xpath/lexer.rl"
+# line 201 "lib/oga/xpath/lexer.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -1662,162 +1664,162 @@ end
 end 
 			end
 	when 14 then
-# line 185 "lib/oga/xpath/lexer.rl"
+# line 187 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_LPAREN) 		end
-# line 368 "lib/oga/xpath/lexer.rl"
+# line 370 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
 		end
 	when 15 then
-# line 186 "lib/oga/xpath/lexer.rl"
+# line 188 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_RPAREN) 		end
-# line 368 "lib/oga/xpath/lexer.rl"
+# line 370 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
 		end
 	when 18 then
-# line 187 "lib/oga/xpath/lexer.rl"
+# line 189 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_COMMA) 		end
-# line 368 "lib/oga/xpath/lexer.rl"
+# line 370 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
 		end
 	when 20 then
-# line 188 "lib/oga/xpath/lexer.rl"
+# line 190 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_COLON) 		end
-# line 368 "lib/oga/xpath/lexer.rl"
+# line 370 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
 		end
 	when 22 then
-# line 189 "lib/oga/xpath/lexer.rl"
+# line 191 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_LBRACK) 		end
-# line 368 "lib/oga/xpath/lexer.rl"
+# line 370 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
 		end
 	when 23 then
-# line 190 "lib/oga/xpath/lexer.rl"
+# line 192 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_RBRACK) 		end
-# line 368 "lib/oga/xpath/lexer.rl"
+# line 370 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
 		end
 	when 45 then
-# line 295 "lib/oga/xpath/lexer.rl"
+# line 297 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_PIPE) 		end
-# line 367 "lib/oga/xpath/lexer.rl"
+# line 369 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 33 then
-# line 296 "lib/oga/xpath/lexer.rl"
+# line 298 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_ADD) 		end
-# line 367 "lib/oga/xpath/lexer.rl"
+# line 369 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 41 then
-# line 297 "lib/oga/xpath/lexer.rl"
+# line 299 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_EQ) 		end
-# line 367 "lib/oga/xpath/lexer.rl"
+# line 369 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 31 then
-# line 298 "lib/oga/xpath/lexer.rl"
+# line 300 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_NEQ) 		end
-# line 367 "lib/oga/xpath/lexer.rl"
+# line 369 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 39 then
-# line 299 "lib/oga/xpath/lexer.rl"
+# line 301 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_LT) 		end
-# line 367 "lib/oga/xpath/lexer.rl"
+# line 369 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 42 then
-# line 300 "lib/oga/xpath/lexer.rl"
+# line 302 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_GT) 		end
-# line 367 "lib/oga/xpath/lexer.rl"
+# line 369 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 40 then
-# line 301 "lib/oga/xpath/lexer.rl"
+# line 303 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_LTE) 		end
-# line 367 "lib/oga/xpath/lexer.rl"
+# line 369 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 43 then
-# line 302 "lib/oga/xpath/lexer.rl"
+# line 304 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_GTE) 		end
-# line 367 "lib/oga/xpath/lexer.rl"
+# line 369 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 27 then
-# line 312 "lib/oga/xpath/lexer.rl"
+# line 314 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_AND) 		end
-# line 367 "lib/oga/xpath/lexer.rl"
+# line 369 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 30 then
-# line 313 "lib/oga/xpath/lexer.rl"
+# line 315 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_OR) 		end
-# line 367 "lib/oga/xpath/lexer.rl"
+# line 369 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 28 then
-# line 314 "lib/oga/xpath/lexer.rl"
+# line 316 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_DIV) 		end
-# line 367 "lib/oga/xpath/lexer.rl"
+# line 369 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 29 then
-# line 315 "lib/oga/xpath/lexer.rl"
+# line 317 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_MOD) 		end
-# line 367 "lib/oga/xpath/lexer.rl"
+# line 369 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 25 then
-# line 316 "lib/oga/xpath/lexer.rl"
+# line 318 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_MUL) 		end
-# line 367 "lib/oga/xpath/lexer.rl"
+# line 369 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 26 then
-# line 317 "lib/oga/xpath/lexer.rl"
+# line 319 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_SUB) 		end
-# line 367 "lib/oga/xpath/lexer.rl"
+# line 369 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
@@ -1826,7 +1828,7 @@ p = p - 1;		end
 		begin
 te = p+1
 		end
-# line 367 "lib/oga/xpath/lexer.rl"
+# line 369 "lib/oga/xpath/lexer.rl"
 		begin
 act = 1;		end
 	when 5 then
@@ -1834,7 +1836,7 @@ act = 1;		end
 		begin
 te = p+1
 		end
-# line 213 "lib/oga/xpath/lexer.rl"
+# line 215 "lib/oga/xpath/lexer.rl"
 		begin
 act = 6;		end
 	when 6 then
@@ -1842,7 +1844,7 @@ act = 6;		end
 		begin
 te = p+1
 		end
-# line 219 "lib/oga/xpath/lexer.rl"
+# line 221 "lib/oga/xpath/lexer.rl"
 		begin
 act = 7;		end
 	when 35 then
@@ -1850,13 +1852,13 @@ act = 7;		end
 		begin
 te = p+1
 		end
-# line 296 "lib/oga/xpath/lexer.rl"
+# line 298 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_ADD) 		end
-# line 213 "lib/oga/xpath/lexer.rl"
+# line 215 "lib/oga/xpath/lexer.rl"
 		begin
 act = 6;		end
-# line 1860 "lib/oga/xpath/lexer.rb"
+# line 1862 "lib/oga/xpath/lexer.rb"
 	end
 	end
 	end
@@ -1870,7 +1872,7 @@ ts = nil;		end
 		begin
 act = 0
 		end
-# line 1874 "lib/oga/xpath/lexer.rb"
+# line 1876 "lib/oga/xpath/lexer.rb"
 	end
 
 	if cs == 0
@@ -1899,7 +1901,7 @@ act = 0
 end
 	end
 
-# line 130 "lib/oga/xpath/lexer.rl"
+# line 132 "lib/oga/xpath/lexer.rl"
 
         # % fix highlight
       ensure
@@ -1950,7 +1952,7 @@ end
       end
 
       
-# line 379 "lib/oga/xpath/lexer.rl"
+# line 381 "lib/oga/xpath/lexer.rl"
 
     end # Lexer
   end # XPath