ransack 2.1.0 → 2.4.0

data/lib/ransack/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = '2.1.0'
+  VERSION = '2.4.0'
 end

data/ransack.gemspec

@@ -11,31 +11,15 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/activerecord-hackery/ransack"
   s.summary     = %q{Object-based searching for Active Record and Mongoid (currently).}
   s.description = %q{Ransack is the successor to the MetaSearch gem. It improves and expands upon MetaSearch's functionality, but does not have a 100%-compatible API.}
-  s.required_ruby_version = '>= 1.9'
+  s.required_ruby_version = '>= 2.3'
   s.license     = 'MIT'
 
-  s.rubyforge_project = "ransack"
-
-  s.add_dependency 'actionpack', '>= 5.0'
-  s.add_dependency 'activerecord', '>= 5.0'
-  s.add_dependency 'activesupport', '>= 5.0'
+  s.add_dependency 'activerecord', '>= 5.2.4'
+  s.add_dependency 'activesupport', '>= 5.2.4'
   s.add_dependency 'i18n'
-  s.add_development_dependency 'rspec', '~> 3'
-  s.add_development_dependency 'machinist', '~> 1.0.6'
-  s.add_development_dependency 'faker', '~> 0.9.5'
-  s.add_development_dependency 'sqlite3', '~> 1.3.3'
-  s.add_development_dependency 'pg', '~> 0.21'
-  s.add_development_dependency 'mysql2', '0.3.20'
-  s.add_development_dependency 'pry', '0.10'
 
   s.files         = `git ls-files`.split("\n")
-
-  s.test_files    = `git ls-files -- {test,spec,features}/*`
-                    .split("\n")
-
-  s.executables   = `git ls-files -- bin/*`
-                    .split("\n")
-                    .map { |f| File.basename(f) }
-
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 end

data/spec/helpers/polyamorous_helper.rb

@@ -3,18 +3,13 @@ module PolyamorousHelper
     Polyamorous::JoinAssociation.new reflection, children, klass
   end
 
-  if ActiveRecord::VERSION::STRING > "5.2.0"
+  if ActiveRecord.version >= ::Gem::Version.new("6.0.0.rc1")
     def new_join_dependency(klass, associations = {})
-      Polyamorous::JoinDependency.new klass, klass.arel_table, associations
-    end
-  elsif ActiveRecord::VERSION::STRING == "5.2.0"
-    def new_join_dependency(klass, associations = {})
-      alias_tracker = ::ActiveRecord::Associations::AliasTracker.create(klass.connection, klass.table_name, [])
-      Polyamorous::JoinDependency.new klass, klass.arel_table, associations, alias_tracker
+      Polyamorous::JoinDependency.new klass, klass.arel_table, associations, Polyamorous::InnerJoin
     end
   else
     def new_join_dependency(klass, associations = {})
-      Polyamorous::JoinDependency.new klass, associations, []
+      Polyamorous::JoinDependency.new klass, klass.arel_table, associations
     end
   end
 

data/spec/{ransack → polyamorous}/join_association_spec.rb

@@ -10,6 +10,13 @@ module Polyamorous
       new_join_association(reflection, parent.children, Article)
     }
 
+    subject { new_join_association(reflection, parent.children, Person) }
+
+    it 'respects polymorphism on equality test' do
+      expect(subject).to eq new_join_association(reflection, parent.children, Person)
+      expect(subject).not_to eq new_join_association(reflection, parent.children, Article)
+    end
+
     it 'leaves the orginal reflection intact for thread safety' do
       reflection.instance_variable_set(:@klass, Article)
       join_association

data/spec/{ransack → polyamorous}/join_dependency_spec.rb

@@ -8,8 +8,8 @@ module Polyamorous
 
       specify { expect(subject.send(:join_root).drop(1).size)
         .to eq(2) }
-      specify { expect(subject.send(:join_root).drop(1).map(&:join_type))
-        .to be_all { Polyamorous::InnerJoin } }
+      specify { expect(subject.send(:join_root).drop(1).map(&:join_type).uniq)
+        .to eq [Polyamorous::InnerJoin] }
     end
 
     context 'with has_many :through association' do
@@ -38,8 +38,8 @@ module Polyamorous
         .to eq 2 }
       specify { expect(subject.send(:join_root).drop(1).map(&:join_type))
         .to eq [Polyamorous::OuterJoin, Polyamorous::OuterJoin] }
-      specify { expect(subject.send(:join_root).drop(1).map(&:join_type))
-        .to be_all { Polyamorous::OuterJoin } }
+      specify { expect(subject.send(:join_root).drop(1).map(&:join_type).uniq)
+        .to eq [Polyamorous::OuterJoin] }
     end
 
     context 'with polymorphic belongs_to join' do
@@ -59,8 +59,19 @@ module Polyamorous
 
       specify { expect(subject.send(:join_root).drop(1).size)
         .to eq 2 }
-      specify { expect(subject.send(:join_root).drop(1).map(&:join_type))
-        .to be_all { Polyamorous::InnerJoin } }
+      specify { expect(subject.send(:join_root).drop(1).map(&:join_type).uniq)
+        .to eq [Polyamorous::InnerJoin] }
+      specify { expect(subject.send(:join_root).drop(1).first.table_name)
+        .to eq 'people' }
+      specify { expect(subject.send(:join_root).drop(1)[1].table_name)
+        .to eq 'comments' }
+    end
+
+    context 'with polymorphic belongs_to join and nested join' do
+      subject { new_join_dependency Note,
+        new_join(:notable, :outer, Person) => :comments }
+      specify { expect(subject.send(:join_root).drop(1).size).to eq 2 }
+      specify { expect(subject.send(:join_root).drop(1).map(&:join_type)).to eq [Polyamorous::OuterJoin, Polyamorous::InnerJoin] }
       specify { expect(subject.send(:join_root).drop(1).first.table_name)
         .to eq 'people' }
       specify { expect(subject.send(:join_root).drop(1)[1].table_name)
@@ -68,7 +79,7 @@ module Polyamorous
     end
 
     context '#left_outer_join in Rails 5 overrides join type specified',
-            if: ActiveRecord::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR < 2 do
+            if: ActiveRecord::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MAJOR < 6 && ActiveRecord::VERSION::MINOR < 2 do
 
       let(:join_type_class) do
         new_join_dependency(

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

@@ -143,14 +143,12 @@ module Ransack
           it 'removes redundant joins from top query' do
             s = Article.ransack(tags_name_not_eq: "Fantasy")
             sql = s.result.to_sql
-
             expect(sql).to_not include('LEFT OUTER JOIN')
           end
 
           it 'handles != for single values' do
             s = Article.ransack(tags_name_not_eq: "Fantasy")
             articles = s.result.to_a
-
             expect(articles).to include marco
             expect(articles).to_not include arthur
           end
@@ -267,10 +265,12 @@ module Ransack
           # end
 
           it 'creates ransack attributes' do
+            person = Person.create!(name: 'Aric Smith')
+
             s = Person.ransack(reversed_name_eq: 'htimS cirA')
             expect(s.result.size).to eq(1)
 
-            expect(s.result.first).to eq Person.where(name: 'Aric Smith').first
+            expect(s.result.first).to eq person
           end
 
           it 'can be accessed through associations' do
@@ -584,31 +584,31 @@ module Ransack
 
           context 'case insensitive sorting' do
             it 'allows sort by desc' do
-              search = Person.search(sorts: ['name_case_insensitive desc'])
+              search = Person.ransack(sorts: ['name_case_insensitive desc'])
               expect(search.result.to_sql).to match /ORDER BY LOWER(.*) DESC/
             end
 
             it 'allows sort by asc' do
-              search = Person.search(sorts: ['name_case_insensitive asc'])
+              search = Person.ransack(sorts: ['name_case_insensitive asc'])
               expect(search.result.to_sql).to match /ORDER BY LOWER(.*) ASC/
             end
           end
 
           context 'regular sorting' do
             it 'allows sort by desc' do
-              search = Person.search(sorts: ['name desc'])
+              search = Person.ransack(sorts: ['name desc'])
               expect(search.result.to_sql).to match /ORDER BY .* DESC/
             end
 
             it 'allows sort by asc' do
-              search = Person.search(sorts: ['name asc'])
+              search = Person.ransack(sorts: ['name asc'])
               expect(search.result.to_sql).to match /ORDER BY .* ASC/
             end
           end
 
           context 'sorting by a scope' do
             it 'applies the correct scope' do
-              search = Person.search(sorts: ['reverse_name asc'])
+              search = Person.ransack(sorts: ['reverse_name asc'])
               expect(search.result.to_sql).to include("ORDER BY REVERSE(name) ASC")
             end
           end

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

@@ -40,6 +40,66 @@ module Ransack
           end
         end
 
+        describe '#build_correlated_subquery' do
+          it 'build correlated subquery for Root STI model' do
+            search = Search.new(Person, { articles_title_not_eq: 'some_title' }, context: subject)
+            attribute = search.conditions.first.attributes.first
+            constraints = subject.build_correlated_subquery(attribute.parent).constraints
+            constraint = constraints.first
+
+            expect(constraints.length).to eql 1
+            expect(constraint.left.name).to eql 'person_id'
+            expect(constraint.left.relation.name).to eql 'articles'
+            expect(constraint.right.name).to eql 'id'
+            expect(constraint.right.relation.name).to eql 'people'
+          end
+
+          it 'build correlated subquery for Child STI model when predicate is not_eq' do
+            search = Search.new(Person, { story_articles_title_not_eq: 'some_title' }, context: subject)
+            attribute = search.conditions.first.attributes.first
+            constraints = subject.build_correlated_subquery(attribute.parent).constraints
+            constraint = constraints.first
+
+            expect(constraints.length).to eql 1
+            expect(constraint.left.relation.name).to eql 'articles'
+            expect(constraint.left.name).to eql 'person_id'
+            expect(constraint.right.relation.name).to eql 'people'
+            expect(constraint.right.name).to eql 'id'
+          end
+
+          it 'build correlated subquery for Child STI model when predicate is eq' do
+            search = Search.new(Person, { story_articles_title_not_eq: 'some_title' }, context: subject)
+            attribute = search.conditions.first.attributes.first
+            constraints = subject.build_correlated_subquery(attribute.parent).constraints
+            constraint = constraints.first
+
+            expect(constraints.length).to eql 1
+            expect(constraint.left.relation.name).to eql 'articles'
+            expect(constraint.left.name).to eql 'person_id'
+            expect(constraint.right.relation.name).to eql 'people'
+            expect(constraint.right.name).to eql 'id'
+          end
+
+          it 'build correlated subquery for multiple conditions (default scope)' do
+            search = Search.new(Person, { comments_body_not_eq: 'some_title'})
+
+            # Was
+            # SELECT "people".* FROM "people" WHERE "people"."id" NOT IN (
+            #   SELECT "comments"."disabled" FROM "comments"
+            #   WHERE "comments"."disabled" = "people"."id"
+            #     AND NOT ("comments"."body" != 'some_title')
+            # ) ORDER BY "people"."id" DESC
+            # Should Be
+            # SELECT "people".* FROM "people" WHERE "people"."id" NOT IN (
+            #   SELECT "comments"."person_id" FROM "comments"
+            #   WHERE "comments"."person_id" = "people"."id"
+            #     AND NOT ("comments"."body" != 'some_title')
+            # ) ORDER BY "people"."id" DESC
+
+            expect(search.result.to_sql).to match /.comments.\..person_id. = .people.\..id./
+          end
+        end
+
         describe 'sharing context across searches' do
           let(:shared_context) { Context.for(Person) }
 
@@ -50,23 +110,6 @@ module Ransack
               context: shared_context)
           end
 
-          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"
-              expect(parents.aliased_table_name).to eq "parents_people"
-            end
-
-            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
-            end
-          end
-
           describe '#join_sources' do
             it 'returns dependent arel join nodes for all searches run against
             the context' do

data/spec/ransack/helpers/form_helper_spec.rb

@@ -25,7 +25,7 @@ module Ransack
       describe '#sort_link with default search_key' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people'
           )
@@ -38,7 +38,7 @@ module Ransack
       describe '#sort_url with default search_key' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people'
           )
@@ -49,7 +49,7 @@ module Ransack
       describe '#sort_link with default search_key defined as symbol' do
         subject { @controller.view_context
           .sort_link(
-            Person.search({ sorts: ['name desc'] }, search_key: :people_search),
+            Person.ransack({ sorts: ['name desc'] }, search_key: :people_search),
             :name, controller: 'people'
           )
         }
@@ -59,7 +59,7 @@ module Ransack
       describe '#sort_url with default search_key defined as symbol' do
         subject { @controller.view_context
           .sort_url(
-            Person.search({ sorts: ['name desc'] }, search_key: :people_search),
+            Person.ransack({ sorts: ['name desc'] }, search_key: :people_search),
             :name, controller: 'people'
           )
         }
@@ -69,7 +69,7 @@ module Ransack
       describe '#sort_link desc through association table defined as symbol' do
         subject { @controller.view_context
           .sort_link(
-            Person.search({ sorts: 'comments_body asc' }),
+            Person.ransack({ sorts: 'comments_body asc' }),
             :comments_body,
             controller: 'people'
           )
@@ -82,7 +82,7 @@ module Ransack
       describe '#sort_url desc through association table defined as symbol' do
         subject { @controller.view_context
           .sort_url(
-            Person.search({ sorts: 'comments_body asc' }),
+            Person.ransack({ sorts: 'comments_body asc' }),
             :comments_body,
             controller: 'people'
           )
@@ -93,7 +93,7 @@ module Ransack
       describe '#sort_link through association table defined as a string' do
         subject { @controller.view_context
           .sort_link(
-            Person.search({ sorts: 'comments.body desc' }),
+            Person.ransack({ sorts: 'comments.body desc' }),
             'comments.body',
             controller: 'people'
           )
@@ -106,7 +106,7 @@ module Ransack
       describe '#sort_url through association table defined as a string' do
         subject { @controller.view_context
           .sort_url(
-            Person.search({ sorts: 'comments.body desc' }),
+            Person.ransack({ sorts: 'comments.body desc' }),
             'comments.body',
             controller: 'people'
           )
@@ -119,7 +119,7 @@ module Ransack
         specify {
           expect { @controller.view_context
             .sort_link(
-              Person.search(@controller.view_context.params[:q]),
+              Person.ransack(@controller.view_context.params[:q]),
               :name,
               controller: 'people'
             )
@@ -132,7 +132,7 @@ module Ransack
         specify {
           expect { @controller.view_context
             .sort_url(
-              Person.search(@controller.view_context.params[:q]),
+              Person.ransack(@controller.view_context.params[:q]),
               :name,
               controller: 'people'
             )
@@ -143,7 +143,7 @@ module Ransack
       describe '#sort_link with search_key defined as a string' do
         subject { @controller.view_context
           .sort_link(
-            Person.search(
+            Person.ransack(
               { sorts: ['name desc'] }, search_key: 'people_search'
             ),
             :name,
@@ -156,7 +156,7 @@ module Ransack
       describe '#sort_link with default_order defined with a string key' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack()],
             :name,
             controller: 'people',
             default_order: 'desc'
@@ -168,7 +168,7 @@ module Ransack
       describe '#sort_url with default_order defined with a string key' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack()],
             :name,
             controller: 'people',
             default_order: 'desc'
@@ -180,7 +180,7 @@ module Ransack
       describe '#sort_link with multiple search_keys defined as an array' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc', 'email asc'])],
+            [:main_app, Person.ransack(sorts: ['name desc', 'email asc'])],
             :name, [:name, 'email DESC'],
             controller: 'people'
           )
@@ -196,7 +196,7 @@ module Ransack
       describe '#sort_url with multiple search_keys defined as an array' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search(sorts: ['name desc', 'email asc'])],
+            [:main_app, Person.ransack(sorts: ['name desc', 'email asc'])],
             :name, [:name, 'email DESC'],
             controller: 'people'
           )
@@ -210,7 +210,7 @@ module Ransack
       describe '#sort_link with multiple search_keys does not break on nil values & ignores them' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc', nil, 'email', nil])],
+            [:main_app, Person.ransack(sorts: ['name desc', nil, 'email', nil])],
             :name, [nil, :name, nil, 'email DESC', nil],
             controller: 'people'
           )
@@ -226,7 +226,7 @@ module Ransack
       describe '#sort_url with multiple search_keys does not break on nil values & ignores them' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search(sorts: ['name desc', nil, 'email', nil])],
+            [:main_app, Person.ransack(sorts: ['name desc', nil, 'email', nil])],
             :name, [nil, :name, nil, 'email DESC', nil],
             controller: 'people'
           )
@@ -240,7 +240,7 @@ module Ransack
       describe '#sort_link with multiple search_keys should allow a label to be specified' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc', 'email asc'])],
+            [:main_app, Person.ransack(sorts: ['name desc', 'email asc'])],
             :name, [:name, 'email DESC'],
             'Property Name',
             controller: 'people'
@@ -252,7 +252,7 @@ module Ransack
       describe '#sort_link with multiple search_keys should flip multiple fields specified without a direction' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc', 'email asc'])],
+            [:main_app, Person.ransack(sorts: ['name desc', 'email asc'])],
             :name, [:name, :email],
             controller: 'people'
           )
@@ -268,7 +268,7 @@ module Ransack
       describe '#sort_url with multiple search_keys should flip multiple fields specified without a direction' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search(sorts: ['name desc', 'email asc'])],
+            [:main_app, Person.ransack(sorts: ['name desc', 'email asc'])],
             :name, [:name, :email],
             controller: 'people'
           )
@@ -282,7 +282,7 @@ module Ransack
       describe '#sort_link with multiple search_keys and default_order specified as a string' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack()],
             :name, [:name, :email],
             controller: 'people',
             default_order: 'desc'
@@ -299,7 +299,7 @@ module Ransack
       describe '#sort_url with multiple search_keys and default_order specified as a string' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack()],
             :name, [:name, :email],
             controller: 'people',
             default_order: 'desc'
@@ -314,7 +314,7 @@ module Ransack
       describe '#sort_link with multiple search_keys and default_order specified as a symbol' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack()],
             :name, [:name, :email],
             controller: 'people',
             default_order: :desc
@@ -331,7 +331,7 @@ module Ransack
       describe '#sort_url with multiple search_keys and default_order specified as a symbol' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack],
             :name, [:name, :email],
             controller: 'people',
             default_order: :desc
@@ -346,7 +346,7 @@ module Ransack
       describe '#sort_link with multiple search_keys should allow multiple default_orders to be specified' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack],
             :name, [:name, :email],
             controller: 'people',
             default_order: { name: 'desc', email: 'asc' }
@@ -363,7 +363,7 @@ module Ransack
       describe '#sort_url with multiple search_keys should allow multiple default_orders to be specified' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack],
             :name, [:name, :email],
             controller: 'people',
             default_order: { name: 'desc', email: 'asc' }
@@ -378,7 +378,7 @@ module Ransack
       describe '#sort_link with multiple search_keys with multiple default_orders should not override a specified order' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack],
             :name, [:name, 'email desc'],
             controller: 'people',
             default_order: { name: 'desc', email: 'asc' }
@@ -395,7 +395,7 @@ module Ransack
       describe '#sort_url with multiple search_keys with multiple default_orders should not override a specified order' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack],
             :name, [:name, 'email desc'],
             controller: 'people',
             default_order: { name: 'desc', email: 'asc' }
@@ -410,7 +410,7 @@ module Ransack
       describe "#sort_link on polymorphic association should preserve association model name case" do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Note.search()],
+            [:main_app, Note.ransack],
             :notable_of_Person_type_name, "Notable",
             controller: 'notes'
           )
@@ -423,7 +423,7 @@ module Ransack
       describe "#sort_url on polymorphic association should preserve association model name case" do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Note.search()],
+            [:main_app, Note.ransack],
             :notable_of_Person_type_name, "Notable",
             controller: 'notes'
           )
@@ -439,7 +439,7 @@ module Ransack
 
           subject {
             @controller.view_context.sort_link(
-              Person.search(
+              Person.ransack(
                 { sorts: ['name desc'] },
                 search_key: 'people_search'
               ),
@@ -457,7 +457,7 @@ module Ransack
 
           subject {
             @controller.view_context.sort_url(
-              Person.search(
+              Person.ransack(
                 { sorts: ['name desc'] },
                 search_key: 'people_search'
               ),
@@ -473,7 +473,7 @@ module Ransack
           if: ::ActiveRecord::VERSION::MAJOR > 3 do
 
           describe 'with symbol q:, #sort_link should include search params' do
-            subject { @controller.view_context.sort_link(Person.search, :name) }
+            subject { @controller.view_context.sort_link(Person.ransack, :name) }
             let(:params) { ActionController::Parameters.new(
               { :q => { name_eq: 'TEST' }, controller: 'people' }
               ) }
@@ -488,7 +488,7 @@ module Ransack
           end
 
           describe 'with symbol q:, #sort_url should include search params' do
-            subject { @controller.view_context.sort_url(Person.search, :name) }
+            subject { @controller.view_context.sort_url(Person.ransack, :name) }
             let(:params) { ActionController::Parameters.new(
               { :q => { name_eq: 'TEST' }, controller: 'people' }
               ) }
@@ -503,7 +503,7 @@ module Ransack
           end
 
           describe "with string 'q', #sort_link should include search params" do
-            subject { @controller.view_context.sort_link(Person.search, :name) }
+            subject { @controller.view_context.sort_link(Person.ransack, :name) }
             let(:params) {
               ActionController::Parameters.new(
                 { 'q' => { name_eq: 'Test2' }, controller: 'people' }
@@ -519,7 +519,7 @@ module Ransack
           end
 
           describe "with string 'q', #sort_url should include search params" do
-            subject { @controller.view_context.sort_url(Person.search, :name) }
+            subject { @controller.view_context.sort_url(Person.ransack, :name) }
             let(:params) {
               ActionController::Parameters.new(
                 { 'q' => { name_eq: 'Test2' }, controller: 'people' }
@@ -539,7 +539,7 @@ module Ransack
       describe '#sort_link with hide order indicator set to true' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people',
             hide_indicator: true
@@ -552,7 +552,7 @@ module Ransack
       describe '#sort_link with hide order indicator set to false' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people',
             hide_indicator: false
@@ -572,7 +572,7 @@ module Ransack
 
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people',
             hide_indicator: false
@@ -593,7 +593,7 @@ module Ransack
 
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name asc'])],
+            [:main_app, Person.ransack(sorts: ['name asc'])],
             :name,
             controller: 'people',
             hide_indicator: false
@@ -614,7 +614,7 @@ module Ransack
 
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people'
           )
@@ -630,7 +630,7 @@ module Ransack
 
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people'
           )
@@ -655,7 +655,7 @@ module Ransack
 
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search],
+            [:main_app, Person.ransack],
             :name,
             controller: 'people'
           )
@@ -681,7 +681,7 @@ module Ransack
 
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people'
           )
@@ -707,7 +707,7 @@ module Ransack
 
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people'
           )
@@ -719,7 +719,7 @@ module Ransack
       describe '#sort_link with a block' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people'
           ) { 'Block label' }
@@ -729,14 +729,14 @@ module Ransack
 
       describe '#search_form_for with default format' do
         subject { @controller.view_context
-          .search_form_for(Person.search) {} }
+          .search_form_for(Person.ransack) {} }
         it { should match /action="\/people"/ }
       end
 
       describe '#search_form_for with pdf format' do
         subject {
           @controller.view_context
-          .search_form_for(Person.search, format: :pdf) {}
+          .search_form_for(Person.ransack, format: :pdf) {}
         }
         it { should match /action="\/people.pdf"/ }
       end
@@ -744,7 +744,7 @@ module Ransack
       describe '#search_form_for with json format' do
         subject {
           @controller.view_context
-          .search_form_for(Person.search, format: :json) {}
+          .search_form_for(Person.ransack, format: :json) {}
         }
         it { should match /action="\/people.json"/ }
       end
@@ -752,7 +752,7 @@ module Ransack
       describe '#search_form_for with an array of routes' do
         subject {
           @controller.view_context
-          .search_form_for([:admin, Comment.search]) {}
+          .search_form_for([:admin, Comment.ransack]) {}
         }
         it { should match /action="\/admin\/comments"/ }
       end
@@ -763,7 +763,7 @@ module Ransack
         end
         subject {
           @controller.view_context
-          .search_form_for(Person.search) { |f| f.text_field :name_eq }
+          .search_form_for(Person.ransack) { |f| f.text_field :name_eq }
         }
         it { should match /example_name_eq/ }
       end