some modifications to lib/active_model

activemodel/lib/active_model/errors.rb

@@ -326,8 +326,7 @@ def generate_message(attribute, type = :invalid, options = {})
       defaults << :"errors.attributes.#{attribute}.#{type}"
       defaults << :"errors.messages.#{type}"
 
-      defaults.compact!
-      defaults.flatten!
+      defaults.compact!.flatten!
 
       key = defaults.shift
       value = (attribute != :base ? @base.send(:read_attribute_for_validation, attribute) : nil)

activemodel/lib/active_model/mass_assignment_security/sanitizer.rb

@@ -31,7 +31,7 @@ def logger
       end
 
       def logger?
-        @target.respond_to?(:logger) && @target.logger
+        @target.respond_to?(:logger) && logger
       end
 
       def process_removed_attributes(attrs)
@@ -40,9 +40,6 @@ def process_removed_attributes(attrs)
     end
 
     class StrictSanitizer < Sanitizer
-      def initialize(target = nil)
-        super()
-      end
 
       def process_removed_attributes(attrs)
         return if (attrs - insensitive_attributes).empty?

activemodel/test/cases/mass_assignment_security/sanitizer_test.rb

@@ -13,7 +13,7 @@ def deny?(key)
 
   def setup
     @logger_sanitizer = ActiveModel::MassAssignmentSecurity::LoggerSanitizer.new(self)
-    @strict_sanitizer = ActiveModel::MassAssignmentSecurity::StrictSanitizer.new(self)
+    @strict_sanitizer = ActiveModel::MassAssignmentSecurity::StrictSanitizer.new
     @authorizer = Authorizer.new
   end