rexle 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bf60ae25658ed969dbe3950f707b4ff7e94afd0
-  data.tar.gz: c30ecda0639ac7c4f8234143a65e3b9e9fd64a41
+  metadata.gz: 2c17be6210359cbed7e2a1698eed5c7b16c118ec
+  data.tar.gz: 1b73e55d26b5f68c66fb1cfa90703e4efff5314e
 SHA512:
-  metadata.gz: 8b797c8787295ecfcf2c86bc84dd33be781eb9ba03a6c086346e7d453c044dfd9085d7849800d11188cb07e50fea6f47db215813174784db1037e2b0ee64f039
-  data.tar.gz: e9cf788c8c308d81102a2a796571a95c2b8a054cf236f7cb79e079b861710e3e851c119b71e778a632c445322c5ba0dbe26255b4c2c790def110f24652fe4da3
+  metadata.gz: b9a2e7317838895ba06abc7931eac60936a22f4b3e1a60bc9ea031d14645851393381a4b90e2215b77d90f0d1a1b16ba9daa680736dcc43373bd7f7f7ca56945
+  data.tar.gz: bdeee7323744309d7eec27e72c714355a51733587925b90f0b36797235b0f8e0001e2ccc92a3dc276c8ddd02ea94afbfb1e507de38ea586dffe97763231ab381

checksums.yaml.gz.sig

@@ -1,3 +1 @@
-H�=�,pr���@��]��PS*2��f�!��f`�0�a):� ?!fi�j���5�ĀFH�Dc��5�#Wf֗���9?SP
-��£�꒘��Q�*�
��H~Hw��I`nh��e'jY�ICTA��������R��ϐmBk�
-��5��y<y�2ܺt��9��#�7���{i�d)��D�A�VC�)d3���j[vɍ��+��AN��Y	�9�`,�C�x�ڣ6!C:���^�Ԋ����	�&2���
+��~&?��{��v�JsG��e57'J�[T@ҟ�M����$\b

data/lib/rexle.rb

@@ -11,6 +11,8 @@ require 'cgi'
 
 # modifications:
 
+# 02-May-2015: improvement: Rexle::Element#xpath function contains() can 
+#                          now be used as a condition .e.g. b[contains(c,'10')]
 # 30-Apr-2015: improvement: Rexle::Element#xpath function contains() can 
 #                           now handle string values
 #              feature: Implemented Rexle::Element#backtrack which 
@@ -371,7 +373,7 @@ class Rexle
     end
     
     def backtrack()
-      BacktrackXPath.new(self).to_s
+      BacktrackXPath.new(self)
     end
     
     def cdata?()
@@ -379,14 +381,18 @@ class Rexle
     end
 
     def contains(raw_args)
+
       path, raw_val = raw_args.split(',',2)
       val = raw_val.strip[/^["']?.*["']?$/]      
       
       anode = query_xpath(path)
-      return unless anode
+
+      return [false] if anode.nil? or anode.empty?
+
       a = scan_contents(anode.first)
-     
-      [a.grep(/#{val}/).length > 0]
+      r = [a.grep(/#{val.sub(/^["'](.*)["']$/,'\1')}/).length > 0]
+
+      r.any?
     end    
     
     def count(path)
@@ -537,7 +543,6 @@ class Rexle
     
     def query_xpath(raw_xpath_value, rlist=[], &blk)
 
-
       flag_func = false            
 
       xpath_value = raw_xpath_value.sub('child::','./')
@@ -555,14 +560,20 @@ class Rexle
 
       remaining_path = ($').to_s
 
+      if remaining_path[/^contains\(/] then
+        raw_condition = raw_condition ? raw_condition + '/' + remaining_path : remaining_path
+        remaining_path = ''        
+      end
+
       r = raw_path[/^([^\/]+)(?=\/\/)/,1] 
+      
       if r then
         a_path = raw_path.split(/(?=\/\/)/,2)
       else
         a_path = raw_path.split('/',2)
       end
       
-      condition = raw_condition if a_path.length <= 1
+      condition = raw_condition if a_path.length <= 1 #and not raw_condition[/^\[\w+\(.*\)\]$/]
 
       if raw_path[0,2] == '//' then
         s = ''
@@ -608,7 +619,7 @@ class Rexle
       #element_name ||= '*'
       raw_condition = '' if condition
 
-      attr_search = format_condition(condition) if condition and condition.length > 0      
+      attr_search = format_condition(condition) if condition and condition.length > 0   
       attr_search2 = xpath_value[/^\[(.*)\]$/,1]
 
       if attr_search2 then
@@ -645,12 +656,12 @@ class Rexle
         if ename != '..' then
 
           return_elements = @child_elements.map.with_index.select do |x, i|
-            
+
             next unless x.is_a? Rexle::Element
 
             (x.name == ename || ename == '.') or  (ename == '*')
           end
-          
+
           if selector then
             ne = return_elements.inject([]) do |r,x| 
               i = x.last + selector
@@ -680,7 +691,13 @@ class Rexle
 
         if (a_path + [remaining_path]).join.empty? then
 
-          rlist = return_elements.map.with_index {|x,i| filter(x, i+1, attr_search, &blk)}.compact          
+          # pass in a block to the filter if it is function contains?
+          rlist = return_elements.map.with_index do |x,i| 
+            r5 = filter(x, i+1, attr_search, &blk)
+
+            r5
+          end.compact
+
           rlist = rlist[0] if rlist.length == 1
 
         else
@@ -731,6 +748,7 @@ class Rexle
       rlist = rlist.flatten(1) unless not(rlist.is_a? Array) or (rlist.length > 1 and rlist[0].is_a? Array)
       rlist = [rlist] if rlist.is_a? Rexle::Element
       rlist = (rlist.length > 0 ? true : false) if flag_func == true
+
       rlist
     end
 
@@ -990,13 +1008,17 @@ class Rexle
 
     def format_condition(condition)
 
-      raw_items = condition[1..-1].scan(/\'[^\']*\'|\"[^\"]*\"|and|or|\d+|[!=<>]+|position\(\)|[@\w\.\/&;]+/)
-
+      raw_items = condition[1..-1].scan(/\'[^\']*\'|\"[^\"]*\"|\
+         and|or|\d+|[!=<>]+|position\(\)|contains\([^\)]+\)|[@\w\.\/&;]+/)
+      
+      
       if raw_items[0][/^\d+$/] then
         return raw_items[0].to_i
       elsif raw_items[0] == 'position()' then
         rrr = "i %s %s" % [raw_items[1].gsub('&lt;','<').gsub('&gt;','>'), raw_items[-1]]
         return rrr
+      elsif raw_items[0][/^contains\(/]
+        return raw_items[0]
       else
 
         andor_items = raw_items.map.with_index.select{|x,i| x[/\band\b|\bor\b/]}.map{|x| [x.last, x.last + 1]}.flatten
@@ -1094,7 +1116,7 @@ class Rexle
     
     
     def filter(raw_element, i, attr_search, &blk)
-
+      
       x, index = raw_element
       e = @child_elements[index]
 
@@ -1102,10 +1124,11 @@ class Rexle
       name, value = e.name, e.value if e.is_a? Rexle::Element
 
       h = x.attributes  # <-- fetch the attributes      
-      
+
       if attr_search then
 
-        attribute_search(attr_search,e, h, i, &blk)
+        r6 = attribute_search(attr_search,e, h, i, &blk)
+        r6
       else
 
         block_given? ? blk.call(e) : e
@@ -1140,7 +1163,7 @@ class Rexle
         if eval(attr_search) then
           block_given? ? blk.call(e) : e
         end
-      elsif attr_search[/e\.xpath/] and eval(attr_search)           
+      elsif attr_search[/e\.xpath/] and eval(attr_search)
         block_given? ? blk.call(e) : e
       elsif e.element attr_search then
         block_given? ? blk.call(e) : e

data.tar.gz.sig

@@ -1 +1 @@
--X ���lr�.�`�6�1/iy�M�"�����؍F�`���cEzh�6	�Xq;jF1���5ji��6o�#�3 ������xIK�{ep�A��S��(���O���J���˯%nG��t��	�pX�%�I���բ��o"�����N�p//�˘�F3��wF���g8t��ֶ1e�=�f�cQqv��r��"rX�I����ݸ�����᱌�n4���g�z�30Wl��.-i5V�lC(�|�j<
+������P����6��Ws��Nl3��uj���e,d>8����Kp�e���

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   Tkua07gB3/nVO3aPg7C3vEbDZCxT3WAMli2uZisYT6ozmdAlDsixLjipgFN4If3z
   Ej0QR3kvGcAvFQ==
   -----END CERTIFICATE-----
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexleparser