fixes for rails 4

Author: Yu Lin

lib/polymorphic_integer_type/extensions.rb

@@ -17,7 +17,7 @@ def belongs_to(name, scope = nil, options = {})
             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
@@ -38,7 +38,7 @@ def belongs_to(name, scope = nil, 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)
@@ -48,19 +48,34 @@ def remove_type_and_establish_mapping(name, options)
 
           options[:foreign_key] ||= "#{poly_type}_id"
           foreign_type = options.delete(:foreign_type) || "#{poly_type}_type"
-          options[:scope] ||= ->(n){where(foreign_type => klass_mapping.to_i)}
+
+          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, scope = nil, options = {}, &extension)
-        options = scope if scope.kind_of? Hash
-        remove_type_and_establish_mapping(name, options)
-        super(name, options.delete(:scope), 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, scope = nil, options = {})
-        options = scope if scope.kind_of? Hash
-        remove_type_and_establish_mapping(name, 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