rexle-xpath 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf2484b60dec398cec31fd15d4fdb5eb9671c709
-  data.tar.gz: 23c7da936c86982362c683ff34aad29dba2a72cc
+  metadata.gz: 7e3af7b969033bc79cda32bf7ab3a65d9b54cc9e
+  data.tar.gz: 32b1214acd14d40e15c91ad212c13f6a9d279f9c
 SHA512:
-  metadata.gz: 9edbc0f90a0f60907355b4e243d455a9df024d65bb3b413df5a007609502a232bf27fba9413d79913f474c9a8cf05dc9016860076339e0bcbeaf774d1289e31c
-  data.tar.gz: 70cf9c629140b49899bee288ebd32ef12247d4856fe6d6b64dc99a57546dd4bdeb2324d4ba836853a0bb3f2526638fa2717c4a4c099cf76cae4abf2a24153810
+  metadata.gz: c0fa3140fc5bf40451319decd8aa432ddb235f6c7f8e0f6de79da0fce45d0cfa04557458e7b12733c0b7a79f0c2fac4175b8dc2927b5b142acd631e2e686dd13
+  data.tar.gz: 253b0aa1f5a1aeeba768ff5d5dd3d0f0a80f0e5d6c58843bc2dfa0fd86431903f285c06af1ad209e70a0be1a7b7ee8f204dbbc92194560cac822a04c9f832ce4

data/lib/rexle-xpath.rb

@@ -16,26 +16,39 @@ class RexleXPath
   def parse(s)
 
     case s
+      
+    # it's an xpath function
     when /^(\w+)\(\)$/
       @node.method(($1).to_sym).call
     else
-      query RexleXPathParser.new(s).to_a
+      query @node, RexleXPathParser.new(s).to_a
     end
   end
 
-  def query(a)
+  def query(node, xpath_instructions)
     
     r = []
+    row = xpath_instructions.shift    
+
+    method_name, *args = row
     
-    a.each do |row|
-      x, *args = row
-      if x == :select then
-        r = @node.select args.first
-      elsif row.is_a? Array then
-        r = query row
+    a = if method_name == :select then
+      
+      r = node.select args.first
+
+      if xpath_instructions.any? and r.any? then
+        r.map {|child_node| query(child_node, xpath_instructions) }
+      else
+        r
       end
+      
+    elsif row.is_a? Array then
+      query node, row
+    else
+      []
     end
-    r
+
+    a.flatten
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle-xpath
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   05Hvy/ad61XnzWtun98claEIk/rC/TxPrbRaOd7vN99WxTy1xn8ElfLSx7CDDrTc
   qN5t1BlRcAgKNw==
   -----END CERTIFICATE-----
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle-xpath-parser