rexle 1.3.20 → 1.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13914206676963d56c9a33f53675fa7e37c9cb61
-  data.tar.gz: 16b304b9a20a10940b7e1f8b919234ef2d44be28
+  metadata.gz: 4dbefefe2ee7e079624cf397cd956515d26fcb47
+  data.tar.gz: 55f6a9d18b0e0b2c547d585dbb117705978b5991
 SHA512:
-  metadata.gz: e0bda0e89b6c9d01bcd6fc676a658d40d8ab5352f851d701a7be3bd9413efe7944b187079fc307fa74145092aaaaf83f684f6e3efd7b6aa28415b2c960bf79c1
-  data.tar.gz: 8925d282bb3314f758b6b5458208594f9b829d304dd535cd2afb83ddd5d532789aea211d36a2bbd9b096c865d72d3311078492ae2d932c1b0a1263be5f0e6c1d
+  metadata.gz: 74c97ba08e685e66b599de477e99ca56af1c250362310dbb0e6e3f01294819c3accaf4b790eb88f04f81c1768f293d9f175d7045fbe5e196bfb15cd3d3ee1f83
+  data.tar.gz: 2d9ad02d1e4cea5cbd320909df7840049e1402b241a0445814bd2dfab3298f400d47d52b14c858d62ba067f9c5ac59e140421f707f16fb06404dd0996dbb4f1c

data/lib/rexle.rb

@@ -12,7 +12,9 @@ require 'backtrack-xpath'
 
 # modifications:
 
-# 21-Apr-2016: An xpath predicate can now contain the mod operator as well as 
+# 21-Apr-2016: feature: The element index can now be used through an 
+#                       xpath block parameter
+#              An xpath predicate can now contain the mod operator as well as 
 #              containing nested logic  e.g. [(position() mod 2) == 1]
 # 16-Apr-2016: improvement: The HTML element div is no longer printed as 
 #                           a self-closing tag if empty
@@ -1137,7 +1139,7 @@ class Rexle
         r6
       else
 
-        block_given? ? blk.call(e) : e
+        block_given? ? blk.call(e, i) : e
       end
 
     end
@@ -1145,21 +1147,21 @@ class Rexle
     def attribute_search(attr_search, e, h, i=nil, &blk)
       
       r2 = if attr_search.is_a? Fixnum then
-        block_given? ? blk.call(e) : e if i == attr_search 
+        block_given? ? blk.call(e,i) : e if i == attr_search 
       elsif attr_search[/i\s(?:<|>|==|%)\s\d+/] and eval(attr_search) then
-        block_given? ? blk.call(e) : e        
+        block_given? ? blk.call(e,i) : e        
       elsif h and !h.empty? and attr_search[/^h\[/] and eval(attr_search) then
-        block_given? ? blk.call(e) : e
+        block_given? ? blk.call(e,i) : e
       elsif attr_search[/^\(name ==/] and e.child_elements.select {|x| 
             next unless x.is_a? Rexle::Element
             name, attributes, value = x.name, x.attributes, x.value.to_s
             b = eval(attr_search)
             b}.length > 0
 
-        block_given? ? blk.call(e) : e
+        block_given? ? blk.call(e,i) : e
         
       elsif attr_search[/^\(name ==/] and eval(attr_search) 
-        block_given? ? blk.call(e) : e          
+        block_given? ? blk.call(e,i) : e          
       elsif attr_search[/^e\.value/]
 
         v = attr_search[/[^\s]+$/]
@@ -1167,12 +1169,12 @@ class Rexle
         attr_search.sub!(/^e.value/,'e.value.' + duck_type)
 
         if eval(attr_search) then
-          block_given? ? blk.call(e) : e
+          block_given? ? blk.call(e,i) : e
         end
       elsif attr_search[/e\.xpath/] and eval(attr_search)
-        block_given? ? blk.call(e) : e
+        block_given? ? blk.call(e,i) : e
       elsif attr_search[/^\w+\(/] and e.element(attr_search)
-        block_given? ? blk.call(e) : e
+        block_given? ? blk.call(e,i) : e
       end      
 
       r2

metadata

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