rexle-xpath 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e614fc69dcc5691190e32d9aba058c368e72e27d
-  data.tar.gz: e31b42bba0e3beb282e84fd4094e766bb672f831
+  metadata.gz: 18b76b3785397c285d8ecedb10d9717490fd9e45
+  data.tar.gz: d5044d586690bc448ba9a8c0878ed2d77bd7a03f
 SHA512:
-  metadata.gz: d3b6f149bc21889d548ebd46cc0ce18756cdb732ce9ab7c914354c934a6297dc8bf2529bad27ed3d35dc6ca0c0e2dc9bc3d9c419f096eea2610bb57c9b877008
-  data.tar.gz: ebad27124d720982f43e5b822b2a6890595d07f82c380e8a851b2a961f61e3aa9a5362a235007aea87e5489ce2cd790021d9ccf1bd6f0cf72c7e00c19109546b
+  metadata.gz: 366a3f5ebb06eb8ce44897d677755536bace9bbcd8f53ef9bb8f03167a8e1cc6e0a56a70a1462bcbe1e8285b2c9133d4e75aec8f4310869ff87061251c8bd9df
+  data.tar.gz: 6fd386b3acd708c283d93ee3a9f709803bc2a99bbbd2b18d7f02f739e81673658c6db0098ef43ef6f5e0cdfb4267a772058a267a32d83d47420ced7f68692caa

checksums.yaml.gz.sig

@@ -1,2 +1 @@
-�i�Z��Q�&��`P�������s+�}C�[�-\���!!&������%W�����pW$"O�w�<�L�.X���Z&`�8���]o3$m�
-����L3_։����G�H�;�r�P]O�0hPM�z�8��f���0���v���+n%��a
+x�gv���QU#�j�d�heE�ڶ�۷l�>jV���:�]6,y�(�m��w`�h�8�!�Ko �0��k�29t]�z��"��^�0�dg��p/ф�^�6�b�/Y{�)M�s}�7d�WR�l��?6l��=�����
0ѧ���t���굹���j��^g��`C��r�

data/lib/rexle-xpath.rb

@@ -7,10 +7,12 @@ require 'rexle-xpath-parser'
 
 class RexleXPath
 
-  def initialize(node=nil)
+  def initialize(node=nil, debug: false)
 
-    @node = node
 
+    @node = node
+    @debug = debug
+    
   end
 
   def parse(s)
@@ -21,15 +23,19 @@ class RexleXPath
     when /^(\w+)\(\)$/
       @node.method(($1).to_sym).call
     else
-      query @node, RexleXPathParser.new(s).to_a
+      a = RexleXPathParser.new(s).to_a
+      puts 'a: ' + a.inspect
+      query @node, a
     end
   end
 
   def query(node=@node, xpath_instructions)
 
+    debug :query, node: node, xpath_instructions: xpath_instructions
+
     r = []
 
-    row = xpath_instructions.shift        
+    row = xpath_instructions.shift
     method_name, *args = row
 
     return query node, row if row.first.is_a? Array    
@@ -47,7 +53,7 @@ class RexleXPath
     r = node.attributes[key]
     
     xi = xpath_instructions
-    
+
     if xi[0] and xi[0][0].to_sym == :value then
       
       _, operator, value = xi.shift
@@ -67,21 +73,25 @@ class RexleXPath
   
   def predicate(node, args, xpath_instructions)
     
+    debug :predicate, node: node, args: args, 
+        xpath_instructions: xpath_instructions
+
     r = query node, args
-    r ? r.any? : r    
+    r.is_a?(Array) ? r.any? : r
+
   end
   
   def select(node, args, xpath_instructions)
 
     a = node.elements.select {|x| x.name == args.first }
-
     predicate = xpath_instructions.flatten.first.to_s == 'predicate'
 
     if xpath_instructions.any? and a.any? then
       
       a.inject([]) do |r, child_node| 
-        
-        r2 = query(child_node, xpath_instructions.clone)
+
+        xi = Marshal.load( Marshal.dump(xpath_instructions) )
+        r2 = query(child_node, xi)
 
         case r2.class.to_s.to_sym
         when :'Rexle::Element' then r << r2
@@ -107,14 +117,20 @@ class RexleXPath
 
     operator, operand = args
     
-    case operator.to_sym
-    when :== then  node.text == operand
-    when :>  then  node.value > operand
-    when :<  then  node.value < operand
-    end
+    node.value.method(operator.to_sym).call operand
         
   end
   
   alias text value
   
+  def debug(method, h={})
+    
+    return unless @debug
+    
+    puts
+    puts '# inside ' + method.to_s
+    h.each {|k,v| puts "... %s: %s" % [k,v.inspect] }
+    puts
+    
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle-xpath
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - James Robertson