rexle 0.2.3 → 0.2.4

data/lib/rexle.rb

@@ -14,11 +14,14 @@ class Rexle
 
     if fn_match.nil? then      
       procs = {
-        Array: proc {|x| r = x.flatten.compact; r.length == 1 ? r[0] : r}, 
+        Array: proc {|x| x.length == 1 ? x[0] : x}, 
         String: proc {|x| x}
       }
-      result = @doc.xpath(path)
+      bucket = []
+      result = @doc.xpath(path, bucket)
+
       procs[result.class.to_s.to_sym].call(result)
+      bucket
     else
       m, xpath_value = fn_match.captures
       method(m.to_sym).call(xpath_value)
@@ -49,7 +52,7 @@ class Rexle
       @child_elements << item
     end    
 
-    def xpath(xpath_value)
+    def xpath(xpath_value, rlist=[])
 
       a = xpath_value.split('/')
 
@@ -86,24 +89,42 @@ class Rexle
 
       end
 
-      wildcard = element_name[0,2] == '//'
+      wildcard = xpath_value[0,2] == '//'
+
+      if wildcard then
+        return scan_match(self, element_name, rlist) 
+      end
+
       return_elements = @child_lookup.map.with_index.select {|x| x[0][0] == element_name or element_name == '*'}
+
         
       if return_elements.length > 0 then
         if a.empty? then
           return_elements.map.with_index {|x,i| filter(x, i+1, attr_search)}
         else
-          return_elements.map.with_index {|x,i| filter(x, i+1, attr_search){|e| r = e.xpath a.join('/'); r || e }}
+          return_elements.map.with_index do |x,i| 
+            rtn_element = filter(x, i+1, attr_search){|e| r = e.xpath(a.join('/'), rlist); r || e } 
+
+            rlist << rtn_element
+            rtn_element
+          end
         end
       else
         # strip off the 1st element from the XPath
         new_xpath = xpath_value[/^\/\/\w+\/(.*)/,1]
         if new_xpath then
-          self.xpath new_xpath
+          self.xpath(new_xpath, rlist)
         end
       end
     end
 
+    def scan_match(nodes, element, rlist)
+      nodes.children.each.with_index do |x, i|
+        rlist << x if x.name == element
+        x.xpath('//' + element, rlist) unless x.children.empty?
+      end
+    end
+
     def attributes()
       @attributes
     end
@@ -133,7 +154,7 @@ class Rexle
       end
     end
 
-  end
+  end # -- end of element --
 
   def scan_element(a)
 
@@ -199,4 +220,4 @@ class Rexle
     @doc.xpath(path).flatten.compact.length
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rexle
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: []
 
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-23 00:00:00 +01:00
+date: 2010-10-25 00:00:00 +01:00
 default_executable: 
 dependencies: []