polyamorous 1.3.3 → 2.3.0

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

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

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

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

data/lib/polyamorous/version.rb

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

data/polyamorous.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Polyamorous::VERSION
   s.authors     = ["Ernie Miller", "Ryan Bigg", "Jon Atack", "Xiang Li"]
   s.email       = ["ernie@erniemiller.org", "radarlistener@gmail.com", "jonnyatack@gmail.com", "bigxiang@gmail.com"]
-  s.homepage    = "https://github.com/activerecord-hackery/polyamorous"
+  s.homepage    = "https://github.com/activerecord-hackery/ransack/tree/master/polyamorous"
   s.license     = "MIT"
   s.summary     = %q{
     Loves/is loved by polymorphic belongs_to associations, Ransack, Squeel, MetaSearch...
@@ -18,9 +18,7 @@ Gem::Specification.new do |s|
     associations.
   }
 
-  s.rubyforge_project = "polyamorous"
-
-  s.add_dependency 'activerecord', '>= 3.0'
+  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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyamorous
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 2.3.0
 platform: ruby
 authors:
 - Ernie Miller
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2019-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -95,47 +95,29 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- Gemfile
-- LICENSE
-- README.md
-- Rakefile
 - lib/polyamorous.rb
-- lib/polyamorous/activerecord_3_and_4.0_ruby_1.9/join_association.rb
-- lib/polyamorous/activerecord_3_and_4.0_ruby_1.9/join_dependency.rb
-- lib/polyamorous/activerecord_4.1_ruby_1.9/join_association.rb
-- 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_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/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_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
+- lib/polyamorous/activerecord_6.1_ruby_2/join_association.rb
+- lib/polyamorous/activerecord_6.1_ruby_2/join_dependency.rb
+- lib/polyamorous/activerecord_6.1_ruby_2/reflection.rb
 - lib/polyamorous/join.rb
 - lib/polyamorous/swapping_reflection_class.rb
 - lib/polyamorous/tree_node.rb
 - lib/polyamorous/version.rb
 - polyamorous.gemspec
-- spec/blueprints/articles.rb
-- spec/blueprints/comments.rb
-- spec/blueprints/notes.rb
-- spec/blueprints/people.rb
-- spec/blueprints/tags.rb
-- spec/helpers/polyamorous_helper.rb
-- spec/polyamorous/join_association_spec.rb
-- spec/polyamorous/join_dependency_spec.rb
-- spec/polyamorous/join_spec.rb
-- spec/spec_helper.rb
-- spec/support/schema.rb
-homepage: https://github.com/activerecord-hackery/polyamorous
+homepage: https://github.com/activerecord-hackery/ransack/tree/master/polyamorous
 licenses:
 - MIT
 metadata: {}
@@ -154,20 +136,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: polyamorous
-rubygems_version: 2.6.13
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Loves/is loved by polymorphic belongs_to associations, Ransack, Squeel, MetaSearch...
-test_files:
-- spec/blueprints/articles.rb
-- spec/blueprints/comments.rb
-- spec/blueprints/notes.rb
-- spec/blueprints/people.rb
-- spec/blueprints/tags.rb
-- spec/helpers/polyamorous_helper.rb
-- spec/polyamorous/join_association_spec.rb
-- spec/polyamorous/join_dependency_spec.rb
-- spec/polyamorous/join_spec.rb
-- spec/spec_helper.rb
-- spec/support/schema.rb
+test_files: []

data/.gitignore

@@ -1,6 +0,0 @@
-*.gem
-.bundle
-Gemfile.lock
-pkg/*
-.ruby-version
-.ruby-gemset

data/.travis.yml

@@ -1,59 +0,0 @@
-language: ruby
-
-sudo: false
-cache: bundler
-
-before_install:
-  - travis_retry gem install bundler
-
-rvm:
-  - 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
-
-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
-
-    - 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
-
-    - 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
-
-    - 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;'
-  - mysql -e 'use ransack;show variables like "%character%";show variables like "%collation%";'
-  - psql -c 'create database ransack;' -U postgres

data/Gemfile

@@ -1,33 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem 'rake'
-
-rails = ENV['RAILS'] || 'master'
-
-if rails == 'master'
-  arel = ENV['AREL'] || 'master'
-  arel_opts =
-    case arel
-    when /\// # A path
-      { path: arel }
-    when /^v/ # A tagged version
-      { git: 'git://github.com/rails/arel.git', tag: arel }
-    else
-      { git: 'git://github.com/rails/arel.git', branch: arel }
-    end
-  gem 'arel', arel_opts
-end
-
-case rails
-when /\// # A path
-  gem 'activerecord', path: "#{rails}/activerecord"
-when /^v/ # A tagged version
-  git 'git://github.com/rails/rails.git', tag: rails do
-    gem 'activerecord'
-  end
-else
-  git 'git://github.com/rails/rails.git', branch: rails do
-    gem 'activerecord'
-  end
-end

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2011 Ernie Miller
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,21 +0,0 @@
-# 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
-[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),
-[Sean Carroll](https://github.com/seanfcarroll) and a great little group of
-[contributors]
-(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
-see here.

data/Rakefile

@@ -1,17 +0,0 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec) do |rspec|
-  rspec.rspec_opts = ['--backtrace']
-end
-
-task :default => :spec
-
-desc "Open an irb session with Ransack and the sample data used in specs"
-task :console do
-  require 'irb'
-  require 'irb/completion'
-  require 'console'
-  ARGV.clear
-  IRB.start
-end

data/lib/polyamorous/activerecord_3_and_4.0_ruby_1.9/join_association.rb

@@ -1,76 +0,0 @@
-# active_record_3_and_4.0_ruby_1.9/join_association.rb
-module Polyamorous
-  module JoinAssociationExtensions
-    include SwappingReflectionClass
-    def self.included(base)
-      base.class_eval do
-        alias_method_chain :initialize, :polymorphism
-        alias_method :equality_without_polymorphism, :==
-        alias_method :==, :equality_with_polymorphism
-        if base.method_defined?(:active_record)
-          alias_method :base_klass, :active_record
-        end
-
-        if ActiveRecord::VERSION::STRING =~ /^3\.0\./
-          alias_method_chain :association_join, :polymorphism
-        else
-          alias_method_chain :build_constraint, :polymorphism
-        end
-      end
-    end
-
-    def initialize_with_polymorphism(
-      reflection, join_dependency, parent = nil, polymorphic_class = nil
-    )
-      if polymorphic_class && ::ActiveRecord::Base > polymorphic_class
-        swapping_reflection_klass(reflection, polymorphic_class) do |reflection|
-          initialize_without_polymorphism(reflection, join_dependency, parent)
-          self.reflection.options[:polymorphic] = true
-        end
-      else
-        initialize_without_polymorphism(reflection, join_dependency, parent)
-      end
-    end
-
-    def equality_with_polymorphism(other)
-      equality_without_polymorphism(other) && base_klass == other.base_klass
-    end
-
-    def build_constraint_with_polymorphism(
-      reflection, table, key, foreign_table, foreign_key
-    )
-      if reflection.options[:polymorphic]
-        build_constraint_without_polymorphism(
-          reflection, table, key, foreign_table, foreign_key
-        )
-        .and(foreign_table[reflection.foreign_type].eq(reflection.klass.name))
-      else
-        build_constraint_without_polymorphism(
-          reflection, table, key, foreign_table, foreign_key
-        )
-      end
-    end
-
-    def association_join_with_polymorphism
-      return @join if @Join
-      @join = association_join_without_polymorphism
-      if reflection.macro == :belongs_to && reflection.options[:polymorphic]
-        aliased_table = Arel::Table.new(
-          table_name,
-          as: @aliased_table_name,
-          engine: arel_engine,
-          columns: klass.columns
-        )
-        parent_table = Arel::Table.new(
-          parent.table_name,
-          as: parent.aliased_table_name,
-          engine: arel_engine,
-          columns: parent.base_klass.columns
-        )
-        @join << parent_table[reflection.options[:foreign_type]]
-                 .eq(reflection.klass.name)
-      end
-      @join
-    end
-  end
-end

data/lib/polyamorous/activerecord_3_and_4.0_ruby_1.9/join_dependency.rb

@@ -1,96 +0,0 @@
-# active_record_3_and_4.0_ruby_1.9/join_dependency.rb
-module Polyamorous
-  module JoinDependencyExtensions
-    def self.included(base)
-      base.class_eval do
-        alias_method_chain :build, :polymorphism
-        alias_method_chain :graft, :polymorphism
-        if base.method_defined?(:active_record)
-          alias_method :base_klass, :active_record
-        end
-      end
-    end
-
-    def graft_with_polymorphism(*associations)
-      associations.each do |association|
-        unless join_associations.detect { |a| association == a }
-          if association.reflection.options[:polymorphic]
-            build(
-              Join.new(
-                association.reflection.name,
-                association.join_type,
-                association.reflection.klass
-                ),
-              association.find_parent_in(self) || join_base,
-              association.join_type
-              )
-          else
-            build(
-              association.reflection.name,
-              association.find_parent_in(self) || join_base,
-              association.join_type
-              )
-          end
-        end
-      end
-      self
-    end
-
-    if ActiveRecord::VERSION::STRING =~ /^3\.0\./
-      def _join_parts
-        @joins
-      end
-    else
-      def _join_parts
-        @join_parts
-      end
-    end
-
-    def build_with_polymorphism(
-      associations, parent = nil, join_type = InnerJoin
-    )
-      case associations
-      when Join
-        parent ||= _join_parts.last
-        reflection = parent.reflections[associations.name] or
-          raise ::ActiveRecord::ConfigurationError,
-            "Association named '#{associations.name
-            }' was not found; perhaps you misspelled it?"
-
-        unless join_association = find_join_association_respecting_polymorphism(
-          reflection, parent, associations.klass
-        )
-          @reflections << reflection
-          join_association = build_join_association_respecting_polymorphism(
-            reflection, parent, associations.klass
-          )
-          join_association.join_type = associations.type
-          _join_parts << join_association
-          cache_joined_association(join_association)
-        end
-
-        join_association
-      else
-        build_without_polymorphism(associations, parent, join_type)
-      end
-    end
-
-    def find_join_association_respecting_polymorphism(reflection, parent, klass)
-      if association = find_join_association(reflection, parent)
-        unless reflection.options[:polymorphic]
-          association
-        else
-          association if association.base_klass == klass
-        end
-      end
-    end
-
-    def build_join_association_respecting_polymorphism(reflection, parent, klass)
-      if reflection.options[:polymorphic] && klass
-        JoinAssociation.new(reflection, self, parent, klass)
-      else
-        JoinAssociation.new(reflection, self, parent)
-      end
-    end
-  end
-end