rexle-xpath 0.2.18 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb702835dcf62b001d9577586640e2097763f93f
-  data.tar.gz: 2c9940716120f543309787e37c56460fc206cd63
+  metadata.gz: a6830597770b873aa7b054e23d48deac4df7f203
+  data.tar.gz: 0b4b8f7dd040ee4a6d875c75690e02b75f5fd647
 SHA512:
-  metadata.gz: 3268a62a478743455c26782d3fcd2402deec696ac0c0a437b36793dfc5d4436d4a321b4a468af4f499dd09f0976d024bb7537bf52cfb88aa773d6e0ff32bd6dc
-  data.tar.gz: 3fa51c81b7ecfbf13fdb285a4f142baa0949de5374dcb1c7869f8481ad1b1da53135034a2e784fb083bd59188bdda032bd66d5c812769846255a5165a637c83f
+  metadata.gz: 0b827b5c398cb520dc0cdd27810504f696a1dbc0ce87caec856a329323004847c06d4af8734f6cc637826fe3a36a3a1daf3a91517f731cb68ba230ac9973df48
+  data.tar.gz: 27c6d89519ee72af78975f69426e18edddcc682b97c36318296d040b4126fcf27b2790f066e7399c022e6f615269bcc338d2e1a0deaccb4561d7f1e6d0be1652

data/lib/rexle-xpath.rb

@@ -42,7 +42,6 @@ class RexleXPath
     else
 
       xpath_instructions = RexleXPathParser.new(s).to_a
-      #puts 'xpath_instructions: ' + xpath_instructions.inspect
       
       query xpath_instructions, @node
     end
@@ -56,7 +55,11 @@ class RexleXPath
     row = xpath_instructions.shift
     method_name, *args = row
 
-    return query row + xpath_instructions, node if row.first.is_a? Array    
+    return query xpath_instructions, node if row == :|
+    
+    if row.is_a? Array and row.first.is_a? Array then
+      return query row + xpath_instructions, node         
+    end
 
     result = if method_name == :predicate then
 
@@ -70,7 +73,8 @@ class RexleXPath
       
     else
 
-      method(method_name.to_sym).call node, args, xpath_instructions
+      r3 = method(method_name.to_sym).call node, args, xpath_instructions
+      r3
     end
 
     result.is_a?(Array) ? result.flatten : result
@@ -171,17 +175,18 @@ class RexleXPath
       return nodes_found[i]
       
     end
-
+    
     if xpath_instructions.any? and nodes_found.any? then
 
       nodes_found.inject([]) do |r, child_node| 
 
         # deep clone the xpath instructions
         xi = xpath_instructions.deep_clone
+        operand = xi.shift  if xi.first == :|
 
         r2 = query(xi, child_node)
 
-        case r2.class.to_s.to_sym
+        r3 = case r2.class.to_s.to_sym
         when :'Rexle::Element' then r << r2
         when :TrueClass        
           predicate ? r << child_node : r << true
@@ -192,11 +197,27 @@ class RexleXPath
         when :NilClass
           r
         else
-          r2.any? ? r << r2 : r          
+          r2.any? ? r << r2 : r #<< child_node
         end # /case
         
+        if operand == :| then
+          nodes_found + r3
+        else
+          r3
+        end
+        
       end # /inject
       
+    elsif xpath_instructions.any? and nodes_found.empty?
+      
+      operator = xpath_instructions.shift
+      
+      if operator == :| then
+        query xpath_instructions, node
+      else
+        nodes_found
+      end
+      
     else
       nodes_found
     end  # /if

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle-xpath
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   nbFbbz3OsHrrR6h7FB5a8wQzCvYMtAr9VMPNl01QqBRi2wCEr6hR3gGBY0T1ZT5P
   qYzPWuECaMhR5w==
   -----END CERTIFICATE-----
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle-xpath-parser