rexle-xpath 0.2.15 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba20f6447871f17c33de45038b860e1f504ea1c2
-  data.tar.gz: ad9f3424c0e4ce948b8e79e2dbda30ad382428a2
+  metadata.gz: 602043c3e561402f8ca1ccba80381ddf76a8aeb4
+  data.tar.gz: af520c3562d76c5113f5a3773bde1f6f26abf5be
 SHA512:
-  metadata.gz: 4f31b4597152e487e85be19f9c80d2c60d0c6b7dff3cc20feeddc39302d31b101dda60eeedd7fa00b81def4c7e47ea5126955614aea0051d2299cc2ea5a71781
-  data.tar.gz: b57bdfac02d9cf80a4dc641b264ae3a6c139902504f4d3852d34f53d97698d328081c6b347e0a6ab3e05478b665c1f43248ab0851758682ecd8c6f958fbe0681
+  metadata.gz: 8ef9645ceadaac88f925d9fe49557111c2bf82b19030f9cdf1478e90c247309ad01d81c985b7b3765c8298e9b7166b6b08a67683af99aa2c218e8ed09742a0bf
+  data.tar.gz: 1500e641feb3a365fa9a9954f7647e9a5459faf49cee29216e4bf0cdcd2a86312c3e8ecc4c3fde5bb93ef4c8a3771dd9ed117fd9497862bf7c9ae2ad4205669e

data.tar.gz.sig

@@ -1,2 +1 @@
-ce�C:�4���W�$��Dx�(L��f^�+
S	'�C�5�ބ_s�)̇J��T�|��7Z��\\�Zd0����1ӭ��o���B׸')�F�R�����T<:Ĩ�@����!�(F>@7�Ħ�^��$�f�*|D��0
-"�i?:������$�
��ʷje!��nQ.`"�oQmj@���-��[z�Y��["�If˂�q�H�K����3�����Y�y�E��3���h�R^�����2�lJ���
+�3z�n��ղ
��[KN�m	8�ׇ�+�Nr;�__�R�A�<uT�	�lD��.z%�g���V���W��J�e{��v&�9�T�J��{�@@��#w�=��S7����V�
��b��o�r�
�h?����w&'�����OVCۂ�����P~)�+0�El�6�$�y�a�E`�Z�W�oԧ����"��$�\�^�?
�և��Ip�	m�!�Y���d�\}��e�o5���>c����hkK�_M��n����

data/lib/rexle-xpath.rb

@@ -28,7 +28,7 @@ class RexleXPath
   end
 
   def parse(s)
-      
+
     # it's an xpath function only
     if /^(?<name>\w+)\(\)$/ =~ s
       
@@ -40,29 +40,42 @@ class RexleXPath
       select(@node, [name])
       
     else
+
+      xpath_instructions = RexleXPathParser.new(s).to_a
+      #puts 'xpath_instructions: ' + xpath_instructions.inspect
       
-      a = RexleXPathParser.new(s).to_a
-      #puts 'a: ' + a.inspect
-      query @node, a
+      query xpath_instructions, @node
     end
   end
 
-  def query(node=@node, xpath_instructions)
+  
+  def query(xpath_instructions=[], node=@node)
 
     debug :query, node: node, xpath_instructions: xpath_instructions
 
-    r = []
-
     row = xpath_instructions.shift
     method_name, *args = row
 
-    return query node, row + xpath_instructions if row.first.is_a? Array    
+    return query row + xpath_instructions, node if row.first.is_a? Array    
+
+    result = if method_name == :predicate then
+
+      result2 = method(method_name.to_sym).call node, args,[]
+      
+      if result2 and xpath_instructions.any? then
+        query xpath_instructions, node
+      else
+        result2
+      end
+      
+    else
 
-    result = method(method_name.to_sym).call node, args, xpath_instructions
+      method(method_name.to_sym).call node, args, xpath_instructions
+    end
 
     result.is_a?(Array) ? result.flatten : result
 
-  end
+  end 
   
   private
   
@@ -77,7 +90,7 @@ class RexleXPath
     xi = xpath_instructions
 
     if xi[0] and xi[0][0].to_sym == :value then
-      
+
       _, operator, value = xi.shift
       attr.method(operator.to_sym).call value
     else
@@ -89,7 +102,7 @@ class RexleXPath
   
   def count(node, args, xpath_instructions)    
     
-    r = query node, xpath_instructions
+    r = query xpath_instructions, node
     [r.length]
   end   
   
@@ -99,14 +112,14 @@ class RexleXPath
         xpath_instructions: xpath_instructions    
     
     i = args.first.to_i
-    r = query node, xpath_instructions
+    r = query xpath_instructions, node
 
     [r[i-1]]
   end
   
   def not(node, args, xpath_instructions)
     
-    r = query node, xpath_instructions
+    r = query xpath_instructions, node
     !(r ? r.any? : r)
   end  
   
@@ -115,7 +128,7 @@ class RexleXPath
     debug :predicate, node: node, args: args, 
         xpath_instructions: xpath_instructions
 
-    r = query node, args
+    r = query args, node
 
     r.is_a?(Array) ? r.any? : r
 
@@ -126,9 +139,9 @@ class RexleXPath
     xi = args #xpath_instructions
 
     a = []
-    a << query(node, xi.deep_clone)
+    a << query(xi.deep_clone, node)
     
-    node.each_recursive {|e| a << query(e, xi.deep_clone) }
+    node.each_recursive {|e| a << query(xi.deep_clone, e) }
     
     a
   end
@@ -158,13 +171,13 @@ class RexleXPath
     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
-        
-        r2 = query(child_node, xi)
+
+        r2 = query(xi, child_node)
 
         case r2.class.to_s.to_sym
         when :'Rexle::Element' then r << r2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle-xpath
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.16
 platform: ruby
 authors:
 - James Robertson
@@ -12,26 +12,26 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE1MDUyOTA4MzYwOFoXDTE2MDUyODA4MzYwOFowSDESMBAG
+  8ixkARkWAmV1MB4XDTE2MDUyOTEzNDcxMFoXDTE3MDUyOTEzNDcxMFowSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBALy0FdFJna4wkq3SX9hCeP9TMhhFTYu2NnW9eRGsF+KnXtPy87L68mqeR5BI
-  GoqSB8HWMlT+DK22HkZEbTMutgOv7JiAUfnOVyghYuHPtfx0XLnb1oIycBzoormG
-  8cgrgc9ajiHxMoz9B1l2yges8+KaKKHGTPHw00DBiYyp0PgHq0f+h/INp1kNzaLA
-  0u7fNCqrrlGGoCKBRcJq4zPeDhRQmRtwlcElaXcF+bZ04SPV1OkD8Ng4PoiKE7jP
-  krMQVu9Ln2GTib0hRxsNNZ4+KeO8bW0nRKK0mSe5duNOYO8F+vckmN0APoLbvn+K
-  wnquYBdnTk5xN3jc+QDNjeuv4v0CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUrWqdHAo8bGle2j3re/GRitAIg2EwJgYDVR0RBB8w
+  ggEBALISALPfeFb2IHDDnLTLgPjc25llYtMV4gD+oMXTIv3xOlwxJwj6b6LiTW9W
+  A60bBReSKThPYIFRQF9NcGuMRpH16pX8aWR+Z5SSIyj5g3t9GZJrmybdksZxR0kY
+  DY3/8vBqYtd1cEDQOVZpveSp1qB3E7J2Z4WNcO9L9dOd3BWSdq8YjteRPZggvGlT
+  k4rWmEAOHKP1YrZmFKxXv99lD9BhnHRDwuBkkIc8YIotYqbz7YJrUjxaR2/spaf7
+  nrJ/u70qVjagrxYfrqpTIx4/t5GXZYDEVKwcoVSD0F6v52jVc29wUDvWP2L8thZI
+  K+gimjnSkr+QO/JuAbY2da2cjscCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUuYfEtfspBiGjzk1B4p1281vD4PAwJgYDVR0RBB8w
   HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAsrGQxmVo
-  BZBzHfcAYG/wa99XsVYTcw0aCEK9EEKuzsp+I7QAJFu8mV1kP9mVPIEHpI7Qrepk
-  JoUZVonykY1QJ9xIncLXiS50KVt0DJSg5e3olB/e73JtIwZJN/6cB756vv5vKTY6
-  D30YDVtDUnmuN5ddCtlLEJ2iITJpYfHCOeNUULqcdCX6v5o8B3fOVpQEU75/xEe+
-  HlklO2rMIVCoPcvxRzDWGUlqo0rdyrrxrCibpS05UNJtR031CYDUJH+SCwwGWP2B
-  05Hvy/ad61XnzWtun98claEIk/rC/TxPrbRaOd7vN99WxTy1xn8ElfLSx7CDDrTc
-  qN5t1BlRcAgKNw==
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEANbAbWnyn
+  0AUujyss1lchjhHqQjF7BOnk5M+d32p4A73PMm4XtfqgwiD1Ix8ygZ6onARuGrcf
+  4NEjk0DS314WYILcXPjg5hDxyb57LJZq4Y4mnQ//a87Zb9xuR+478fZH/IldAZSc
+  rRwpzA/L7RE4YXq11UAMUfo/HXMd8ksCU9yL4MoJwyIDInLzZLW1gAT+cnzb2gyL
+  rXQIHP1YcNVmPNdYLPiBN6F6aSHZYVlJmsBQytSQGlWTcqJ4bVvKE+j7yfoxaBqi
+  nbFbbz3OsHrrR6h7FB5a8wQzCvYMtAr9VMPNl01QqBRi2wCEr6hR3gGBY0T1ZT5P
+  qYzPWuECaMhR5w==
   -----END CERTIFICATE-----
-date: 2016-05-28 00:00:00.000000000 Z
+date: 2016-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle-xpath-parser