rexle 1.3.26 → 1.3.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7da47f8001a64e9aceee1d162829c66ec3334c57
-  data.tar.gz: a9f17ccda8b13401b56198dac0c6c8bf3abca4ec
+  metadata.gz: cc9061e7f94d1f11a1eba7340e7a5452b00649f4
+  data.tar.gz: 036c63375a1cae28f1042e4bb786417ce03f0c22
 SHA512:
-  metadata.gz: 8f83eecbb739ee7ec616145f2f26982c9f02fa03ce98c4b001e0f09474cfa77726b98fc0961466f16ec01a1f09d0c3d05136162ecbe8532b38e51aef40696b22
-  data.tar.gz: 6c228aec57852e66e76e8fa40cff9cb6fd56606f7fba06130d9e20221192a5848d9ea51b66fb43d04328a2305d3b25500344ad6d3a3e4f1160862c67437a2df5
+  metadata.gz: 9f3b082e70777e6b98bedbae24ca2765f33d308844494e9300779bef608bbda21448e3ea3e650793179a630ab2235bd84c40d0c92afe1620210d8e241abce364
+  data.tar.gz: 5f2f0abd467f33f49d438358bc1779f41df73bb954e0812b3719af8e10489ea2f2585fe1b82aa227d5f2c5a060d3c3670fbbfb1ed940003fa8a61782f4f1d9ac

data/lib/rexle.rb

@@ -12,7 +12,9 @@ require 'backtrack-xpath'
 
 # modifications:
 
-# 22-Apr-2016: revision: The previous feature can now include simple 
+# 23-Apr-2016: xpath improvement: Better predicate support 
+#                                 e.g. e.xpath("node != ''")
+#              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
@@ -596,6 +598,7 @@ class Rexle
           condition = raw_xpath_value if element_name.nil?
 
         else
+
           if xpath_value[/^\[/] then
             condition = xpath_value
             element_name = nil
@@ -627,6 +630,8 @@ class Rexle
       
       
       return_elements = []
+      
+      
 
       if raw_path[0,2] == '//' then
 
@@ -667,15 +672,44 @@ class Rexle
         elsif element_name.nil?
           return eval attr_search          
         else
+          
+          if raw_selector.nil? and ename != element_part  then
+
+            right_cond = element_part[/#{ename}(.*)/,1]
+
+          end                    
 
           return_elements = @child_elements.map.with_index.select do |x, i|
 
             next unless x.is_a? Rexle::Element
 
-            x.name == ename or  (ename == '*')
+            #x.name == ename or  (ename == '*')
+            
+            r10 = ((x.name == ename) or  (ename == '*'))
+
+            
+
           end
+          
+          if right_cond then
+                        
+            
+            r12 = return_elements.map do |x, i|
+
+              if x.text then
 
+                r11 = eval x.text.to_s + right_cond
 
+              else
+                false
+              end
+              
+            end
+            
+            return r12
+            
+          end          
+          
           if selector then
             ne = return_elements.inject([]) do |r,x| 
               i = x.last + selector
@@ -692,8 +726,7 @@ class Rexle
 
         end
       end
-
-
+                
       if return_elements.length > 0 then
 
         if (a_path + [remaining_path]).join.empty? then
@@ -741,6 +774,7 @@ class Rexle
 
           rlist = rlist.flatten(1) unless rlist.length > 1 \
                                                        and rlist[0].is_a? Array
+          rlist
 
         end
 

metadata

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