Merge pull request rails#6668 from pomnikita/master

Compact array of values added to PermissionSet instance
flyerhzm · Jun 8, 2012 · 41d6371 · 41d6371
2 parents d1136e6 + 00ff0a6
commit 41d6371
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/activemodel/lib/active_model/mass_assignment_security/permission_set.rb b/activemodel/lib/active_model/mass_assignment_security/permission_set.rb
@@ -5,7 +5,7 @@ module MassAssignmentSecurity
     class PermissionSet < Set
 
       def +(values)
-        super(values.map(&:to_s))
+        super(values.compact.map(&:to_s))
       end
 
       def include?(key)

diff --git a/activemodel/test/cases/mass_assignment_security/permission_set_test.rb b/activemodel/test/cases/mass_assignment_security/permission_set_test.rb
@@ -13,6 +13,12 @@ def setup
     assert new_list.include?('admin'), "did not add collection to #{@permission_list.inspect}}"
   end
 
+  test "+ compacts added collection values" do
+    added_collection = [ nil ]
+    new_list = @permission_list + added_collection
+    assert_equal new_list, @permission_list, "did not add collection to #{@permission_list.inspect}}"
+  end
+
   test "include? normalizes multi-parameter keys" do
     multi_param_key = 'admin(1)'
     new_list = @permission_list += [ 'admin' ]