rexle 0.5.1 → 0.5.2

data/lib/rexle.rb

@@ -24,18 +24,20 @@ class Rexle
     
   end
 
-  def xpath(path)
+  def xpath(path, &blk)
 
     # is it a function
     fn_match = path.match(/^(\w+)\(([^\)]+)\)$/)
 
+    #    Array: proc {|x| x.flatten.compact}, 
     if fn_match.nil? then      
       procs = {
-        Array: proc {|x| x.flatten.compact}, 
-        String: proc {|x| x}
+        Array: proc {|x| block_given? ? x : x.flatten }, 
+        String: proc {|x| x},
+        :"Rexle::Element" => proc {|x| [x]}
       }
       bucket = []
-      result = @doc.xpath(path, bucket)
+      result = @doc.xpath(path, bucket, &blk)
 
       procs[result.class.to_s.to_sym].call(result)
       
@@ -57,23 +59,23 @@ class Rexle
       @child_lookup = []
     end
 
-    def xpath(xpath_value, rlist=[])
+    def xpath(xpath_value, rlist=[], &blk)
 
-      a = xpath_value.split('/')
+      a_path = xpath_value.split('/')
 
       if xpath_value[0,2] == '//' then
-        s = a[2]
+        s = a_path[2]
       elsif xpath_value == 'text()' then      
-        a.shift
+        a_path.shift
         return @value
       else
         attribute = xpath_value[/^attribute::(.*)/,1] 
         return @attributes[attribute] if attribute and @attributes and @attributes.has_key?(attribute)
  
-        s = a.shift
+        s = a_path.shift
       end
 
-      elmnt_path = s[/^(\w+\[[^\]]+\])|[\/]+{,2}[^\/]+/]
+      elmnt_path = s[/^([\w\*]+\[[^\]]+\])|[\/]+{,2}[^\/]+/]
       element_name, condition = elmnt_path.match(/(^[^\[]+)(\[[^\]]+\])?/).captures
       
       attr_search = format_attributes(condition) if condition
@@ -86,22 +88,28 @@ class Rexle
         
       if return_elements.length > 0 then
 
-        if a.empty? then
-          rlist = return_elements.map.with_index {|x,i| filter(x, i+1, attr_search)}
+        if a_path.empty? then
+          rlist = return_elements.map.with_index {|x,i| filter(x, i+1, attr_search, &blk)}
+          rlist = rlist[0] if rlist.length <= 1
         else
           
           rlist << return_elements.map.with_index do |x,i| 
-            rtn_element = filter(x, i+1, attr_search){|e| r = e.xpath(a.join('/')); r || e }
-            next unless rtn_element 
+            rtn_element = filter(x, i+1, attr_search){|e| r = e.xpath(a_path.join('/'), &blk); (r || e) }
+            next if rtn_element.nil? or (rtn_element.is_a? Array and rtn_element.empty?)
 
             if rtn_element.is_a? Array then
-              rtn_element.flatten
-            elsif (rtn_element.is_a? String) || not(rtn_element[0].is_a? String)
+              rtn_element
+            elsif (rtn_element.is_a? String) || (rtn_element.is_a?(Array) and not(rtn_element[0].is_a? String))
+              rtn_element
+            elsif rtn_element.is_a? Rexle::Element
               rtn_element
             end
           end
+          #
+          rlist = rlist.flatten(1) unless rlist.length > 1 and rlist[0].is_a? Array
 
         end
+        rlist.compact! if rlist.is_a? Array
 
       else
 
@@ -109,11 +117,13 @@ class Rexle
         new_xpath = xpath_value[/^\/\/\w+\/(.*)/,1]
 
         if new_xpath then
-          self.xpath(new_xpath, rlist)
+          self.xpath(new_xpath, rlist,&blk)
         end
       end
 
       #a.shift # added by jr 171110
+      rlist = rlist.flatten(1) unless not(rlist.is_a? Array) or (rlist.length > 1 and rlist[0].is_a? Array)
+      rlist = [rlist] if rlist.is_a? Rexle::Element
       rlist
     end
 
@@ -215,7 +225,6 @@ class Rexle
       e = @child_elements[x.last]
       h = x[0][1]  # <-- fetch the attributes
 
-
       if attr_search then
         if attr_search.is_a? Fixnum then
           block_given? ? blk.call(e) : e if i == attr_search 
@@ -311,10 +320,10 @@ class Rexle
   
   # scan a rexml doc
   #
-  def scan_doc(node)
+  def scan_doc(node)a = rexle.xpath("records/url"){|e| %w(full_url short_url).map{|x| e.text(x)}}
     children = node.elements.map {|child| scan_doc child}
     attributes = node.attributes.inject({}){|r,x| r.merge(Hash[*x])}
     [node.name, node.text.to_s, attributes, *children]
   end
     
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rexle
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: []