Merge branch 'master' into rails-4

Conflicts:
	lib/polymorphic_integer_type/extensions.rb

Author: Kyle d'Oliveira

lib/polymorphic_integer_type/extensions.rb

@@ -17,8 +17,10 @@ def belongs_to(name, scope = nil, options = {})
             mapping[t]
           end
 
-          define_method "#{foreign_type}=" do |klass|
-            enum = mapping.key(klass.to_s) || klass
+          define_method "#{foreign_type}=" do |klass|            
+            enum = mapping.key(klass.to_s)
+            enum ||= mapping.key(klass.base_class.to_s) if klass.kind_of?(Class) && klass <= ActiveRecord::Base
+            enum ||= klass if klass != NilClass
             super(enum)
           end
 

lib/polymorphic_integer_type/version.rb

@@ -1,3 +1,3 @@
 module PolymorphicIntegerType
-  VERSION = "1.0.1"
+  VERSION = "1.0.5"
 end

spec/polymorphic_integer_type_spec.rb

@@ -17,6 +17,16 @@
 
   let(:link) { Link.create(:source => source, :target => target) }
 
+  context "when the source is nil" do
+    let(:source) { nil }
+    let(:target) { nil }
+    it "should have the no id/type for the source" do
+      expect(link.source_id).to be_nil
+      expect(link.source_type).to be_nil
+      expect(link.source).to be_nil
+    end
+  end
+
   shared_examples "proper source" do
     it "should have the proper id, type and object for the source" do
       expect(link.source_id).to eql source.id
@@ -131,5 +141,15 @@
 
   end
 
+  context "when the association is an STI table" do
+    let(:link) { Link.create(:source => source, :target => whiskey) }
+    let(:source) { Dog.create(:name => "Bela", :kind => "Dog", :owner => owner) }
+    it "should have the proper id, type and object for the source" do
+      expect(link.source_id).to eql source.id
+      expect(link.source_type).to eql "Animal"
+      expect(link.source).to eql source
+    end
+  end
+  
 
 end

spec/spec_helper.rb

@@ -3,6 +3,7 @@
 require 'support/configuration'
 require 'support/link'
 require 'support/animal'
+require 'support/dog'
 require 'support/person'
 require 'support/food'
 require 'support/drink'

spec/support/dog.rb

@@ -0,0 +1,4 @@
+class Dog < Animal
+
+
+end

spec/support/migrations/2_create_animal_table.rb

@@ -3,6 +3,7 @@ class CreateAnimalTable < ActiveRecord::Migration
   def up
     create_table :animals do |t|
       t.string :name
+      t.string :type
       t.string :kind
       t.integer :owner_id
     end