v1.2.4 - fix params type checking in nested attributes

westonganger · Sep 22, 2016 · f4057b2 · f4057b2
1 parent 7567c9d
commit f4057b2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.2.4
+
+* Fixed params type checking with nested attributes
+
 ## 1.2.3
 
 * Fixed ArgumentError with nested attributes

diff --git a/lib/active_record/mass_assignment_security/nested_attributes.rb b/lib/active_record/mass_assignment_security/nested_attributes.rb
@@ -76,11 +76,9 @@ 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]
 
-        class_name = attributes_collection.class.name
-
-        if class_name == 'ActionController::Parameters'
+        if attributes_collection.class.name == 'ActionController::Parameters'
           attributes_collection = attributes_collection.to_unsafe_h
-        elsif !['Hash','Array'].include?(class_name)
+        elsif !attributes_collection.is_a?(Hash) && !attributes_collection.is_a?(Array)
           raise ArgumentError, "ActionController::Parameters or Hash or Array expected, got #{attributes_collection.class.name} (#{attributes_collection.inspect})"
         end
 

diff --git a/lib/protected_attributes/version.rb b/lib/protected_attributes/version.rb
@@ -1,3 +1,3 @@
 module ProtectedAttributes
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end