rexle 0.3.10 → 0.4.0

data/lib/rexle.rb

@@ -6,8 +6,12 @@ require 'rexleparser'
 
 class Rexle
 
-  def initialize(s)
-    a = RexleParser.new(s).to_a
+  def initialize(x)
+    procs = {
+      String: proc {|x| RexleParser.new(x).to_a},
+      Array: proc {|x| x}
+    }
+    a = procs[x.class.to_s.to_sym].call(x)
     @doc = scan_element(*a)
   end
 
@@ -35,8 +39,9 @@ class Rexle
 
   class Element
     attr_accessor :name, :value
+    attr_reader :child_lookup
 
-    def initialize(name=nil, value='', attributes={})
+    def initialize(name=nil, value='', attributFes={})
       @name, @value, @attributes = name, value, attributes
       raise "Element name must not be blank" unless name
       @child_elements = []
@@ -127,24 +132,42 @@ 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
       else
+
         and_items = raw_items.map.with_index.select{|x,i| x == 'and'}.map{|x| [x.last, x.last + 1]}.flatten
         indices = [0] + and_items + [raw_items.length]
-        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] == '='
-            "h['%s'] %s %s" % x
-          else
-            x
+
+        if raw_items[0][0] == '@' then
+          raw_items[0].sub!(/^@/,'')
+          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] == '='
+              "h['%s'] %s %s" % x
+            else
+              x
+            end
           end
-        end
 
-        return items.join(' ')
+          return items.join(' ')
+        else
+
+          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
+            else
+              x
+            end
+          end
+
+          return items.join(' ')
+        end
       end
     end
 
@@ -175,7 +198,10 @@ class Rexle
       if attr_search then
         if attr_search.is_a? Fixnum then
           block_given? ? blk.call(e) : e if i == attr_search 
-        elsif h and eval(attr_search)
+        elsif h and attr_search[/^h\[/] and eval(attr_search)
+          block_given? ? blk.call(e) : e
+        elsif attr_search[/^name ==/] and \
+            e.child_lookup.select{|name, attributes, value| eval(attr_search) }.length > 0
           block_given? ? blk.call(e) : e
         end
       else

metadata

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