rexle 0.5.2 → 0.5.3

data/lib/rexle.rb

@@ -159,18 +159,20 @@ class Rexle
     end
 
     def format_attributes(condition)
-      raw_items = condition[1..-1].scan(/\'[^\']*\'|and|\d+|[!=]+|[@\w\.]+/)
+      raw_items = condition[1..-1].scan(/\'[^\']*\'|and|or|\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]
+        andor_items = raw_items.map.with_index.select{|x,i| x[/and|or/]}.map{|x| [x.last, x.last + 1]}.flatten
+
+        indices = [0] + andor_items + [raw_items.length]
 
         if raw_items[0][0] == '@' then
-          raw_items[0].sub!(/^@/,'')
+          raw_items.each{|x| x.gsub!(/^@/,'')}
           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] == '='

metadata

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