fix creating assocations with specs and add module generator

Author: Drew-Goddyn

lib/polymorphic_integer_type.rb

@@ -3,6 +3,8 @@
 require "polymorphic_integer_type/version"
 require "polymorphic_integer_type/extensions"
 require "polymorphic_integer_type/mapping"
+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"
@@ -14,8 +16,4 @@
   require "polymorphic_integer_type/activerecord_5_0_0/association_query_handler_extension"
 end
 
-if ACTIVE_RECORD_VERSION < Gem::Version.new("5.2.0")
-  require "polymorphic_integer_type/activerecord_4/belongs_to_polymorphic_association_extension"
-end
-
 module PolymorphicIntegerType; end

…_to_polymorphic_association_extension.rb …_to_polymorphic_association_extension.rblib/polymorphic_integer_type/activerecord_4/belongs_to_polymorphic_association_extension.rb renamed to lib/polymorphic_integer_type/belongs_to_polymorphic_association_extension.rb lib/polymorphic_integer_type/activerecord_4/belongs_to_polymorphic_association_extension.rb renamed to lib/polymorphic_integer_type/belongs_to_polymorphic_association_extension.rb

@@ -3,7 +3,7 @@ module Associations
     class BelongsToPolymorphicAssociation < BelongsToAssociation
       private def replace_keys(record)
         super
-        owner[reflection.foreign_type] = record.class.base_class
+        owner[reflection.foreign_type] = record.class
       end
     end
   end

lib/polymorphic_integer_type/extensions.rb

@@ -20,37 +20,11 @@ def belongs_to(name, scope = nil, **options)
           _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
 
-          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
-
-          include(foreign_type_extension)
+          ModuleGenerator.generate_and_include(self, foreign_type, name)
 
           validate do
             t = send(foreign_type)

lib/polymorphic_integer_type/mapping.rb

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

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
+

polymorphic_integer_type.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
   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

spec/polymorphic_integer_type_spec.rb

@@ -14,6 +14,51 @@
 
   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")
+          allow(Link).to receive(:source_type_mapping).and_return({1 => "Person", 2 => "Animal", 3 => "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 }
@@ -73,15 +118,6 @@
     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 namedpaced 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

spec/spec_helper.rb

@@ -12,6 +12,7 @@
 require 'support/drink'
 require 'support/namespaced_activity'
 require 'byebug'
+require 'pry'
 
 RSpec.configure do |config|
   config.before(:suite) do

spec/support/link.rb

@@ -3,12 +3,4 @@ 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

spec/support/namespaced_activity.rb

@@ -5,7 +5,7 @@ class Activity< ActiveRecord::Base
     self.store_full_sti_class = false
     self.table_name = "activities"
 
-    has_many :target_links, as: :target, integer_type: true, class_name: "Link"
+    has_many :target_links, as: :target, inverse_of: :target, integer_type: true, class_name: "Link"
   end
 end