polyamorous 1.2.0 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a754ac3545728f4de5d4d5e4f75687991f7b41ca
-  data.tar.gz: c2a55008f158f99fd534e66b2306e045271edf1d
+  metadata.gz: c99b340d1137da69048738077239bf10471388fe
+  data.tar.gz: 289568abe8acfc3dd93b8c3fb45f7a6910fd1752
 SHA512:
-  metadata.gz: 1ae3f57016adf1c30563485ae3ae7155aa3e95c880241231e346930de0ab16e1a75082d79563ba2850f2f2513ab7f7a92dd78a5d14e88c19e0aebaf551cdf422
-  data.tar.gz: e0f9296bbbe67e09691d67e5d70b4a0809e71db9ae9a79fcd6bfed483834cf9dae15bf733ed22f645009a7cca66d4f4f79a7fd6aef3952a28fd75d4259e41f06
+  metadata.gz: 0f035d8d3d7ec83992e5eb63f2bd608a7131c1104ad86b5320d7eb953d7e6f8159bf4458636cb03ca0506e18c1bba83f996ede2772bbd11671eec38b251314b0
+  data.tar.gz: 7186a137a3299ce00fdf66526e5a71763cbd99737811e48f0285b2dd2ea1b1bc0952fbf1cb750c24e26393708071e3f753a794022261871e88d1a6958edd0fe6

data/.travis.yml

@@ -1,53 +1,57 @@
 language: ruby
 
 sudo: false
+cache: bundler
 
 before_install:
   - travis_retry gem install bundler
 
 rvm:
-  - 2.2.1
-  - 2.1
-  - 2.0
-  - 1.9
+  - 2.5.0
+  - 2.4.3
+  - 2.3.6
+  - 2.2.9
 
 env:
   - RAILS=4-2-stable AREL=6-0-stable DB=sqlite
   - RAILS=4-2-stable AREL=6-0-stable DB=mysql
   - RAILS=4-2-stable AREL=6-0-stable DB=postgres
+  - RAILS=5-0-stable AREL=7-0-stable DB=sqlite
+  - RAILS=5-0-stable AREL=7-0-stable DB=mysql
+  - RAILS=5-0-stable AREL=7-0-stable DB=postgres
+  - RAILS=5-1-stable AREL=8-0-stable DB=sqlite
+  - RAILS=5-1-stable AREL=8-0-stable DB=mysql
+  - RAILS=5-1-stable AREL=8-0-stable DB=postgres
 
-  - RAILS=4-1-stable AREL=5-0-stable DB=sqlite
-  - RAILS=4-1-stable AREL=5-0-stable DB=mysql
-  - RAILS=4-1-stable AREL=5-0-stable DB=postgres
-
-  - RAILS=4-0-stable AREL=4-0-stable DB=sqlite
-  - RAILS=4-0-stable AREL=4-0-stable DB=mysql
-  - RAILS=4-0-stable AREL=4-0-stable DB=postgres
-
-  - RAILS=3-2-stable AREL=3-0-stable DB=sqlite
-  - RAILS=3-2-stable AREL=3-0-stable DB=mysql
-  - RAILS=3-2-stable AREL=3-0-stable DB=postgres
+matrix:
+  include:
+    - rvm: 2.5.0
+      env: RAILS=master DB=sqlite3
+    - rvm: 2.5.0
+      env: RAILS=master DB=mysql
+    - rvm: 2.5.0
+      env: RAILS=master DB=postgres
 
-  - RAILS=3-1-stable AREL=2-2-stable DB=sqlite
-  - RAILS=3-1-stable AREL=2-2-stable DB=mysql
-  - RAILS=3-1-stable AREL=2-2-stable DB=postgres
+    - rvm: 2.4.3
+      env: RAILS=master DB=sqlite3
+    - rvm: 2.4.3
+      env: RAILS=master DB=mysql
+    - rvm: 2.4.3
+      env: RAILS=master DB=postgres
 
-  - RAILS=3-0-stable AREL=2-0-stable DB=sqlite
-  - RAILS=3-0-stable AREL=2-0-stable DB=mysql
-  - RAILS=3-0-stable AREL=2-0-stable DB=postgres
+    - rvm: 2.3.6
+      env: RAILS=master DB=sqlite3
+    - rvm: 2.3.6
+      env: RAILS=master DB=mysql
+    - rvm: 2.3.6
+      env: RAILS=master DB=postgres
 
-matrix:
-  include:
-    - rvm: 2.2.1
+    - rvm: 2.2.9
       env: RAILS=master DB=sqlite3
-    - rvm: 2.2.1
+    - rvm: 2.2.9
       env: RAILS=master DB=mysql
-    - rvm: 2.2.1
+    - rvm: 2.2.9
       env: RAILS=master DB=postgres
-  allow_failures:
-    - env: RAILS=master DB=sqlite3
-    - env: RAILS=master DB=mysql
-    - env: RAILS=master DB=postgres
 
 before_script:
   - mysql -e 'create database ransack collate utf8_general_ci;'

data/README.md

@@ -1,18 +1,21 @@
 # Polyamorous
+[![Build Status](https://travis-ci.org/activerecord-hackery/polyamorous.svg?branch=master)](https://travis-ci.org/activerecord-hackery/polyamorous)
+[![Gem Version](https://badge.fury.io/rb/polyamorous.svg)](https://badge.fury.io/rb/polyamorous)
+[![Code Climate](https://codeclimate.com/github/activerecord-hackery/polyamorous/badges/gpa.svg)](https://codeclimate.com/github/activerecord-hackery/polyamorous)
 
-[![Build Status](https://travis-ci.org/activerecord-hackery/polyamorous.svg)]
-(https://travis-ci.org/activerecord-hackery/polyamorous)
-[![Gem Version](https://badge.fury.io/rb/polyamorous.svg)]
-(http://badge.fury.io/rb/polyamorous)
-
-Polyamorous is an extraction from MetaSearch 1.1.x, Ransack, and Squeel by
+Polyamorous is an extraction of shared code from the
+[Active Record Hackery](https://github.com/activerecord-hackery) gems
+[Ransack](https://github.com/activerecord-hackery/ransack),
+[Squeel](https://github.com/activerecord-hackery/squeel) and
+[MetaSearch](https://github.com/activerecord-hackery/meta_search) by
 [Ernie Miller](http://twitter.com/erniemiller) and maintained by
 [Ryan Bigg](http://twitter.com/ryanbigg),
 [Xiang Li](http://bigxiang.github.io),
-[Jon Atack](http://twitter.com/jonatack) and a great group of
+[Jon Atack](http://twitter.com/jonatack),
+[Sean Carroll](https://github.com/seanfcarroll) and a great little group of
 [contributors]
 (https://github.com/activerecord-hackery/polyamorous/graphs/contributors).
 
-## Copyright
-
-Copyright © 2011-2015 [Ernie Miller](http://twitter.com/erniemiller)
+It is an internal library for extending various versions of Active Record with
+polymorphism. There is no public API, so it's `:nodoc:`. Move along. Nothing to
+see here.

data/lib/polyamorous/activerecord_4.1_ruby_1.9/join_dependency.rb

@@ -1,4 +1,4 @@
 # active_record_4.1_ruby_1.9/join_dependency.rb
 require 'polyamorous/activerecord_4.2_ruby_2/join_dependency'
 require 'polyamorous/activerecord_4.2_ruby_1.9/join_dependency'
-require 'polyamorous/activerecord_4.1_ruby_2/make_joins'
+require 'polyamorous/activerecord_4.1_ruby_2/make_polyamorous_inner_joins'

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

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

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

@@ -1,3 +1,3 @@
 # active_record_4.1_ruby_2/join_dependency.rb
 require 'polyamorous/activerecord_4.2_ruby_2/join_dependency'
-require 'polyamorous/activerecord_4.1_ruby_2/make_joins'
+require 'polyamorous/activerecord_4.1_ruby_2/make_polyamorous_inner_joins'

data/lib/polyamorous/activerecord_4.1_ruby_2/{make_joins.rb → make_polyamorous_inner_joins.rb}

@@ -1,11 +1,14 @@
 module Polyamorous
   module JoinDependencyExtensions
     # Replaces ActiveRecord::Associations::JoinDependency#make_inner_joins
-    def make_joins(parent, child)
+    #
+    def make_polyamorous_inner_joins(parent, child)
       make_constraints(
         parent, child, child.tables, child.join_type || Arel::Nodes::InnerJoin
       )
-      .concat child.children.flat_map { |c| make_inner_joins(child, c) }
+      .concat child.children.flat_map { |c|
+        make_polyamorous_inner_joins(child, c)
+      }
     end
   end
 end

data/lib/polyamorous/activerecord_4.2_ruby_1.9/join_dependency.rb

@@ -20,26 +20,18 @@ module Polyamorous
     end
 
     # Replaces ActiveRecord::Associations::JoinDependency#build
+    #
     def build_with_polymorphism(associations, base_klass)
       associations.map do |name, right|
         if name.is_a? Join
           reflection = find_reflection base_klass, name.name
           reflection.check_validity!
-          if reflection.polymorphic?
-            JoinAssociation.new(
-              reflection,
-              build(right, name.klass || base_klass),
-              name.klass,
-              name.type
-            )
+          klass = if reflection.polymorphic?
+            name.klass || base_klass
           else
-            JoinAssociation.new(
-              reflection,
-              build(right, reflection.klass),
-              name.klass,
-              name.type
-            )
+            reflection.klass
           end
+          JoinAssociation.new(reflection, build(right, klass), name.klass, name.type)
         else
           reflection = find_reflection base_klass, name
           reflection.check_validity!
@@ -52,10 +44,11 @@ module Polyamorous
     end
 
     # Replaces ActiveRecord::Associations::JoinDependency#join_constraints
-    # to call #make_joins instead of #make_inner_joins.
+    # to call #make_polyamorous_inner_joins instead of #make_inner_joins
+    #
     def join_constraints_with_polymorphism(outer_joins)
       joins = join_root.children.flat_map { |child|
-        make_joins(join_root, child)
+        make_polyamorous_inner_joins join_root, child
       }
       joins.concat outer_joins.flat_map { |oj|
         if join_root.match? oj.join_root
@@ -69,7 +62,8 @@ module Polyamorous
     end
 
     module ClassMethods
-    # Replaces ActiveRecord::Associations::JoinDependency#self.walk_tree
+      # Replaces ActiveRecord::Associations::JoinDependency#self.walk_tree
+      #
       def walk_tree_with_polymorphism(associations, hash)
         case associations
         when TreeNode
@@ -77,14 +71,13 @@ module Polyamorous
         when Hash
           associations.each do |k, v|
             cache =
-            case k
-            when TreeNode
-              k.add_to_tree(hash)
-            else
-              hash[k] ||= {}
-            end
+              if TreeNode === k
+                k.add_to_tree(hash)
+              else
+                hash[k] ||= {}
+              end
             walk_tree(v, cache)
-          end
+         end
         else
           walk_tree_without_polymorphism(associations, hash)
         end

data/lib/polyamorous/activerecord_4.2_ruby_2/join_association.rb

@@ -1,37 +1,2 @@
 # active_record_4.2_ruby_2/join_association.rb
-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
-
-    # Reference https://github.com/rails/rails/commit/9b15db51b78028bfecdb85595624de4b838adbd1
-    # NOTE Not sure we still need it?
-    def ==(other)
-      base_klass == other.base_klass
-    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
+require 'polyamorous/activerecord_5.0_ruby_2/join_association'

data/lib/polyamorous/activerecord_4.2_ruby_2/join_dependency.rb

@@ -1,61 +1,14 @@
 # active_record_4.2_ruby_2/join_dependency.rb
+require 'polyamorous/activerecord_5.0_ruby_2/join_dependency'
+
 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!
-          if reflection.polymorphic?
-            JoinAssociation.new(
-              reflection,
-              build(right, name.klass || base_klass),
-              name.klass,
-              name.type
-            )
-          else
-            JoinAssociation.new(
-              reflection,
-              build(right, reflection.klass),
-              name.klass,
-              name.type
-            )
-          end
-        else
-          reflection = find_reflection base_klass, name
-          reflection.check_validity!
-          if reflection.polymorphic?
-            raise ActiveRecord::EagerLoadPolymorphicError.new(reflection)
-          end
-          JoinAssociation.new reflection, build(right, reflection.klass)
-        end
-      end
-    end
-
-    def find_join_association_respecting_polymorphism(reflection, parent, klass)
-      if association = parent.children.find { |j| j.reflection == reflection }
-        unless reflection.polymorphic?
-          association
-        else
-          association if association.base_klass == klass
-        end
-      end
-    end
-
-    def build_join_association_respecting_polymorphism(reflection, parent, klass)
-      if reflection.polymorphic? && klass
-        JoinAssociation.new(reflection, self, klass)
-      else
-        JoinAssociation.new(reflection, self)
-      end
-    end
-
     # Replaces ActiveRecord::Associations::JoinDependency#join_constraints
-    # to call #make_joins instead of #make_inner_joins.
+    # to call #make_polyamorous_inner_joins instead of #make_inner_joins.
+    #
     def join_constraints(outer_joins)
       joins = join_root.children.flat_map { |child|
-        make_joins(join_root, child)
+        make_polyamorous_inner_joins join_root, child
       }
       joins.concat outer_joins.flat_map { |oj|
         if join_root.match? oj.join_root
@@ -67,39 +20,5 @@ module Polyamorous
         end
       }
     end
-
-    # Replaces ActiveRecord::Associations::JoinDependency#make_inner_joins
-    def make_joins(parent, child)
-      [
-        make_constraints(
-          parent, child, child.tables, child.join_type || Arel::Nodes::InnerJoin
-        )
-      ] + child.children.flat_map { |c| make_inner_joins(child, c) }
-    end
-
-    private :make_joins
-
-    module ClassMethods
-    # Prepended before ActiveRecord::Associations::JoinDependency#self.walk_tree
-      def walk_tree(associations, hash)
-        case associations
-        when TreeNode
-          associations.add_to_tree(hash)
-        when Hash
-          associations.each do |k, v|
-            cache =
-              case k
-              when TreeNode
-                k.add_to_tree(hash)
-              else
-                hash[k] ||= {}
-              end
-            walk_tree(v, cache)
-          end
-        else
-          super(associations, hash)
-        end
-      end
-    end
   end
 end

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

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

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

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

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

@@ -0,0 +1,39 @@
+# active_record_5.1_ruby_2/join_association.rb
+
+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
+
+    # Reference: https://github.com/rails/rails/commit/9b15db5
+    # NOTE: Not sure we still need it?
+    #
+    def ==(other)
+      base_klass == other.base_klass
+    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/activerecord_5.1_ruby_2/join_dependency.rb

@@ -0,0 +1,130 @@
+# active_record_5.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! if ActiveRecord::VERSION::MAJOR >= 5
+
+          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 ActiveRecord::VERSION::MAJOR >= 5
+
+          if reflection.polymorphic?
+            raise ActiveRecord::EagerLoadPolymorphicError.new(reflection)
+          end
+          JoinAssociation.new reflection, build(right, reflection.klass)
+        end
+      end
+    end
+
+    def find_join_association_respecting_polymorphism(reflection, parent, klass)
+      if association = parent.children.find { |j| j.reflection == reflection }
+        unless reflection.polymorphic?
+          association
+        else
+          association if association.base_klass == klass
+        end
+      end
+    end
+
+    def build_join_association_respecting_polymorphism(reflection, parent, klass)
+      if reflection.polymorphic? && klass
+        JoinAssociation.new(reflection, self, klass)
+      else
+        JoinAssociation.new(reflection, self)
+      end
+    end
+
+    # Replaces ActiveRecord::Associations::JoinDependency#join_constraints
+    #
+    # This internal method was changed in Rails 5.0 by commit
+    # https://github.com/rails/rails/commit/e038975 which added
+    # left_outer_joins (see #make_polyamorous_left_outer_joins below) and added
+    # passing an additional argument, `join_type`, to #join_constraints.
+    #
+    def join_constraints(outer_joins, join_type)
+      joins = join_root.children.flat_map { |child|
+        if join_type == Arel::Nodes::OuterJoin
+          make_polyamorous_left_outer_joins join_root, child
+        else
+          make_polyamorous_inner_joins join_root, child
+        end
+      }
+
+      joins.concat outer_joins.flat_map { |oj|
+        if join_root.match? oj.join_root
+          walk(join_root, oj.join_root)
+        else
+          oj.join_root.children.flat_map { |child|
+            make_outer_joins(oj.join_root, child)
+          }
+        end
+      }
+    end
+
+    # Replaces ActiveRecord::Associations::JoinDependency#make_left_outer_joins,
+    # a new method that was added in Rails 5.0 with the following commit:
+    # https://github.com/rails/rails/commit/e038975
+    #
+    def make_polyamorous_left_outer_joins(parent, child)
+      tables    = child.tables
+      join_type = Arel::Nodes::OuterJoin
+      info      = make_constraints parent, child, tables, join_type
+
+      [info] + child.children.flat_map { |c|
+        make_polyamorous_left_outer_joins(child, c)
+      }
+    end
+
+    # Replaces ActiveRecord::Associations::JoinDependency#make_inner_joins
+    #
+    def make_polyamorous_inner_joins(parent, child)
+      tables    = child.tables
+      join_type = child.join_type || Arel::Nodes::InnerJoin
+      info      = make_constraints parent, child, tables, join_type
+
+      [info] + child.children.flat_map { |c|
+        make_polyamorous_inner_joins(child, c)
+      }
+    end
+
+    private :make_polyamorous_inner_joins, :make_polyamorous_left_outer_joins
+
+    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/lib/polyamorous/activerecord_5.2_ruby_2/join_association.rb

@@ -0,0 +1,39 @@
+# active_record_5.2_ruby_2/join_association.rb
+
+module Polyamorous
+  module JoinAssociationExtensions
+    include SwappingReflectionClass
+    def self.prepended(base)
+      base.class_eval { attr_reader :join_type }
+    end
+
+    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|
+          super(reflection, children, alias_tracker)
+          self.reflection.options[:polymorphic] = true
+        end
+      else
+        super(reflection, children, alias_tracker)
+      end
+    end
+
+    # Reference: https://github.com/rails/rails/commit/9b15db5
+    # NOTE: Not sure we still need it?
+    #
+    def ==(other)
+      base_klass == other.base_klass
+    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/activerecord_5.2_ruby_2/join_dependency.rb

@@ -0,0 +1,130 @@
+# active_record_5.2_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! if ActiveRecord::VERSION::MAJOR >= 5
+
+          klass = if reflection.polymorphic?
+            name.klass || base_klass
+          else
+            reflection.klass
+          end
+          JoinAssociation.new(reflection, build(right, klass), alias_tracker, name.klass, name.type)
+        else
+          reflection = find_reflection base_klass, name
+          reflection.check_validity!
+          reflection.check_eager_loadable! if ActiveRecord::VERSION::MAJOR >= 5
+
+          if reflection.polymorphic?
+            raise ActiveRecord::EagerLoadPolymorphicError.new(reflection)
+          end
+          JoinAssociation.new(reflection, build(right, reflection.klass), alias_tracker)
+        end
+      end
+    end
+
+    def find_join_association_respecting_polymorphism(reflection, parent, klass)
+      if association = parent.children.find { |j| j.reflection == reflection }
+        unless reflection.polymorphic?
+          association
+        else
+          association if association.base_klass == klass
+        end
+      end
+    end
+
+    def build_join_association_respecting_polymorphism(reflection, parent, klass)
+      if reflection.polymorphic? && klass
+        JoinAssociation.new(reflection, self, alias_tracker, klass)
+      else
+        JoinAssociation.new(reflection, self, alias_tracker)
+      end
+    end
+
+    # Replaces ActiveRecord::Associations::JoinDependency#join_constraints
+    #
+    # This internal method was changed in Rails 5.0 by commit
+    # https://github.com/rails/rails/commit/e038975 which added
+    # left_outer_joins (see #make_polyamorous_left_outer_joins below) and added
+    # passing an additional argument, `join_type`, to #join_constraints.
+    #
+    def join_constraints(outer_joins, join_type)
+      joins = join_root.children.flat_map { |child|
+        if join_type == Arel::Nodes::OuterJoin
+          make_polyamorous_left_outer_joins join_root, child
+        else
+          make_polyamorous_inner_joins join_root, child
+        end
+      }
+
+      joins.concat outer_joins.flat_map { |oj|
+        if join_root.match? oj.join_root
+          walk(join_root, oj.join_root)
+        else
+          oj.join_root.children.flat_map { |child|
+            make_outer_joins(oj.join_root, child)
+          }
+        end
+      }
+    end
+
+    # Replaces ActiveRecord::Associations::JoinDependency#make_left_outer_joins,
+    # a new method that was added in Rails 5.0 with the following commit:
+    # https://github.com/rails/rails/commit/e038975
+    #
+    def make_polyamorous_left_outer_joins(parent, child)
+      tables    = child.tables
+      join_type = Arel::Nodes::OuterJoin
+      info      = make_constraints parent, child, tables, join_type
+
+      info + child.children.flat_map { |c|
+        make_polyamorous_left_outer_joins(child, c)
+      }
+    end
+
+    # Replaces ActiveRecord::Associations::JoinDependency#make_inner_joins
+    #
+    def make_polyamorous_inner_joins(parent, child)
+      tables    = child.tables
+      join_type = child.join_type || Arel::Nodes::InnerJoin
+      info      = make_constraints parent, child, tables, join_type
+
+      info + child.children.flat_map { |c|
+        make_polyamorous_inner_joins(child, c)
+      }
+    end
+
+    private :make_polyamorous_inner_joins, :make_polyamorous_left_outer_joins
+
+    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/lib/polyamorous/version.rb

@@ -1,3 +1,3 @@
 module Polyamorous
-  VERSION = '1.2.0'
+  VERSION = '1.3.3'
 end

data/lib/polyamorous.rb

@@ -25,15 +25,8 @@ if defined?(::ActiveRecord)
   require 'polyamorous/join'
   require 'polyamorous/swapping_reflection_class'
 
-  ar_version =
-    case ::ActiveRecord::VERSION::STRING[0,3]
-    when '4.2', '5.0'
-      '4.2'
-    when '4.1'
-      '4.1'
-    else
-      '3_and_4.0'
-    end
+  ar_version = ::ActiveRecord::VERSION::STRING[0,3]
+  ar_version = '3_and_4.0' if ar_version < '4.1'
 
   method, ruby_version =
     if RUBY_VERSION >= '2.0' && ar_version >= '4.1'

data/polyamorous.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "polyamorous"
 
   s.add_dependency 'activerecord', '>= 3.0'
-  s.add_development_dependency 'rspec', '~> 2.14.0'
+  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 'faker', '~> 1.6.5'
   s.add_development_dependency 'sqlite3', '~> 1.3.3'
 
   s.files         = `git ls-files`.split("\n")

data/spec/helpers/polyamorous_helper.rb

@@ -9,12 +9,18 @@ module PolyamorousHelper
     end
   end
 
-  def new_join_dependency(klass, associations = {})
-    Polyamorous::JoinDependency.new klass, associations, []
+  if ActiveRecord::VERSION::STRING >= "5.2"
+    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/polyamorous/join_association_spec.rb

@@ -2,10 +2,53 @@ require 'spec_helper'
 
 module Polyamorous
   describe JoinAssociation do
-    if ActiveRecord::VERSION::STRING >= '4.1'
-      include_examples 'Join Association on ActiveRecord 4.1'
-    else
-      include_examples 'Join Association on ActiveRecord 3 and 4.0'
+
+    join_base, join_association_args, polymorphic =
+      if ActiveRecord::VERSION::STRING >= '4.1'
+        [:join_root, 'parent.children', 'reflection.options[:polymorphic]']
+      else
+        [:join_base, 'join_dependency, parent', 'options[:polymorphic]']
+      end
+
+    let(:join_dependency) { new_join_dependency Note, {} }
+    let(:reflection) { Note.reflect_on_association(:notable) }
+    let(:parent) { join_dependency.send(join_base) }
+    let(:join_association) {
+      eval("new_join_association(reflection, #{join_association_args}, Article)")
+    }
+
+    subject {
+      join_dependency.build_join_association_respecting_polymorphism(
+        reflection, parent, Person
+      )
+    }
+
+    it 'respects polymorphism on equality test' do
+      expect(subject).to eq(
+        join_dependency.build_join_association_respecting_polymorphism(
+          reflection, parent, Person
+        )
+      )
+      expect(subject).not_to eq(
+        join_dependency.build_join_association_respecting_polymorphism(
+          reflection, parent, Article
+        )
+      )
+    end
+
+    it 'leaves the orginal reflection intact for thread safety' do
+      reflection.instance_variable_set(:@klass, Article)
+      join_association
+      .swapping_reflection_klass(reflection, Person) do |new_reflection|
+        expect(new_reflection.options).not_to equal reflection.options
+        expect(new_reflection.options).not_to have_key(:polymorphic)
+        expect(new_reflection.klass).to eq(Person)
+        expect(reflection.klass).to eq(Article)
+      end
+    end
+
+    it 'sets the polymorphic option to true after initializing' do
+      expect(join_association.instance_eval(polymorphic)).to be true
     end
   end
 end

data/spec/polyamorous/join_dependency_spec.rb

@@ -2,10 +2,101 @@ require 'spec_helper'
 
 module Polyamorous
   describe JoinDependency do
-    if ActiveRecord::VERSION::STRING >= '4.1'
-      include_examples 'Join Dependency on ActiveRecord 4.1'
-    else
-      include_examples 'Join Dependency on ActiveRecord 3 and 4.0'
+
+    method, join_associations, join_base =
+      if ActiveRecord::VERSION::STRING >= '4.1'
+        [:instance_eval, 'join_root.drop(1)', :join_root]
+      else
+        [:send, 'join_associations', :join_base]
+      end
+
+    context 'with symbol joins' do
+      subject { new_join_dependency Person, articles: :comments }
+
+      specify { expect(subject.send(method, join_associations).size)
+        .to eq(2) }
+      specify { expect(subject.send(method, join_associations).map(&:join_type))
+        .to be_all { Polyamorous::InnerJoin } }
+    end
+
+    context 'with has_many :through association' do
+      subject { new_join_dependency Person, :authored_article_comments }
+
+      specify { expect(subject.send(method, join_associations).size)
+        .to eq 1 }
+      specify { expect(subject.send(method, join_associations).first.table_name)
+        .to eq 'comments' }
+    end
+
+    context 'with outer join' do
+      subject { new_join_dependency Person, new_join(:articles, :outer) }
+
+      specify { expect(subject.send(method, join_associations).size)
+        .to eq 1 }
+      specify { expect(subject.send(method, join_associations).first.join_type)
+        .to eq Polyamorous::OuterJoin }
+    end
+
+    context 'with nested outer joins' do
+      subject { new_join_dependency Person,
+        new_join(:articles, :outer) => new_join(:comments, :outer) }
+
+      specify { expect(subject.send(method, join_associations).size)
+        .to eq 2 }
+      specify { expect(subject.send(method, join_associations).map(&:join_type))
+        .to eq [Polyamorous::OuterJoin, Polyamorous::OuterJoin] }
+      specify { expect(subject.send(method, join_associations).map(&:join_type))
+        .to be_all { Polyamorous::OuterJoin } }
+    end
+
+    context 'with polymorphic belongs_to join' do
+      subject { new_join_dependency Note, new_join(:notable, :inner, Person) }
+
+      specify { expect(subject.send(method, join_associations).size)
+        .to eq 1 }
+      specify { expect(subject.send(method, join_associations).first.join_type)
+        .to eq Polyamorous::InnerJoin }
+      specify { expect(subject.send(method, join_associations).first.table_name)
+        .to eq 'people' }
+
+      it 'finds a join association respecting polymorphism' do
+        parent = subject.send(join_base)
+        reflection = Note.reflect_on_association(:notable)
+
+        expect(subject.find_join_association_respecting_polymorphism(
+          reflection, parent, Person))
+          .to eq subject.send(method, join_associations).first
+      end
+    end
+
+    context 'with polymorphic belongs_to join and nested symbol join' do
+      subject { new_join_dependency Note,
+        new_join(:notable, :inner, Person) => :comments }
+
+      specify { expect(subject.send(method, join_associations).size)
+        .to eq 2 }
+      specify { expect(subject.send(method, join_associations).map(&:join_type))
+        .to be_all { Polyamorous::InnerJoin } }
+      specify { expect(subject.send(method, join_associations).first.table_name)
+        .to eq 'people' }
+      specify { expect(subject.send(method, join_associations)[1].table_name)
+        .to eq 'comments' }
+    end
+
+    context '#left_outer_join in Rails 5 overrides join type specified',
+            if: ActiveRecord::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR < 2 do
+
+      let(:join_type_class) do
+        new_join_dependency(
+          Person,
+          new_join(:articles)
+        ).join_constraints(
+          [],
+          Arel::Nodes::OuterJoin
+        ).first.joins.map(&:class)
+      end
+
+      specify { expect(join_type_class).to eq [Arel::Nodes::OuterJoin] }
     end
   end
 end

data/spec/polyamorous/join_spec.rb

@@ -7,7 +7,7 @@ module Polyamorous
       expect(join).to be_kind_of(TreeNode)
     end
 
-    it 'can be add to a tree' do
+    it 'can be added to a tree' do
       join = new_join(:articles, :outer)
 
       tree_hash = {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyamorous
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.3
 platform: ruby
 authors:
 - Ernie Miller
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-05 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -33,14 +33,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: machinist
   requirement: !ruby/object:Gem::Requirement
@@ -61,14 +61,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 1.6.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 1.6.5
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -108,11 +108,17 @@ files:
 - lib/polyamorous/activerecord_4.1_ruby_1.9/join_dependency.rb
 - lib/polyamorous/activerecord_4.1_ruby_2/join_association.rb
 - lib/polyamorous/activerecord_4.1_ruby_2/join_dependency.rb
-- lib/polyamorous/activerecord_4.1_ruby_2/make_joins.rb
+- lib/polyamorous/activerecord_4.1_ruby_2/make_polyamorous_inner_joins.rb
 - lib/polyamorous/activerecord_4.2_ruby_1.9/join_association.rb
 - lib/polyamorous/activerecord_4.2_ruby_1.9/join_dependency.rb
 - lib/polyamorous/activerecord_4.2_ruby_2/join_association.rb
 - lib/polyamorous/activerecord_4.2_ruby_2/join_dependency.rb
+- lib/polyamorous/activerecord_5.0_ruby_2/join_association.rb
+- lib/polyamorous/activerecord_5.0_ruby_2/join_dependency.rb
+- lib/polyamorous/activerecord_5.1_ruby_2/join_association.rb
+- lib/polyamorous/activerecord_5.1_ruby_2/join_dependency.rb
+- lib/polyamorous/activerecord_5.2_ruby_2/join_association.rb
+- lib/polyamorous/activerecord_5.2_ruby_2/join_dependency.rb
 - lib/polyamorous/join.rb
 - lib/polyamorous/swapping_reflection_class.rb
 - lib/polyamorous/tree_node.rb
@@ -129,10 +135,6 @@ files:
 - spec/polyamorous/join_spec.rb
 - spec/spec_helper.rb
 - spec/support/schema.rb
-- spec/support/shared_examples/join_association_3_and_4.0.rb
-- spec/support/shared_examples/join_association_4.1.rb
-- spec/support/shared_examples/join_dependency_3_and_4.0.rb
-- spec/support/shared_examples/join_dependency_4.1.rb
 homepage: https://github.com/activerecord-hackery/polyamorous
 licenses:
 - MIT
@@ -153,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: polyamorous
-rubygems_version: 2.4.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Loves/is loved by polymorphic belongs_to associations, Ransack, Squeel, MetaSearch...
@@ -169,7 +171,3 @@ test_files:
 - spec/polyamorous/join_spec.rb
 - spec/spec_helper.rb
 - spec/support/schema.rb
-- spec/support/shared_examples/join_association_3_and_4.0.rb
-- spec/support/shared_examples/join_association_4.1.rb
-- spec/support/shared_examples/join_dependency_3_and_4.0.rb
-- spec/support/shared_examples/join_dependency_4.1.rb

data/spec/support/shared_examples/join_association_3_and_4.0.rb

@@ -1,42 +0,0 @@
-shared_examples 'Join Association on ActiveRecord 3 and 4.0' do
-  let(:join_dependency) { new_join_dependency Note, {} }
-  let(:reflection) { Note.reflect_on_association(:notable) }
-  let(:parent) { join_dependency.join_base }
-  let(:join_association) {
-    new_join_association(reflection, join_dependency, parent, Article)
-  }
-
-  subject {
-    join_dependency.build_join_association_respecting_polymorphism(
-      reflection, parent, Person
-    )
-  }
-
-  it 'respects polymorphism on equality test' do
-    expect(subject).to eq(
-      join_dependency.build_join_association_respecting_polymorphism(
-        reflection, parent, Person
-      )
-    )
-    expect(subject).not_to eq(
-      join_dependency.build_join_association_respecting_polymorphism(
-        reflection, parent, Article
-      )
-    )
-  end
-
-  it 'leaves the orginal reflection intact for thread safety' do
-    reflection.instance_variable_set(:@klass, Article)
-    join_association
-    .swapping_reflection_klass(reflection, Person) do |new_reflection|
-      expect(new_reflection.options).not_to equal reflection.options
-      expect(new_reflection.options).not_to have_key(:polymorphic)
-      expect(new_reflection.klass).to eq(Person)
-      expect(reflection.klass).to eq(Article)
-    end
-  end
-
-  it 'sets the polmorphic option to true after initializing' do
-    expect(join_association.options[:polymorphic]).to be_true
-  end
-end

data/spec/support/shared_examples/join_association_4.1.rb

@@ -1,42 +0,0 @@
-shared_examples 'Join Association on ActiveRecord 4.1' do
-  let(:join_dependency) { new_join_dependency Note, {} }
-  let(:reflection) { Note.reflect_on_association(:notable) }
-  let(:parent) { join_dependency.join_root }
-  let(:join_association) {
-    new_join_association(reflection, parent.children, Article)
-  }
-
-  subject {
-    join_dependency.build_join_association_respecting_polymorphism(
-      reflection, parent, Person
-    )
-  }
-
-  it 'respects polymorphism on equality test' do
-    expect(subject).to eq(
-      join_dependency.build_join_association_respecting_polymorphism(
-        reflection, parent, Person
-      )
-    )
-    expect(subject).not_to eq(
-      join_dependency.build_join_association_respecting_polymorphism(
-        reflection, parent, Article
-      )
-    )
-  end
-
-  it 'leaves the orginal reflection intact for thread safety' do
-    reflection.instance_variable_set(:@klass, Article)
-    join_association
-    .swapping_reflection_klass(reflection, Person) do |new_reflection|
-      expect(new_reflection.options).not_to equal reflection.options
-      expect(new_reflection.options).not_to have_key(:polymorphic)
-      expect(new_reflection.klass).to eq(Person)
-      expect(reflection.klass).to eq(Article)
-    end
-  end
-
-  it 'sets the polmorphic option to true after initializing' do
-    expect(join_association.reflection.options[:polymorphic]).to be_true
-  end
-end

data/spec/support/shared_examples/join_dependency_3_and_4.0.rb

@@ -1,65 +0,0 @@
-shared_examples "Join Dependency on ActiveRecord 3 and 4.0" do
-  context 'with symbol joins' do
-    subject { new_join_dependency Person, :articles => :comments }
-
-    specify { expect(subject.join_associations.size).to eq(2) }
-    specify { expect(subject.join_associations)
-      .to be_all { |a| a.join_type == Polyamorous::InnerJoin } }
-  end
-
-  context 'with has_many :through association' do
-    subject { new_join_dependency Person, :authored_article_comments }
-
-    specify { expect(subject.join_associations.size).to eq(1) }
-    specify { expect(subject.join_associations.first.table_name)
-      .to eq 'comments' }
-  end
-
-  context 'with outer join' do
-    subject { new_join_dependency Person, new_join(:articles, :outer) }
-
-    specify { expect(subject.join_associations.size).to eq(1) }
-    specify { expect(subject.join_associations)
-      .to be_all { |a| a.join_type == Polyamorous::OuterJoin } }
-  end
-
-  context 'with nested outer joins' do
-    subject { new_join_dependency Person,
-      new_join(:articles, :outer) => new_join(:comments, :outer) }
-
-    specify { expect(subject.join_associations.size).to eq(2) }
-    specify { expect(subject.join_associations)
-      .to be_all { |a| a.join_type == Polyamorous::OuterJoin } }
-  end
-
-  context 'with polymorphic belongs_to join' do
-    subject { new_join_dependency Note, new_join(:notable, :inner, Person) }
-
-    specify { expect(subject.join_associations.size).to eq(1) }
-    specify { expect(subject.join_associations)
-      .to be_all { |a| a.join_type == Polyamorous::InnerJoin } }
-    specify { expect(subject.join_associations.first.table_name)
-      .to eq 'people' }
-
-    it 'finds a join association respecting polymorphism' do
-      parent = subject.join_base
-      reflection = Note.reflect_on_association(:notable)
-      expect(subject.find_join_association_respecting_polymorphism(
-        reflection, parent, Person
-      )).to eq subject.join_associations.first
-    end
-  end
-
-  context 'with polymorphic belongs_to join and nested symbol join' do
-    subject { new_join_dependency Note,
-      new_join(:notable, :inner, Person) => :comments }
-
-    specify { expect(subject.join_associations.size).to eq(2) }
-    specify { expect(subject.join_associations)
-      .to be_all { |a| a.join_type == Polyamorous::InnerJoin } }
-    specify { expect(subject.join_associations.first.table_name)
-      .to eq 'people' }
-    specify { expect(subject.join_associations[1].table_name)
-      .to eq 'comments' }
-  end
-end

data/spec/support/shared_examples/join_dependency_4.1.rb

@@ -1,65 +0,0 @@
-shared_examples "Join Dependency on ActiveRecord 4.1" do
-  context 'with symbol joins' do
-    subject { new_join_dependency Person, :articles => :comments }
-
-    specify { expect(subject.join_root.drop(1).size).to eq(2) }
-    specify { expect(subject.join_root.drop(1).map(&:join_type))
-      .to be_all { Polyamorous::InnerJoin } }
-  end
-
-  context 'with has_many :through association' do
-    subject { new_join_dependency Person, :authored_article_comments }
-
-    specify { expect(subject.join_root.drop(1).size).to eq(1) }
-    specify { expect(subject.join_root.drop(1).first.table_name)
-      .to eq 'comments' }
-  end
-
-  context 'with outer join' do
-    subject { new_join_dependency Person, new_join(:articles, :outer) }
-
-    specify { expect(subject.join_root.drop(1).size).to eq(1) }
-    specify { expect(subject.join_root.drop(1).first.join_type)
-      .to eq Polyamorous::OuterJoin }
-  end
-
-  context 'with nested outer joins' do
-    subject { new_join_dependency Person,
-      new_join(:articles, :outer) => new_join(:comments, :outer) }
-
-    specify { expect(subject.join_root.drop(1).size).to eq(2) }
-    specify { expect(subject.join_root.drop(1).map(&:join_type))
-      .to be_all { Polyamorous::OuterJoin } }
-  end
-
-  context 'with polymorphic belongs_to join' do
-    subject { new_join_dependency Note, new_join(:notable, :inner, Person) }
-
-    specify { expect(subject.join_root.drop(1).size).to eq(1) }
-    specify { expect(subject.join_root.drop(1).first.join_type)
-      .to eq Polyamorous::InnerJoin }
-    specify { expect(subject.join_root.drop(1).first.table_name)
-      .to eq 'people' }
-
-    it 'finds a join association respecting polymorphism' do
-      parent = subject.join_root
-      reflection = Note.reflect_on_association(:notable)
-      expect(subject.find_join_association_respecting_polymorphism(
-        reflection, parent, Person
-      )).to eq subject.join_root.drop(1).first
-    end
-  end
-
-  context 'with polymorphic belongs_to join and nested symbol join' do
-    subject { new_join_dependency Note,
-      new_join(:notable, :inner, Person) => :comments }
-
-    specify { expect(subject.join_root.drop(1).size).to eq(2) }
-    specify { expect(subject.join_root.drop(1).map(&:join_type))
-      .to be_all { Polyamorous::InnerJoin } }
-    specify { expect(subject.join_root.drop(1).first.table_name)
-      .to eq 'people' }
-    specify { expect(subject.join_root.drop(1)[1].table_name)
-      .to eq 'comments' }
-  end
-end