aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-05-27 15:59:14 -0700
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-05-27 16:16:33 -0700
commite70bd6bdfae3615a013cf6252efdea3d94c5b64c (patch)
tree89ac550acb72350437685af8654ae8987d85a039 /actionpack
parenta5688fa9073dc8824d98071346e6cd9ae417eb72 (diff)
downloadrails-e70bd6bdfae3615a013cf6252efdea3d94c5b64c.tar.gz
rails-e70bd6bdfae3615a013cf6252efdea3d94c5b64c.tar.bz2
rails-e70bd6bdfae3615a013cf6252efdea3d94c5b64c.zip
Added hook point in new base #send_action which does the actual action method dispatching
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/abstract/base.rb4
-rw-r--r--actionpack/lib/action_controller/new_base/base.rb2
2 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/abstract/base.rb b/actionpack/lib/action_controller/abstract/base.rb
index 0e4803388a..bbd42623d3 100644
--- a/actionpack/lib/action_controller/abstract/base.rb
+++ b/actionpack/lib/action_controller/abstract/base.rb
@@ -95,9 +95,11 @@ module AbstractController
# overrides it to include the case where a template matching the
# action_name is found.
def process_action(method_name)
- send(method_name)
+ send_action(method_name)
end
+ alias send_action send
+
def _handle_action_missing
action_missing(@_action_name)
end
diff --git a/actionpack/lib/action_controller/new_base/base.rb b/actionpack/lib/action_controller/new_base/base.rb
index 6fe7793030..f8aaf05387 100644
--- a/actionpack/lib/action_controller/new_base/base.rb
+++ b/actionpack/lib/action_controller/new_base/base.rb
@@ -39,7 +39,7 @@ module ActionController
# TODO: Extract into its own module
# This should be moved together with other normalizing behavior
module ImplicitRender
- def process_action(method_name)
+ def send_action(method_name)
ret = super
default_render unless performed?
ret