aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-06-10 19:39:09 +0200
committerJosé Valim <jose.valim@gmail.com>2010-06-10 19:39:09 +0200
commitb67ec8ba20099c8b39bf344f385bbbd2b9c8f47d (patch)
tree008a576bb72baffd49b2483b3b08e181933e29c1 /actionpack/lib/action_controller
parentc4d6245e875bbb276c122a5a401422d341dac4df (diff)
downloadrails-b67ec8ba20099c8b39bf344f385bbbd2b9c8f47d.tar.gz
rails-b67ec8ba20099c8b39bf344f385bbbd2b9c8f47d.tar.bz2
rails-b67ec8ba20099c8b39bf344f385bbbd2b9c8f47d.zip
class_attribute is not a direct replacement of class_inheritable_*.
If you are setting a hash or an array in class_attribute or you need to freeze it, to ensure people won't modify it in place or you need to dup it on inheritance.
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/hide_actions.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/hide_actions.rb b/actionpack/lib/action_controller/metal/hide_actions.rb
index 3358d80c35..32d7a96701 100644
--- a/actionpack/lib/action_controller/metal/hide_actions.rb
+++ b/actionpack/lib/action_controller/metal/hide_actions.rb
@@ -8,7 +8,7 @@ module ActionController
included do
class_attribute :hidden_actions
- self.hidden_actions = Set.new
+ self.hidden_actions = Set.new.freeze
end
private
@@ -25,7 +25,7 @@ module ActionController
# ==== Parameters
# *args<#to_s>:: A list of actions
def hide_action(*args)
- self.hidden_actions = hidden_actions.dup.merge(args.map(&:to_s))
+ self.hidden_actions = hidden_actions.dup.merge(args.map(&:to_s)).freeze
end
def inherited(klass)
@@ -41,7 +41,7 @@ module ActionController
# Overrides AbstractController::Base#action_methods to remove any methods
# that are listed as hidden methods.
def action_methods
- @action_methods ||= Set.new(super.reject {|name| hidden_actions.include?(name)})
+ @action_methods ||= Set.new(super.reject { |name| hidden_actions.include?(name) })
end
end
end