activerecord-refinements 0.1.0 → 0.1.1

data/lib/active_record/refinements.rb

@@ -0,0 +1,54 @@
+module ActiveRecord
+  module Refinements
+    module WhereBlockSyntax
+      refine Symbol do
+        %i[== != =~ > >= < <=].each do |op|
+          define_method(op) {|val| [self, op, val] }
+        end
+      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)
+          clone.tap do |relation|
+            relation.where_values += build_where(evaluator.evaluate(&block))
+          end
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/activerecord-refinements/version.rb

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

data/lib/activerecord-refinements.rb

@@ -1,60 +1,8 @@
 require 'activerecord-refinements/version'
 require 'active_record'
+require 'active_record/refinements'
 
 module ActiveRecord
-  module Refinements
-    module WhereBlockSyntax
-      refine Symbol do
-        %i[== != =~ > >= < <=].each do |op|
-          define_method(op) {|val| [self, op, val] }
-        end
-      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)
-          clone.tap do |relation|
-            relation.where_values += build_where(evaluator.evaluate(&block))
-          end
-        else
-          super
-        end
-      end
-    end
-  end
-
   module QueryMethods
     prepend ActiveRecord::Refinements::QueryMethods
   end

data/spec/where_spec.rb

@@ -6,7 +6,7 @@ describe 'Symbol enhancements' do
     it { should =~ /WHERE "users"."name" = 'matz'/ }
   end
 
-  describe '#=~' do
+  describe '#!=' do
     subject { User.where { :name != 'nobu' }.to_sql }
     it { should =~ /WHERE \("users"."name" != 'nobu'\)/ }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-refinements
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -72,6 +72,7 @@ files:
 - README.md
 - Rakefile
 - activerecord-refinements.gemspec
+- lib/active_record/refinements.rb
 - lib/activerecord-refinements.rb
 - lib/activerecord-refinements/version.rb
 - spec/spec_helper.rb