diff options
Diffstat (limited to 'actionpack/lib/action_controller/new_base/hide_actions.rb')
-rw-r--r-- | actionpack/lib/action_controller/new_base/hide_actions.rb | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/actionpack/lib/action_controller/new_base/hide_actions.rb b/actionpack/lib/action_controller/new_base/hide_actions.rb index 86852a26cd..af68c772b1 100644 --- a/actionpack/lib/action_controller/new_base/hide_actions.rb +++ b/actionpack/lib/action_controller/new_base/hide_actions.rb @@ -8,26 +8,27 @@ module ActionController extlib_inheritable_accessor(:hidden_actions) { Set.new } end - def action_methods - self.class.action_methods - end - private + # Overrides AbstractController::Base#action_method? to return false if the + # action name is in the list of hidden actions. def action_method?(action_name) !hidden_actions.include?(action_name) && super end module ClassMethods - # Sets + # Sets all of the actions passed in as hidden actions. + # + # ==== Parameters + # *args<#to_s>:: A list of actions def hide_action(*args) - args.each do |arg| - self.hidden_actions << arg.to_s - end + hidden_actions.merge(args.map! {|a| a.to_s }) end + # 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| self.hidden_actions.include?(name.to_s)}) + @action_methods ||= Set.new(super.reject {|name| hidden_actions.include?(name)}) end end end |