everywhere 1.0.1 → 2.0.0

data/README.rdoc

@@ -28,8 +28,15 @@ And where + "not like" as well.
 
 == Syntaxes
 
-"+Everywhere+" supports 4 syntaxes. Note that you can use only one syntax at a time, and others will be disabled.
-The +hash_value+ syntax will be enabled by default.
+"+Everywhere+" supports 5 syntaxes. Note that you can use only one syntax at a time, and others will be disabled.
+The +chain+ syntax will be enabled by default.
+
+* chain
++Model.where+ with no args can be chained with +not+, +like+, and +not_like+ methods.
+This syntax was proposed by Jeremy Kemper: https://github.com/rails/rails/pull/5950#issuecomment-5591330
+
+    User.where.not(:name => 'foo')
+     => SELECT "users".* FROM "users" WHERE ("users"."name" != 'foo')
 
 * hash_value
 Push the value into a Hash indexed by +:not+.
@@ -61,7 +68,7 @@ See specs for more details.
 
 == Supported versions
 
-ActiveRecord 3.0.x, 3.1.x, and 3.2 (edge)
+ActiveRecord 3.0.x, 3.1.x, 3.2.x, and 4.0 (edge)
 
 
 == Usage
@@ -74,9 +81,20 @@ Bundle 'everywhere' gem.
 You can choose one from four syntaxes listed above.
 For example, if you prefer the symbol syntax, put the following line in your config file.
 
-  config.active_record.where_syntax = :symbol
+  config.active_record.where_syntax = :hash_value
+
+The default value is +:chain+.
+
+* for users of previous versions
+Note that the default behaviour has been changed since 2.0 release if you've not explicitly configured the syntax.
+
+
+== Running specs
+
+There is spec file for each syntax but there is no Rake task for running all the specs at once, because there's no way to load these freedom-patches without interfering each other.
+So, please run the +rspec+ command specifying one spec file.
 
-The default value is +:hash_value+.
+% bundle e rspec spec/chain_spec.rb
 
 
 == Contributing to Everywhere

data/lib/everywhere/chain.rb

@@ -0,0 +1,58 @@
+require 'everywhere/util'
+
+module ActiveRecord
+  module ChainRelation
+    module NotBuilder
+      include Everywhere::Util
+
+      def build_where(opts, other = [])
+        super.map {|r| negate r}
+      end
+    end
+
+    module LikeBuilder
+      def build_where(opts, other = [])
+        super.map {|r| Arel::Nodes::Matches.new r.left, r.right}
+      end
+    end
+
+    module NotLikeBuilder
+      def build_where(opts, other = [])
+        super.map {|r| Arel::Nodes::DoesNotMatch.new r.left, r.right}
+      end
+    end
+
+    def not(opts, *rest)
+      extend(NotBuilder).where(opts, *rest).dup
+    end
+
+    def like(opts, *rest)
+      extend(LikeBuilder).where(opts, *rest).dup
+    end
+
+    def not_like(opts, *rest)
+      extend(NotLikeBuilder).where(opts, *rest).dup
+    end
+  end
+
+  module QueryMethods
+    if ActiveRecord::VERSION::STRING > '4'
+      def where_with_not_and_like_and_not_like(opts = nil, *rest)
+        if opts.nil?
+          spawn.extend(ChainRelation)
+        else
+          where_without_not_and_like_and_not_like(opts, *rest)
+        end
+      end
+    else
+      def where_with_not_and_like_and_not_like(opts = nil, *rest)
+        if opts.nil?
+          clone.extend(ChainRelation)
+        else
+          where_without_not_and_like_and_not_like(opts, *rest)
+        end
+      end
+    end
+    alias_method_chain :where, :not_and_like_and_not_like
+  end
+end

data/lib/everywhere/railtie.rb

@@ -10,7 +10,7 @@ module Everywhere
   class Railtie < ::Rails::Railtie #:nodoc:
     initializer 'everywhere' do |app|
       ActiveSupport.on_load(:active_record) do
-        require "everywhere/#{app.config.active_record.where_syntax || 'hash_value'}"
+        require "everywhere/#{app.config.active_record.where_syntax || 'chain'}"
       end
     end
   end

data/lib/everywhere/version.rb

@@ -1,3 +1,3 @@
 module Everywhere
-  VERSION = '1.0.1'
+  VERSION = '2.0.0'
 end

data/spec/chain_spec.rb

@@ -0,0 +1,120 @@
+require 'spec_helper'
+require 'everywhere/chain'
+
+describe 'normal query' do
+  before do
+    @where = Post.where(:title => 'hello').where_values
+  end
+  specify { @where.should have(1).item }
+  subject { @where.first }
+  its(:to_sql) { should == %q["posts"."title" = 'hello'] }
+end
+
+describe 'not' do
+  describe 'not eq' do
+    before do
+      @where = Post.where.not(:title => 'hello').where_values
+    end
+    specify { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."title" != 'hello'] }
+  end
+
+  describe 'not null' do
+    before do
+      @where = Post.where.not(:created_at => nil).where_values
+    end
+    specify { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."created_at" IS NOT NULL] }
+  end
+
+  describe 'not in' do
+    before do
+      @where = Post.where.not(:title => %w[hello goodbye]).where_values
+    end
+    specify { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."title" NOT IN ('hello', 'goodbye')] }
+  end
+
+  describe 'association' do
+    before do
+      @where = Post.joins(:comments).where.not(:comments => {:body => 'foo'}).where_values
+    end
+    specify { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["comments"."body" != 'foo'] }
+  end
+
+  describe 'with preceding where' do
+    before do
+      @where = Post.where(:title => 'hello').where.not(:title => 'world').where_values
+    end
+    specify { @where.should have(2).items }
+    it 'should work' do
+      @where.last.to_sql.should == %q["posts"."title" != 'world']
+    end
+    describe 'preceding where' do
+      it 'should not be affected' do
+        @where.first.to_sql.should == %q["posts"."title" = 'hello']
+      end
+    end
+  end
+
+  describe 'with succeeding where' do
+    before do
+      @where = Post.where.not(:title => 'hello').where(:title => 'world').where_values
+    end
+    specify { @where.should have(2).items }
+    it 'should work' do
+      @where.first.to_sql.should == %q["posts"."title" != 'hello']
+    end
+    describe 'succeeding where' do
+      it 'should not be affected' do
+        @where.last.to_sql.should == %q["posts"."title" = 'world']
+      end
+    end
+  end
+end
+
+describe 'like' do
+  describe 'like match' do
+    before do
+      @where = Post.where.like(:title => 'he%').where_values
+    end
+    specify { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."title" LIKE 'he%'] }
+  end
+end
+
+describe 'not like' do
+  describe 'not like match' do
+    before do
+      @where = Post.where.not_like(:title => 'he%').where_values
+    end
+    specify { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."title" NOT LIKE 'he%'] }
+  end
+end
+
+describe 'chaining multiple extended queries' do
+  before do
+    @where = Post.where.like(:title => '%hell%').where.not(:title => 'world').where.not_like(:title => 'heaven and %').where_values
+  end
+  specify { @where.should have(3).items }
+  describe 'not' do
+    subject { @where[1] }
+    its(:to_sql) { should == %q["posts"."title" != 'world'] }
+  end
+  describe 'like' do
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."title" LIKE '%hell%'] }
+  end
+  describe 'not like' do
+    subject { @where.last }
+    its(:to_sql) { should == %q["posts"."title" NOT LIKE 'heaven and %'] }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: everywhere
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2012-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -74,6 +74,7 @@ files:
 - Rakefile
 - everywhere.gemspec
 - lib/everywhere.rb
+- lib/everywhere/chain.rb
 - lib/everywhere/hash_key.rb
 - lib/everywhere/hash_value.rb
 - lib/everywhere/method.rb
@@ -81,6 +82,7 @@ files:
 - lib/everywhere/symbol.rb
 - lib/everywhere/util.rb
 - lib/everywhere/version.rb
+- spec/chain_spec.rb
 - spec/hash_key_spec.rb
 - spec/hash_value_spec.rb
 - spec/method_spec.rb
@@ -111,6 +113,7 @@ signing_key:
 specification_version: 3
 summary: Hash condition syntax for AR query everywhere!
 test_files:
+- spec/chain_spec.rb
 - spec/hash_key_spec.rb
 - spec/hash_value_spec.rb
 - spec/method_spec.rb