ransack 2.3.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bffef7e72f7a8e247d02c8f08fdca3234be7be51c1c6bb8d02fe23e194ff440e
-  data.tar.gz: 0b33224e20bd71a3f0915c2346403e35b61f6eae6adaa159bb21048cf874be66
+  metadata.gz: f5cd517575121b1f2c1041501645a95680a4efbe82c0b2d6c74e079d080cda29
+  data.tar.gz: f927c47bfc28f15d7a24eb2761ae1d003ff18912c1c91e7716ed2628f9012ccc
 SHA512:
-  metadata.gz: '075369a8203e72ec979755e47157876db98861ec41a0ac419bf8c10bec16369566cc40214d70d707a285ffc646a9afb66aa4849a88ae2a031b44d481de9348d3'
-  data.tar.gz: '0381f3b76f64fa38eb28f02e2fbe35e47224a56cc18e5bb0b93db8581e6f85b200836c678066f98797633874df161a96e87d09e18583e362c0b5a96a02839482'
+  metadata.gz: be9485ce5f692f990c7b8c5b59c961311783fafb845c3580dbd0d08eb62e24c1067da75e98f24cd4553e7db21a15531ca2943c1633566995a6e7c64d6310d2f2
+  data.tar.gz: 3fbca263c9e5f399695e9cc69e50762fc72875860ad495c04368ff84d90c68100d5ca1b6db22aa17a5c2c52efccd4d99bc0c29b5485ae6608390a606fd35ac18

data/.travis.yml

@@ -1,33 +1,33 @@
+branches: master
+
 language: ruby
 
 rvm:
-  - 2.6.5
+  - 2.6.6
 
 services:
   - mysql
 
 env:
+  - RAILS=v6.1.0.rc1 DB=sqlite3
+  - RAILS=v6.1.0.rc1 DB=mysql
+  - RAILS=v6.1.0.rc1 DB=postgres
+
+  - RAILS=v6.0.3 DB=sqlite3
+  - RAILS=v6.0.3 DB=mysql
+  - RAILS=v6.0.3 DB=postgres
+
   - RAILS=6-0-stable DB=sqlite3
   - RAILS=6-0-stable DB=mysql
   - RAILS=6-0-stable DB=postgres
 
-  - RAILS=v6.0.0 DB=sqlite3
-  - RAILS=v6.0.0 DB=mysql
-  - RAILS=v6.0.0 DB=postgres
-
   - RAILS=5-2-stable DB=sqlite3
   - RAILS=5-2-stable DB=mysql
   - RAILS=5-2-stable DB=postgres
 
-  - RAILS=v5.2.3 DB=sqlite3
-  - RAILS=v5.2.3 DB=mysql
-  - RAILS=v5.2.3 DB=postgres
-
-matrix:
-  allow_failures:
-    - env: RAILS=6-0-stable DB=sqlite3
-    - env: RAILS=6-0-stable DB=mysql
-    - env: RAILS=6-0-stable DB=postgres
+  - RAILS=v5.2.4 DB=sqlite3
+  - RAILS=v5.2.4 DB=mysql
+  - RAILS=v5.2.4 DB=postgres
 
 before_script:
   - if [ "$DB" = "mysql" ];

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## 2.4.0 - 2020-11-27
+
+*
+  PR []()
+
+* Support ActiveRecord 6.1.0.rc1.
+  PR [1172](https://github.com/activerecord-hackery/ransack/pull/1172)
+
+* Fix for ActiveRecord 5.2.4 (note security fix in 5.2.4.2 for ActiveView's escape_javascript CVE-2020-5267 for all earlier versions)
+
+* Drop support for ActiveRecord older than 5.2.4.
+  PR [1166](https://github.com/activerecord-hackery/ransack/pull/1166)
+
 ## 2.3.2 - 2020-01-11
 
 * Breakfix to bump Polyamorous

data/CONTRIBUTING.md

@@ -64,6 +64,9 @@ Here's a quick guide:
 2. Create a thoughtfully-named branch for your changes (`git checkout -b my-new-feature`).
 
 3. Install the development dependencies by running `bundle install`.
+   To install rails other than latest (set in Gemfile): `RAILS='5-2-stable' bundle install`
+
+        $ RAILS='5-2-stable' bundle install
 
 4. Begin by running the tests. We only take pull requests with passing tests,
    and it's great to know that you have a clean slate:
@@ -84,16 +87,18 @@ Here's a quick guide:
        $ mysql -u root
        mysql> create database ransack;     
 
-   To run only the tests in a particular file: `rspec <path/to/filename>`
+   The test suite runs by default
+
+   To run only the tests in a particular file: `bundle exec rspec <path/to/filename>`
 
-        $ rspec spec/ransack/search_spec.rb
+        $ bundle exec rspec spec/ransack/search_spec.rb
 
-   To run a single test in that file: `rspec <path/to/filename> -e "test name"`
+   To run a single test in that file: `bundle exec rspec <path/to/filename> -e "test name"`
 
-        $ rspec spec/ransack/search_spec.rb -e "accepts a context option"
+        $ bundle exec rspec spec/ransack/search_spec.rb -e "accepts a context option"
 
-5. Hack away! Please use Ruby features that are compatible down to Ruby 1.9.
-   Since version 1.5, Ransack no longer maintains Ruby 1.8 compatibility.
+5. Hack away! Please use Ruby features that are compatible down to Ruby 2.3.
+   Since version 2.3.1, Ransack no longer maintains Ruby 2.2 compatibility.
 
 6. Add tests for your changes. Only refactoring and documentation changes
    require no new tests. If you are adding functionality or fixing a bug, we

data/Gemfile

@@ -14,10 +14,10 @@ rails_version = case rails
                   rails
                 end
 
-gem 'faker', '~> 0.9.5'
+gem 'faker', '~> 1.0'
 gem 'sqlite3', ::Gem::Version.new(rails_version) >= ::Gem::Version.new('6-0-stable') ? '~> 1.4.1' : '~> 1.3.3'
 gem 'pg', '~> 1.0'
-gem 'pry', '0.10'
+gem 'pry', '~> 0.12.2'
 gem 'byebug'
 
 case rails

data/README.md

@@ -1,5 +1,9 @@
 # ![Ransack](./logo/ransack-h.png "Ransack")
 
+**MAINTAINER WANTED** 
+
+Please see the [Maintainer wanted issue](https://github.com/activerecord-hackery/ransack/issues/1159) if you are interested.
+
 [![Build Status](https://travis-ci.org/activerecord-hackery/ransack.svg)](https://travis-ci.org/activerecord-hackery/ransack)
 [![Gem Version](https://badge.fury.io/rb/ransack.svg)](http://badge.fury.io/rb/ransack)
 [![Code Climate](https://codeclimate.com/github/activerecord-hackery/ransack/badges/gpa.svg)](https://codeclimate.com/github/activerecord-hackery/ransack)
@@ -437,13 +441,10 @@ List of all possible predicates
 | `*_lteq_any` | Less than or equal to any | |
 | `*_gt_any` | Greater than any | |
 | `*_gteq_any` | Greater than or equal to any | |
-| `*_matches_any` | `*_does_not_match_any` | same as above but with `LIKE` |
 | `*_lt_all` | Less than all | SQL: `col < value1 AND col < value2` |
 | `*_lteq_all` | Less than or equal to all | |
 | `*_gt_all` | Greater than all | |
 | `*_gteq_all` | Greater than or equal to all | |
-| `*_matches_all` | Matches all | same as above but with `LIKE` |
-| `*_does_not_match_all` | Does not match all | |
 | `*_not_eq_all` | none of values in a set | |
 | `*_start` | Starts with | SQL: `col LIKE 'value%'` |
 | `*_not_start` | Does not start with | |
@@ -463,7 +464,7 @@ List of all possible predicates
 | `*_not_cont` | Does not contain |
 | `*_not_cont_any` | Does not contain any of | |
 | `*_not_cont_all` | Does not contain all of | |
-| `*_i_cont` | Contains value with case insensitive | uses `LIKE` |
+| `*_i_cont` | Contains value with case insensitive | uses `ILIKE` |
 | `*_i_cont_any` | Contains any of values with case insensitive | |
 | `*_i_cont_all` | Contains all of values with case insensitive | |
 | `*_not_i_cont` | Does not contain with case insensitive |

data/{polyamorous/lib → lib}/polyamorous/activerecord_5.2_ruby_2/join_association.rb

@@ -16,5 +16,9 @@ module Polyamorous
         super(reflection, children)
       end
     end
+
+    def ==(other)
+      base_klass == other.base_klass
+    end
   end
 end

data/lib/polyamorous/activerecord_5.2_ruby_2/reflection.rb

@@ -0,0 +1,11 @@
+module Polyamorous
+  module ReflectionExtensions
+    def join_scope(table, foreign_table, foreign_klass)
+      if respond_to?(:polymorphic?) && polymorphic?
+        super.where!(foreign_table[foreign_type].eq(klass.name))
+      else
+        super
+      end
+    end
+  end
+end

data/{polyamorous/lib → lib}/polyamorous/activerecord_6.0_ruby_2/join_association.rb

@@ -1,2 +1 @@
-# active_record_6.0_ruby_2/join_association
 require 'polyamorous/activerecord_5.2_ruby_2/join_association'

data/{polyamorous/lib → lib}/polyamorous/activerecord_6.0_ruby_2/join_dependency.rb

@@ -1,5 +1,4 @@
 # active_record_6.0_ruby_2/join_dependency.rb
-
 module Polyamorous
   module JoinDependencyExtensions
     # Replaces ActiveRecord::Associations::JoinDependency#build

data/{polyamorous/lib → lib}/polyamorous/activerecord_6.0_ruby_2/reflection.rb

@@ -1,2 +1 @@
-# active_record_6.0_ruby_2/reflection.rb
 require 'polyamorous/activerecord_5.2_ruby_2/reflection'

data/lib/polyamorous/activerecord_6.1_ruby_2/join_association.rb

@@ -0,0 +1,74 @@
+module Polyamorous
+  module JoinAssociationExtensions
+    include SwappingReflectionClass
+    def self.prepended(base)
+      base.class_eval { attr_reader :join_type }
+    end
+
+    def initialize(reflection, children, polymorphic_class = nil, join_type = Arel::Nodes::InnerJoin)
+      @join_type = join_type
+      if polymorphic_class && ::ActiveRecord::Base > polymorphic_class
+        swapping_reflection_klass(reflection, polymorphic_class) do |reflection|
+          super(reflection, children)
+          self.reflection.options[:polymorphic] = true
+        end
+      else
+        super(reflection, children)
+      end
+    end
+
+    # Same as #join_constraints, but instead of constructing tables from the
+    # given block, uses the ones passed
+    def join_constraints_with_tables(foreign_table, foreign_klass, join_type, alias_tracker, tables)
+      joins = []
+      chain = []
+
+      reflection.chain.each.with_index do |reflection, i|
+        table = tables[i]
+
+        @table ||= table
+        chain << [reflection, table]
+      end
+
+      # The chain starts with the target table, but we want to end with it here (makes
+      # more sense in this context), so we reverse
+      chain.reverse_each do |reflection, table|
+        klass = reflection.klass
+
+        join_scope = reflection.join_scope(table, foreign_table, foreign_klass)
+
+        unless join_scope.references_values.empty?
+          join_dependency = join_scope.construct_join_dependency(
+            join_scope.eager_load_values | join_scope.includes_values, Arel::Nodes::OuterJoin
+          )
+          join_scope.joins!(join_dependency)
+        end
+
+        arel = join_scope.arel(alias_tracker.aliases)
+        nodes = arel.constraints.first
+
+        if nodes.is_a?(Arel::Nodes::And)
+          others = nodes.children.extract! do |node|
+            !Arel.fetch_attribute(node) { |attr| attr.relation.name == table.name }
+          end
+        end
+
+        joins << table.create_join(table, table.create_on(nodes), join_type)
+
+        if others && !others.empty?
+          joins.concat arel.join_sources
+          append_constraints(joins.last, others)
+        end
+
+        # The current table in this iteration becomes the foreign table in the next
+        foreign_table, foreign_klass = table, klass
+      end
+
+      joins
+    end
+
+    def ==(other)
+      base_klass == other.base_klass
+    end
+  end
+end

data/lib/polyamorous/activerecord_6.1_ruby_2/join_dependency.rb

@@ -0,0 +1,93 @@
+# active_record_6.1_ruby_2/join_dependency.rb
+module Polyamorous
+  module JoinDependencyExtensions
+    # Replaces ActiveRecord::Associations::JoinDependency#build
+    def build(associations, base_klass)
+      associations.map do |name, right|
+        if name.is_a? Join
+          reflection = find_reflection base_klass, name.name
+          reflection.check_validity!
+          reflection.check_eager_loadable!
+
+          klass = if reflection.polymorphic?
+            name.klass || base_klass
+          else
+            reflection.klass
+          end
+          JoinAssociation.new(reflection, build(right, klass), name.klass, name.type)
+        else
+          reflection = find_reflection base_klass, name
+          reflection.check_validity!
+          reflection.check_eager_loadable!
+
+          if reflection.polymorphic?
+            raise ActiveRecord::EagerLoadPolymorphicError.new(reflection)
+          end
+          JoinAssociation.new(reflection, build(right, reflection.klass))
+        end
+      end
+    end
+
+    def join_constraints(joins_to_add, alias_tracker, references)
+      @alias_tracker = alias_tracker
+      @joined_tables = {}
+      @references = {}
+
+      references.each do |table_name|
+        @references[table_name.to_sym] = table_name if table_name.is_a?(String)
+      end
+
+      joins = make_join_constraints(join_root, join_type)
+
+      joins.concat joins_to_add.flat_map { |oj|
+        if join_root.match?(oj.join_root) && join_root.table.name == oj.join_root.table.name
+          walk join_root, oj.join_root, oj.join_type
+        else
+          make_join_constraints(oj.join_root, oj.join_type)
+        end
+      }
+    end
+
+    def construct_tables_for_association!(join_root, association)
+      tables = table_aliases_for(join_root, association)
+      association.table = tables.first
+      tables
+    end
+
+    private
+
+    def table_aliases_for(parent, node)
+      node.reflection.chain.map { |reflection|
+        alias_tracker.aliased_table_for(reflection.klass.arel_table) do
+          root = reflection == node.reflection
+          name = reflection.alias_candidate(parent.table_name)
+          root ? name : "#{name}_join"
+        end
+      }
+    end
+
+    module ClassMethods
+      # Prepended before ActiveRecord::Associations::JoinDependency#walk_tree
+      #
+      def walk_tree(associations, hash)
+        case associations
+        when TreeNode
+          associations.add_to_tree(hash)
+        when Hash
+          associations.each do |k, v|
+            cache =
+              if TreeNode === k
+                k.add_to_tree(hash)
+              else
+                hash[k] ||= {}
+              end
+            walk_tree(v, cache)
+          end
+        else
+          super(associations, hash)
+        end
+      end
+    end
+
+  end
+end

data/{polyamorous/lib → lib}/polyamorous/activerecord_6.1_ruby_2/reflection.rb

@@ -1,2 +1 @@
-# active_record_6.1_ruby_2/reflection.rb
 require 'polyamorous/activerecord_6.0_ruby_2/reflection'

data/lib/ransack.rb

@@ -1,7 +1,7 @@
 require 'active_support/core_ext'
 require 'ransack/configuration'
 require 'ransack/adapters'
-require 'polyamorous'
+require 'polyamorous/polyamorous.rb'
 
 Ransack::Adapters.object_mapper.require_constants
 

data/lib/ransack/adapters/active_record/context.rb

@@ -1,5 +1,5 @@
 require 'ransack/context'
-require 'polyamorous'
+require 'polyamorous/polyamorous'
 
 module Ransack
   module Adapters
@@ -99,7 +99,9 @@ module Ransack
         def join_sources
           base, joins = begin
             alias_tracker = ::ActiveRecord::Associations::AliasTracker.create(self.klass.connection, @object.table.name, [])
-            constraints   = if ::Gem::Version.new(::ActiveRecord::VERSION::STRING) >= ::Gem::Version.new(Constants::RAILS_6_0)
+            constraints   = if ::Gem::Version.new(::ActiveRecord::VERSION::STRING) >= ::Gem::Version.new(Constants::RAILS_6_1_ALPHA)
+              @join_dependency.join_constraints(@object.joins_values, alias_tracker, @object.references_values)
+            elsif ::Gem::Version.new(::ActiveRecord::VERSION::STRING) >= ::Gem::Version.new(Constants::RAILS_6_0)
               @join_dependency.join_constraints(@object.joins_values, alias_tracker)
             else
               @join_dependency.join_constraints(@object.joins_values, @join_type, alias_tracker)
@@ -172,16 +174,31 @@ module Ransack
         private
 
         def extract_correlated_key(join_root)
-          correlated_key = join_root.right.expr.left
-
-          if correlated_key.is_a? Arel::Nodes::And
-            correlated_key = correlated_key.left.left
-          elsif correlated_key.is_a? Arel::Nodes::Equality
-            correlated_key = correlated_key.left
-          elsif correlated_key.is_a? Arel::Nodes::Grouping
-            correlated_key = join_root.right.expr.right.left
+          case join_root
+          when Arel::Nodes::OuterJoin
+            # one of join_root.right/join_root.left is expected to be Arel::Nodes::On
+            if join_root.right.is_a?(Arel::Nodes::On)
+              extract_correlated_key(join_root.right.expr)
+            elsif join_root.left.is_a?(Arel::Nodes::On)
+              extract_correlated_key(join_root.left.expr)
+            else
+              raise 'Ransack encountered an unexpected arel structure'
+            end
+          when Arel::Nodes::Equality
+            pk = primary_key
+            if join_root.left == pk
+              join_root.right
+            elsif join_root.right == pk
+              join_root.left
+            else
+              nil
+            end
+          when Arel::Nodes::And
+            extract_correlated_key(join_root.left) || extract_correlated_key(join_root.right)
           else
-            correlated_key
+            # eg parent was Arel::Nodes::And and the evaluated side was one of
+            # Arel::Nodes::Grouping or MultiTenant::TenantEnforcementClause
+            nil
           end
         end
 
@@ -310,7 +327,11 @@ module Ransack
           @join_dependency.instance_variable_get(:@join_root).children.push found_association
 
           # Builds the arel nodes properly for this association
-          @join_dependency.send(:construct_tables!, jd.instance_variable_get(:@join_root))
+          if ::Gem::Version.new(::ActiveRecord::VERSION::STRING) >= ::Gem::Version.new(Constants::RAILS_6_1_ALPHA)
+            @tables_pot[found_association] = @join_dependency.construct_tables_for_association!(jd.instance_variable_get(:@join_root), found_association)
+          else
+            @join_dependency.send(:construct_tables!, jd.instance_variable_get(:@join_root))
+          end
 
           # Leverage the stashed association functionality in AR
           @object = @object.joins(jd)
@@ -320,12 +341,22 @@ module Ransack
         def extract_joins(association)
           parent = @join_dependency.instance_variable_get(:@join_root)
           reflection = association.reflection
-          join_constraints = association.join_constraints(
+          join_constraints = if ::Gem::Version.new(::ActiveRecord::VERSION::STRING) >= ::Gem::Version.new(Constants::RAILS_6_1_ALPHA)
+                               association.join_constraints_with_tables(
+                                 parent.table,
+                                 parent.base_klass,
+                                 Arel::Nodes::OuterJoin,
+                                 @join_dependency.instance_variable_get(:@alias_tracker),
+                                 @tables_pot[association]
+                               )
+                             else
+                               association.join_constraints(
                                  parent.table,
                                  parent.base_klass,
                                  Arel::Nodes::OuterJoin,
                                  @join_dependency.instance_variable_get(:@alias_tracker)
                                )
+                             end
           join_constraints.to_a.flatten
         end
       end

data/lib/ransack/adapters/active_record/ransack/context.rb

@@ -28,6 +28,7 @@ module Ransack
       @join_type = options[:join_type] || Polyamorous::OuterJoin
       @search_key = options[:search_key] || Ransack.options[:search_key]
       @associations_pot = {}
+      @tables_pot = {}
       @lock_associations = []
 
       @base = @join_dependency.instance_variable_get(:@join_root)

data/lib/ransack/adapters/active_record/ransack/nodes/condition.rb

@@ -47,12 +47,19 @@ module Ransack
         end
 
         def casted_array?(predicate)
-          predicate.respond_to?(:val) && predicate.val.is_a?(Array)
+          (predicate.respond_to?(:value) && predicate.value.is_a?(Array)) || # Rails 6.1
+            (predicate.respond_to?(:val) && predicate.val.is_a?(Array)) # Rails 5.2, 6.0
         end
 
         def format_values_for(predicate)
-          predicate.val.map do |value|
-            value.is_a?(String) ? Arel::Nodes.build_quoted(value) : value
+          value = if predicate.respond_to?(:value)
+                    predicate.value # Rails 6.1
+                  else
+                    predicate.val # Rails 5.2, 6.0
+                  end
+
+          value.map do |val|
+            val.is_a?(String) ? Arel::Nodes.build_quoted(val) : val
           end
         end
 

data/lib/ransack/constants.rb

@@ -46,6 +46,7 @@ module Ransack
     CONT                = 'cont'.freeze
 
     RAILS_6_0           = '6.0.0'.freeze
+    RAILS_6_1_ALPHA     = '6.1.0.alpha'.freeze
 
     RANSACK_SLASH_SEARCHES = 'ransack/searches'.freeze
     RANSACK_SLASH_SEARCHES_SLASH_SEARCH = 'ransack/searches/search'.freeze

data/lib/ransack/nodes/grouping.rb

@@ -108,7 +108,7 @@ module Ransack
       alias :g= :groupings=
 
       def method_missing(method_id, *args)
-        method_name = method_id.to_s
+        method_name = method_id.to_s.dup
         writer = method_name.sub!(/\=$/, ''.freeze)
         if attribute_method?(method_name)
           if writer

data/lib/ransack/search.rb

@@ -18,6 +18,7 @@ module Ransack
       params = params.to_unsafe_h if params.respond_to?(:to_unsafe_h)
       if params.is_a? Hash
         params = params.dup
+        params = params.transform_values { |v| v.is_a?(String) ? v.strip : v }
         params.delete_if { |k, v| [*v].all?{ |i| i.blank? && i != false } }
       else
         params = {}

data/lib/ransack/translate.rb

@@ -50,7 +50,7 @@ module Ransack
 
         defaults << options.delete(:default) if options[:default]
         options.reverse_merge! count: 1, default: defaults
-        I18n.translate(defaults.shift, options.merge(interpolations))
+        I18n.translate(defaults.shift, **options.merge(interpolations))
       end
 
       def association(key, options = {})
@@ -67,7 +67,7 @@ module Ransack
           end
         defaults << context.traverse(key).model_name.human
         options = { :count => 1, :default => defaults }
-        I18n.translate(defaults.shift, options)
+        I18n.translate(defaults.shift, **options)
       end
 
       private
@@ -83,7 +83,7 @@ module Ransack
         options = { count: 1, default: defaults }
         interpolations = build_interpolations(associated_class)
 
-        I18n.translate(defaults.shift, options.merge(interpolations))
+        I18n.translate(defaults.shift, **options.merge(interpolations))
       end
 
       def default_attribute_name

data/lib/ransack/version.rb

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

data/ransack.gemspec

@@ -14,19 +14,12 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.3'
   s.license     = 'MIT'
 
-  s.add_dependency 'activerecord', '>= 5.2.1'
-  s.add_dependency 'activesupport', '>= 5.2.1'
+  s.add_dependency 'activerecord', '>= 5.2.4'
+  s.add_dependency 'activesupport', '>= 5.2.4'
   s.add_dependency 'i18n'
-  s.add_dependency 'polyamorous', Ransack::VERSION.to_s
 
   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/{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/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

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

@@ -79,6 +79,25 @@ module Ransack
             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
@@ -91,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/search_spec.rb

@@ -20,6 +20,12 @@ module Ransack
         Search.new(Person, name_eq: 'foobar')
       end
 
+      it 'strip leading & trailing whitespace before building' do
+        expect_any_instance_of(Search).to receive(:build)
+        .with({ 'name_eq' => 'foobar' })
+        Search.new(Person, name_eq: '   foobar     ')
+      end
+
       it 'removes empty suffixed conditions before building' do
         expect_any_instance_of(Search).to receive(:build).with({})
         Search.new(Person, name_eq_any: [''])
@@ -109,6 +115,43 @@ module Ransack
         expect(s.result.to_sql).to include 'published'
       end
 
+      # The failure/oversight in Ransack::Nodes::Condition#arel_predicate or deeper is beyond my understanding of the structures
+      it 'preserves (inverts) default scope and conditions for negative subqueries' do
+        # the positive case (published_articles_title_eq) is
+        # SELECT "people".* FROM "people"
+        # LEFT OUTER JOIN "articles" ON "articles"."person_id" = "people"."id"
+        #   AND "articles"."published" = 't'
+        #   AND ('default_scope' = 'default_scope')
+        # WHERE "articles"."title" = 'Test' ORDER BY "people"."id" DESC
+        #
+        # negative case was
+        # SELECT "people".* FROM "people" WHERE "people"."id" NOT IN (
+        #   SELECT "articles"."person_id" FROM "articles"
+        #   WHERE "articles"."person_id" = "people"."id"
+        #     AND NOT ("articles"."title" != 'Test')
+        # ) ORDER BY "people"."id" DESC
+        #
+        # Should have been like
+        # SELECT "people".* FROM "people" WHERE "people"."id" NOT IN (
+        #   SELECT "articles"."person_id" FROM "articles"
+        #   WHERE "articles"."person_id" = "people"."id"
+        #     AND "articles"."title" = 'Test' AND "articles"."published" = 't' AND ('default_scope' = 'default_scope')
+        # ) ORDER BY "people"."id" DESC
+        #
+        # With tenanting (eg default_scope with column reference), NOT IN should be like
+        # SELECT "people".* FROM "people" WHERE "people"."tenant_id" = 'tenant_id' AND "people"."id" NOT IN (
+        #   SELECT "articles"."person_id" FROM "articles"
+        #   WHERE "articles"."person_id" = "people"."id"
+        #     AND "articles"."tenant_id" = 'tenant_id'
+        #     AND "articles"."title" = 'Test' AND "articles"."published" = 't' AND ('default_scope' = 'default_scope')
+        # ) ORDER BY "people"."id" DESC
+
+        pending("spec should pass, but I do not know how/where to fix lib code")
+        s = Search.new(Person, published_articles_title_not_eq: 'Test')
+        expect(s.result.to_sql).to include 'default_scope'
+        expect(s.result.to_sql).to include 'published'
+      end
+
       it 'discards empty conditions' do
         s = Search.new(Person, children_name_eq: '')
         condition = s.base[:children_name_eq]
@@ -220,6 +263,9 @@ module Ransack
       let(:children_people_name_field) {
         "#{quote_table_name("children_people")}.#{quote_column_name("name")}"
       }
+      let(:notable_type_field) {
+        "#{quote_table_name("notes")}.#{quote_column_name("notable_type")}"
+      }
       it 'evaluates conditions contextually' do
         s = Search.new(Person, children_name_eq: 'Ernie')
         expect(s.result).to be_an ActiveRecord::Relation
@@ -228,18 +274,22 @@ module Ransack
       end
 
       it 'use appropriate table alias' do
+        skip "Rails 6 regressed here, but it's fixed in 6-0-stable since https://github.com/rails/rails/commit/f9ba52477ca288e7effa5f6794ae3df3f4e982bc" if ENV["RAILS"] == "v6.0.3"
+
         s = Search.new(Person, {
           name_eq: "person_name_query",
           articles_title_eq: "person_article_title_query",
           parent_name_eq: "parent_name_query",
           parent_articles_title_eq: 'parents_article_title_query'
         }).result
+
         real_query = remove_quotes_and_backticks(s.to_sql)
 
         expect(real_query)
-          .to match(%r{LEFT OUTER JOIN articles ON (\('default_scope' = 'default_scope'\) AND )?articles.person_id = people.id})
+                .to match(%r{LEFT OUTER JOIN articles ON (\('default_scope' = 'default_scope'\) AND )?articles.person_id = people.id})
         expect(real_query)
-          .to match(%r{LEFT OUTER JOIN articles articles_people ON (\('default_scope' = 'default_scope'\) AND )?articles_people.person_id = parents_people.id})
+                .to match(%r{LEFT OUTER JOIN articles articles_people ON (\('default_scope' = 'default_scope'\) AND )?articles_people.person_id = parents_people.id})
+
         expect(real_query)
           .to include "people.name = 'person_name_query'"
         expect(real_query)
@@ -282,6 +332,7 @@ module Ransack
         s = Search.new(Note, notable_of_Person_type_name_eq: 'Ernie').result
         expect(s).to be_an ActiveRecord::Relation
         expect(s.to_sql).to match /#{people_name_field} = 'Ernie'/
+        expect(s.to_sql).to match /#{notable_type_field} = 'Person'/
       end
 
       it 'evaluates nested conditions' do
@@ -320,11 +371,8 @@ module Ransack
             { m: 'or', comments_body_cont: 'e', articles_comments_body_cont: 'e' }
           ]
         )
-        if ActiveRecord::VERSION::MAJOR == 3
-          all_or_load, uniq_or_distinct = :all, :uniq
-        else
-          all_or_load, uniq_or_distinct = :load, :distinct
-        end
+
+        all_or_load, uniq_or_distinct = :load, :distinct
         expect(s.result.send(all_or_load).size)
         .to eq(9000)
         expect(s.result(distinct: true).size)

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'machinist/active_record'
+require 'polyamorous/polyamorous.rb'
 require 'sham'
 require 'faker'
 require 'ransack'

data/spec/support/schema.rb

@@ -164,6 +164,8 @@ end
 class Comment < ActiveRecord::Base
   belongs_to :article
   belongs_to :person
+
+  default_scope { where(disabled: false) }
 end
 
 class Tag < ActiveRecord::Base
@@ -209,6 +211,7 @@ module Schema
         t.integer  :article_id
         t.integer  :person_id
         t.text     :body
+        t.boolean  :disabled, default: false
       end
 
       create_table :tags, force: true do |t|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Ernie Miller
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-11 00:00:00.000000000 Z
+date: 2020-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,28 +19,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 5.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 5.2.4
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 5.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 5.2.4
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -55,20 +55,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: polyamorous
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.3.2
 description: Ransack is the successor to the MetaSearch gem. It improves and expands
   upon MetaSearch's functionality, but does not have a 100%-compatible API.
 email:
@@ -88,6 +74,19 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/polyamorous/activerecord_5.2_ruby_2/join_association.rb
+- lib/polyamorous/activerecord_5.2_ruby_2/join_dependency.rb
+- lib/polyamorous/activerecord_5.2_ruby_2/reflection.rb
+- lib/polyamorous/activerecord_6.0_ruby_2/join_association.rb
+- lib/polyamorous/activerecord_6.0_ruby_2/join_dependency.rb
+- lib/polyamorous/activerecord_6.0_ruby_2/reflection.rb
+- lib/polyamorous/activerecord_6.1_ruby_2/join_association.rb
+- lib/polyamorous/activerecord_6.1_ruby_2/join_dependency.rb
+- lib/polyamorous/activerecord_6.1_ruby_2/reflection.rb
+- lib/polyamorous/join.rb
+- lib/polyamorous/polyamorous.rb
+- lib/polyamorous/swapping_reflection_class.rb
+- lib/polyamorous/tree_node.rb
 - lib/ransack.rb
 - lib/ransack/adapters.rb
 - lib/ransack/adapters/active_record.rb
@@ -150,21 +149,6 @@ files:
 - logo/ransack-v.svg
 - logo/ransack.png
 - logo/ransack.svg
-- polyamorous/lib/polyamorous.rb
-- polyamorous/lib/polyamorous/activerecord_5.2_ruby_2/join_association.rb
-- polyamorous/lib/polyamorous/activerecord_5.2_ruby_2/join_dependency.rb
-- polyamorous/lib/polyamorous/activerecord_5.2_ruby_2/reflection.rb
-- polyamorous/lib/polyamorous/activerecord_6.0_ruby_2/join_association.rb
-- polyamorous/lib/polyamorous/activerecord_6.0_ruby_2/join_dependency.rb
-- polyamorous/lib/polyamorous/activerecord_6.0_ruby_2/reflection.rb
-- polyamorous/lib/polyamorous/activerecord_6.1_ruby_2/join_association.rb
-- polyamorous/lib/polyamorous/activerecord_6.1_ruby_2/join_dependency.rb
-- polyamorous/lib/polyamorous/activerecord_6.1_ruby_2/reflection.rb
-- polyamorous/lib/polyamorous/join.rb
-- polyamorous/lib/polyamorous/swapping_reflection_class.rb
-- polyamorous/lib/polyamorous/tree_node.rb
-- polyamorous/lib/polyamorous/version.rb
-- polyamorous/polyamorous.gemspec
 - ransack.gemspec
 - spec/blueprints/articles.rb
 - spec/blueprints/comments.rb
@@ -174,14 +158,14 @@ files:
 - spec/console.rb
 - spec/helpers/polyamorous_helper.rb
 - spec/helpers/ransack_helper.rb
+- spec/polyamorous/join_association_spec.rb
+- spec/polyamorous/join_dependency_spec.rb
+- spec/polyamorous/join_spec.rb
 - spec/ransack/adapters/active_record/base_spec.rb
 - spec/ransack/adapters/active_record/context_spec.rb
 - spec/ransack/configuration_spec.rb
 - spec/ransack/helpers/form_builder_spec.rb
 - spec/ransack/helpers/form_helper_spec.rb
-- spec/ransack/join_association_spec.rb
-- spec/ransack/join_dependency_spec.rb
-- spec/ransack/join_spec.rb
 - spec/ransack/nodes/condition_spec.rb
 - spec/ransack/nodes/grouping_spec.rb
 - spec/ransack/predicate_spec.rb
@@ -222,14 +206,14 @@ test_files:
 - spec/console.rb
 - spec/helpers/polyamorous_helper.rb
 - spec/helpers/ransack_helper.rb
+- spec/polyamorous/join_association_spec.rb
+- spec/polyamorous/join_dependency_spec.rb
+- spec/polyamorous/join_spec.rb
 - spec/ransack/adapters/active_record/base_spec.rb
 - spec/ransack/adapters/active_record/context_spec.rb
 - spec/ransack/configuration_spec.rb
 - spec/ransack/helpers/form_builder_spec.rb
 - spec/ransack/helpers/form_helper_spec.rb
-- spec/ransack/join_association_spec.rb
-- spec/ransack/join_dependency_spec.rb
-- spec/ransack/join_spec.rb
 - spec/ransack/nodes/condition_spec.rb
 - spec/ransack/nodes/grouping_spec.rb
 - spec/ransack/predicate_spec.rb

data/polyamorous/lib/polyamorous/activerecord_5.2_ruby_2/reflection.rb

@@ -1,12 +0,0 @@
-module Polyamorous
-  module ReflectionExtensions
-    def build_join_constraint(table, foreign_table)
-      if polymorphic?
-        super(table, foreign_table)
-        .and(foreign_table[foreign_type].eq(klass.name))
-      else
-        super(table, foreign_table)
-      end
-    end
-  end
-end

data/polyamorous/lib/polyamorous/activerecord_6.1_ruby_2/join_association.rb

@@ -1,2 +0,0 @@
-# active_record_6.1_ruby_2/join_association
-require 'polyamorous/activerecord_6.0_ruby_2/join_association'

data/polyamorous/lib/polyamorous/activerecord_6.1_ruby_2/join_dependency.rb

@@ -1,2 +0,0 @@
-# active_record_6.1_ruby_2/join_dependency.rb
-require 'polyamorous/activerecord_6.0_ruby_2/join_dependency'

data/polyamorous/lib/polyamorous/version.rb

@@ -1,3 +0,0 @@
-module Polyamorous
-  VERSION = '2.3.2'
-end

data/polyamorous/polyamorous.gemspec

@@ -1,27 +0,0 @@
-# -*- 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.2.1'
-
-  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"]
-end