polyamorous 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ff05c13352acf27880e21028691c8bd6b6f89e0
-  data.tar.gz: 5e6d545c5402a4b32425de4f0e929377b4681492
+  metadata.gz: ba8814592b049107b1eba9e3a5ae6688cb204be0
+  data.tar.gz: accde4c264086caab8643396bb8d17a95ecbefbf
 SHA512:
-  metadata.gz: 9ba07c1dc59826858869435c4d2a816c543208c4c87ab6ac57df31de05c32eed600f416b38982f3b0a5678b4b92a4f9443d866b89c029f1c7fe40fca36636ccc
-  data.tar.gz: ae5c40ed036a5d584dd134a2208fd37009a58962410b0ad2fe212285295889cf59d7211864eb1ebdc71062296f5c24589f7cd8c23d9a8402b42b5668a9345d4e
+  metadata.gz: 72f2e30aebe8916dd516d303a14bed69f25bc88784faca7f0cf9abaaeddfd610801cb4eb21f87e26765282965bc8ed214d5dc751975d4e829487eec5a68d927a
+  data.tar.gz: d65afd228a8693875fbdc9d5210952c78e31bffe4c1fa033028e769489f3e218c37bd55fe2ec30779a9b4b3cb7f14ba6f555165022c8e276766d8966383bf4ac

data/.travis.yml

@@ -1,76 +1,57 @@
 language: ruby
 
 sudo: false
+cache: bundler
 
 before_install:
   - travis_retry gem install bundler
 
 rvm:
-  - 2.3.1
-  - 2.2.5
-  - 2.1.10
-  - 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=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
-
-  - 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
-
-  - 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
+  - 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
 
 matrix:
   include:
-    - rvm: 2.3.1
+    - rvm: 2.5.0
       env: RAILS=master DB=sqlite3
-    - rvm: 2.3.1
+    - rvm: 2.5.0
       env: RAILS=master DB=mysql
-    - rvm: 2.3.1
+    - rvm: 2.5.0
       env: RAILS=master DB=postgres
 
-    - rvm: 2.2.5
+    - rvm: 2.4.3
       env: RAILS=master DB=sqlite3
-    - rvm: 2.2.5
+    - rvm: 2.4.3
       env: RAILS=master DB=mysql
-    - rvm: 2.2.5
+    - rvm: 2.4.3
       env: RAILS=master DB=postgres
 
-    - rvm: 2.3.1
-      env: RAILS=5-0-stable DB=sqlite3
-    - rvm: 2.3.1
-      env: RAILS=5-0-stable DB=mysql
-    - rvm: 2.3.1
-      env: RAILS=5-0-stable DB=postgres
-
-    - rvm: 2.2.5
-      env: RAILS=5-0-stable DB=sqlite3
-    - rvm: 2.2.5
-      env: RAILS=5-0-stable DB=mysql
-    - rvm: 2.2.5
-      env: RAILS=5-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
 
-  allow_failures:
-    - env: RAILS=master DB=sqlite3
-    - env: RAILS=master DB=mysql
-    - env: RAILS=master DB=postgres
+    - rvm: 2.2.9
+      env: RAILS=master DB=sqlite3
+    - rvm: 2.2.9
+      env: RAILS=master DB=mysql
+    - rvm: 2.2.9
+      env: RAILS=master DB=postgres
 
 before_script:
   - mysql -e 'create database ransack collate utf8_general_ci;'

data/README.md

@@ -1,11 +1,7 @@
 # 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)
-[![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?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)
 
 Polyamorous is an extraction of shared code from the
 [Active Record Hackery](https://github.com/activerecord-hackery) gems
@@ -15,7 +11,8 @@ Polyamorous is an extraction of shared code from the
 [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 little 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).
 

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

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

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

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

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

@@ -8,7 +8,7 @@ module Polyamorous
     end
 
     def initialize(reflection, children, polymorphic_class = nil,
-      join_type = Arel::Nodes::InnerJoin)
+                   join_type = Arel::Nodes::InnerJoin)
       @join_type = join_type
       if polymorphic_class && ::ActiveRecord::Base > polymorphic_class
         swapping_reflection_klass(reflection, polymorphic_class) do |reflection|
@@ -30,7 +30,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/activerecord_5.1_ruby_2/join_dependency.rb

@@ -9,15 +9,19 @@ module Polyamorous
         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
+                    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
@@ -115,7 +119,7 @@ module Polyamorous
                 hash[k] ||= {}
               end
             walk_tree(v, cache)
-         end
+          end
         else
           super(associations, hash)
         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.3.1'
+  VERSION = '1.3.2'
 end

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_dependency_spec.rb

@@ -11,10 +11,10 @@ module Polyamorous
       end
 
     context 'with symbol joins' do
-      subject { new_join_dependency Person, :articles => :comments }
+      subject { new_join_dependency Person, articles: :comments }
 
       specify { expect(subject.send(method, join_associations).size)
-        .to eq 2 }
+        .to eq(2) }
       specify { expect(subject.send(method, join_associations).map(&:join_type))
         .to be_all { Polyamorous::InnerJoin } }
     end
@@ -84,12 +84,17 @@ module Polyamorous
     end
 
     context '#left_outer_join in Rails 5 overrides join type specified',
-      if: ActiveRecord::VERSION::MAJOR >= 5 do
-
-      let(:join_type_class) {
-        new_join_dependency(Person, new_join(:articles))
-        .join_constraints([], Arel::Nodes::OuterJoin).first.joins.map(&:class)
-      }
+            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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyamorous
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Ernie Miller
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2017-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -117,6 +117,8 @@ files:
 - 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
@@ -153,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: polyamorous
-rubygems_version: 2.6.4
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Loves/is loved by polymorphic belongs_to associations, Ransack, Squeel, MetaSearch...