rexle 1.2.24 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c587a7adf6153f298ab4f9c8d22b18739fa423a7
-  data.tar.gz: f417248f88dfb25dd2185d9c5588823598808a19
+  metadata.gz: 8af7ff3ce7ef696fa24a906caa25c32381c11458
+  data.tar.gz: 756dc93d3d000174f6e7d44230092ab827498ccb
 SHA512:
-  metadata.gz: d8669981d259758addaec1848a6be6cc62ae6f3e6314b48ca3fd45090c1b906e7f76243e6a886bd0fdc506b1a675ae2eafa443128fd1bfb7b240834a070da83e
-  data.tar.gz: bf6a08e14b84c7fd705865582dc369859670302371e1c67c0a42b50f39b9aedc9af4d49747526df2202561b3f21c6e9cb8339d78b202798191c441543987a7ea
+  metadata.gz: 0af0430e0dc89eb284320748b95421cdeb69da273fb268dddc981724aba5a5c32dcfccf7fab01519aea4a4a7108da10932921c61faf361ef34dbb9dd84e1296e
+  data.tar.gz: 9de8aac2472905c73183f64063ef5e1218e18694ca40e0ead0cec3ac247898b8da2f017cfd716b7885abf8a43638f3caa72bcbe5bc6d8fcf04625db10b45e5df

data/lib/rexle.rb

@@ -11,6 +11,8 @@ require 'cgi'
 
 # modifications:
 
+# 30-Apr-2015: improvement: Rexle::Element#xpath function contains() can 
+#                           now handle string values
 # 24-Mar-2015: bug fix: Rexle::Elements no longer allows indexes less than 1
 # 20-Mar-2015: bug fix: Dynarex documents which fail to parse properly with the
 #                          Dynarex parser are now parsed by by the Rexle parser
@@ -304,7 +306,7 @@ class Rexle
     @instructions = [["xml", "version='1.0' encoding='UTF-8'"]] 
     @doctype = :xml
 
-    # what type of input is it? Is it a string, array, or REXML doc?
+    # what type of input is it? Is it a string, array
     if x then
       procs = {
         String: proc {|x| parse_string(x)},
@@ -314,9 +316,7 @@ class Rexle
       doc_node = ['doc',Attributes.new]
   
       @a = procs[x.class.to_s.to_sym].call(x)
-      #@log.debug 'rexle: before scan_element a: ' + @a.inspect
       @doc = scan_element(*(doc_node << @a))
-      #@log.debug 'rexle: after scan_element' + self.to_a.inspect
       
       # fetch the namespaces
       @prefixes = []
@@ -438,7 +438,6 @@ class Rexle
     
     def xpath(path, rlist=[], &blk)
 
-      #return if path[/^(?:preceding|following)-sibling/]
       r = filter_xpath(path, rlist=[], &blk)
       r.is_a?(Array) ? r.compact : r      
     end
@@ -456,7 +455,7 @@ class Rexle
         m = end_fn_match[1..-4]
         [method(m.to_sym).call(xpath path)]
       
-      elsif (fn_match and fn_match.captures.first[/^(attribute|@)/]) or fn_match.nil? then 
+      elsif (fn_match and fn_match.captures.first[/^(attribute|@)/]) 
 
         procs = {
 
@@ -479,33 +478,63 @@ class Rexle
 
           query_xpath(xp.strip, bucket, &blk)         
         end
-
+        
         results = raw_results
 
         procs[results.class.to_s.to_sym].call(results) if results              
         
-      else
+      elsif fn_match.nil?
+        
+        procs = {
 
-        m, xpath_value, index = fn_match.captures        
+          Array: proc { |x| 
+            if block_given? then 
+              x.flatten(1) 
+            else
+              rs = x.flatten
+              rs.any?{|x| x == true or x == false} ? rs : rs.uniq(&:object_id) 
+            end
+          }, 
+         String: proc {|x| x},
+          Hash: proc {|x| x},
+          TrueClass: proc{|x| x},
+          FalseClass: proc{|x| x},
+          :"Rexle::Element" => proc {|x| [x]}
+        }
+        bucket = []
+        raw_results = path.split('|').map do |xp|
+
+          query_xpath(xp.strip, bucket, &blk)         
+        end
+
+        return [true] if !path[/[><]/] and raw_results.flatten.index(true)
+        results = raw_results # .flatten.select {|x| x}
+        
+        procs[results.class.to_s.to_sym].call(results) if results            
         
+      else
+        
+        m, xpath_value, index = fn_match.captures        
+
         if m == 'text' then
           a = texts()
           return index ? a[index.to_i - 1].to_s : a
         end
         
-        xpath_value.empty? ? method(m.to_sym).call : method(m.to_sym).call(xpath_value) 
+        raw_results = xpath_value.empty? ? method(m.to_sym).call : method(m.to_sym).call(xpath_value) 
+
+        raw_results
+
       end
 
     end    
     
     def query_xpath(raw_xpath_value, rlist=[], &blk)
 
-      #remove any pre'fixes
-     #@rexle.prefixes.each {|x| xpath_value.sub!(x + ':','') }
+
       flag_func = false            
 
       xpath_value = raw_xpath_value.sub('child::','./')
-      #xpath_value.sub!(/\.\/(?=[\/])/,'')
 
       if xpath_value[/^[\w\/]+\s*=.*/] then        
         flag_func = true
@@ -513,11 +542,8 @@ class Rexle
         xpath_value.sub!(/^\w+\s*=.*/,'.[\0]')
         xpath_value.sub!(/\/([\w]+\s*=.*)/,'[\1]')
 
-        #result = self.element xpath_value        
-        #return [(result.is_a?(Rexle::Element) ? true : false)]
       end
 
-      #xpath_value.sub!(/^attribute::/,'*/attribute::')
       raw_path, raw_condition = xpath_value.sub(/^\.?\/(?!\/)/,'')\
           .match(/([^\[]+)(\[[^\]]+\])?/).captures 
 
@@ -659,6 +685,9 @@ class Rexle
 
               r = e.xpath(a_path.join('/') + raw_condition.to_s \
                     + remaining_path, &blk)
+
+              r = e if r.is_a?(Array) and r.first and r.first == true and a_path.empty?
+
               r
             end
 
@@ -672,6 +701,8 @@ class Rexle
               rtn_element
             elsif rtn_element.is_a? Rexle::Element
               rtn_element
+            elsif rtn_element  == true
+              true
             end
           end
 

metadata

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