From b4903a8e34da77b96ea136ccd015c1634a8a5c2b Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Fri, 1 May 2009 16:01:37 -0700
Subject: Modify new_base to use String action_names for back-compat

---
 actionpack/lib/action_controller/abstract/base.rb      | 8 ++++----
 actionpack/lib/action_controller/abstract/callbacks.rb | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'actionpack/lib/action_controller/abstract')

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
-- 
cgit v1.2.3