polymorphic_integer_type 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 167cd58ce2ec474eea9268af532e07815e3c1a0c
-  data.tar.gz: a523c263e4822806d3ce02543417658f4904c0a0
+  metadata.gz: f818991a7fa6b0835e39fd4133d6bc7c163e6d4e
+  data.tar.gz: 2e2715bfdb1d56e36d142b9c5b9bebf785795ab3
 SHA512:
-  metadata.gz: e1913d6fea43ec6707438afbec0c60c8525e015e75062f8115afb7d4176143bb4efe8d79364dfd465d6551c8bb131815933fca85aa1df98813e62541ca8cca4d
-  data.tar.gz: d4adcee63eeb967d4e4ecb17a53ec72cae5d23937c52a8e3030f4d27da9cf771b6a136583e9e0c2bf5a75ff31ab94895b2bcb2a7232ae140714a35961292242d
+  metadata.gz: d9616ed1ea9e3bd402b4632b0c3b9aa4355a282424941f1538a86498420f84f91e06e9471cf7d0e243afad70f9dc74f3348b5252a4c2aea455a6b0bdc7f40c04
+  data.tar.gz: e6b3723b6b3de1b558797c2334252369896674c451f40760ff0a1f8ccde01c14a55058c30f4fc1a7d117c70406a1e67880ecaf5cf597270358033d3e88c96d01

data/lib/polymorphic_integer_type/extensions.rb

@@ -24,26 +24,32 @@ module PolymorphicIntegerType
             mapping
           end
 
-          define_method foreign_type do
-            t = super()
-            mapping[t]
-          end
+          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|
-            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)
+            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.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
-            enum ||= klass if klass != NilClass
-            super(enum)
-          end
 
-          define_method "#{name}=" do |record|
-            super(record)
-            send("#{foreign_type}=", record.class)
+            define_method "#{name}=" do |record|
+              super(record)
+              send("#{foreign_type}=", record.class)
+            end
           end
 
+          include(foreign_type_extension)
+
           validate do
             t = send(foreign_type)
             unless t.nil? || mapping.values.include?(t)

data/lib/polymorphic_integer_type/version.rb

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

data/spec/support/link.rb

@@ -3,4 +3,12 @@ class Link < ActiveRecord::Base
 
   belongs_to :source, polymorphic: true, integer_type: true
   belongs_to :target, polymorphic: true, integer_type: true
+
+  def source=(val)
+    super(val)
+  end
+
+  def source_type=(val)
+    super(val)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polymorphic_integer_type
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Kyle d'Oliveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-05 00:00:00.000000000 Z
+date: 2019-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord