polymorphic_integer_type 2.2.2 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 167cd58ce2ec474eea9268af532e07815e3c1a0c
-  data.tar.gz: a523c263e4822806d3ce02543417658f4904c0a0
+SHA256:
+  metadata.gz: 0d7804d64bb9623f7c1e99d9cc3e9d87660c4aa0377dcb990d0f36116e9d0f84
+  data.tar.gz: 4530a6917ae04b9e5b22823551a2c999909b32406d899aad950ac26373db333a
 SHA512:
-  metadata.gz: e1913d6fea43ec6707438afbec0c60c8525e015e75062f8115afb7d4176143bb4efe8d79364dfd465d6551c8bb131815933fca85aa1df98813e62541ca8cca4d
-  data.tar.gz: d4adcee63eeb967d4e4ecb17a53ec72cae5d23937c52a8e3030f4d27da9cf771b6a136583e9e0c2bf5a75ff31ab94895b2bcb2a7232ae140714a35961292242d
+  metadata.gz: 0017c3e990e834177af622495715ea839c720bd5d511faf9675ae74820e9bff2a2cf63c7d648b7098b135b009a88a7f5a8386ee359e412f22749c77980d18939
+  data.tar.gz: 156289387a5dd038b1c8380b18514e78f9f3c418c0fd0fff5deb844d8a94006ea742fd3cc47ed6948cf970f3e1dde106df0a60b781b388300ed969aa5f6bdb7c

data/README.md

@@ -6,11 +6,11 @@ Rails' polymorphic associations are pretty useful. The example they give to set
 class Picture < ActiveRecord::Base
   belongs_to :imageable, polymorphic: true
 end
- 
+
 class Employee < ActiveRecord::Base
   has_many :pictures, as: :imageable
 end
- 
+
 class Product < ActiveRecord::Base
   has_many :pictures, as: :imageable
 end
@@ -31,7 +31,7 @@ class CreatePictures < ActiveRecord::Migration
 end
 ```
 
-The problem with this approach is that `imageable_type` is a string (and by default it is 255 characters). This is a little ridiculous. For comparison, if we had a state machine with X states, would we describe the states with strings `"State1", "State2", etc` or would we just enumerate the state column and make it an integer? This gem will allow us to use an integer for the `imageable_type` column. 
+The problem with this approach is that `imageable_type` is a string (and by default it is 255 characters). This is a little ridiculous. For comparison, if we had a state machine with X states, would we describe the states with strings `"State1", "State2", etc` or would we just enumerate the state column and make it an integer? This gem will allow us to use an integer for the `imageable_type` column.
 
 ## Installation
 
@@ -60,7 +60,7 @@ class Picture < ActiveRecord::Base
   belongs_to :imageable, polymorphic: {1 => "Employee", 2 => "Product"}
 end
 ```
- 
+
  Next, include `PolymorphicIntegerType::Extensions` into any of the models that point back to the polymorphic integer type association (e.g., `Picture#imageable`) and add a [polymorphic association using `as:`](http://guides.rubyonrails.org/association_basics.html#polymorphic-associations).
 
 ```ruby
@@ -69,7 +69,7 @@ class Employee < ActiveRecord::Base
 
   has_many :pictures, as: :imageable
 end
- 
+
 class Product < ActiveRecord::Base
   include PolymorphicIntegerType::Extensions
 
@@ -84,10 +84,10 @@ You can also store polymorphic type mappings separate from your models. This sho
 ```ruby
 PolymorphicIntegerType::Mapping.configuration do |config|
   config.add :imageable, {1 => "Employee", 2 => "Product" }
-end 
+end
 ```
 
-Note: The mapping here can start from whatever integer you wish, but I would advise not using 0. The reason being that if you had a new class, for instance `Avatar`, and also wanted to use this polymorphic association but forgot to include it in the mapping, it would effectively get `to_i` called on it and stored in the database. `"Avatar".to_i == 0`, so if your mapping included 0, this would create a weird bug. 
+Note: The mapping here can start from whatever integer you wish, but I would advise not using 0. The reason being that if you had a new class, for instance `Avatar`, and also wanted to use this polymorphic association but forgot to include it in the mapping, it would effectively get `to_i` called on it and stored in the database. `"Avatar".to_i == 0`, so if your mapping included 0, this would create a weird bug.
 
 ### Migrating an existing association
 
@@ -95,14 +95,14 @@ If you want to convert a polymorphic association that is already a string, you'l
 
 ```ruby
 class PictureToPolymorphicIntegerType < ActiveRecord::Migration
-  
+
   def up
     change_table :pictures do |t|
       t.integer :new_imageable_type
     end
 
     execute <<-SQL
-      UPDATE reminders
+      UPDATE picture
       SET new_imageable_type = CASE imageable_type
                                  WHEN 'Employee' THEN 1
                                  WHEN 'Product' THEN 2

data/Rakefile

@@ -2,6 +2,17 @@ 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")
+      puts "Running specs for #{Pathname.new(gemfile).basename}"
+      system("BUNDLE_GEMFILE=#{gemfile} bundle install > /dev/null && BUNDLE_GEMFILE=#{gemfile} bundle exec rspec")
+      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")

data/gemfiles/Gemfile.rails-4.2-stable

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

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

@@ -0,0 +1,68 @@
+GIT
+  remote: git://github.com/rails/rails.git
+  revision: e9d6b85f3e834ceea2aeabe4cbaa96a7c73eb896
+  branch: 4-2-stable
+  specs:
+    activemodel (4.2.11.1)
+      activesupport (= 4.2.11.1)
+      builder (~> 3.1)
+    activerecord (4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
+      arel (~> 6.0)
+    activesupport (4.2.11.1)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+
+PATH
+  remote: ..
+  specs:
+    polymorphic_integer_type (2.2.4)
+      activerecord
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    arel (6.0.4)
+    builder (3.2.4)
+    byebug (11.0.1)
+    concurrent-ruby (1.1.5)
+    diff-lcs (1.3)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    minitest (5.13.0)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
+    sqlite3 (1.3.13)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord!
+  bundler
+  byebug
+  polymorphic_integer_type!
+  rake
+  rspec
+  sqlite3 (~> 1.3.6)
+
+BUNDLED WITH
+   1.16.1

data/gemfiles/Gemfile.rails-5.0-stable

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

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

@@ -0,0 +1,66 @@
+GIT
+  remote: git://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 (2.2.4)
+      activerecord
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    arel (7.1.4)
+    byebug (11.0.1)
+    concurrent-ruby (1.1.5)
+    diff-lcs (1.3)
+    i18n (1.7.0)
+      concurrent-ruby (~> 1.0)
+    minitest (5.13.0)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
+    sqlite3 (1.3.13)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord!
+  bundler
+  byebug
+  polymorphic_integer_type!
+  rake
+  rspec
+  sqlite3 (~> 1.3.6)
+
+BUNDLED WITH
+   1.16.1

data/gemfiles/Gemfile.rails-5.1-stable

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

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

@@ -0,0 +1,66 @@
+GIT
+  remote: git://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 (2.2.4)
+      activerecord
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    arel (8.0.0)
+    byebug (11.0.1)
+    concurrent-ruby (1.1.5)
+    diff-lcs (1.3)
+    i18n (1.7.0)
+      concurrent-ruby (~> 1.0)
+    minitest (5.13.0)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
+    sqlite3 (1.4.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord!
+  bundler
+  byebug
+  polymorphic_integer_type!
+  rake
+  rspec
+  sqlite3
+
+BUNDLED WITH
+   1.16.1

data/gemfiles/Gemfile.rails-5.2-stable

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

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

@@ -0,0 +1,66 @@
+GIT
+  remote: git://github.com/rails/rails.git
+  revision: 892eab777c418135ce0646e91bc9ebb08a29ab9b
+  branch: 5-2-stable
+  specs:
+    activemodel (5.2.4.1)
+      activesupport (= 5.2.4.1)
+    activerecord (5.2.4.1)
+      activemodel (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
+      arel (>= 9.0)
+    activesupport (5.2.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+
+PATH
+  remote: ..
+  specs:
+    polymorphic_integer_type (2.2.4)
+      activerecord
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    arel (9.0.0)
+    byebug (11.0.1)
+    concurrent-ruby (1.1.5)
+    diff-lcs (1.3)
+    i18n (1.7.0)
+      concurrent-ruby (~> 1.0)
+    minitest (5.13.0)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
+    sqlite3 (1.4.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord!
+  bundler
+  byebug
+  polymorphic_integer_type!
+  rake
+  rspec
+  sqlite3
+
+BUNDLED WITH
+   1.16.1

data/lib/polymorphic_integer_type.rb

@@ -1,10 +1,19 @@
+ACTIVE_RECORD_VERSION = Gem::Version.new(ActiveRecord::VERSION::STRING)
+
 require "polymorphic_integer_type/version"
 require "polymorphic_integer_type/extensions"
 require "polymorphic_integer_type/mapping"
-if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new("5")
-  require "polymorphic_integer_type/predicate_builder_extension"
+require "polymorphic_integer_type/module_generator"
+require "polymorphic_integer_type/belongs_to_polymorphic_association_extension"
+
+if ACTIVE_RECORD_VERSION < Gem::Version.new("5")
+  require "polymorphic_integer_type/activerecord_4/predicate_builder_extension"
 else
-  require "polymorphic_integer_type/polymorphic_array_value_extension"
+  require "polymorphic_integer_type/activerecord_5_0_0/polymorphic_array_value_extension"
+end
+
+if ACTIVE_RECORD_VERSION >= Gem::Version.new("5.0") && ACTIVE_RECORD_VERSION < Gem::Version.new("5.2.0")
+  require "polymorphic_integer_type/activerecord_5_0_0/association_query_handler_extension"
 end
 
 module PolymorphicIntegerType; end

data/lib/polymorphic_integer_type/activerecord_5_0_0/association_query_handler_extension.rb

@@ -0,0 +1,38 @@
+module PolymorphicIntegerType
+  module AssociationQueryHandlerExtension
+    def call(attribute, value)
+      queries = {}
+      table = value.associated_table
+
+      if value.base_class
+        queries[table.association_foreign_type.to_s] = polymorphic_value_for(value)
+      end
+
+      queries[table.association_foreign_key.to_s] = value.ids
+      predicate_builder.build_from_hash(queries)
+    end
+
+    protected
+
+    def polymorphic_value_for(query_value)
+      table = query_value.associated_table
+      association = table.send(:association)
+      klass = association.active_record
+      name = association.name
+
+      if klass.respond_to?("#{name}_type_mapping")
+        type_mapping = klass.send("#{name}_type_mapping")
+
+        type_mapping.key(query_value.value.class.sti_name) ||
+          type_mapping.key(query_value.base_class.to_s) ||
+          type_mapping.key(query_value.base_class.sti_name)
+      else
+        query_value.base_class.name
+      end
+    end
+
+
+  end
+end
+
+ActiveRecord::PredicateBuilder::AssociationQueryHandler.prepend(PolymorphicIntegerType::AssociationQueryHandlerExtension)

data/lib/polymorphic_integer_type/activerecord_5_0_0/polymorphic_array_value_extension.rb

@@ -0,0 +1,34 @@
+module PolymorphicIntegerType
+  module PolymorphicArrayValueExtension
+
+    # original method:
+    # def type_to_ids_mapping
+    #   default_hash = Hash.new { |hsh, key| hsh[key] = [] }
+    #   result = values.each_with_object(default_hash) do |value, hash|
+    #     hash[klass(value).polymorphic_name] << convert_to_id(value)
+    #   end
+    # end
+
+    def type_to_ids_mapping
+      association = @associated_table.send(:association)
+      name = association.name
+      default_hash = Hash.new { |hsh, key| hsh[key] = [] }
+      values.each_with_object(default_hash) do |value, hash|
+        klass = respond_to?(:klass, true) ? klass(value) : value.class
+        if association.active_record.respond_to?("#{name}_type_mapping")
+          mapping = association.active_record.send("#{name}_type_mapping")
+          key ||= mapping.key(klass.polymorphic_name) if klass.respond_to?(:polymorphic_name)
+          key ||= mapping.key(klass.sti_name)
+          key ||= mapping.key(klass.base_class.to_s)
+          key ||= mapping.key(klass.base_class.sti_name)
+
+          hash[key] << convert_to_id(value)
+        else
+          hash[klass.polymorphic_name] << convert_to_id(value)
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::PredicateBuilder::PolymorphicArrayValue.prepend(PolymorphicIntegerType::PolymorphicArrayValueExtension)

data/lib/polymorphic_integer_type/belongs_to_polymorphic_association_extension.rb

@@ -0,0 +1,12 @@
+module ActiveRecord
+  module Associations
+    class BelongsToPolymorphicAssociation < BelongsToAssociation
+      private def replace_keys(record)
+        super
+        unless record.nil?
+          owner[reflection.foreign_type] = record.class.base_class
+        end
+      end
+    end
+  end
+end

data/lib/polymorphic_integer_type/extensions.rb

@@ -20,29 +20,11 @@ module PolymorphicIntegerType
           _polymorphic_foreign_types << foreign_type
 
           # Required way to dynamically define a class method on the model
-          singleton_class.__send__(:define_method, "#{foreign_type}_mapping") do
+          define_singleton_method("#{foreign_type}_mapping") do
             mapping
           end
 
-          define_method foreign_type do
-            t = super()
-            mapping[t]
-          end
-
-          define_method "#{foreign_type}=" do |klass|
-            enum = mapping.key(klass.to_s)
-            if klass.kind_of?(Class) && klass <= ActiveRecord::Base
-              enum ||= mapping.key(klass.base_class.to_s)
-              enum ||= mapping.key(klass.base_class.sti_name)
-            end
-            enum ||= klass if klass != NilClass
-            super(enum)
-          end
-
-          define_method "#{name}=" do |record|
-            super(record)
-            send("#{foreign_type}=", record.class)
-          end
+          ModuleGenerator.generate_and_include(self, foreign_type, name)
 
           validate do
             t = send(foreign_type)
@@ -63,14 +45,15 @@ module PolymorphicIntegerType
         if options[:as] && (polymorphic_type_mapping || integer_type)
           poly_type = options.delete(:as)
           polymorphic_type_mapping ||= PolymorphicIntegerType::Mapping[poly_type]
-          if polymorphic_type_mapping == nil
+          if polymorphic_type_mapping.nil?
             raise "Polymorphic type mapping missing for #{poly_type.inspect}"
           end
 
-          klass_mapping = (polymorphic_type_mapping || {}).key(sti_name)
+          klass_mapping = polymorphic_type_mapping.key(polymorphic_name) if respond_to?(:polymorphic_name)
+          klass_mapping ||= polymorphic_type_mapping.key(sti_name)
 
-          if klass_mapping == nil
-            raise "Class not found for #{sti_name.inspect} in polymorphic type mapping: #{polymorphic_type_mapping}"
+          if klass_mapping.nil?
+            raise "Class not found for #{inspect} in polymorphic type mapping: #{polymorphic_type_mapping}"
           end
 
           options[:foreign_key] ||= "#{poly_type}_id"
@@ -89,7 +72,7 @@ module PolymorphicIntegerType
       def retrieve_polymorphic_type_mapping(polymorphic_type:, class_name:)
         return if polymorphic_type.nil?
 
-        belongs_to_class = class_name.safe_constantize
+        belongs_to_class = compute_type(class_name)
         method_name = "#{polymorphic_type}_type_mapping"
 
         if belongs_to_class && belongs_to_class.respond_to?(method_name)

data/lib/polymorphic_integer_type/mapping.rb

@@ -15,6 +15,6 @@ module PolymorphicIntegerType
       @@mapping[as] || {}
     end
 
+    singleton_class.send(:alias_method, :[]=, :add)
   end
-
 end

data/lib/polymorphic_integer_type/module_generator.rb

@@ -0,0 +1,34 @@
+module PolymorphicIntegerType
+  class ModuleGenerator
+    def self.generate_and_include(klass,foreign_type, name)
+      foreign_type_extension = Module.new do
+        define_method foreign_type do
+          t = super()
+          self.class.send("#{foreign_type}_mapping")[t]
+        end
+
+        define_method "#{foreign_type}=" do |klass|
+          mapping = self.class.send("#{foreign_type}_mapping")
+          enum = mapping.key(klass.to_s)
+          if klass.kind_of?(Class) && klass <= ActiveRecord::Base
+            enum ||= mapping.key(klass.polymorphic_name) if klass.respond_to?(:polymorphic_name)
+            enum ||= mapping.key(klass.sti_name)
+            enum ||= mapping.key(klass.base_class.to_s)
+            enum ||= mapping.key(klass.base_class.sti_name)
+          end
+          enum ||= klass if klass != NilClass
+          super(enum)
+        end
+
+        define_method "#{name}=" do |record|
+          super(record)
+          send("#{foreign_type}=", record.class)
+          association(name).loaded!
+        end
+      end
+
+      klass.include(foreign_type_extension)
+    end
+  end
+end
+

data/lib/polymorphic_integer_type/version.rb

@@ -1,3 +1,3 @@
 module PolymorphicIntegerType
-  VERSION = "2.2.2"
+  VERSION = "2.3.1"
 end

data/polymorphic_integer_type.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord"
+  spec.add_dependency "activerecord", "< 6"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "pry-byebug"
 end

data/spec/polymorphic_integer_type_spec.rb

@@ -14,6 +14,50 @@ describe PolymorphicIntegerType do
 
   let(:link) { Link.create(source: source, target: target) }
 
+
+  context "when creating associations" do
+    it "sets the source_type" do
+      link = dog.source_links.new
+      expect(link.source_type).to eq("Animal")
+    end
+
+    it "sets the target_type" do
+      link = kibble.target_links.new
+      expect(link.target_type).to eq("Food")
+    end
+
+    context "when models are namespaced" do
+      context "and mappings include namespaces" do
+        it "sets the source_type" do
+          allow(Link).to receive(:source_type_mapping).and_return({3 => "Namespaced::Plant"})
+          allow(Link).to receive(:source_type_mapping2).and_return({3 => "Namespaced::Plant"})
+
+          link = Namespaced::Plant.create(name: "Oak").source_links.new
+          expect(link.source_type).to eq("Namespaced::Plant")
+        end
+
+        it "sets the target_type" do
+          allow(Link).to receive(:target_type_mapping).and_return({3 => "Namespaced::Activity"})
+          link = Namespaced::Activity.create(name: "swaying").target_links.new
+          expect(link.target_type).to eq("Namespaced::Activity")
+        end
+      end
+
+      context "and mappings don't include namespaces" do
+        it "sets the source type" do
+          Link.source_type_mapping
+          link = Namespaced::Plant.create(name: "Oak").source_links.new
+          expect(link.source_type).to eq("Plant")
+        end
+
+        it "sets the target type" do
+          link = Namespaced::Activity.create(name:"swaying").target_links.new
+          expect(link.target_type).to eq("Activity")
+        end
+      end
+    end
+  end
+
   context "when the source is nil" do
     let(:source) { nil }
     let(:target) { nil }
@@ -24,22 +68,64 @@ describe PolymorphicIntegerType do
     end
   end
 
-  context "when the source is a class that modifies the sti_name" do
+  context "when the source is a class that modifies the sti_name or polymorphic_name" do
+    context "and we leverage the polymorphic_name" do
+      before do
+        allow(PolymorphicIntegerType).to receive(:use_polymorphic_name).and_return(true)
+      end
+
+      it "properly sets the source_type to the modified class name" do
+        link = Link.new(source: Namespaced::Animal.new)
+        expect(link.source_type).to eql "Animal"
+      end
+
+      it "can read dirty attributes from an associated object" do
+        animal = Namespaced::Animal.create!(name: "Oldie")
+        animal.name = "Newton"
+        link = Link.create!(source: animal)
+
+        expect(link.source.name).to eq("Newton")
+      end
+    end
+
     it "properly sets the source_type to the modified class name" do
       link = Link.new(source: Namespaced::Animal.new)
       expect(link.source_type).to eql "Animal"
     end
+
+    it "can read dirty attributes from an associated object" do
+      animal = Namespaced::Animal.create!(name: "Oldie")
+      animal.name = "Newton"
+      link = Link.create!(source: animal)
+
+      expect(link.source.name).to eq("Newton")
+    end
   end
 
   context "when querying the associations" do
     let(:source) { cat }
     let(:target) { nil }
+
     it "properly finds the object with a where" do
       expect(Link.where(source: source, id: link.id).first).to eql link
     end
+
+    it "properly finds the object when passing an array of sources" do
+      expect(Link.where(source: [source])).to eq [link]
+    end
+
     it "properly finds the object with a find_by" do
       expect(Link.find_by(source: source, id: link.id)).to eql link
     end
+
+    context "when source and target are namespaced without modifying polymorphic_name" do
+      it "properly finds the object" do
+        plant = Namespaced::Plant.create(name: "Mighty", kind: "Oak", owner: owner)
+        activity = Namespaced::Activity.create(name: "swaying")
+        link = Link.create(source: plant, target: activity)
+        expect(Link.where(source: plant, id: link.id).first).to eql link
+      end
+    end
   end
 
   shared_examples "proper source" do
@@ -70,7 +156,6 @@ describe PolymorphicIntegerType do
         expect(source.source_links[0].source).to eql source
       end
     end
-
   end
   context "When a link is given polymorphic record" do
     let(:link) { Link.create(source: source) }
@@ -83,9 +168,7 @@ describe PolymorphicIntegerType do
 
       include_examples "proper source"
       include_examples "proper target"
-
     end
-
   end
 
   context "When a link is given polymorphic id and type" do
@@ -98,12 +181,10 @@ describe PolymorphicIntegerType do
       before { link.update_attributes(target_id: target.id, target_type: target.class.to_s) }
       include_examples "proper source"
       include_examples "proper target"
-
     end
-
   end
 
-  context "When using a relation to the links with eagar loading" do
+  context "When using a relation to the links with eager loading" do
     let!(:links){
       [Link.create(source: source, target: kibble),
         Link.create(source: source, target: water)]
@@ -113,12 +194,10 @@ describe PolymorphicIntegerType do
     it "should be able to return the links and the targets" do
       expect(cat.source_links).to match_array links
       expect(cat.source_links.includes(:target).collect(&:target)).to match_array [water, kibble]
-
     end
-
   end
 
-  context "When using a through relation to the links with eagar loading" do
+  context "When using a through relation to the links with eager loading" do
     let!(:links){
       [Link.create(source: source, target: kibble),
         Link.create(source: source, target: water)]
@@ -128,12 +207,10 @@ describe PolymorphicIntegerType do
     it "should be able to return the links and the targets" do
       expect(owner.pet_source_links).to match_array links
       expect(owner.pet_source_links.includes(:target).collect(&:target)).to match_array [water, kibble]
-
     end
-
   end
 
-  context "When eagar loading the polymorphic association" do
+  context "When eager loading the polymorphic association" do
     let(:link) { Link.create(source_id: source.id, source_type: source.class.to_s) }
     let(:source) { cat }
 
@@ -145,15 +222,12 @@ describe PolymorphicIntegerType do
         expect(links.first.source).to eql cat
         expect(links.last.source).to eql dog
       end
-
     end
 
     it "should be able to preload the association" do
       l = Link.includes(:source).where(id: link.id).first
       expect(l.source).to eql cat
     end
-
-
   end
 
   context "when the association is an STI table" do
@@ -205,7 +279,7 @@ describe PolymorphicIntegerType do
     include_examples "proper target"
 
     it "creates foreign_type mapping method" do
-      expect(Link.source_type_mapping).to eq({1 => "Person", 2 => "Animal"})
+      expect(Link.source_type_mapping).to eq({1 => "Person", 2 => "Animal", 3 => "Plant"})
       expect(InlineLink.source_type_mapping).to eq({10 => "Person", 11 => "InlineAnimal"})
     end
 
@@ -246,7 +320,7 @@ describe PolymorphicIntegerType do
 
       self.table_name = "drinks"
 
-      has_many :inline_links2, as: :target
+      has_many :inline_link2s, as: :target
     end
 
     let!(:animal) { InlineAnimal2.create!(name: "Lucy") }

data/spec/spec_helper.rb

@@ -5,16 +5,20 @@ require 'support/configuration'
 require 'support/link'
 require 'support/animal'
 require 'support/namespaced_animal'
+require 'support/namespaced_plant'
 require 'support/dog'
 require 'support/person'
 require 'support/food'
 require 'support/drink'
+require 'support/namespaced_activity'
+require 'byebug'
+require 'pry'
 
 RSpec.configure do |config|
   config.before(:suite) do
     database_config = YAML.load(File.open("#{File.dirname(__FILE__)}/support/database.yml"))
     ActiveRecord::Base.establish_connection(database_config)
-    if Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("5")
+    if Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("5.2.0")
       ActiveRecord::MigrationContext.new("#{File.dirname(__FILE__)}/support/migrations").migrate
     end
   end

data/spec/support/configuration.rb

@@ -1,4 +1,4 @@
 PolymorphicIntegerType::Mapping.configuration do |config|
-  config.add :source, {1 => "Person", 2 => "Animal"}
-  config.add :target, {1 => "Food", 2 => "Drink"}
+  config.add :source, {1 => "Person", 2 => "Animal", 3 => "Plant"}
+  config.add :target, {1 => "Food", 2 => "Drink", 3 => "Activity"}
 end

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

@@ -0,0 +1,17 @@
+class CreatePlantTable < ActiveRecord::Migration[5.2]
+
+  def up
+    create_table :plants do |t|
+      t.string :name
+      t.string :type
+      t.string :kind
+      t.integer :owner_id
+    end
+  end
+
+  def down
+    drop_table :plants
+  end
+
+end
+

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

@@ -0,0 +1,15 @@
+class CreateActivityTable < ActiveRecord::Migration[5.2]
+
+  def up
+    create_table :activities do |t|
+      t.string :name
+    end
+  end
+
+  def down
+    drop_table :activities
+  end
+
+end
+
+

data/spec/support/namespaced_activity.rb

@@ -0,0 +1,11 @@
+module Namespaced
+  class Activity < ActiveRecord::Base
+    include PolymorphicIntegerType::Extensions
+
+    self.store_full_sti_class = false
+    self.table_name = "activities"
+
+    has_many :target_links, as: :target, inverse_of: :target, integer_type: true, class_name: "Link"
+  end
+end
+

data/spec/support/namespaced_animal.rb

@@ -3,5 +3,9 @@ module Namespaced
 
     self.store_full_sti_class = false
     self.table_name = "animals"
+
+    def self.polymorphic_name
+      "Animal"
+    end
   end
-end
+end

data/spec/support/namespaced_plant.rb

@@ -0,0 +1,11 @@
+module Namespaced
+  class Plant < ActiveRecord::Base
+    include PolymorphicIntegerType::Extensions
+
+    self.store_full_sti_class = false
+    self.table_name = "plants"
+
+    belongs_to :owner, class_name: "Person"
+    has_many :source_links, as: :source, inverse_of: :source, integer_type: true, class_name: "Link"
+  end
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: polymorphic_integer_type
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.1
 platform: ruby
 authors:
 - Kyle d'Oliveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-05 00:00:00.000000000 Z
+date: 2020-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,11 +108,22 @@ files:
 - README.md
 - Rakefile
 - bin/setup
+- gemfiles/Gemfile.rails-4.2-stable
+- gemfiles/Gemfile.rails-4.2-stable.lock
+- 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
 - lib/polymorphic_integer_type.rb
+- lib/polymorphic_integer_type/activerecord_4/predicate_builder_extension.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
+- lib/polymorphic_integer_type/belongs_to_polymorphic_association_extension.rb
 - lib/polymorphic_integer_type/extensions.rb
 - lib/polymorphic_integer_type/mapping.rb
-- lib/polymorphic_integer_type/polymorphic_array_value_extension.rb
-- lib/polymorphic_integer_type/predicate_builder_extension.rb
+- lib/polymorphic_integer_type/module_generator.rb
 - lib/polymorphic_integer_type/version.rb
 - polymorphic_integer_type.gemspec
 - spec/polymorphic_integer_type_spec.rb
@@ -129,7 +140,11 @@ files:
 - spec/support/migrations/3_create_person_table.rb
 - spec/support/migrations/4_create_food_table.rb
 - spec/support/migrations/5_create_drink_table.rb
+- spec/support/migrations/6_create_plant_table.rb
+- spec/support/migrations/7_create_activity_table.rb
+- spec/support/namespaced_activity.rb
 - spec/support/namespaced_animal.rb
+- spec/support/namespaced_plant.rb
 - spec/support/person.rb
 homepage: ''
 licenses:
@@ -151,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Use integers rather than strings for the _type field
@@ -170,5 +185,9 @@ test_files:
 - spec/support/migrations/3_create_person_table.rb
 - spec/support/migrations/4_create_food_table.rb
 - spec/support/migrations/5_create_drink_table.rb
+- spec/support/migrations/6_create_plant_table.rb
+- spec/support/migrations/7_create_activity_table.rb
+- spec/support/namespaced_activity.rb
 - spec/support/namespaced_animal.rb
+- spec/support/namespaced_plant.rb
 - spec/support/person.rb

data/lib/polymorphic_integer_type/polymorphic_array_value_extension.rb

@@ -1,20 +0,0 @@
-module PolymorphicIntegerType
-  module PolymorphicArrayValueExtension
-    def type_to_ids_mapping
-      super.tap do |result|
-        association = @associated_table.send(:association)
-        klass = association.active_record
-        name = association.name
-
-        if klass.respond_to?("#{name}_type_mapping")
-          result.transform_keys! do |key|
-            klass.send("#{name}_type_mapping").key(key)
-          end
-        end
-        result
-      end
-    end
-  end
-end
-
-ActiveRecord::PredicateBuilder::PolymorphicArrayValue.prepend(PolymorphicIntegerType::PolymorphicArrayValueExtension)