Remove MassAssignmentSecurity from ActiveModel

This will be moved out to protected_attributes gem
rails · Sep 17, 2012 · f8c9a4d · f8c9a4d
1 parent a8f6d5c
commit f8c9a4d
Show file tree

Hide file tree

Showing 16 changed files with 15 additions and 816 deletions.
diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb
@@ -36,7 +36,6 @@ module ActiveModel
   autoload :EachValidator, 'active_model/validator'
   autoload :ForbiddenAttributesProtection
   autoload :Lint
-  autoload :MassAssignmentSecurity
   autoload :Model
   autoload :Name, 'active_model/naming'
   autoload :Naming

diff --git a/activemodel/lib/active_model/forbidden_attributes_protection.rb b/activemodel/lib/active_model/forbidden_attributes_protection.rb
@@ -3,11 +3,11 @@ class ForbiddenAttributes < StandardError
   end
 
   module ForbiddenAttributesProtection
-    def sanitize_for_mass_assignment(new_attributes, options = {})
-      if !new_attributes.respond_to?(:permitted?) || (new_attributes.respond_to?(:permitted?) && new_attributes.permitted?)
-        super
-      else
+    def sanitize_for_mass_assignment(attributes, options = {})
+      if attributes.respond_to?(:permitted?) && !attributes.permitted?
         raise ActiveModel::ForbiddenAttributes
+      else
+        attributes
       end
     end
   end

diff --git a/activemodel/lib/active_model/mass_assignment_security.rb b/activemodel/lib/active_model/mass_assignment_security.rb