rexle 0.4.7 → 0.4.8

data/lib/rexle.rb

@@ -71,7 +71,8 @@ class Rexle
         s = a.shift
       end
 
-      element_name, condition = s.match(/(^[^\[]+)(\[[^\]]+\])?/).captures
+      elmnt_path = s[/^(\w+\[[^\]]+\])|[\/]+{,2}[^\/]+/]
+      element_name, condition = elmnt_path.match(/(^[^\[]+)(\[[^\]]+\])?/).captures
       
       attr_search = format_attributes(condition) if condition
 
@@ -110,6 +111,7 @@ class Rexle
         end
       end
 
+      #a.shift # added by jr 171110
       rlist
     end
 
@@ -139,7 +141,7 @@ class Rexle
     end
 
     def format_attributes(condition)
-      raw_items = condition[1..-1].scan(/\'[^\']*\'|and|\d+|[!=]+|[@\w]+/)
+      raw_items = condition[1..-1].scan(/\'[^\']*\'|and|\d+|[!=]+|[@\w\.]+/)
    
       if raw_items[0][/^\d+$/] then
         return raw_items[0].to_i
@@ -165,9 +167,14 @@ class Rexle
 
           cons_items = indices.each_cons(2).map{|x,y| raw_items.slice(x...y)}
           items = cons_items.map do |x| 
+
             if x.length >= 3 then
               x[1] = '==' if x[1] == '='
-              "name == '%s' and value %s %s" % x
+              if x[0] != '.' then
+                "name == '%s' and value %s %s" % [x[0], x[1], x[2]]
+              else
+                "e.value %s %s" % [x[1], x[2]]
+              end
             else
               x
             end
@@ -178,6 +185,8 @@ class Rexle
       end
     end
 
+
+
     def scan_match(nodes, element, attr_search, condition, rlist)
       nodes.children.each.with_index do |x, i|
         if x.name == element
@@ -200,6 +209,7 @@ 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 
@@ -208,6 +218,8 @@ class Rexle
         elsif attr_search[/^name ==/] and \
             e.child_lookup.select{|name, attributes, value| eval(attr_search) }.length > 0
           block_given? ? blk.call(e) : e
+        elsif attr_search[/^e\.value/] and eval(attr_search)           
+          block_given? ? blk.call(e) : e
         end
       else
         block_given? ? blk.call(e) : e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rexle
 version: !ruby/object:Gem::Version 
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors: []
 
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 +00:00
+date: 2010-11-17 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency