polyamorous 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e492b2c26e7349c7319dcbeef6873fc5a86e2a8c6eb8e9fa7d0a9a7797f3bf1d
-  data.tar.gz: 46334d1ae1c9223ee8bb100785a91e0601faaf653b7c43ae7be1c6740731974b
+  metadata.gz: 4828e729dad541eaab8ae5ec3274171f8b3af19c9280880e5b34ddfe6df62a52
+  data.tar.gz: 68b0698ce59b4a487b6b633d958714d6418422e3a7a4cbbf6c09e5d81aae7d34
 SHA512:
-  metadata.gz: 4046a135237cd578403749be629af46ecec8e14841f930dc0524dbec9906219ec8d45e681e402a0fe874c632f03babca710f7f993db7afdfd85ad5f2882b2bf6
-  data.tar.gz: 1f6bb027ca8d1c1b2e90586c05b59282f0355422b550f33436b98deb1738fd7c5a17370560f087f7f4cd6e85d4faebcc7221375886f89b29d7936364722c3859
+  metadata.gz: edfcad3c9bdbe53d68e203efac4dba201f06084fb22b962fc0f2ac2350b1a7af56a4d5dc05ca330689ab31e1581acdf77f186c7b28625f2a3a3e6f6137f4b68d
+  data.tar.gz: 66eacd475f4907bc8183522d4c3ed6617941cec8898d2fac2f4ac2f9a0953cf66f8e8183eb6db0fce7b0302bc75c9e204bba3c7e8ce9bcb669841a08f739695e

data/lib/polyamorous.rb

@@ -12,16 +12,11 @@ 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" && ::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|
+  %w(join_association join_dependency reflection).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
+  ActiveRecord::Reflection::AbstractReflection.send(:prepend, Polyamorous::ReflectionExtensions)
 
   Polyamorous::JoinDependency.send(:prepend, Polyamorous::JoinDependencyExtensions)
   Polyamorous::JoinDependency.singleton_class.send(:prepend, Polyamorous::JoinDependencyExtensions::ClassMethods)

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

@@ -1,5 +1,3 @@
-# active_record_5.2.1_ruby_2/join_association.rb
-
 module Polyamorous
   module JoinAssociationExtensions
     include SwappingReflectionClass

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

@@ -1,5 +1,3 @@
-# active_record_5.2.1_ruby_2/join_dependency.rb
-
 module Polyamorous
   module JoinDependencyExtensions
     # Replaces ActiveRecord::Associations::JoinDependency#build

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

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

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

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

data/lib/polyamorous/version.rb

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

data/polyamorous.gemspec

@@ -18,18 +18,10 @@ Gem::Specification.new do |s|
     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.add_dependency 'activerecord', '>= 5.2.1'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-
-  # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
-  # s.add_runtime_dependency "rest-client"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyamorous
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Ernie Miller
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-18 00:00:00.000000000 Z
+date: 2020-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,70 +19,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: machinist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.6
-- !ruby/object:Gem::Dependency
-  name: faker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.5
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 5.2.1
 description: "\n    This is just an extraction from Ransack/Squeel. You probably don't
   want to use this\n    directly. It extends ActiveRecord's associations to support
   polymorphic belongs_to\n    associations.\n  "
@@ -96,16 +40,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/polyamorous.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.0_ruby_2/join_association.rb
-- lib/polyamorous/activerecord_5.2.0_ruby_2/join_dependency.rb
-- lib/polyamorous/activerecord_5.2.0_ruby_2/reflection.rb
-- lib/polyamorous/activerecord_5.2.1_ruby_2/join_association.rb
-- lib/polyamorous/activerecord_5.2.1_ruby_2/join_dependency.rb
-- lib/polyamorous/activerecord_5.2.1_ruby_2/reflection.rb
+- lib/polyamorous/activerecord_5.2_ruby_2/join_association.rb
+- lib/polyamorous/activerecord_5.2_ruby_2/join_dependency.rb
+- lib/polyamorous/activerecord_5.2_ruby_2/reflection.rb
 - lib/polyamorous/activerecord_6.0_ruby_2/join_association.rb
 - lib/polyamorous/activerecord_6.0_ruby_2/join_dependency.rb
 - lib/polyamorous/activerecord_6.0_ruby_2/reflection.rb

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

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

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

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

@@ -1,112 +0,0 @@
-# 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!
-
-          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
-
-    # 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.0_ruby_2/join_association.rb

@@ -1,31 +0,0 @@
-# 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
-
-    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.0_ruby_2/join_dependency.rb

@@ -1,112 +0,0 @@
-# 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!
-
-          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 reflection.polymorphic?
-            raise ActiveRecord::EagerLoadPolymorphicError.new(reflection)
-          end
-          JoinAssociation.new(reflection, build(right, reflection.klass), alias_tracker)
-        end
-      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) && join_root.table.name == oj.join_root.table.name
-          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.1_ruby_2/reflection.rb

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