rexle 1.3.14 → 1.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e776621157e65a33b2df6868828286633b40d8f5
-  data.tar.gz: 9a0d1b84665de2e310ba49dd5534a9df3325c81d
+  metadata.gz: 14c6f276ae292ed9e707c76af6996b7ff9b66c34
+  data.tar.gz: f8b62b17790fa2e0b5cdc132a7d9a589a23b95bf
 SHA512:
-  metadata.gz: 2251cb40dd1c6bdad1ad0462e5fdc1a09d238e66b107c7a7991a1527cbd97a638b98ac3df3a9a0bfe2e7143adae120584c5e596cad0c940586b7c08ec8829797
-  data.tar.gz: 7786bb4e4bcec86144aed24fefbf6bb3e78f0b30df78fb5b12d0bac12ebf94e14f992fd70e0aa6d4e01ffc1b75198d155d922fa6f3584dc77a542504227305db
+  metadata.gz: ff4e2456dde4369a2dc688df333085f2c6579c04954ed1c419c427fd17560d1695590e9fadc2b89c5eebfe90bace5c46a14b33128f41f47fb61639c36ec10268
+  data.tar.gz: 6caaa53b123b3cd2089f5c9794927d53f8e0adba57ec3c349e0160028b231daa06f17ef5ec03ad77509a68d2ca7886761b76ed34f55ffa01c9f92f2c2bb3950e

data/lib/rexle.rb

@@ -12,6 +12,8 @@ require 'backtrack-xpath'
 
 # modifications:
 
+# 15-Mar-2016: bug fix: Reapplied a select case statement (which had 
+#                     subsequently been deleted) from method attribute_search()
 # 13-Mar-2016: bug fix: Reapplied a statement that was commented out in 
 #                       the previous gem release
 #              bug fix: Removed a redundant statement from 
@@ -310,6 +312,7 @@ class Rexle
     end
 
     def contains(raw_args)
+
       #log = Logger.new('rexle.log','daily')
       #log.debug 'inside contains'
       path, raw_val = raw_args.split(',',2)
@@ -498,7 +501,7 @@ class Rexle
     end    
     
     def query_xpath(raw_xpath_value, rlist=[], &blk)
-      
+
       #@log.debug 'query_xpath : ' + raw_xpath_value.inspect
       #@log.debug '++ ' + self.xml.inspect
 
@@ -519,9 +522,11 @@ class Rexle
           .match(/([^\[]+)(\[[^\]]+\])?/).captures 
 
       remaining_path = ($').to_s
+
       #@log.debug 'remaining_path: ' + remaining_path.inspect
 
       if remaining_path[/^contains\(/] then
+
         raw_condition = raw_condition ? raw_condition + '/' + remaining_path \
                                                                : remaining_path
         remaining_path = ''        
@@ -629,8 +634,12 @@ class Rexle
           r2 =  self.parent.xpath(remaining_xpath)
 
           return r2
+          
         elsif ename == '.'
-          return self
+
+          remaining_xpath = raw_path[1..-1]
+          return remaining_xpath.empty? ? self : self.xpath(remaining_xpath)
+          
         else
 
           return_elements = @child_elements.map.with_index.select do |x, i|
@@ -1069,18 +1078,17 @@ class Rexle
     end
     
     def scan_match(node, path)
-
+      
       if path == '//' then
         return [node, node.text, 
           node.elements.map {|x| scan_match x, path}]
       end
-
+      
       r = []
       xpath2 = path[2..-1] 
-      xpath2.sub!(/^\*\//,'')
-      xpath2.sub!(/^\*/,self.name)
-      xpath2.sub!(/^\w+/,'').sub!(/^\//,'') if xpath2[/^\w+/] == self.name
-      
+      #jr150316 xpath2.sub!(/^\*\//,'')
+      #jr150316xpath2.sub!(/^\*/,self.name)
+      #jr150316xpath2.sub!(/^\w+/,'').sub!(/^\//,'') if xpath2[/^\w+/] == self.name
 
       r << node.xpath(xpath2)
       r << node.elements.map {|n| scan_match(n, path) if n\
@@ -1152,6 +1160,8 @@ class Rexle
         end
       elsif attr_search[/e\.xpath/] and eval(attr_search)
         block_given? ? blk.call(e) : e
+      elsif e.element(attr_search)
+        block_given? ? blk.call(e) : e
       end      
 
       r2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle
 version: !ruby/object:Gem::Version
-  version: 1.3.14
+  version: 1.3.15
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   Tkua07gB3/nVO3aPg7C3vEbDZCxT3WAMli2uZisYT6ozmdAlDsixLjipgFN4If3z
   Ej0QR3kvGcAvFQ==
   -----END CERTIFICATE-----
-date: 2016-03-13 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexleparser