diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-14 01:56:07 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-14 02:01:08 -0700 |
commit | c286952050e8fe16b0f6d64ba0687b52cc8f2ae1 (patch) | |
tree | 38dc6ad83ca0d4ae2695ca85793baa38ce06ea55 /actionpack/lib/action_controller | |
parent | 5dd29c466c38a1bc395da579fd4b22c5e5a8e9fd (diff) | |
download | rails-c286952050e8fe16b0f6d64ba0687b52cc8f2ae1.tar.gz rails-c286952050e8fe16b0f6d64ba0687b52cc8f2ae1.tar.bz2 rails-c286952050e8fe16b0f6d64ba0687b52cc8f2ae1.zip |
Minimal base/new_base comparison
Diffstat (limited to 'actionpack/lib/action_controller')
4 files changed, 16 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/abstract/base.rb b/actionpack/lib/action_controller/abstract/base.rb index c9e1081b23..4b8d953643 100644 --- a/actionpack/lib/action_controller/abstract/base.rb +++ b/actionpack/lib/action_controller/abstract/base.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/module/attr_internal' + module AbstractController class Error < StandardError; end @@ -89,7 +91,7 @@ module AbstractController # you must handle it by also overriding process_action and # handling the case. def respond_to_action?(action_name) - action_methods.include?(action_name) || respond_to?(:action_missing, true) + action_methods.include?(action_name.to_s) || respond_to?(:action_missing, true) end end -end
\ No newline at end of file +end diff --git a/actionpack/lib/action_controller/abstract/logger.rb b/actionpack/lib/action_controller/abstract/logger.rb index 5fb78f1755..b154be754b 100644 --- a/actionpack/lib/action_controller/abstract/logger.rb +++ b/actionpack/lib/action_controller/abstract/logger.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/class/attribute_accessors' + module AbstractController module Logger extend ActiveSupport::DependencyModule @@ -6,4 +8,4 @@ module AbstractController cattr_accessor :logger end end -end
\ No newline at end of file +end diff --git a/actionpack/lib/action_controller/new_base/http.rb b/actionpack/lib/action_controller/new_base/http.rb index fb6041a04e..6852eb200a 100644 --- a/actionpack/lib/action_controller/new_base/http.rb +++ b/actionpack/lib/action_controller/new_base/http.rb @@ -1,3 +1,6 @@ +require 'action_controller/abstract' +require 'active_support/core_ext/module/delegation' + module ActionController class Http < AbstractController::Base abstract! @@ -57,7 +60,7 @@ module ActionController def self.action(name) @actions ||= {} - @actions[name] ||= proc do |env| + @actions[name.to_s] ||= proc do |env| new.call(name, env) end end diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index c0eb61340b..7edd379bc0 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -1,5 +1,10 @@ require 'cgi' require 'uri' +require 'set' + +require 'active_support/core_ext/module/aliasing' +require 'active_support/core_ext/module/attribute_accessors' + require 'action_controller/routing/optimisations' require 'action_controller/routing/routing_ext' require 'action_controller/routing/route' |