Remove support for the protected attributes gem

Related to #10690.
rails · Jan 10, 2015 · f4fbc03 · f4fbc03 · senny · Dec 23, 2015
1 parent d8b8a72
commit f4fbc03
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Remove support for the `protected_attributes` gem.
+
+    *Carlos Antonio da Silva + Roberto Miranda*
+
 *   Fix accessing of fixtures having non-string labels like Fixnum.
 
     *Prathamesh Sonpatki*

diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
@@ -274,16 +274,14 @@ def table_metadata # :nodoc:
     # ==== Example:
     #   # Instantiates a single new object
     #   User.new(first_name: 'Jamie')
-    def initialize(attributes = nil, options = {})
+    def initialize(attributes = nil)
       @attributes = self.class._default_attributes.dup
       self.class.define_attribute_methods
 
       init_internals
       initialize_internals_callback
 
-      # +options+ argument is only needed to make protected_attributes gem easier to hook.
-      # Remove it when we drop support to this gem.
-      init_attributes(attributes, options) if attributes
+      assign_attributes(attributes) if attributes
 
       yield self if block_given?
       _run_initialize_callbacks
@@ -557,12 +555,6 @@ def init_internals
     def initialize_internals_callback
     end
 
-    # This method is needed to make protected_attributes gem easier to hook.
-    # Remove it when we drop support to this gem.
-    def init_attributes(attributes, options)
-      assign_attributes(attributes)
-    end
-
     def thaw
       if frozen?
         @attributes = @attributes.dup