polymorphic_integer_type 3.3.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea9d51ebb89d80399f1ef17cc3e7163fe4923db10710d352e1f849cbeb81c782
-  data.tar.gz: '0910cded5f13a659aa01ba248353c6b2a23f81bb80dd447d54aa37f5a5a526b9'
+  metadata.gz: 8d10470b4fde6a60c09165ec1d7359041515b9e63fcd4281739acf3620304dc8
+  data.tar.gz: 5ec3cf4e59dff1e62906eeb84357ca87a5f433503573d9806541ff115eeb5c26
 SHA512:
-  metadata.gz: 05e5887f356fd8d96352adc20ad4aae0d4dd8d8d42c7611b5bb83aabcdf03e7132e1366855ef4148b92e001afd9d10430525c43127ac34fe3b3dcc6e776cfbf8
-  data.tar.gz: 0da151ee5cd138ef7d677cdd5fb7040e674144cedfbcc06cff50dfb11c37a5b972717359e07a21ceac3c7aab03878a040002f2b4e41d309d5c90bf003def445f
+  metadata.gz: 2c2239a63b258b65ff77aa190770d61369f938a2c281355a6c8ccede01271e8c57054257912c95210afeab910330d8aba42a31ad7d7de1c227e84281c2802528
+  data.tar.gz: 46963ce891ca6f9ad8148291dd9bd793361ce3e16c16ed939f2f08b00fa18f3f910253b799bd05262e5906252512514e4900457a2dca57f1fde08d795c48db54

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v3.5.0 (2026-04-30)
+
+### Added
+
+- Add Rails 8.1 compatibility. Rails 8.1 changed `PredicateBuilder::PolymorphicArrayValue#initialize` from `(associated_table, values)` to `(reflection, values)`, dropping the `@associated_table` ivar. `type_to_ids_mapping` now reads `@reflection` when available and falls back to `@associated_table.send(:reflection)` for older Rails versions.
+
 ## v3.2.1 (2023-12-14)
 
 ### Fixed
@@ -26,3 +32,11 @@
 
 - Remove unsupported rails versions(5.0, 5.2, 6.0) and ruby version(2.7)
 
+## v3.4.0 (2024-XX-XX)
+
+### Added
+
+- Add Rails 8.0 compatibility (requires Ruby 3.2+)
+
+### Removed 
+- Remove unsupported rails versions 6.x

data/README.md

@@ -138,16 +138,23 @@ Lastly, you will need to be careful of any place where you are doing raw SQL que
 
 ## Setup
 
-You'll need to have git, Ruby, and MySQL. Then get up and running with a few commands:
+You'll need to have git and Ruby. Then get up and running with a few commands:
 
 ```bash
 $ git clone ...
 $ bundle install
 $ vim spec/support/database.yml # Update username and password
-$ bin/setup
+$ bin/setup # Uses SQLite3 for testing (no additional setup required)
 $ bundle exec rspec
 ```
 
+## Database Compatibility
+
+This gem works with any database supported by ActiveRecord (SQLite3, MySQL, PostgreSQL, etc.). 
+The gem extends ActiveRecord's polymorphic associations and doesn't use database-specific features.
+
+Development and testing uses SQLite3 for simplicity.
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -1,48 +1,52 @@
-require "bundler/gem_tasks"
-require "yaml"
-require "active_record"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'yaml'
+require 'active_record'
 
 namespace :test do
   task :all do
-    Dir.glob("./gemfiles/Gemfile*").each do |gemfile|
-      next if gemfile.end_with?(".lock")
+    Dir.glob('./gemfiles/Gemfile*').each do |gemfile|
+      next if gemfile.end_with?('.lock')
+
       puts "Running specs for #{Pathname.new(gemfile).basename}"
       system("BUNDLE_GEMFILE=#{gemfile} bundle install > /dev/null && BUNDLE_GEMFILE=#{gemfile} bundle exec rspec")
-      puts ""
+      puts ''
     end
   end
 end
 
 namespace :db do
-  database_config = YAML.load(File.open("./spec/support/database.yml"))
-  admin_database_config = database_config.merge(database: "mysql")
-  migration_path = File.expand_path("./spec/support/migrations")
+  database_config = YAML.load(File.open('./spec/support/database.yml'))
+  migration_path = File.expand_path('./spec/support/migrations')
 
-  desc "Create the database"
+  desc 'Create the database'
   task :create do
-    ActiveRecord::Base.establish_connection(admin_database_config)
-    ActiveRecord::Base.connection.create_database(database_config.fetch(:database))
-    puts "Database created."
+    # SQLite3 creates the database file automatically, just ensure directory exists
+    db_file = database_config.fetch(:database)
+    FileUtils.mkdir_p(File.dirname(db_file)) unless File.dirname(db_file) == '.'
+    puts 'Database ready (SQLite3).'
   end
 
-  desc "Migrate the database"
+  desc 'Migrate the database'
   task :migrate do
     ActiveRecord::Base.establish_connection(database_config)
-    ActiveRecord::Migrator.migrate(migration_path)
-    Rake::Task["db:schema"].invoke
-    puts "Database migrated."
+    ActiveRecord::MigrationContext.new(migration_path).migrate
+    Rake::Task['db:schema'].invoke
+    puts 'Database migrated.'
   end
 
-  desc "Drop the database"
+  desc 'Drop the database'
   task :drop do
-    ActiveRecord::Base.establish_connection(admin_database_config)
-    ActiveRecord::Base.connection.drop_database(database_config.fetch(:database))
-    puts "Database deleted."
+    # For SQLite3, just delete the file
+    db_file = database_config.fetch(:database)
+    File.delete(db_file) if File.exist?(db_file)
+    puts 'Database deleted.'
   end
 
-  desc "Reset the database"
+  desc 'Reset the database'
   task reset: [:drop, :create, :migrate]
-    desc 'Create a db/schema.rb file that is portable against any DB supported by AR'
+  desc 'Create a db/schema.rb file that is portable against any DB supported by AR'
 
   task :schema do
     # Noop to make ActiveRecord happy

data/gemfiles/Gemfile.rails-8.0-stable

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

data/gemfiles/Gemfile.rails-8.1-stable

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

data/lib/polymorphic_integer_type/activerecord_5_0_0/polymorphic_array_value_extension.rb

@@ -10,10 +10,14 @@ module PolymorphicIntegerType
     # end
 
     def type_to_ids_mapping
-      if ACTIVE_RECORD_VERSION < Gem::Version.new("6.1")
-        association = @associated_table.send(:association)
+      # Rails 8.1 changed `PredicateBuilder::PolymorphicArrayValue#initialize`
+      # from `(associated_table, values)` to `(reflection, values)`, dropping
+      # the `@associated_table` ivar. Read whichever ivar is available so this
+      # gem works across Rails 6.1–8.1.
+      association = if instance_variable_defined?(:@reflection) && @reflection
+        @reflection
       else
-        association = @associated_table.send(:reflection)
+        @associated_table.send(:reflection)
       end
 
       name = association.name

data/lib/polymorphic_integer_type/belongs_to_polymorphic_association_extension.rb

@@ -3,16 +3,9 @@ module ActiveRecord
     class BelongsToPolymorphicAssociation < BelongsToAssociation
       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
+      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

@@ -118,12 +118,7 @@ module PolymorphicIntegerType
         if is_polymorphic_integer
           reflection.foreign_integer_type = foreign_integer_type
           reflection.integer_type = integer_type
-
-          if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new("6.1")
-            ActiveRecord::Associations::Association.prepend(PolymorphicIntegerType::PolymorphicForeignAssociationExtension)
-          else
-            ActiveRecord::Associations::ForeignAssociation.prepend(PolymorphicIntegerType::PolymorphicForeignAssociationExtension)
-          end
+          ActiveRecord::Associations::ForeignAssociation.prepend(PolymorphicIntegerType::PolymorphicForeignAssociationExtension)
         end
       end
 

data/lib/polymorphic_integer_type/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PolymorphicIntegerType
-  VERSION = "3.3.0"
+  VERSION = '3.5.0'
 end

data/polymorphic_integer_type.gemspec

@@ -1,27 +1,30 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'polymorphic_integer_type/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "polymorphic_integer_type"
+  spec.name          = 'polymorphic_integer_type'
   spec.version       = PolymorphicIntegerType::VERSION
-  spec.authors       = ["Kyle d'Oliveira"]
-  spec.email         = ["kyle@goclio.com"]
-  spec.description   = %q{Allows the *_type field in the DB to be an integer rather than a string}
-  spec.summary       = %q{Use integers rather than strings for the _type field}
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.authors       = ['Kyle d\'Oliveira']
+  spec.email         = ['kyle@goclio.com']
+  spec.description   = 'Allows the *_type field in the DB to be an integer rather than a string'
+  spec.summary       = 'Use integers rather than strings for the _type field'
+  spec.homepage      = ''
+  spec.license       = 'MIT'
+
+  spec.required_ruby_version = '>= 3.0'
 
   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.require_paths = ['lib']
 
-  spec.add_dependency "activerecord", "< 8"
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "pry-byebug"
+  spec.add_dependency 'activerecord', '< 9.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'sqlite3'
 end

data/spec/polymorphic_integer_type_spec.rb

@@ -136,6 +136,11 @@ describe PolymorphicIntegerType do
       expect(Link.where(source: [source])).to eq [link]
     end
 
+    it "properly finds objects when passing an array of mixed-type sources" do
+      link_for_dog = Link.create(source: dog)
+      expect(Link.where(source: [cat, dog])).to match_array [link, link_for_dog]
+    end
+
     it "properly finds the object with a find_by" do
       expect(Link.find_by(source: source, id: link.id)).to eql link
     end

data/spec/spec_helper.rb

@@ -20,17 +20,10 @@ 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 active_record_version >= Gem::Version.new("6.1") && active_record_version < Gem::Version.new("7.0")
-      ActiveRecord::MigrationContext.new(migrations_path, ActiveRecord::SchemaMigration).migrate      
-    end
 
-    if active_record_version >= Gem::Version.new("7.0")
-      ActiveRecord::MigrationContext.new(migrations_path).migrate
-    end
+    ActiveRecord::MigrationContext.new(migrations_path).migrate
   end
 
   config.around do |example|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polymorphic_integer_type
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Kyle d'Oliveira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-13 00:00:00.000000000 Z
+date: 2026-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,9 +109,10 @@ files:
 - README.md
 - Rakefile
 - bin/setup
-- gemfiles/Gemfile.rails-6.1-stable
 - gemfiles/Gemfile.rails-7.0-stable
 - gemfiles/Gemfile.rails-7.2-stable
+- gemfiles/Gemfile.rails-8.0-stable
+- gemfiles/Gemfile.rails-8.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
@@ -158,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/gemfiles/Gemfile.rails-6.1-stable

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