Merge branch 'master' of git://github.com/rails/rails into old

1 files changed, 35 insertions, 0 deletions

diff --git a/actionpack/lib/action_controller/metal/hide_actions.rb b/actionpack/lib/action_controller/metal/hide_actions.rb
new file mode 100644
index 0000000000..af68c772b1
--- /dev/null
+++ b/actionpack/lib/action_controller/metal/hide_actions.rb
@@ -0,0 +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) { Set.new }
+    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 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
+
+      # 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