1 files changed, 20 insertions, 24 deletions
diff --git a/actionpack/lib/action_controller/new_base/hide_actions.rb b/actionpack/lib/action_controller/new_base/hide_actions.rb
index b45e520bee..af68c772b1 100644
--- a/actionpack/lib/action_controller/new_base/hide_actions.rb
+++ b/actionpack/lib/action_controller/new_base/hide_actions.rb
@@ -1,39 +1,35 @@
 module ActionController
+  # ActionController::HideActions adds the ability to prevent public methods on a controller
+  # to be called as actions.
   module HideActions
     extend ActiveSupport::Concern
 
     included do
-      extlib_inheritable_accessor :hidden_actions
-      self.hidden_actions ||= Set.new
+      extlib_inheritable_accessor(:hidden_actions) { Set.new }
     end
 
-    def action_methods
-      self.class.action_names
-    end
+  private
 
-    def action_names
-      action_methods
+    # 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
 
-    private
-      def action_method?(action_name)
-        !hidden_actions.include?(action_name) && super
+    module ClassMethods
+      # Sets all of the actions passed in as hidden actions.
+      #
+      # ==== Parameters
+      # *args<#to_s>:: A list of actions
+      def hide_action(*args)
+        hidden_actions.merge(args.map! {|a| a.to_s })
       end
 
-      module ClassMethods
-        def hide_action(*args)
-          args.each do |arg|
-            self.hidden_actions << arg.to_s
-          end
-        end
-
-        def action_methods
-          @action_names ||= Set.new(super.reject {|name| self.hidden_actions.include?(name.to_s)})
-        end
-
-        def self.action_names
-          action_methods
-        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| hidden_actions.include?(name)})
       end
+    end
   end
 end