rexle 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d0cd773f30476b44a8f3efca774d605dce5d4e8
-  data.tar.gz: f70f550783380e1110135310ff6da3888a4dbc5c
+  metadata.gz: 263aade38f51977874dcd017bc8639d475c02dd5
+  data.tar.gz: bf4857e694d9ebb017bbb90f3a9ac2b0758f0f0b
 SHA512:
-  metadata.gz: e73b58669324eb634853d98da2fd6d7441d0dd1936c823f62f4b4fe621c1586f14d3f58994c2df6f813ac570c7c9f89173736a9c2b442c3b0c3b67670e1ba603
-  data.tar.gz: 67c3c47d64f818463a2c5998bb38b23b9cf742ab430cd8b40ef04472497ac1ac1043b69d035751c4e8c5eeefbbdfb60a167ed8e7330c70e6a181f67915aee556
+  metadata.gz: 7df7c15a944ce8a73bce3f60abde5fecfd854fd4b2fac74e4e77a34fa9c5ac20e1b376f437f685a95400cf75917853deb320f964d91608bba2c7d3c1c41441ec
+  data.tar.gz: 026a933cf664b37bc1a984156aafc36861edcac8cd451a321446da54523cc0aa56e4e069f53bf7c1d699c6b4634f4059de1bb266f0c0cd2a0a848db5a33dca62

data/lib/rexle.rb

@@ -11,7 +11,7 @@ include REXML
 
 # modifications:
 
-# 14-Jun-2014: bug fix: Processing instructions should now display properly
+# 12-Jul-2014: XPath with a single element condition now works e.g. b[c]
 # 07-Jun-2014: bug fix: An XPath nested within an XPath (using a selector) 
 #                       should now wok properly e.g. record/abc[item/xyz="red"]
 # 04-Jun-2014: bug fix: If XPath contains /text(), only valid 
@@ -309,6 +309,7 @@ class Rexle
 
       #    Array: proc {|x| x.flatten.compact}, 
       if (fn_match and fn_match.captures.first[/^(attribute|@)/]) or fn_match.nil? then 
+
         procs = {
           #jr061012 Array: proc {|x| block_given? ? x : x.flatten.uniq },
           Array: proc { |x| 
@@ -335,6 +336,7 @@ class Rexle
         procs[results.class.to_s.to_sym].call(results) if results
         
       else
+
         m, xpath_value = fn_match.captures        
         xpath_value.empty? ? method(m.to_sym).call : method(m.to_sym).call(xpath_value) 
       end
@@ -452,7 +454,7 @@ 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
+          rlist = return_elements.map.with_index {|x,i| filter(x, i+1, attr_search, &blk)}.compact          
           rlist = rlist[0] if rlist.length == 1
 
         else
@@ -822,6 +824,7 @@ class Rexle
       h = x[0][1]  # <-- fetch the attributes      
       
       if attr_search then
+
         attribute_search(attr_search,e, h, i, &blk)
       else
 
@@ -832,8 +835,6 @@ class Rexle
 
     def attribute_search(attr_search, e, h, i=nil, &blk)
 
-      r2 = e.xpath('records/dependency/summary/title')
-
       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
@@ -854,6 +855,8 @@ class Rexle
         end
       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
       end      
     end
   end # -- end of element --

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   UOGKUMV5RApHDnC0ywMYNe0HK7qMSTP5YLKs8JUjNxpc5jl8+o3D3sHkNN4DzbQm
   jVfzDZ+niKvAUA==
   -----END CERTIFICATE-----
-date: 2014-06-14 00:00:00.000000000 Z
+date: 2014-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexleparser
@@ -145,3 +145,4 @@ signing_key:
 specification_version: 4
 summary: Rexle is a simple XML parser written purely in Ruby
 test_files: []
+has_rdoc: