rexle 1.4.8 → 1.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 865cc7a71d4a184f3ce0450eb298ec0f54e326ad
-  data.tar.gz: 1307888f6c0f21619f8b75c8c1e4fc121e557956
+  metadata.gz: 98f19567413d343fb79d1c7e52f86fdc9dbdc88b
+  data.tar.gz: bafcdc98a8e5b68a6c62bfdee0848c207fd76e54
 SHA512:
-  metadata.gz: 28d1a7a4fad981131f6a0ac81f984501138e82fe8ca20f0df8466bc238b499b36874a721bd06d54023564deb4e58234e8196602f238d241e9f214e028f89abcf
-  data.tar.gz: aadce61ccd4c3cd539ae5b6cc0971c4f294df0abb1ed37df8bae26c2f0e18de8102b746e393ab742b7b9c471c9e1ad1f541f3c16dac3f716d11da761780fce20
+  metadata.gz: b37416cc559780e556e9a1c7d84b9b9a4a5c27ee8fb617e4c92ad875fd78f74ca9b3b99b9cae272546e0b804bf6cd9433b3337fd292d9ae594c870277bdc330f
+  data.tar.gz: a2723ec9c0a4916c17d42ceb614461ca10239b9a029cb951c74a477311c26eef21518d2877e45ef415f0d504b14c57a88ad63aecf64fbe2e6f1dc865cffe280c

data.tar.gz.sig

@@ -1,3 +1,3 @@
-�ڞ�@��2��	/�a�z"q�>q�-!�A*#��7io�[R�wa��ȇM�2��}��l����[(���1�^��7qe{�o�u��X�̃8��2thAuk~�䙧F[����*5Q�
-��
-	Sވ��25�t�K��	�5��s�W)(���7{s:�?�9V�&�%�'#�,ܙ�>
+Ak���=���;�&h�T�;Ϸ�}n���Ԟ1��Ԓ>�)?��K���2�A]��,y?��{��`�eZ�ݾ�R��~�d�1������d
+�RN��*���6�T�N�����d�F4��h����l)�)�
�i��?�+˖1�Wa>O�gS=�"JC�r�,j�v�a)5x�OQ�6Q��vȋ�‰�U�J��.8<簍��ؖ�u5B��j�裎�m��
+Ҽ�l��57V|���;�s25

data/lib/rexle.rb

@@ -11,6 +11,8 @@ require 'backtrack-xpath'
 
 
 # modifications:
+# 14-Sep-2017: improvement: An *and* operator can now be 
+#                           used between xpath statements
 # 10-Sep-2017: bug fix: The following XPath has now been tested => //.[@id]
 # 10-Aug-2017: feature: Rexle now has a member variable (@rexle) to keep 
 #              track of the working document when elements are passed to 
@@ -525,10 +527,18 @@ class Rexle
           :"Rexle::Element" => proc {|x| [x]}
         }
         bucket = []
-        raw_results = path.split('|').map do |xp|
-          query_xpath(xp.strip, bucket, &blk)         
-        end
+        
+        if path =~ /[\[]|\(/ then
 
+          raw_results = path.split(/\|/).map do |xp|
+            query_xpath(xp.strip, bucket, &blk)         
+          end
+        else
+          raw_results = path.split(/ *(?:\||\band\b) */).map do |xp|
+            query_xpath(xp.strip, bucket, &blk)         
+          end          
+        end
+        
         return [true] if !path[/[><]/] and raw_results.flatten.index(true)
         results = raw_results # .flatten.select {|x| x}
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.4.9
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   CqFh6U4iXSHeN7EtB+IaYwj0O7/uQThVBDM+MzSHp5u25hrVs7KrKap0f6rdAVcF
   1V8kvBbe/enp7g==
   -----END CERTIFICATE-----
-date: 2017-09-10 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexleparser