activerecord-refinements 0.1.1 → 0.2.0

data/lib/active_record/refinements.rb

@@ -8,42 +8,31 @@ module ActiveRecord
       end
     end
 
-    class WhereBlockEvaluator
-      using ActiveRecord::Refinements::WhereBlockSyntax
-
-      def initialize(table)
-        @table = table
-      end
-
-      def evaluate(&block)
-        col, op, val = instance_eval &block
-        case op
-        when :==
-          @table[col].eq val
-        when :!=
-          @table[col].not_eq val
-        when :=~
-          @table[col].matches val
-        when :>
-          @table[col].gt val
-        when :>=
-          @table[col].gteq val
-        when :<
-          @table[col].lt val
-        when :<=
-          @table[col].lteq val
-        else
-          raise "unexpected op: #{op}"
-        end
-      end
-    end
-
     module QueryMethods
       def where(opts = nil, *rest, &block)
         if block
-          evaluator = ActiveRecord::Refinements::WhereBlockEvaluator.new(table)
+          col, op, val = Module.new { using ActiveRecord::Refinements::WhereBlockSyntax }.module_eval &block
+          arel_node = case op
+          when :==
+            table[col].eq val
+          when :!=
+            table[col].not_eq val
+          when :=~
+            table[col].matches val
+          when :>
+            table[col].gt val
+          when :>=
+            table[col].gteq val
+          when :<
+            table[col].lt val
+          when :<=
+            table[col].lteq val
+          else
+            raise "unexpected op: #{op}"
+          end
+
           clone.tap do |relation|
-            relation.where_values += build_where(evaluator.evaluate(&block))
+            relation.where_values += build_where(arel_node)
           end
         else
           super

data/lib/activerecord-refinements/version.rb

@@ -1,5 +1,5 @@
 module Activerecord
   module Refinements
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-refinements
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord