rexle 1.4.9 → 1.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98f19567413d343fb79d1c7e52f86fdc9dbdc88b
-  data.tar.gz: bafcdc98a8e5b68a6c62bfdee0848c207fd76e54
+  metadata.gz: bb551e9cf6a92e8f75ac9067fad4c2afaf5f7dd9
+  data.tar.gz: 5e73ba3a1bae02aa5ce2385d43d4dd6bf131f3c8
 SHA512:
-  metadata.gz: b37416cc559780e556e9a1c7d84b9b9a4a5c27ee8fb617e4c92ad875fd78f74ca9b3b99b9cae272546e0b804bf6cd9433b3337fd292d9ae594c870277bdc330f
-  data.tar.gz: a2723ec9c0a4916c17d42ceb614461ca10239b9a029cb951c74a477311c26eef21518d2877e45ef415f0d504b14c57a88ad63aecf64fbe2e6f1dc865cffe280c
+  metadata.gz: 4cd6f197d50eb6a4f8c9e5f5813b718daef95691d4e3ecd76673a0b3df73483f4fb1a5b8ac4bbf3609757c3e97338fca2810f5c83444197354d99bf5db403026
+  data.tar.gz: ce54a10d2f5371009657ace6951f2504a58ad12a7a02ead2077b1cdcd3a1fd9dd0f16199fa90dfa13e58be3224469289be200b1a247f8d3e0a0441fdd8dc548b

data/lib/rexle.rb

@@ -11,6 +11,8 @@ require 'backtrack-xpath'
 
 
 # modifications:
+# 16-Sep-2017: improvement: Multiple results are now returned if the 
+#                           xpath contains an *and* operator
 # 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]
@@ -528,18 +530,29 @@ class Rexle
         }
         bucket = []
         
-        if path =~ /[\[]|\(/ then
+        results = if path =~ /[\[]|\(/ then
 
           raw_results = path.split(/\|/).map do |xp|
             query_xpath(xp.strip, bucket, &blk)         
           end
+
+          raw_results.flatten.index(true) ? [true] : []
+          
         else
           raw_results = path.split(/ *(?:\||\band\b) */).map do |xp|
             query_xpath(xp.strip, bucket, &blk)         
           end          
+
+          if path =~ / and / then
+
+            raw_results.flatten.select {|x| x == true or x == false}            
+
+          else
+            raw_results.flatten.index(true) ? [true] : []
+          end
         end
-        
-        return [true] if !path[/[><]/] and raw_results.flatten.index(true)
+
+        return results if !path[/[><]/] and results.any?
         results = raw_results # .flatten.select {|x| x}
         
         procs[results.class.to_s.to_sym].call(results) if results            

metadata

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