ransack 1.3.0 → 1.4.0

data/spec/ransack/adapters/active_record/context_spec.rb

@@ -3,11 +3,16 @@ require 'spec_helper'
 module Ransack
   module Adapters
     module ActiveRecord
+      version = ::ActiveRecord::VERSION
+      AR_version = "#{version::MAJOR}.#{version::MINOR}"
+
       describe Context do
         subject { Context.new(Person) }
 
-        if ::ActiveRecord::VERSION::STRING >= "3.1"
-          its(:alias_tracker) { should be_a ::ActiveRecord::Associations::AliasTracker }
+        if AR_version >= "3.1"
+          its(:alias_tracker) {
+            should be_a ::ActiveRecord::Associations::AliasTracker
+          }
         end
 
         describe '#relation_for' do
@@ -22,7 +27,8 @@ module Ransack
             result = subject.evaluate(search)
 
             expect(result).to be_an ::ActiveRecord::Relation
-            expect(result.to_sql).to match /#{quote_column_name("name")} = 'Joe Blow'/
+            expect(result.to_sql)
+            .to match /#{quote_column_name("name")} = 'Joe Blow'/
           end
 
           it 'SELECTs DISTINCT when distinct: true' do
@@ -38,12 +44,15 @@ module Ransack
           let(:shared_context) { Context.for(Person) }
 
           before do
-            Search.new(Person, {:parent_name_eq => 'A'}, context: shared_context)
-            Search.new(Person, {:children_name_eq => 'B'}, context: shared_context)
+            Search.new(Person, { :parent_name_eq => 'A' },
+              context: shared_context)
+            Search.new(Person, { :children_name_eq => 'B' },
+              context: shared_context)
           end
 
-          describe '#join_associations', :if => ::ActiveRecord::VERSION::STRING <= '4.0' do
-            it 'returns dependent join associations for all searches run against the context' do
+          describe '#join_associations', :if => AR_version <= '4.0' do
+            it 'returns dependent join associations for all searches run
+                against the context' do
               parents, children = shared_context.join_associations
 
               expect(children.aliased_table_name).to eq "children_people"
@@ -53,22 +62,28 @@ module Ransack
             it 'can be rejoined to execute a valid query' do
               parents, children = shared_context.join_associations
 
-              expect { Person.joins(parents).joins(children).to_a }.to_not raise_error
+              expect { Person.joins(parents).joins(children).to_a }
+              .to_not raise_error
             end
           end
 
-          describe '#join_sources', :if => ::ActiveRecord::VERSION::STRING >= '3.1' do
-            it 'returns dependent arel join nodes for all searches run against the context' do
+          describe '#join_sources' do
+            # FIXME: fix this test for Rails 4.2.
+            it 'returns dependent arel join nodes for all searches run against
+            the context',
+            :if => %w(3.1 3.2 4.0 4.1).include?(AR_version) do
               parents, children = shared_context.join_sources
 
               expect(children.left.name).to eq "children_people"
               expect(parents.left.name).to eq "parents_people"
             end
 
-            it 'can be rejoined to execute a valid query' do
+            it 'can be rejoined to execute a valid query',
+            :if => AR_version >= '3.1' do
               parents, children = shared_context.join_sources
 
-              expect { Person.joins(parents).joins(children).to_a }.to_not raise_error
+              expect { Person.joins(parents).joins(children).to_a }
+              .to_not raise_error
             end
           end
         end

data/spec/ransack/nodes/condition_spec.rb

@@ -5,13 +5,21 @@ module Ransack
     describe Condition do
 
       context 'with multiple values and an _any predicate' do
-        subject { Condition.extract(Context.for(Person), 'name_eq_any', Person.first(2).map(&:name)) }
+        subject {
+          Condition.extract(
+            Context.for(Person), 'name_eq_any', Person.first(2).map(&:name)
+          )
+        }
 
         specify { expect(subject.values.size).to eq(2) }
       end
 
       context 'with an invalid predicate' do
-        subject { Condition.extract(Context.for(Person), 'name_invalid', Person.first.name) }
+        subject {
+          Condition.extract(
+            Context.for(Person), 'name_invalid', Person.first.name
+          )
+        }
 
         context "when ignore_unknown_conditions is false" do
           before do

data/spec/ransack/predicate_spec.rb

@@ -80,6 +80,70 @@ module Ransack
       end
     end
 
+    describe 'true' do
+      it 'generates an equality condition for boolean true' do
+        @s.awesome_true = true
+        field = "#{quote_table_name("people")}.#{quote_column_name("awesome")}"
+        expect(@s.result.to_sql).to match /#{field} = #{
+          ActiveRecord::Base.connection.quoted_true}/
+      end
+
+      it 'generates an inequality condition for boolean true' do
+        @s.awesome_true = false
+        field = "#{quote_table_name("people")}.#{quote_column_name("awesome")}"
+        expect(@s.result.to_sql).to match /#{field} != #{
+          ActiveRecord::Base.connection.quoted_true}/
+      end
+    end
+
+    describe 'not_true' do
+      it 'generates an inequality condition for boolean true' do
+        @s.awesome_not_true = true
+        field = "#{quote_table_name("people")}.#{quote_column_name("awesome")}"
+        expect(@s.result.to_sql).to match /#{field} != #{
+          ActiveRecord::Base.connection.quoted_true}/
+      end
+
+      it 'generates an equality condition for boolean true' do
+        @s.awesome_not_true = false
+        field = "#{quote_table_name("people")}.#{quote_column_name("awesome")}"
+        expect(@s.result.to_sql).to match /#{field} = #{
+          ActiveRecord::Base.connection.quoted_true}/
+      end
+    end
+
+    describe 'false' do
+      it 'generates an equality condition for boolean false' do
+        @s.awesome_false = true
+        field = "#{quote_table_name("people")}.#{quote_column_name("awesome")}"
+        expect(@s.result.to_sql).to match /#{field} = #{
+          ActiveRecord::Base.connection.quoted_false}/
+      end
+
+      it 'generates an inequality condition for boolean false' do
+        @s.awesome_false = false
+        field = "#{quote_table_name("people")}.#{quote_column_name("awesome")}"
+        expect(@s.result.to_sql).to match /#{field} != #{
+          ActiveRecord::Base.connection.quoted_false}/
+      end
+    end
+
+    describe 'not_false' do
+      it 'generates an inequality condition for boolean false' do
+        @s.awesome_not_false = true
+        field = "#{quote_table_name("people")}.#{quote_column_name("awesome")}"
+        expect(@s.result.to_sql).to match /#{field} != #{
+          ActiveRecord::Base.connection.quoted_false}/
+      end
+
+      it 'generates an equality condition for boolean false' do
+        @s.awesome_not_false = false
+        field = "#{quote_table_name("people")}.#{quote_column_name("awesome")}"
+        expect(@s.result.to_sql).to match /#{field} = #{
+          ActiveRecord::Base.connection.quoted_false}/
+      end
+    end
+
     describe 'null' do
       it 'generates a value IS NULL query' do
         @s.name_null = true

data/spec/ransack/search_spec.rb

@@ -43,8 +43,12 @@ module Ransack
 
       it 'accepts a context option' do
         shared_context = Context.for(Person)
-        search1 = Search.new(Person, {"name_eq" => "A"}, context: shared_context)
-        search2 = Search.new(Person, {"name_eq" => "B"}, context: shared_context)
+        search1 = Search.new(
+          Person, { "name_eq" => "A" }, context: shared_context
+          )
+        search2 = Search.new(
+          Person, { "name_eq" => "B" }, context: shared_context
+          )
         expect(search1.context).to be search2.context
       end
     end
@@ -89,6 +93,11 @@ module Ransack
         expect(condition.value).to eq 'Ernie'
       end
 
+      it 'preserves default scope conditions for associations' do
+        search = Search.new(Person, :articles_title_eq => 'Test')
+        expect(search.result.to_sql).to include "default_scope"
+      end
+
       it 'discards empty conditions' do
         search = Search.new(Person, :children_name_eq => '')
         condition = search.base[:children_name_eq]
@@ -169,7 +178,9 @@ module Ransack
 
         context "when ignore_unknown_conditions is false" do
           before do
-            Ransack.configure { |config| config.ignore_unknown_conditions = false }
+            Ransack.configure { |config|
+              config.ignore_unknown_conditions = false
+            }
           end
 
           specify { expect { subject }.to raise_error ArgumentError }
@@ -177,12 +188,20 @@ module Ransack
 
         context "when ignore_unknown_conditions is true" do
           before do
-            Ransack.configure { |config| config.ignore_unknown_conditions = true }
+            Ransack.configure { |config|
+              config.ignore_unknown_conditions = true
+            }
           end
 
           specify { expect { subject }.not_to raise_error }
         end
       end
+
+      it 'does not modify the parameters' do
+        params = { :name_eq => '' }
+        expect { Search.new(Person, params) }.not_to change { params }
+      end
+
     end
 
     describe '#result' do

data/spec/support/schema.rb

@@ -88,6 +88,12 @@ class Article < ActiveRecord::Base
   has_many :comments
   has_and_belongs_to_many :tags
   has_many :notes, :as => :notable
+
+  if ActiveRecord::VERSION::STRING >= '3.1'
+    default_scope { where("'default_scope' = 'default_scope'") }
+  else # Rails 3.0 does not accept a block
+    default_scope where("'default_scope' = 'default_scope'")
+  end
 end
 
 module Namespace
@@ -129,7 +135,7 @@ module Schema
         t.string   :only_admin
         t.integer  :salary
         t.boolean  :awesome, default: false
-        t.timestamps
+        t.timestamps null: false
       end
 
       create_table :articles, :force => true do |t|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Ernie Miller
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-23 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -192,6 +192,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -218,6 +219,7 @@ files:
 - lib/ransack/locale/fr.yml
 - lib/ransack/locale/hu.yml
 - lib/ransack/locale/nl.yml
+- lib/ransack/locale/ro.yml
 - lib/ransack/locale/zh.yml
 - lib/ransack/naming.rb
 - lib/ransack/nodes.rb