ransack 2.1.1 → 2.3.0

data/lib/ransack/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = '2.1.1'
+  VERSION = '2.3.0'
 end

data/{lib → polyamorous/lib}/polyamorous.rb

@@ -12,13 +12,17 @@ if defined?(::ActiveRecord)
   require 'polyamorous/swapping_reflection_class'
 
   ar_version = ::ActiveRecord::VERSION::STRING[0,3]
-  ar_version = ::ActiveRecord::VERSION::STRING[0,5] if ar_version >= "5.2"
-  ar_version = "5.2.1" if ::ActiveRecord::VERSION::STRING >= "5.2.1"
-
+  ar_version = ::ActiveRecord::VERSION::STRING[0,5] if ar_version >= "5.2" && ::ActiveRecord.version < ::Gem::Version.new("6.0")
+  ar_version = "5.2.1" if ::ActiveRecord::VERSION::STRING >= "5.2.1" && ::ActiveRecord.version < ::Gem::Version.new("6.0")
   %w(join_association join_dependency).each do |file|
     require "polyamorous/activerecord_#{ar_version}_ruby_2/#{file}"
   end
 
+  if ar_version >= "5.2.0"
+    require "polyamorous/activerecord_#{ar_version}_ruby_2/reflection.rb"
+    ::ActiveRecord::Reflection::AbstractReflection.send(:prepend, Polyamorous::ReflectionExtensions)
+  end
+
   Polyamorous::JoinDependency.send(:prepend, Polyamorous::JoinDependencyExtensions)
   Polyamorous::JoinDependency.singleton_class.send(:prepend, Polyamorous::JoinDependencyExtensions::ClassMethods)
   Polyamorous::JoinAssociation.send(:prepend, Polyamorous::JoinAssociationExtensions)

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

@@ -7,8 +7,7 @@ module Polyamorous
       base.class_eval { attr_reader :join_type }
     end
 
-    def initialize(reflection, children, polymorphic_class = nil,
-                   join_type = Arel::Nodes::InnerJoin)
+    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|

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

@@ -7,8 +7,7 @@ module Polyamorous
       base.class_eval { attr_reader :join_type }
     end
 
-    def initialize(reflection, children, alias_tracker, polymorphic_class = nil,
-      join_type = Arel::Nodes::InnerJoin)
+    def initialize(reflection, children, alias_tracker, 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|
@@ -23,7 +22,7 @@ module Polyamorous
     def build_constraint(klass, table, key, foreign_table, foreign_key)
       if reflection.polymorphic?
         super(klass, table, key, foreign_table, foreign_key)
-        .and(foreign_table[reflection.foreign_type].eq(reflection.klass.name))
+          .and(foreign_table[reflection.foreign_type].eq(reflection.klass.name))
       else
         super(klass, table, key, foreign_table, foreign_key)
       end

data/{lib → polyamorous/lib}/polyamorous/activerecord_5.2.0_ruby_2/join_dependency.rb

@@ -38,7 +38,6 @@ module Polyamorous
     # passing an additional argument, `join_type`, to #join_constraints.
     #
     def join_constraints(outer_joins, join_type)
-      @alias_tracker = alias_tracker
       joins = join_root.children.flat_map { |child|
         if join_type == Arel::Nodes::OuterJoin
           make_polyamorous_left_outer_joins join_root, child
@@ -48,7 +47,7 @@ module Polyamorous
       }
 
       joins.concat outer_joins.flat_map { |oj|
-        if join_root.match? oj.join_root
+        if join_root.match?(oj.join_root) && join_root.table.name == oj.join_root.table.name
           walk(join_root, oj.join_root)
         else
           oj.join_root.children.flat_map { |child|

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

@@ -0,0 +1,12 @@
+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/{lib → polyamorous/lib}/polyamorous/activerecord_5.2.1_ruby_2/join_association.rb

@@ -18,14 +18,5 @@ module Polyamorous
         super(reflection, children)
       end
     end
-
-    def build_constraint(klass, table, key, foreign_table, foreign_key)
-      if reflection.polymorphic?
-        super(klass, table, key, foreign_table, foreign_key)
-        .and(foreign_table[reflection.foreign_type].eq(reflection.klass.name))
-      else
-        super(klass, table, key, foreign_table, foreign_key)
-      end
-    end
   end
 end

data/{lib → polyamorous/lib}/polyamorous/activerecord_5.2.1_ruby_2/join_dependency.rb

@@ -3,7 +3,6 @@
 module Polyamorous
   module JoinDependencyExtensions
     # Replaces ActiveRecord::Associations::JoinDependency#build
-    #
     def build(associations, base_klass)
       associations.map do |name, right|
         if name.is_a? Join
@@ -30,6 +29,31 @@ module Polyamorous
       end
     end
 
+    def join_constraints(joins_to_add, join_type, alias_tracker)
+      @alias_tracker = alias_tracker
+
+      construct_tables!(join_root)
+      joins = make_join_constraints(join_root, join_type)
+
+      joins.concat joins_to_add.flat_map { |oj|
+        construct_tables!(oj.join_root)
+        if join_root.match?(oj.join_root) && join_root.table.name == oj.join_root.table.name
+          walk join_root, oj.join_root
+        else
+          make_join_constraints(oj.join_root, join_type)
+        end
+      }
+    end
+
+    private
+      def make_constraints(parent, child, join_type = Arel::Nodes::OuterJoin)
+        foreign_table = parent.table
+        foreign_klass = parent.base_klass
+        join_type = child.join_type || join_type if join_type == Arel::Nodes::InnerJoin
+        joins = child.join_constraints(foreign_table, foreign_klass, join_type, alias_tracker)
+        joins.concat child.children.flat_map { |c| make_constraints(child, c, join_type) }
+      end
+
     module ClassMethods
       # Prepended before ActiveRecord::Associations::JoinDependency#walk_tree
       #

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

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

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

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

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

@@ -0,0 +1,81 @@
+# active_record_6.0_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)
+      @alias_tracker = alias_tracker
+
+      construct_tables!(join_root)
+      joins = make_join_constraints(join_root, join_type)
+
+      joins.concat joins_to_add.flat_map { |oj|
+        construct_tables!(oj.join_root)
+        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
+
+    private
+      def make_constraints(parent, child, join_type = Arel::Nodes::OuterJoin)
+        foreign_table = parent.table
+        foreign_klass = parent.base_klass
+        join_type = child.join_type || join_type if join_type == Arel::Nodes::InnerJoin
+        joins = child.join_constraints(foreign_table, foreign_klass, join_type, alias_tracker)
+        joins.concat child.children.flat_map { |c| make_constraints(child, c, join_type) }
+      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/polyamorous/activerecord_6.0_ruby_2/reflection.rb

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

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

@@ -0,0 +1,2 @@
+# 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

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

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

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

data/polyamorous/lib/polyamorous/version.rb

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

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

@@ -14,19 +14,19 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9'
   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 'i18n'
+  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 '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

@@ -3,11 +3,15 @@ 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, 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::STRING == "5.2.0"
+  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

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

@@ -40,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) }
 

data/spec/ransack/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(