rexle 1.3.23 → 1.3.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6c5957458176112c174e906f22b66b4bcf89491
-  data.tar.gz: d90e7b7fab6073f713389f5322bb77e9360f4051
+  metadata.gz: 50783241717d52838cb563f1597366f8c7ed5fb3
+  data.tar.gz: 53abc4c8932cb1c4945ed414bc731931797f4b39
 SHA512:
-  metadata.gz: 0dfd23f375e064a7fb3521c72e8c9d2797f39199aff63921fc9220ef345c37c30e51a62efa06798a73d9edc174956b70de7c068738e762099efb6bea61b56142
-  data.tar.gz: 494fef4519f78b160ba8ffb9e8cc99246b1c8e30626c40d65e440b0e22043dce2a36cf7add7c694b34a4e8fd25949c23f9a3e726d73afb0b0331d24fa727db52
+  metadata.gz: 6ac63ab6be0d1d501be89d8515cb37cfa48ef31993f8a2fe0ed3b70d96e2e209b336d7c80a64a60b8d1db4925285995073ba38ecc62ce92503b02811ede58a7c
+  data.tar.gz: 4dd0880b32a643bb98cd39002ae983df5a085514cfd54483ed55be7a89bb6937fefcfdcccd301229f44f57ef3365b1219e2101a010e061f0ddec68d92eac67ad

data/lib/rexle.rb

@@ -12,6 +12,8 @@ require 'backtrack-xpath'
 
 # modifications:
 
+# 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 
 #                       which itself can be treat as a Rexle document
 #              An xpath predicate can now contain the mod operator as well as 
@@ -411,6 +413,7 @@ class Rexle
     alias previous_sibling previous_element
     
     def xpath(path, rlist=[], &blk)
+      
       #@log.debug 'inside xpath ' + path.inspect
 
       r = filter_xpath(path, rlist=[], &blk)
@@ -461,7 +464,6 @@ class Rexle
         }
         bucket = []
         raw_results = path.split('|').map do |xp|
-
           query_xpath(xp.strip, bucket, &blk)         
         end
         
@@ -489,7 +491,6 @@ class Rexle
         }
         bucket = []
         raw_results = path.split('|').map do |xp|
-
           query_xpath(xp.strip, bucket, &blk)         
         end
 
@@ -497,7 +498,7 @@ class Rexle
         results = raw_results # .flatten.select {|x| x}
         
         procs[results.class.to_s.to_sym].call(results) if results            
-        
+
       else
         
         m, xpath_value, index = fn_match.captures        
@@ -526,7 +527,7 @@ class Rexle
       xpath_value = raw_xpath_value.sub('child::','./')
 
       if xpath_value[/^[\w\/]+\s*=.*/] then
-        #@log.debug 'yah'
+
         flag_func = true
 
         xpath_value.sub!(/^\w+\s*=.*/,'.[\0]')
@@ -535,7 +536,7 @@ class Rexle
       end
 
       raw_path, raw_condition = xpath_value.sub(/^\.?\/(?!\/)/,'')\
-          .match(/([^\[]+)(\[[^\]]+\])?/).captures 
+          .match(/([^\[]+)(\[[^\]]+\])?/).captures
 
       remaining_path = ($').to_s
 
@@ -549,7 +550,7 @@ class Rexle
       end
 
       r = raw_path[/^([^\/]+)(?=\/\/)/,1] 
-      
+
       if r then
         a_path = raw_path.split(/(?=\/\/)/,2)
       else
@@ -577,13 +578,16 @@ class Rexle
 
       # isolate the xpath to return just the path to the current element
 
-      elmnt_path = s[/^([\w:\-\*]+\[[^\]]+\])|[\/]+{,2}[^\/]+/]
+      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
           element_name = element_part[/^[\w:\-\*\.]+/]
+          
+          condition = raw_xpath_value unless element_name
 
         else
           if xpath_value[/^\[/] then
@@ -601,7 +605,7 @@ class Rexle
         end
 
       end
-
+      
       #element_name ||= '*'
       raw_condition = '' if condition
 
@@ -655,7 +659,8 @@ class Rexle
 
           remaining_xpath = raw_path[1..-1]
           return remaining_xpath.empty? ? self : self.xpath(remaining_xpath)
-          
+        elsif element_name.nil?
+          return eval attr_search          
         else
 
           return_elements = @child_elements.map.with_index.select do |x, i|
@@ -1017,10 +1022,15 @@ class Rexle
     def format_condition(condition)
 
       raw_items = condition[1..-1].scan(/\'[^\']*\'|\"[^\"]*\"|\
-         and|or|\d+|[!=<>]+|position\(\)|contains\([^\)]+\)|notx\([^\)]+\)|[@\w\.\/&;]+/)
+         and|or|\d+|[!=<>%]+|position\(\)|contains\([^\)]+\)|notx\([^\)]+\)|[@\w\.\/&;]+/)
       
       if raw_items[0][/^\d+$/] then
-        return raw_items[0].to_i
+
+        if condition[0 ] == '[' then
+          return raw_items[0].to_i
+        else
+          return condition
+        end
       elsif raw_items[0] == 'position()' then
 
         rrr = condition[1..-2].gsub(/position\(\)/,'i').gsub('&lt;','<')\
@@ -1181,7 +1191,7 @@ class Rexle
         end
       elsif attr_search[/e\.xpath/] and eval(attr_search)
         block_given? ? blk.call(e) : e
-      elsif attr_search[/^\w+\(/] and e.element(attr_search)
+      elsif attr_search[/^\w*\(/] and e.element(attr_search)
         block_given? ? blk.call(e) : e
       end      
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle
 version: !ruby/object:Gem::Version
-  version: 1.3.23
+  version: 1.3.24
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   pOw2Fx4uv9tO6wagRTcaHduxkh4jYfPDQI9mODFccHeY+wRLDGTENQwIILvMgEa7
   50vRuyU+obGfjg==
   -----END CERTIFICATE-----
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexleparser