rexle 0.5.7 → 0.5.8

data/lib/rexle.rb

@@ -74,9 +74,16 @@ class Rexle
  
         s = a_path.shift
       end
-
+  
       elmnt_path = s[/^([\w\*]+\[[^\]]+\])|[\/]+{,2}[^\/]+/]
-      element_name, condition = elmnt_path.match(/(^[^\[]+)(\[[^\]]+\])?/).captures
+      element_part, condition = elmnt_path.match(/(^@?[^\[]+)(\[[^\]]+\])?/).captures
+
+      unless element_part[/^@/] then
+        element_name = element_part
+      else
+        condition = element_part
+        element_name = nil
+      end
       
       attr_search = format_attributes(condition) if condition
 
@@ -212,16 +219,27 @@ class Rexle
 
     def scan_match(nodes, element, attr_search, condition, rlist)
       nodes.children.each.with_index do |x, i|
-        if x.name == element
-          h = x.attributes
-          if attr_search then
-            rlist << x if h and eval(attr_search)
-          else
-            rlist << x 
+
+        h = x.attributes
+
+        if element and not(element.empty?) then
+          if x.name == element
+            if attr_search then
+              rlist << x if h and eval(attr_search)
+            else
+              rlist << x 
+            end
           end
-        end
+        else
 
-        x.xpath('//' + element + condition.to_s, rlist) unless x.children.empty?
+          attribute = condition[/@(.*)/,1]
+  
+          if h.has_key? attribute then
+            rlist << h[attribute]
+          end
+        end
+    
+        x.xpath('//' + element.to_s + condition.to_s, rlist) unless x.children.empty?
       end
       rlist
     end

metadata

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