polymorphic_integer_type 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0a0c496105cf4f71bbb7d8e37f4b7d5464a155c6d69adc32860a42f57b54ce2
-  data.tar.gz: 6b91ce4961f8ff169c8a106bc258d25ff8f59aff0c59a97ed7488c9d708851bd
+  metadata.gz: eeec5115208f7fee02b00a10f05e660a46550b2c0815999133a1fe541950c1dc
+  data.tar.gz: 8268bfe5dd15c0cb9f3c6cc240989ad89cc112dff8ac9723ed64e6de8e7ddc61
 SHA512:
-  metadata.gz: 224efc3b41dc88ba440de3a87398a6422e817cc6adcedb216145d9fdfe004c9d3c5da733f81e547d27481dae3806290173dd4db65d4b72759084d0c4132a48d0
-  data.tar.gz: 91168a3fa7ed06b8de0c51b15d5199a66ede9e0b3265a7ea23861a796219f2948e9eef18b51c8c349fe23706ebfb9c9131fbec181a175c703c6d701061205a84
+  metadata.gz: 801b9bf926c3a23237f0838013d8e425c902292f186f38f65ff41c0e80b94ac5df15152e8d8d108800650439e069c990342f2d6c4fdcfb79b4e4870403bc93f9
+  data.tar.gz: c81b0af3ef8593d8f607c12db9ef0b685f91cd7b21b4e85f70289cd30fcfe839427e2eecc43cb2de01295ba454522e15dd04be101cfa001d86061c68403d1432

data/.gitignore

@@ -20,3 +20,4 @@ tmp
 .byebug_history
 polymorphic_integer_type_test
 gemfiles/*.lock
+.idea/

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+### Changed
+
+## v3.2.1 (2023-12-14)
+
+### Fixed
+
+- Not proper assigning polymorphic value with `has_many` and `has_one` reflection.
+
+### Added
+
+- Added .idea/ folder to .gitignore
+
+### Changed

data/lib/polymorphic_integer_type/extensions.rb

@@ -2,6 +2,10 @@ module PolymorphicIntegerType
 
   module Extensions
     module ClassMethods
+      ActiveRecord::Reflection::HasManyReflection.attr_accessor(:foreign_integer_type)
+      ActiveRecord::Reflection::HasManyReflection.attr_accessor(:integer_type)
+      ActiveRecord::Reflection::HasOneReflection.attr_accessor(:foreign_integer_type)
+      ActiveRecord::Reflection::HasOneReflection.attr_accessor(:integer_type)
 
       def belongs_to(name, scope = nil, **options)
         options = scope if scope.kind_of? Hash
@@ -64,8 +68,10 @@ module PolymorphicIntegerType
             condition = instance_exec(&scope).merge(condition) if scope.is_a?(Proc)
             condition
           }
+          return foreign_type, klass_mapping.to_i
         else
           options[:scope] ||= scope
+          return nil, nil
         end
       end
 
@@ -86,8 +92,10 @@ module PolymorphicIntegerType
           scope = nil
         end
 
-        remove_type_and_establish_mapping(name, options, scope)
-        super(name, options.delete(:scope), **options, &extension)
+        integer_type_values = remove_type_and_establish_mapping(name, options, scope)
+        super(name, options.delete(:scope), **options, &extension).tap do
+          remove_integer_type_and_set_attributes_and_extension(integer_type_values, reflections[name.to_s])
+        end
       end
 
       def has_one(name, scope = nil, **options)
@@ -96,8 +104,27 @@ module PolymorphicIntegerType
           scope = nil
         end
 
-        remove_type_and_establish_mapping(name, options, scope)
-        super(name, options.delete(:scope), **options)
+        integer_type_values = remove_type_and_establish_mapping(name, options, scope)
+        super(name, options.delete(:scope), **options).tap do
+          remove_integer_type_and_set_attributes_and_extension(integer_type_values, reflections[name.to_s])
+        end
+      end
+
+      def remove_integer_type_and_set_attributes_and_extension(integer_type_values, reflection)
+        foreign_integer_type = integer_type_values[0]
+        integer_type = integer_type_values[1]
+        is_polymorphic_integer = foreign_integer_type && integer_type
+
+        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
+        end
       end
 
 

data/lib/polymorphic_integer_type/polymorphic_foreign_association_extension.rb

@@ -0,0 +1,11 @@
+module PolymorphicIntegerType
+  module PolymorphicForeignAssociationExtension
+
+    def set_owner_attributes(record)
+      super
+      if reflection.foreign_integer_type && reflection.integer_type
+        record._write_attribute(reflection.foreign_integer_type, reflection.integer_type)
+      end
+    end
+  end
+end

data/lib/polymorphic_integer_type/version.rb

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

data/lib/polymorphic_integer_type.rb

@@ -6,6 +6,7 @@ require "polymorphic_integer_type/mapping"
 require "polymorphic_integer_type/module_generator"
 require "polymorphic_integer_type/belongs_to_polymorphic_association_extension"
 require "polymorphic_integer_type/activerecord_5_0_0/polymorphic_array_value_extension"
+require "polymorphic_integer_type/polymorphic_foreign_association_extension"
 
 if ACTIVE_RECORD_VERSION < Gem::Version.new("5.2.0")
   require "polymorphic_integer_type/activerecord_5_0_0/association_query_handler_extension"

data/spec/polymorphic_integer_type_spec.rb

@@ -26,6 +26,28 @@ describe PolymorphicIntegerType do
       expect(link.target_type).to eq("Food")
     end
 
+    context "from HasManyReflection" do
+      it "sets the source properly HasManyReflection" do
+        link_1 = Link.create()
+        link_2 = Link.create()
+        dog.source_links = [link_1, link_2]
+        expect(link_1.source_type).to eq("Animal")
+        expect(link_1.source_id).to eq(dog.id)
+        expect(link_2.source_type).to eq("Animal")
+        expect(link_1.source_id).to eq(dog.id)
+      end
+    end
+
+    context "from HasOneReflection" do
+      it "sets the source properly HasOneReflection" do
+        link = Link.create()
+        dog.source_link = link
+
+        expect(link.source_type).to eq("Animal")
+        expect(link.source_id).to eq(dog.id)
+      end
+    end
+
     context "when models are namespaced" do
       context "and mappings include namespaces" do
         it "sets the source_type" do
@@ -340,6 +362,10 @@ describe PolymorphicIntegerType do
       expect(link[:target_type]).to eq(13)
     end
 
+    it "pulls mapping from given hash" do
+      animal.source_links.new
+    end
+
     it "doesn't break string type polymorphic associations" do
       expect(link.normal_target).to eq(drink)
       expect(link.normal_target_type).to eq("InlineDrink2")

data/spec/support/animal.rb

@@ -3,5 +3,5 @@ class Animal < ActiveRecord::Base
 
   belongs_to :owner, class_name: "Person"
   has_many :source_links, as: :source, integer_type: true, class_name: "Link"
-
+  has_one :source_link, as: :source, integer_type: true, class_name: "Link"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polymorphic_integer_type
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Kyle d'Oliveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-09 00:00:00.000000000 Z
+date: 2023-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -103,6 +103,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -121,6 +122,7 @@ files:
 - lib/polymorphic_integer_type/extensions.rb
 - lib/polymorphic_integer_type/mapping.rb
 - lib/polymorphic_integer_type/module_generator.rb
+- lib/polymorphic_integer_type/polymorphic_foreign_association_extension.rb
 - lib/polymorphic_integer_type/version.rb
 - polymorphic_integer_type.gemspec
 - spec/polymorphic_integer_type_spec.rb