merge

Author: westonganger

CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.2.3
+
+* Fixed ArgumentError with nested attributes
+
+## 1.2.2
+
+* Fix for Rails 5
+
+## 1.2.1
+
+* Fix for Rails 5
+
 ## 1.2.0
 
 * Added Rails 5 support, already works just needed the gemspec updated to allow it

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://api.travis-ci.org/westonganger/protected_attributes_continued.svg?branch=master)](https://travis-ci.org/westonganger/protected_attributes_continued)
 
-This is the community continued version of `protected_attributes`. I have created this new repo because the Rails team refuses to support the `protected_attributes` gem for Rails 5. It already works perfectly fine with Rails 5 it just needed the dependencies relaxed. For people who would like to continue using this feature in their Rails 5 apps lets continue the development here. The original `protected_attributes` was officially supported by the Rails team until the release of Rails 5.0.
+This is the community continued version of `protected_attributes`. I have created this new repo and changed the name because the Rails team refuses to support the `protected_attributes` gem for Rails 5. For people who would like to continue using this feature in their Rails 5 apps lets continue here. I am currently_using this successfully in number of Rails 5 production apps. 
 
 Protect attributes from mass-assignment in Active Record models.
 

lib/active_record/mass_assignment_security/nested_attributes.rb

@@ -76,8 +76,12 @@ def assign_nested_attributes_for_one_to_one_association(association_name, attrib
       def assign_nested_attributes_for_collection_association(association_name, attributes_collection, assignment_opts = {})
         options = self.nested_attributes_options[association_name]
 
-        unless attributes_collection.is_a?(Hash) || attributes_collection.is_a?(Array)
-          raise ArgumentError, "Hash or Array expected, got #{attributes_collection.class.name} (#{attributes_collection.inspect})"
+        class_name = attributes_collection.class.name
+
+        if class_name == 'ActionController::Parameters'
+          attributes_collection = attributes_collection.to_unsafe_h
+        elsif !['Hash','Array'].include?(class_name)
+          raise ArgumentError, "ActionController::Parameters or Hash or Array expected, got #{attributes_collection.class.name} (#{attributes_collection.inspect})"
         end
 
         if limit = options[:limit]
@@ -109,7 +113,7 @@ def assign_nested_attributes_for_collection_association(association_name, attrib
         existing_records = if association.loaded?
           association.target
         else
-          attribute_ids = attributes_collection.map {|a| a['id'] || a[:id] }.compact
+          attribute_ids = attributes_collection.map{|a| a['id'] || a[:id] }.compact
           attribute_ids.empty? ? [] : association.scope.where(association.klass.primary_key => attribute_ids)
         end
 

lib/protected_attributes/version.rb

@@ -1,3 +1,3 @@
 module ProtectedAttributes
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end