rexle 1.3.19 → 1.3.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d4a05c0029e1844f848445f0253e656e76fd74e
-  data.tar.gz: 864e6fa3e813adf522b6196baed511be871aa750
+  metadata.gz: 13914206676963d56c9a33f53675fa7e37c9cb61
+  data.tar.gz: 16b304b9a20a10940b7e1f8b919234ef2d44be28
 SHA512:
-  metadata.gz: f31e0edfe2fd742b66e7f6e2de4b87b6b15e5f748d8a14f07612b950f59d24adb47726310a85360f33acb085a3102b56bde1cd6bf505050be4a1b53d2a300fd8
-  data.tar.gz: 1d553faa32a0e308f41c50e3ffe9804259960cd4b2687a253d26af7e67cdeb278f85ac9b5435824945e0aada4d42020955cfba3476041e206ed2fbb0d2d491aa
+  metadata.gz: e0bda0e89b6c9d01bcd6fc676a658d40d8ab5352f851d701a7be3bd9413efe7944b187079fc307fa74145092aaaaf83f684f6e3efd7b6aa28415b2c960bf79c1
+  data.tar.gz: 8925d282bb3314f758b6b5458208594f9b829d304dd535cd2afb83ddd5d532789aea211d36a2bbd9b096c865d72d3311078492ae2d932c1b0a1263be5f0e6c1d

data/lib/rexle.rb

@@ -12,6 +12,8 @@ require 'backtrack-xpath'
 
 # modifications:
 
+# 21-Apr-2016: 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
 # 04-Apr-2016: bug fix: modified the bug fix from the 15-Mar-2016 to 
@@ -1010,7 +1012,10 @@ class Rexle
       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;','>').gsub('=','=='), raw_items[-1]]
+
+        rrr = condition[1..-2].gsub(/position\(\)/,'i').gsub('&lt;','<')\
+            .gsub('&gt;','>').gsub(/\s=\B/,' ==').gsub(/\bmod\b/,'%')
+
         return rrr
       elsif raw_items[0][/^contains\(/]
         return raw_items[0]
@@ -1138,10 +1143,10 @@ class Rexle
     end
 
     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 
-      elsif attr_search[/i\s(?:<|>|==)\s\d+/] and eval(attr_search) then
+      elsif attr_search[/i\s(?:<|>|==|%)\s\d+/] and eval(attr_search) then
         block_given? ? blk.call(e) : e        
       elsif h and !h.empty? and attr_search[/^h\[/] and eval(attr_search) then
         block_given? ? blk.call(e) : e

metadata

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