rexle 1.3.24 → 1.3.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50783241717d52838cb563f1597366f8c7ed5fb3
-  data.tar.gz: 53abc4c8932cb1c4945ed414bc731931797f4b39
+  metadata.gz: 7da47f8001a64e9aceee1d162829c66ec3334c57
+  data.tar.gz: a9f17ccda8b13401b56198dac0c6c8bf3abca4ec
 SHA512:
-  metadata.gz: 6ac63ab6be0d1d501be89d8515cb37cfa48ef31993f8a2fe0ed3b70d96e2e209b336d7c80a64a60b8d1db4925285995073ba38ecc62ce92503b02811ede58a7c
-  data.tar.gz: 4dd0880b32a643bb98cd39002ae983df5a085514cfd54483ed55be7a89bb6937fefcfdcccd301229f44f57ef3365b1219e2101a010e061f0ddec68d92eac67ad
+  metadata.gz: 8f83eecbb739ee7ec616145f2f26982c9f02fa03ce98c4b001e0f09474cfa77726b98fc0961466f16ec01a1f09d0c3d05136162ecbe8532b38e51aef40696b22
+  data.tar.gz: 6c228aec57852e66e76e8fa40cff9cb6fd56606f7fba06130d9e20221192a5848d9ea51b66fb43d04328a2305d3b25500344ad6d3a3e4f1160862c67437a2df5

data/lib/rexle.rb

@@ -12,6 +12,8 @@ require 'backtrack-xpath'
 
 # modifications:
 
+# 22-Apr-2016: revision: The previous feature can now include simple 
+#                        predicate logic e.g. 2 < 5
 # 22-Apr-2016: feature: Using an XPath A pure logic predicate can now be 
 #                       processed e.g. (4 % 1) != 1
 # 21-Apr-2016: feature: The xpath() method now returns a Rexle::Recordset object 
@@ -579,15 +581,19 @@ class Rexle
       # isolate the xpath to return just the path to the current element
 
       elmnt_path = s[/^([a-zA-Z:\-\*]+\[[^\]]+\])|[\/]+{,2}[^\/]+/]
-
       element_part = elmnt_path[/(^@?[^\[]+)?/,1] if elmnt_path
 
       if element_part then
 
-        unless element_part[/^(@|[@\.\w]+[\s=])/] then
+        unless element_part[/^(@|[@\.a-zA-Z]+[\s=])/] then
+
           element_name = element_part[/^[\w:\-\*\.]+/]
+
+          if element_name and element_name[/^\d/] then
+            element_name = nil
+          end
           
-          condition = raw_xpath_value unless element_name
+          condition = raw_xpath_value if element_name.nil?
 
         else
           if xpath_value[/^\[/] then
@@ -595,7 +601,6 @@ class Rexle
             element_name = nil
           else
             condition = element_part
-
             attr_search = format_condition('[' + condition + ']')
             #@log.debug 'attr_search : ' + attr_search.inspect
             return [attribute_search(attr_search, \
@@ -605,7 +610,7 @@ class Rexle
         end
 
       end
-      
+
       #element_name ||= '*'
       raw_condition = '' if condition
 
@@ -1021,9 +1026,9 @@ class Rexle
 
     def format_condition(condition)
 
-      raw_items = condition[1..-1].scan(/\'[^\']*\'|\"[^\"]*\"|\
+      raw_items = condition.sub(/\[(.*)\]/,'\1').scan(/\'[^\']*\'|\"[^\"]*\"|\
          and|or|\d+|[!=<>%]+|position\(\)|contains\([^\)]+\)|notx\([^\)]+\)|[@\w\.\/&;]+/)
-      
+
       if raw_items[0][/^\d+$/] then
 
         if condition[0 ] == '[' then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle
 version: !ruby/object:Gem::Version
-  version: 1.3.24
+  version: 1.3.26
 platform: ruby
 authors:
 - James Robertson