polymorphic_integer_type 2.2.5 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: ffe9ae194b9a0be401d770ef0b2dbcef7ebf20f39a8d3c5a6c84bb8247085610
-  data.tar.gz: 5df31e9e5463c7cf1ed62d3417d93a8162de83ad8d2bb9e7ace34eb995813491
+SHA1:
+  metadata.gz: 6c2cf440c0f3c18a7617ca1afb6ef64df29f5318
+  data.tar.gz: c69f7e53591f29f1ca30f34824fcd82cf0d8347f
 SHA512:
-  metadata.gz: 07d497236946c160efe5d19c19b6cd63254d79d45088794ba71f6e916ba96c5e65313151c57122010e4a72a354363b358da4fc4c29a96b921d29a574f2b7be13
-  data.tar.gz: 36c0844e4b66881bd7df5052b0dd2d8dfa3de1a1505d5932c179721239a50efad292bb3f47a98d86ac16b6e74702158fc11c8da6a361483e20c5b045e39dc4bc
+  metadata.gz: 6d53e634ae33cd8ea9be786f8e5d8416154773a5795bff1a9d9b943961336755d416fef200cea78655d67d74253b52d95d2c18d1949cbd71f98550bc40050e12
+  data.tar.gz: 3a35e05e8c28d847255c7f16168bda71f176f247f6260e2d54879e2a295764fd8f5a93de7dbbb146505040477a7e0e162755d6f8983e57de0ded30ba796d8158

data/lib/polymorphic_integer_type/extensions.rb

@@ -34,6 +34,7 @@ module PolymorphicIntegerType
               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)
@@ -45,6 +46,7 @@ module PolymorphicIntegerType
             define_method "#{name}=" do |record|
               super(record)
               send("#{foreign_type}=", record.class)
+              association(name).loaded!
             end
           end
 
@@ -69,14 +71,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"

data/lib/polymorphic_integer_type/version.rb

@@ -1,3 +1,3 @@
 module PolymorphicIntegerType
-  VERSION = "2.2.5"
+  VERSION = "2.3.0"
 end

data/spec/polymorphic_integer_type_spec.rb

@@ -25,6 +25,25 @@ describe PolymorphicIntegerType do
   end
 
   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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polymorphic_integer_type
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.3.0
 platform: ruby
 authors:
 - Kyle d'Oliveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -160,7 +160,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Use integers rather than strings for the _type field