ransack 1.8.3 → 2.3.0

data/polyamorous/polyamorous.gemspec

@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "polyamorous/version"
+
+Gem::Specification.new do |s|
+  s.name        = "polyamorous"
+  s.version     = Polyamorous::VERSION
+  s.authors     = ["Ernie Miller", "Ryan Bigg", "Jon Atack", "Xiang Li"]
+  s.email       = ["ernie@erniemiller.org", "radarlistener@gmail.com", "jonnyatack@gmail.com", "bigxiang@gmail.com"]
+  s.homepage    = "https://github.com/activerecord-hackery/ransack/tree/master/polyamorous"
+  s.license     = "MIT"
+  s.summary     = %q{
+    Loves/is loved by polymorphic belongs_to associations, Ransack, Squeel, MetaSearch...
+  }
+  s.description = %q{
+    This is just an extraction from Ransack/Squeel. You probably don't want to use this
+    directly. It extends ActiveRecord's associations to support polymorphic belongs_to
+    associations.
+  }
+
+  s.add_dependency 'activerecord', '>= 5.0'
+  s.add_development_dependency 'rspec', '~> 3'
+  s.add_development_dependency 'machinist', '~> 1.0.6'
+  s.add_development_dependency 'faker', '~> 1.6.5'
+  s.add_development_dependency 'sqlite3', '~> 1.3.3'
+
+  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.require_paths = ["lib"]
+
+  # specify any dependencies here; for example:
+  # s.add_development_dependency "rspec"
+  # s.add_runtime_dependency "rest-client"
+end

data/ransack.gemspec

@@ -6,28 +6,27 @@ Gem::Specification.new do |s|
   s.name        = "ransack"
   s.version     = Ransack::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Ernie Miller", "Ryan Bigg", "Jon Atack"]
-  s.email       = ["ernie@erniemiller.org", "radarlistener@gmail.com", "jonnyatack@gmail.com"]
+  s.authors     = ["Ernie Miller", "Ryan Bigg", "Jon Atack","Sean Carroll"]
+  s.email       = ["ernie@erniemiller.org", "radarlistener@gmail.com", "jonnyatack@gmail.com","sfcarroll@gmail.com"]
   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.license     = 'MIT'
 
-  s.rubyforge_project = "ransack"
-
-  s.add_dependency 'actionpack', '>= 3.0'
-  s.add_dependency 'activerecord', '>= 3.0'
-  s.add_dependency 'activesupport', '>= 3.0'
+  s.add_dependency 'actionpack', '>= 5.0'
+  s.add_dependency 'activerecord', '>= 5.0'
+  s.add_dependency 'activesupport', '>= 5.0'
   s.add_dependency 'i18n'
-  s.add_dependency 'polyamorous', '~> 1.3'
+  s.add_dependency 'polyamorous', Ransack::VERSION.to_s
   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'
+  s.add_development_dependency 'sqlite3', ::Gem::Version.new(ENV['RAILS'].gsub(/^v/, '')) >= ::Gem::Version.new('6-0-stable') ? '~> 1.4.1' : '~> 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.add_development_dependency 'byebug'
 
   s.files         = `git ls-files`.split("\n")
 

data/spec/helpers/polyamorous_helper.rb

@@ -0,0 +1,28 @@
+module PolyamorousHelper
+  def new_join_association(reflection, children, klass)
+    Polyamorous::JoinAssociation.new reflection, children, klass
+  end
+
+  if ActiveRecord.version >= ::Gem::Version.new("6.0.0.rc1")
+    def new_join_dependency(klass, associations = {})
+      Polyamorous::JoinDependency.new klass, klass.arel_table, associations, Polyamorous::InnerJoin
+    end
+  elsif ActiveRecord.version > ::Gem::Version.new("5.2.0")
+    def new_join_dependency(klass, associations = {})
+      Polyamorous::JoinDependency.new klass, klass.arel_table, associations
+    end
+  elsif ActiveRecord.version == ::Gem::Version.new("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
+    end
+  else
+    def new_join_dependency(klass, associations = {})
+      Polyamorous::JoinDependency.new klass, associations, []
+    end
+  end
+
+  def new_join(name, type = Polyamorous::InnerJoin, klass = nil)
+    Polyamorous::Join.new name, type, klass
+  end
+end

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

@@ -18,6 +18,13 @@ module Ransack
             expect(subject.object).to be_an ::ActiveRecord::Relation
           end
 
+          context "multiple database connection" do
+            it "does not raise error" do
+              expect { Person.ransack(name_cont: "test") }.not_to raise_error
+              expect { SubDB::OperationHistory.ransack(people_id_eq: 1) }.not_to raise_error
+            end
+          end
+
           context 'with scopes' do
             before do
               allow(Person)
@@ -90,6 +97,25 @@ module Ransack
                 expect(s.result.to_sql).to (include 'age > 0')
               end
             end
+
+            context "with ransackable_scopes_skip_sanitize_args enabled for scope" do
+              before do
+                allow(Person)
+                .to receive(:ransackable_scopes_skip_sanitize_args)
+                .and_return([:over_age])
+              end
+
+              it 'passes true values to scopes' do
+                s = Person.ransack('over_age' => 1)
+                expect(s.result.to_sql).to (include 'age > 1')
+              end
+
+              it 'passes false values to scopes'  do
+                s = Person.ransack('over_age' => 0)
+                expect(s.result.to_sql).to (include 'age > 0')
+              end
+            end
+
           end
 
           it 'does not raise exception for string :params argument' do
@@ -429,6 +455,16 @@ module Ransack
             end
           end
 
+          it 'sorts with different join variants' do
+            comments = [
+              Comment.create(article: Article.create(title: 'Avenger'), person: Person.create(salary: 100_000)),
+              Comment.create(article: Article.create(title: 'Avenge'), person: Person.create(salary: 50_000)),
+            ]
+            expect(Comment.ransack(article_title_cont: 'aven',s: 'person_salary desc').result).to eq(comments)
+            expect(Comment.joins(:person).ransack(s: 'persons_salarydesc', article_title_cont: 'aven').result).to eq(comments)
+            expect(Comment.joins(:person).ransack(article_title_cont: 'aven',s: 'persons_salary desc').result).to eq(comments)
+          end
+
           it 'allows sort by `only_sort` field' do
             s = Person.ransack(
               's' => { '0' => { 'dir' => 'asc', 'name' => 'only_sort' } }
@@ -505,6 +541,7 @@ module Ransack
             )
           end
 
+
           it 'should allow passing ransacker arguments to a ransacker' do
             s = Person.ransack(
               c: [{
@@ -544,6 +581,37 @@ module Ransack
               /BETWEEN 2 AND 6 GROUP BY articles.person_id \) DESC/
             )
           end
+
+          context 'case insensitive sorting' do
+            it 'allows sort by desc' do
+              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.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.ransack(sorts: ['name desc'])
+              expect(search.result.to_sql).to match /ORDER BY .* DESC/
+            end
+
+            it 'allows sort by asc' do
+              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.ransack(sorts: ['reverse_name asc'])
+              expect(search.result.to_sql).to include("ORDER BY REVERSE(name) ASC")
+            end
+          end
         end
 
         describe '#ransackable_attributes' do
@@ -613,6 +681,12 @@ module Ransack
           it { should eq [] }
         end
 
+        describe '#ransackable_scopes_skip_sanitize_args' do
+          subject { Person.ransackable_scopes_skip_sanitize_args }
+
+          it { should eq [] }
+        end
+
       end
     end
   end

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

@@ -10,8 +10,7 @@ module Ransack
         subject { Context.new(Person) }
 
 
-        it 'has an Active Record alias tracker method',
-        if: AR_version >= '3.1' do
+        it 'has an Active Record alias tracker method' do
           expect(subject.alias_tracker)
           .to be_an ::ActiveRecord::Associations::AliasTracker
         end
@@ -41,6 +40,47 @@ 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
+        end
+
         describe 'sharing context across searches' do
           let(:shared_context) { Context.for(Person) }
 
@@ -69,16 +109,14 @@ module Ransack
           end
 
           describe '#join_sources' do
-            # FIXME: fix this test for Rails 4.2 and 5.0.
             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
+            the context' 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',
-            if: AR_version >= '3.1' do
+            it 'can be rejoined to execute a valid query' do
               parents, children = shared_context.join_sources
 
               expect { Person.joins(parents).joins(children).to_a }

data/spec/ransack/configuration_spec.rb

@@ -48,6 +48,7 @@ module Ransack
     it 'should have default values for arrows' do
       expect(Ransack.options[:up_arrow]).to eq '▼'
       expect(Ransack.options[:down_arrow]).to eq '▲'
+      expect(Ransack.options[:default_arrow]).to eq nil
     end
 
     it 'changes the default value for the up arrow only' do
@@ -72,17 +73,31 @@ module Ransack
       Ransack.options = default
     end
 
-    it 'changes the default value for both arrows' do
+    it 'changes the default value for the default arrow only' do
+      default, new_default_arrow  = Ransack.options.clone, '<i class="default"></i>'
+
+      Ransack.configure { |c| c.custom_arrows = { default_arrow: new_default_arrow } }
+
+      expect(Ransack.options[:up_arrow]).to eq default[:up_arrow]
+      expect(Ransack.options[:down_arrow]).to eq default[:down_arrow]
+      expect(Ransack.options[:default_arrow]).to eq new_default_arrow
+
+      Ransack.options = default
+    end
+
+    it 'changes the default value for all arrows' do
       default        = Ransack.options.clone
       new_up_arrow   = '<i class="fa fa-long-arrow-up"></i>'
       new_down_arrow = 'U+02193'
+      new_default_arrow = 'defaultarrow'
 
       Ransack.configure do |c|
-        c.custom_arrows = { up_arrow: new_up_arrow, down_arrow: new_down_arrow }
+        c.custom_arrows = { up_arrow: new_up_arrow, down_arrow: new_down_arrow, default_arrow: new_default_arrow }
       end
 
       expect(Ransack.options[:up_arrow]).to eq new_up_arrow
       expect(Ransack.options[:down_arrow]).to eq new_down_arrow
+      expect(Ransack.options[:default_arrow]).to eq new_default_arrow
 
       Ransack.options = default
     end

data/spec/ransack/helpers/form_builder_spec.rb

@@ -21,11 +21,7 @@ module Ransack
         @controller.view_context.search_form_for(@s) { |f| @f = f }
       end
 
-      it 'selects previously-entered time values with datetime_select',
-        unless: (
-          RUBY_VERSION >= '2.3' &&
-          ::ActiveRecord::VERSION::STRING.first(3) < '3.2'
-          ) do
+      it 'selects previously-entered time values with datetime_select' do
         date_values = %w(2011 1 2 03 04 05)
       # @s.created_at_eq = date_values # This works in Rails 4.x but not 3.x
         @s.created_at_eq = [2011, 1, 2, 3, 4, 5] # so we have to do this
@@ -75,11 +71,7 @@ module Ransack
       describe '#sort_link' do
         it 'sort_link for ransack attribute' do
           sort_link = @f.sort_link :name, :controller => 'people'
-          if ActiveRecord::VERSION::STRING =~ /^3\.[1-2]\./
-            expect(sort_link).to match /people\?q%5Bs%5D=name\+asc/
-          else
-            expect(sort_link).to match /people\?q(%5B|\[)s(%5D|\])=name\+asc/
-          end
+          expect(sort_link).to match /people\?q(%5B|\[)s(%5D|\])=name\+asc/
           expect(sort_link).to match /sort_link/
           expect(sort_link).to match /Full Name<\/a>/
         end
@@ -171,11 +163,7 @@ module Ransack
         # Starting from Rails 4.2, the date_select html attributes are no longer
         # `sort`ed (for a speed gain), so the tests have to be different:
         def date_select_html(val)
-          if ::ActiveRecord::VERSION::STRING >= '4.2'
-            %(<option value="#{val}" selected="selected">#{val}</option>)
-          else
-            %(<option selected="selected" value="#{val}">#{val}</option>)
-          end
+          %(<option value="#{val}" selected="selected">#{val}</option>)
         end
 
     end