polyamorous 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 974ca93cd847897179ae0ad4d5a2628bd65a8444
-  data.tar.gz: 7183fb57fe8068011d9add6efd750d9386c87342
+  metadata.gz: 9ff05c13352acf27880e21028691c8bd6b6f89e0
+  data.tar.gz: 5e6d545c5402a4b32425de4f0e929377b4681492
 SHA512:
-  metadata.gz: 1e8ddde2bf2c992b252712c63c96cac958a59289887650ac6c611481f77a4b7f5f69e7375f010afddb065dbfc955bbefe91b4dc397404978ccb6f10cff278a82
-  data.tar.gz: d193721ba969fd2ff9f08bf227be4a7d9192cb303fa7b3c51c37d762fe363c01f6b7b89d1b08c714cfbd69afec97a8c16f715b0347181ca87734e61fdfdb0da0
+  metadata.gz: 9ba07c1dc59826858869435c4d2a816c543208c4c87ab6ac57df31de05c32eed600f416b38982f3b0a5678b4b92a4f9443d866b89c029f1c7fe40fca36636ccc
+  data.tar.gz: ae5c40ed036a5d584dd134a2208fd37009a58962410b0ad2fe212285295889cf59d7211864eb1ebdc71062296f5c24589f7cd8c23d9a8402b42b5668a9345d4e

data/.travis.yml

@@ -6,8 +6,9 @@ before_install:
   - travis_retry gem install bundler
 
 rvm:
-  - 2.2.3
-  - 2.1
+  - 2.3.1
+  - 2.2.5
+  - 2.1.10
   - 2.0
   - 1.9
 
@@ -38,12 +39,34 @@ env:
 
 matrix:
   include:
-    - rvm: 2.2.3
+    - rvm: 2.3.1
       env: RAILS=master DB=sqlite3
-    - rvm: 2.2.3
+    - rvm: 2.3.1
       env: RAILS=master DB=mysql
-    - rvm: 2.2.3
+    - rvm: 2.3.1
       env: RAILS=master DB=postgres
+
+    - rvm: 2.2.5
+      env: RAILS=master DB=sqlite3
+    - rvm: 2.2.5
+      env: RAILS=master DB=mysql
+    - rvm: 2.2.5
+      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
+
   allow_failures:
     - env: RAILS=master DB=sqlite3
     - env: RAILS=master DB=mysql

data/README.md

@@ -20,7 +20,5 @@ Polyamorous is an extraction of shared code from the
 (https://github.com/activerecord-hackery/polyamorous/graphs/contributors).
 
 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
+polymorphism. There is no public API, so it's `:nodoc:`. Move along. Nothing to
 see here.
-
-Copyright © 2011-2015 [Ernie Miller](http://twitter.com/erniemiller)

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

@@ -1,6 +1,7 @@
 module Polyamorous
   module JoinDependencyExtensions
     # Replaces ActiveRecord::Associations::JoinDependency#make_inner_joins
+    #
     def make_polyamorous_inner_joins(parent, child)
       make_constraints(
         parent, child, child.tables, child.join_type || Arel::Nodes::InnerJoin

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

@@ -20,6 +20,7 @@ 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
@@ -43,7 +44,8 @@ module Polyamorous
     end
 
     # Replaces ActiveRecord::Associations::JoinDependency#join_constraints
-    # to call #make_polyamorous_inner_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_polyamorous_inner_joins join_root, child
@@ -60,10 +62,22 @@ 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)
-        if TreeNode === associations
+        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
           walk_tree_without_polymorphism(associations, hash)
         end

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

@@ -1,38 +1,2 @@
 # active_record_5.0_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
+require 'polyamorous/activerecord_5.1_ruby_2/join_association'

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

@@ -1,116 +1,2 @@
 # active_record_5.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!
-          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!
-          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 = child.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)
-        if TreeNode === associations
-          associations.add_to_tree(hash)
-        else
-          super(associations, hash)
-        end
-      end
-    end
-
-  end
-end
+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,126 @@
+# 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!
+          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!
+          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/version.rb

@@ -1,3 +1,3 @@
 module Polyamorous
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

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/polyamorous/join_association_spec.rb

@@ -47,8 +47,8 @@ module Polyamorous
       end
     end
 
-    it 'sets the polmorphic option to true after initializing' do
-      expect(join_association.instance_eval(polymorphic)).to be_true
+    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

@@ -82,5 +82,16 @@ module Polyamorous
       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 do
+
+      let(:join_type_class) {
+        new_join_dependency(Person, new_join(:articles))
+        .join_constraints([], Arel::Nodes::OuterJoin).first.joins.map(&:class)
+      }
+
+      specify { expect(join_type_class).to eq [Arel::Nodes::OuterJoin] }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyamorous
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Ernie Miller
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-07-13 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
@@ -115,6 +115,8 @@ files:
 - 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/join.rb
 - lib/polyamorous/swapping_reflection_class.rb
 - lib/polyamorous/tree_node.rb
@@ -151,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: polyamorous
-rubygems_version: 2.5.0
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Loves/is loved by polymorphic belongs_to associations, Ransack, Squeel, MetaSearch...