activerecord-refinements 0.0.1 → 0.1.0

data/lib/activerecord-refinements.rb

@@ -3,48 +3,59 @@ require 'active_record'
 
 module ActiveRecord
   module Refinements
-    refine Symbol do
-      def ==(val)
-        {self => val}
-      end
-
-      def !=(val)
-        ["#{self} <> ?", val]
-      end
-
-      def =~(val)
-        ["#{self} like ?", val]
-      end
-
-      def >(val)
-        ["#{self} > ?", val]
-      end
-
-      def >=(val)
-        ["#{self} >= ?", val]
+    module WhereBlockSyntax
+      refine Symbol do
+        %i[== != =~ > >= < <=].each do |op|
+          define_method(op) {|val| [self, op, val] }
+        end
       end
+    end
 
-      def <(val)
-        ["#{self} < ?", val]
+    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
 
-      def <=(val)
-        ["#{self} <= ?", val]
+    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
-    def where(opts = nil, *rest, &block)
-      return self if opts.blank? && block.nil?
-
-      relation = clone
-      if block
-        relation.where_values += build_where(Module.new { using ActiveRecord::Refinements }.module_eval(&block))
-      else
-        relation.where_values += build_where(opts, rest)
-      end
-      relation
-    end
+    prepend ActiveRecord::Refinements::QueryMethods
   end
 end

data/lib/activerecord-refinements/version.rb

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

data/spec/where_spec.rb

@@ -8,31 +8,43 @@ describe 'Symbol enhancements' do
 
   describe '#=~' do
     subject { User.where { :name != 'nobu' }.to_sql }
-    it { should =~ /WHERE \(name <> 'nobu'\)/ }
+    it { should =~ /WHERE \("users"."name" != 'nobu'\)/ }
   end
 
   describe '#>' do
     subject { User.where { :age > 3 }.to_sql }
-    it { should =~ /WHERE \(age > 3\)/ }
+    it { should =~ /WHERE \("users"."age" > 3\)/ }
   end
 
   describe '#>=' do
     subject { User.where { :age >= 18 }.to_sql }
-    it { should =~ /WHERE \(age >= 18\)/ }
+    it { should =~ /WHERE \("users"."age" >= 18\)/ }
   end
 
   describe '#<' do
     subject { User.where { :age < 60 }.to_sql }
-    it { should =~ /WHERE \(age < 60\)/ }
+    it { should =~ /WHERE \("users"."age" < 60\)/ }
   end
 
   describe '#<=' do
     subject { User.where { :age <= 35 }.to_sql }
-    it { should =~ /WHERE \(age <= 35\)/ }
+    it { should =~ /WHERE \("users"."age" <= 35\)/ }
   end
 
   describe '#=~' do
     subject { User.where { :name =~ 'tender%' }.to_sql }
-    it { should =~ /WHERE \(name like 'tender%'\)/ }
+    it { should =~ /WHERE \("users"."name" LIKE 'tender%'\)/ }
   end
+
+  context 'outside of where block' do
+    specify {
+      expect { :omg > 1 }.to raise_error ArgumentError
+    }
+  end
+end
+
+# just to make sure that this plugin does not break AR
+describe 'AR default where syntax' do
+  subject { User.where(name: 'Ruby', age: 19).to_sql }
+  it { should =~ /WHERE "users"."name" = 'Ruby' AND "users"."age" = 19/ }
 end

metadata

@@ -1,74 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: activerecord-refinements
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
 platform: ruby
-authors: 
+authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-27 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Adding clean and powerful query syntax on AR using refinements
-email: 
+email:
 - ronnie@dio.jp
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -79,39 +76,30 @@ files:
 - lib/activerecord-refinements/version.rb
 - spec/spec_helper.rb
 - spec/where_spec.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ActiveRecord + Ruby 2.0 refinements
-test_files: 
+test_files:
 - spec/spec_helper.rb
 - spec/where_spec.rb