aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/abstract/base.rb8
-rw-r--r--actionpack/lib/action_controller/abstract/callbacks.rb4
-rw-r--r--actionpack/lib/action_controller/new_base/base.rb2
3 files changed, 7 insertions, 7 deletions
diff --git a/actionpack/lib/action_controller/abstract/base.rb b/actionpack/lib/action_controller/abstract/base.rb
index 3b85ba5565..8a8e748c0e 100644
--- a/actionpack/lib/action_controller/abstract/base.rb
+++ b/actionpack/lib/action_controller/abstract/base.rb
@@ -21,7 +21,7 @@ module AbstractController
end
def process(action)
- new.process(action)
+ new.process(action.to_s)
end
def hidden_actions
@@ -31,11 +31,11 @@ module AbstractController
def action_methods
@action_methods ||=
# All public instance methods of this class, including ancestors
- public_instance_methods(true).map { |m| m.to_sym }.to_set -
+ public_instance_methods(true).map { |m| m.to_s }.to_set -
# Except for public instance methods of Base and its ancestors
- internal_methods.map { |m| m.to_sym } +
+ internal_methods.map { |m| m.to_s } +
# Be sure to include shadowed public instance methods of this class
- public_instance_methods(false).map { |m| m.to_sym } -
+ public_instance_methods(false).map { |m| m.to_s } -
# And always exclude explicitly hidden actions
hidden_actions
end
diff --git a/actionpack/lib/action_controller/abstract/callbacks.rb b/actionpack/lib/action_controller/abstract/callbacks.rb
index c8b509081c..5f1607940a 100644
--- a/actionpack/lib/action_controller/abstract/callbacks.rb
+++ b/actionpack/lib/action_controller/abstract/callbacks.rb
@@ -14,11 +14,11 @@ module AbstractController
module ClassMethods
def _normalize_callback_options(options)
if only = options[:only]
- only = Array(only).map {|o| "action_name == :#{o}"}.join(" || ")
+ only = Array(only).map {|o| "action_name == '#{o}'"}.join(" || ")
options[:per_key] = {:if => only}
end
if except = options[:except]
- except = Array(except).map {|e| "action_name == :#{e}"}.join(" || ")
+ except = Array(except).map {|e| "action_name == '#{e}'"}.join(" || ")
options[:per_key] = {:unless => except}
end
end
diff --git a/actionpack/lib/action_controller/new_base/base.rb b/actionpack/lib/action_controller/new_base/base.rb
index 00d161289e..f663900944 100644
--- a/actionpack/lib/action_controller/new_base/base.rb
+++ b/actionpack/lib/action_controller/new_base/base.rb
@@ -42,7 +42,7 @@ module ActionController
def call(env)
@_request = ActionDispatch::Request.new(env)
@_response = ActionDispatch::Response.new
- process(@_request.parameters[:action].to_sym)
+ process(@_request.parameters[:action])
@_response.body = response_body
@_response.prepare!
self