aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model/mass_assignment_security/permission_set.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-07-08 19:02:34 +0200
committerJosé Valim <jose.valim@gmail.com>2010-07-08 19:02:34 +0200
commitc285f07a92c643729a1a6ae6282cd597fe8e20e3 (patch)
treed55f1b06c29f2998c24ed5307856e94e71d17594 /activemodel/lib/active_model/mass_assignment_security/permission_set.rb
parent4b66aab00fa0ea6bcc6ec81df19e44de34fd7864 (diff)
downloadrails-c285f07a92c643729a1a6ae6282cd597fe8e20e3.tar.gz
rails-c285f07a92c643729a1a6ae6282cd597fe8e20e3.tar.bz2
rails-c285f07a92c643729a1a6ae6282cd597fe8e20e3.zip
Change documentation for ActiveModel::MassAssignmentSecurity a bit and make debug always be called since some people may overwrite warn! to add extra behavior even if logger is not available.
Diffstat (limited to 'activemodel/lib/active_model/mass_assignment_security/permission_set.rb')
-rw-r--r--activemodel/lib/active_model/mass_assignment_security/permission_set.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/activemodel/lib/active_model/mass_assignment_security/permission_set.rb b/activemodel/lib/active_model/mass_assignment_security/permission_set.rb
index 978da493d7..7c48472799 100644
--- a/activemodel/lib/active_model/mass_assignment_security/permission_set.rb
+++ b/activemodel/lib/active_model/mass_assignment_security/permission_set.rb
@@ -2,7 +2,6 @@ require 'active_model/mass_assignment_security/sanitizer'
module ActiveModel
module MassAssignmentSecurity
-
class PermissionSet < Set
attr_accessor :logger
@@ -14,11 +13,11 @@ module ActiveModel
super(remove_multiparameter_id(key))
end
- protected
+ protected
- def remove_multiparameter_id(key)
- key.gsub(/\(.+/, '')
- end
+ def remove_multiparameter_id(key)
+ key.to_s.gsub(/\(.+/, '')
+ end
end
class WhiteList < PermissionSet
@@ -36,6 +35,5 @@ module ActiveModel
include?(key)
end
end
-
end
end \ No newline at end of file