Merge branch 'rails-4'

Conflicts:
	lib/polymorphic_integer_type/extensions.rb

Author: Kyle d'Oliveira

lib/polymorphic_integer_type/extensions.rb

@@ -3,20 +3,21 @@ module PolymorphicIntegerType
   module Extensions
     module ClassMethods
 
-      def belongs_to(name, options = {})
+      def belongs_to(name, scope = nil, options = {})
+        options = scope if scope.kind_of? Hash
         integer_type = options.delete :integer_type
         super
         if options[:polymorphic] && integer_type
           mapping = PolymorphicIntegerType::Mapping[name]
-          foreign_type = reflections[name].foreign_type
+          foreign_type = reflections[name.to_s].foreign_type
           self._polymorphic_foreign_types << foreign_type
 
           define_method foreign_type do
             t = super()
             mapping[t]
           end
 
-          define_method "#{foreign_type}=" do |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
@@ -37,7 +38,7 @@ def belongs_to(name, options = {})
         end
       end
 
-      def remove_type_and_establish_mapping(name, options)
+      def remove_type_and_establish_mapping(name, options, scope)
         integer_type = options.delete :integer_type
         if options[:as] && integer_type
           poly_type = options.delete(:as)
@@ -47,24 +48,35 @@ def remove_type_and_establish_mapping(name, options)
 
           options[:foreign_key] ||= "#{poly_type}_id"
           foreign_type = options.delete(:foreign_type) || "#{poly_type}_type"
-          options[:conditions] ||= {}
-          if options[:conditions].is_a?(Array)
-            cond = options[:conditions].first
-            options[:conditions][0] = "(#{cond}) AND #{foreign_type}=#{klass_mapping.to_i}"
-          else
-            options[:conditions].merge!({foreign_type => klass_mapping.to_i})
-          end
+
+          options[:scope] ||= -> {
+            condition = where(foreign_type => klass_mapping.to_i)
+            condition = instance_exec(&scope).merge(condition) if scope.is_a?(Proc)
+            condition
+          }
+        else
+          options[:scope] ||= scope
         end
       end
 
-      def has_many(name, options = {}, &extension)
-        remove_type_and_establish_mapping(name, options)
-        super(name, options, &extension)
+      def has_many(name, scope = nil, options = {}, &extension)
+        if scope.kind_of? Hash
+          options = scope
+          scope = nil
+        end
+
+        remove_type_and_establish_mapping(name, options, scope)
+        super(name, options.delete(:scope), options, &extension)
       end
 
-      def has_one(name, options = {})
-        remove_type_and_establish_mapping(name, options)
-        super(name, options)
+      def has_one(name, scope = nil, options = {})
+        if scope.kind_of? Hash
+          options = scope
+          scope = nil
+        end
+
+        remove_type_and_establish_mapping(name, options, scope)
+        super(name, options.delete(:scope), options)
       end
 
 

polymorphic_integer_type.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.2"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "activerecord", "3.2.11"
-  spec.add_development_dependency "mysql", "2.8.1"
-  spec.add_development_dependency "debugger"  
+  spec.add_development_dependency "activerecord", "4.2.0"
+  spec.add_development_dependency "mysql2", "0.3.16"
+  spec.add_development_dependency "byebug"
 
 end

spec/support/active_record.rb

@@ -2,7 +2,7 @@
 Dir["#{File.dirname(__FILE__)}/migrations/*.rb"].each {|f| require f}
 
 config = {
-  :adapter => "mysql",
+  :adapter => "mysql2",
   :host => "localhost",
   :database => "polymorphic_integer_type_test",
   :username => "root",