polymorphic_integer_type 3.0.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96fa454bca5e242711a9cc17183c3dbfe7b8c9303bd0bbe1cd246d030761639d
-  data.tar.gz: 536c3c02769ef0e020e300225e9e1cf453235d5341adc6f98cd973e1d7ea79d1
+  metadata.gz: e0a0c496105cf4f71bbb7d8e37f4b7d5464a155c6d69adc32860a42f57b54ce2
+  data.tar.gz: 6b91ce4961f8ff169c8a106bc258d25ff8f59aff0c59a97ed7488c9d708851bd
 SHA512:
-  metadata.gz: dae28edc37bb45b1852a9d1f60347e74496d2ba371645514654ae9807a680de40d5487779b219a0fef3cad4ce220b2f0444e51c9907dbd6269653d2082eff1bf
-  data.tar.gz: 32e6df91034dd5423d8c3787512246e570a1cec2d5d85bdfee2eed2d1932640562dc9ef08881aa6fe09edb1d218597613833ac56389f3807327a28cef7e517db
+  metadata.gz: 224efc3b41dc88ba440de3a87398a6422e817cc6adcedb216145d9fdfe004c9d3c5da733f81e547d27481dae3806290173dd4db65d4b72759084d0c4132a48d0
+  data.tar.gz: 91168a3fa7ed06b8de0c51b15d5199a66ede9e0b3265a7ea23861a796219f2948e9eef18b51c8c349fe23706ebfb9c9131fbec181a175c703c6d701061205a84

data/.gitignore

@@ -19,3 +19,4 @@ test/version_tmp
 tmp
 .byebug_history
 polymorphic_integer_type_test
+gemfiles/*.lock

data/gemfiles/Gemfile.rails-6.1-stable

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "activerecord", github: "rails/rails", branch: "6-1-stable"

data/gemfiles/Gemfile.rails-7.0-stable

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "activerecord", github: "rails/rails", branch: "7-0-stable"

data/lib/polymorphic_integer_type/activerecord_5_0_0/polymorphic_array_value_extension.rb

@@ -10,7 +10,12 @@ module PolymorphicIntegerType
     # end
 
     def type_to_ids_mapping
-      association = @associated_table.send(:association)
+      if ACTIVE_RECORD_VERSION < Gem::Version.new("6.1")
+        association = @associated_table.send(:association)
+      else
+        association = @associated_table.send(:reflection)
+      end
+
       name = association.name
       default_hash = Hash.new { |hsh, key| hsh[key] = [] }
       values.each_with_object(default_hash) do |value, hash|
@@ -24,7 +29,7 @@ module PolymorphicIntegerType
 
           hash[key] << convert_to_id(value)
         else
-          hash[klass.polymorphic_name] << convert_to_id(value)
+          hash[klass(value)&.polymorphic_name] << convert_to_id(value)
         end
       end
     end

data/lib/polymorphic_integer_type/belongs_to_polymorphic_association_extension.rb

@@ -1,10 +1,17 @@
 module ActiveRecord
   module Associations
     class BelongsToPolymorphicAssociation < BelongsToAssociation
-      private def replace_keys(record)
-        super
-        unless record.nil?
-          owner[reflection.foreign_type] = record.class.base_class
+      private
+
+      if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new("6.1")
+        def replace_keys(record)
+          super
+          owner[reflection.foreign_type] = record.class.base_class unless record.nil?
+        end
+      elsif
+        def replace_keys(record, force: false)
+          super
+          owner[reflection.foreign_type] = record.class.base_class unless record.nil?
         end
       end
     end

data/lib/polymorphic_integer_type/extensions.rb

@@ -87,7 +87,7 @@ module PolymorphicIntegerType
         end
 
         remove_type_and_establish_mapping(name, options, scope)
-        super(name, options.delete(:scope), options, &extension)
+        super(name, options.delete(:scope), **options, &extension)
       end
 
       def has_one(name, scope = nil, **options)
@@ -97,7 +97,7 @@ module PolymorphicIntegerType
         end
 
         remove_type_and_establish_mapping(name, options, scope)
-        super(name, options.delete(:scope), options)
+        super(name, options.delete(:scope), **options)
       end
 
 

data/lib/polymorphic_integer_type/version.rb

@@ -1,3 +1,3 @@
 module PolymorphicIntegerType
-  VERSION = "3.0.0"
+  VERSION = "3.2.0"
 end

data/polymorphic_integer_type.gemspec

@@ -13,12 +13,12 @@ Gem::Specification.new do |spec|
   spec.homepage      = ""
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files -- . ':!.github/'`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", "< 6.1"
+  spec.add_dependency "activerecord", "< 7.1"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

data/spec/spec_helper.rb

@@ -17,14 +17,21 @@ require 'pry'
 RSpec.configure do |config|
   config.before(:suite) do
     database_config = YAML.load(File.open("#{File.dirname(__FILE__)}/support/database.yml"))
+    migrations_path = "#{File.dirname(__FILE__)}/support/migrations"
+    active_record_version = Gem::Version.new(ActiveRecord::VERSION::STRING)
+
     ActiveRecord::Base.establish_connection(database_config)
 
-    if Gem::Version.new(ActiveRecord::VERSION::STRING) == Gem::Version.new("5.2.0")
-      ActiveRecord::MigrationContext.new("#{File.dirname(__FILE__)}/support/migrations").migrate      
+    if active_record_version < Gem::Version.new("5.2")
+      ActiveRecord::Migrator.migrate(migrations_path)      
+    end
+
+    if active_record_version >= Gem::Version.new("5.2") && active_record_version < Gem::Version.new("6.0")
+      ActiveRecord::MigrationContext.new(migrations_path).migrate      
     end
     
-    if Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("6.0")
-      ActiveRecord::MigrationContext.new("#{File.dirname(__FILE__)}/support/migrations", ActiveRecord::SchemaMigration).migrate      
+    if active_record_version >= Gem::Version.new("6.0")
+      ActiveRecord::MigrationContext.new(migrations_path, ActiveRecord::SchemaMigration).migrate      
     end
   end
 

data/spec/support/migrations/1_create_link_table.rb

@@ -1,4 +1,4 @@
-class CreateLinkTable < ActiveRecord::Migration[5.2]
+class CreateLinkTable < ActiveRecord::Migration[5.0]
 
   def up
     create_table :links do |t|

data/spec/support/migrations/2_create_animal_table.rb

@@ -1,4 +1,4 @@
-class CreateAnimalTable < ActiveRecord::Migration[5.2]
+class CreateAnimalTable < ActiveRecord::Migration[5.0]
 
   def up
     create_table :animals do |t|

data/spec/support/migrations/3_create_person_table.rb

@@ -1,4 +1,4 @@
-class CreatePersonTable < ActiveRecord::Migration[5.2]
+class CreatePersonTable < ActiveRecord::Migration[5.0]
 
   def up
     create_table :people do |t|

data/spec/support/migrations/4_create_food_table.rb

@@ -1,4 +1,4 @@
-class CreateFoodTable < ActiveRecord::Migration[5.2]
+class CreateFoodTable < ActiveRecord::Migration[5.0]
 
   def up
     create_table :foods do |t|

data/spec/support/migrations/5_create_drink_table.rb

@@ -1,4 +1,4 @@
-class CreateDrinkTable < ActiveRecord::Migration[5.2]
+class CreateDrinkTable < ActiveRecord::Migration[5.0]
 
   def up
     create_table :drinks do |t|

data/spec/support/migrations/6_create_plant_table.rb

@@ -1,4 +1,4 @@
-class CreatePlantTable < ActiveRecord::Migration[5.2]
+class CreatePlantTable < ActiveRecord::Migration[5.0]
 
   def up
     create_table :plants do |t|

data/spec/support/migrations/7_create_activity_table.rb

@@ -1,4 +1,4 @@
-class CreateActivityTable < ActiveRecord::Migration[5.2]
+class CreateActivityTable < ActiveRecord::Migration[5.0]
 
   def up
     create_table :activities do |t|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polymorphic_integer_type
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Kyle d'Oliveira
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-20 00:00:00.000000000 Z
+date: 2023-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -109,13 +109,11 @@ files:
 - Rakefile
 - bin/setup
 - gemfiles/Gemfile.rails-5.0-stable
-- gemfiles/Gemfile.rails-5.0-stable.lock
 - gemfiles/Gemfile.rails-5.1-stable
-- gemfiles/Gemfile.rails-5.1-stable.lock
 - gemfiles/Gemfile.rails-5.2-stable
-- gemfiles/Gemfile.rails-5.2-stable.lock
-- gemfiles/Gemfile.rails-6-0-stable
-- gemfiles/Gemfile.rails-6-0-stable.lock
+- gemfiles/Gemfile.rails-6.0-stable
+- gemfiles/Gemfile.rails-6.1-stable
+- gemfiles/Gemfile.rails-7.0-stable
 - lib/polymorphic_integer_type.rb
 - lib/polymorphic_integer_type/activerecord_5_0_0/association_query_handler_extension.rb
 - lib/polymorphic_integer_type/activerecord_5_0_0/polymorphic_array_value_extension.rb
@@ -149,7 +147,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -164,8 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.4.10
+signing_key: 
 specification_version: 4
 summary: Use integers rather than strings for the _type field
 test_files:

data/gemfiles/Gemfile.rails-5.0-stable.lock

@@ -1,74 +0,0 @@
-GIT
-  remote: https://github.com/rails/rails.git
-  revision: ac6aa32f7cf66264ba87eabed7c042bb60bcf3a2
-  branch: 5-0-stable
-  specs:
-    activemodel (5.0.7.2)
-      activesupport (= 5.0.7.2)
-    activerecord (5.0.7.2)
-      activemodel (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
-      arel (~> 7.0)
-    activesupport (5.0.7.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-
-PATH
-  remote: ..
-  specs:
-    polymorphic_integer_type (3.0.0)
-      activerecord (< 6.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    arel (7.1.4)
-    byebug (11.1.3)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.8)
-    diff-lcs (1.4.4)
-    i18n (1.8.10)
-      concurrent-ruby (~> 1.0)
-    method_source (1.0.0)
-    minitest (5.14.4)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
-    rake (13.0.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    sqlite3 (1.3.13)
-    thread_safe (0.3.6)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord!
-  bundler
-  polymorphic_integer_type!
-  pry-byebug
-  rake
-  rspec
-  sqlite3 (~> 1.3.6)
-
-BUNDLED WITH
-   2.1.4

data/gemfiles/Gemfile.rails-5.1-stable.lock

@@ -1,74 +0,0 @@
-GIT
-  remote: https://github.com/rails/rails.git
-  revision: 663206d20aec374a28a24bb43bc7b1233042ed9b
-  branch: 5-1-stable
-  specs:
-    activemodel (5.1.7)
-      activesupport (= 5.1.7)
-    activerecord (5.1.7)
-      activemodel (= 5.1.7)
-      activesupport (= 5.1.7)
-      arel (~> 8.0)
-    activesupport (5.1.7)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-
-PATH
-  remote: ..
-  specs:
-    polymorphic_integer_type (3.0.0)
-      activerecord (< 6.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    arel (8.0.0)
-    byebug (11.1.3)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.8)
-    diff-lcs (1.4.4)
-    i18n (1.8.10)
-      concurrent-ruby (~> 1.0)
-    method_source (1.0.0)
-    minitest (5.14.4)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
-    rake (13.0.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    sqlite3 (1.4.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord!
-  bundler
-  polymorphic_integer_type!
-  pry-byebug
-  rake
-  rspec
-  sqlite3
-
-BUNDLED WITH
-   2.1.4

data/gemfiles/Gemfile.rails-5.2-stable.lock

@@ -1,74 +0,0 @@
-GIT
-  remote: https://github.com/rails/rails.git
-  revision: 48661542a2607d55f436438fe21001d262e61fec
-  branch: 5-2-stable
-  specs:
-    activemodel (5.2.6)
-      activesupport (= 5.2.6)
-    activerecord (5.2.6)
-      activemodel (= 5.2.6)
-      activesupport (= 5.2.6)
-      arel (>= 9.0)
-    activesupport (5.2.6)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-
-PATH
-  remote: ..
-  specs:
-    polymorphic_integer_type (3.0.0)
-      activerecord (< 6.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    arel (9.0.0)
-    byebug (11.1.3)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.8)
-    diff-lcs (1.4.4)
-    i18n (1.8.10)
-      concurrent-ruby (~> 1.0)
-    method_source (1.0.0)
-    minitest (5.14.4)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
-    rake (13.0.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    sqlite3 (1.4.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord!
-  bundler
-  polymorphic_integer_type!
-  pry-byebug
-  rake
-  rspec
-  sqlite3
-
-BUNDLED WITH
-   2.1.4

data/gemfiles/Gemfile.rails-6-0-stable.lock

@@ -1,74 +0,0 @@
-GIT
-  remote: https://github.com/rails/rails.git
-  revision: ef97441036e0ebbe1aa2108d59c408707f998ffd
-  branch: 6-0-stable
-  specs:
-    activemodel (6.0.3.7)
-      activesupport (= 6.0.3.7)
-    activerecord (6.0.3.7)
-      activemodel (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
-    activesupport (6.0.3.7)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-
-PATH
-  remote: ..
-  specs:
-    polymorphic_integer_type (3.0.0)
-      activerecord (< 6.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    byebug (11.1.3)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.8)
-    diff-lcs (1.4.4)
-    i18n (1.8.10)
-      concurrent-ruby (~> 1.0)
-    method_source (1.0.0)
-    minitest (5.14.4)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
-    rake (13.0.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    sqlite3 (1.4.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-    zeitwerk (2.4.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord!
-  bundler
-  polymorphic_integer_type!
-  pry-byebug
-  rake
-  rspec
-  sqlite3
-
-BUNDLED WITH
-   2.1.4