polymorphic_integer_type 3.0.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96fa454bca5e242711a9cc17183c3dbfe7b8c9303bd0bbe1cd246d030761639d
-  data.tar.gz: 536c3c02769ef0e020e300225e9e1cf453235d5341adc6f98cd973e1d7ea79d1
+  metadata.gz: eb3b9a7f294ca84e3f4090aeb66dbd11046cb721e58b51b762d3fac2a77f90e3
+  data.tar.gz: 4b9ed1f6e1c36d98a573932bd747780aae00032e238ab8cf7385d6d12d6fb0a3
 SHA512:
-  metadata.gz: dae28edc37bb45b1852a9d1f60347e74496d2ba371645514654ae9807a680de40d5487779b219a0fef3cad4ce220b2f0444e51c9907dbd6269653d2082eff1bf
-  data.tar.gz: 32e6df91034dd5423d8c3787512246e570a1cec2d5d85bdfee2eed2d1932640562dc9ef08881aa6fe09edb1d218597613833ac56389f3807327a28cef7e517db
+  metadata.gz: 7a7cb4348a7be18c626d9a611a6005b991b6a09c016c0dd3908e10326da0bc8495072dfcf16ce998a55fce3c8f7bfbce34709df9b3882cceb01dbfe2ff274dc1
+  data.tar.gz: 1ddd7ed8095268053c37092ac0f1c8ebf73fee6111dc51bdda027dd4a2e3c4f23d92402ee60724c04f9d7737b06c8a022712683dc23503adf0f2c35b30090159

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+/.github/workflows/ @clio/application-security @clio/penguins

data/.github/workflows/ci.yml

@@ -0,0 +1,34 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        gemfile:
+          - Gemfile.rails-5.0-stable
+          - Gemfile.rails-5.1-stable
+          - Gemfile.rails-5.2-stable
+          - Gemfile.rails-6.0-stable
+          - Gemfile.rails-6.1-stable
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "2.6"
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run:
+          bundle exec rspec

data/.github/workflows/gem-push.yml

@@ -0,0 +1,30 @@
+name: Ruby Gem
+
+on:
+  release:
+    types: [ published ]
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby 2.7
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.7.x
+
+    - name: Publish to RubyGems
+      env:
+        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem

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/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|

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/version.rb

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

data/polymorphic_integer_type.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   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"
   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.1.1
 platform: ruby
 authors:
 - Kyle d'Oliveira
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-20 00:00:00.000000000 Z
+date: 2021-11-04 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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +102,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/CODEOWNERS"
+- ".github/workflows/ci.yml"
+- ".github/workflows/gem-push.yml"
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
@@ -109,13 +112,10 @@ 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
 - 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 +149,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+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