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

Conflicts:
	actionmailer/lib/action_mailer.rb

122 files changed, 2382 insertions, 2025 deletions

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 30f3f31563..782b4229fb 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,19 @@
 *Edge*
 
+* Added ActionDispatch::Request#authorization to access the http authentication header regardless of its proxy hiding [DHH]
+
+* Added :alert, :notice, and :flash as options to ActionController::Base#redirect_to that'll automatically set the proper flash before the redirection [DHH]. Examples:
+
+    flash[:notice] = 'Post was created'
+    redirect_to(@post)
+  
+  ...becomes:
+  
+    redirect_to(@post, :notice => 'Post was created')
+
+* Added ActionController::Base#notice/= and ActionController::Base#alert/= as a convenience accessors in both the controller and the view for flash[:notice]/= and flash[:alert]/= [DHH]
+
+
 * Introduce grouped_collection_select helper.  #1249 [Dan Codeape, Erik Ostrom]
 
 * Make sure javascript_include_tag/stylesheet_link_tag does not append ".js" or ".css" onto external urls. #1664 [Matthew Rudy Jacobs]
diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 99bdcc95fa..863daa4b44 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -31,7 +31,6 @@ Rake::TestTask.new(:test_action_pack) do |t|
   # this will not happen automatically and the tests (as a whole) will error
   t.test_files = Dir.glob('test/{abstract,controller,dispatch,template}/**/*_test.rb').sort
 
-  t.verbose = true
   # t.warning = true
 end
 
@@ -45,7 +44,6 @@ desc 'ActiveRecord Integration Tests'
 Rake::TestTask.new(:test_active_record_integration) do |t|
   t.libs << 'test'
   t.test_files = Dir.glob("test/activerecord/*_test.rb")
-  t.verbose = true
 end
 
 # Genereate the RDoc documentation
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index 78286f6747..dc91fba64d 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -16,9 +16,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency('activesupport', '= 3.0.pre')
   s.add_dependency('activemodel',   '= 3.0.pre')
-  s.add_dependency('rack',          '~> 1.0.1')
+  s.add_dependency('rack',          '~> 1.1.0')
   s.add_dependency('rack-test',     '~> 0.5.0')
-  s.add_dependency('rack-mount',    '~> 0.2')
+  s.add_dependency('rack-mount',    '~> 0.4.0')
   s.add_dependency('erubis',        '~> 2.6.5')
 
   s.require_path = 'lib'
diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index 1a6c4278c9..237ab577ba 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -1,16 +1,18 @@
-require "active_support/core_ext/module/attr_internal"
-require "active_support/core_ext/module/delegation"
+activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
+$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
+
+require 'active_support/ruby/shim'
+require 'active_support/core_ext/module/attr_internal'
+require 'active_support/core_ext/module/delegation'
 
 module AbstractController
-  autoload :Base,                "abstract_controller/base"
-  autoload :Callbacks,           "abstract_controller/callbacks"
-  autoload :Helpers,             "abstract_controller/helpers"
-  autoload :Layouts,             "abstract_controller/layouts"
-  autoload :LocalizedCache,      "abstract_controller/localized_cache"
-  autoload :Logger,              "abstract_controller/logger"
-  autoload :RenderingController, "abstract_controller/rendering_controller"
-  # === Exceptions
-  autoload :ActionNotFound,      "abstract_controller/exceptions"
-  autoload :DoubleRenderError,   "abstract_controller/exceptions"
-  autoload :Error,               "abstract_controller/exceptions"
+  extend ActiveSupport::Autoload
+
+  autoload :Base
+  autoload :Callbacks
+  autoload :Helpers
+  autoload :Layouts
+  autoload :LocalizedCache
+  autoload :Logger
+  autoload :Rendering
 end
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb
index f5b1c9e4d1..efea81aa71 100644
--- a/actionpack/lib/abstract_controller/base.rb
+++ b/actionpack/lib/abstract_controller/base.rb
@@ -1,8 +1,11 @@
 module AbstractController
+  class Error < StandardError; end
+  class ActionNotFound < StandardError; end
 
   class Base
     attr_internal :response_body
     attr_internal :action_name
+    attr_internal :formats
 
     class << self
       attr_reader :abstract
@@ -74,21 +77,23 @@ module AbstractController
     abstract!
 
     # Calls the action going through the entire action dispatch stack.
-    # 
+    #
     # The actual method that is called is determined by calling
     # #method_for_action. If no method can handle the action, then an
     # ActionNotFound error is raised.
     #
     # ==== Returns
     # self
-    def process(action)
+    def process(action, *args)
       @_action_name = action_name = action.to_s
 
       unless action_name = method_for_action(action_name)
         raise ActionNotFound, "The action '#{action}' could not be found"
       end
 
-      process_action(action_name)
+      @_response_body = nil
+
+      process_action(action_name, *args)
     end
 
   private
@@ -108,8 +113,8 @@ module AbstractController
     # Call the action. Override this in a subclass to modify the
     # behavior around processing an action. This, and not #process,
     # is the intended way to override action dispatching.
-    def process_action(method_name)
-      send_action(method_name)
+    def process_action(method_name, *args)
+      send_action(method_name, *args)
     end
 
     # Actually call the method associated with the action. Override
diff --git a/actionpack/lib/abstract_controller/exceptions.rb b/actionpack/lib/abstract_controller/exceptions.rb
deleted file mode 100644
index b671516de1..0000000000
--- a/actionpack/lib/abstract_controller/exceptions.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module AbstractController
-  class Error < StandardError; end
-  class ActionNotFound < StandardError; end
-
-  class DoubleRenderError < Error
-    DEFAULT_MESSAGE = "Render and/or redirect were called multiple times in this action. Please note that you may only call render OR redirect, and at most once per action. Also note that neither redirect nor render terminate execution of the action, so if you want to exit an action after redirecting, you need to do something like \"redirect_to(...) and return\"."
-
-    def initialize(message = nil)
-      super(message || DEFAULT_MESSAGE)
-    end
-  end
-end
diff --git a/actionpack/lib/abstract_controller/helpers.rb b/actionpack/lib/abstract_controller/helpers.rb
index d3b492ad09..1d898d1a4c 100644
--- a/actionpack/lib/abstract_controller/helpers.rb
+++ b/actionpack/lib/abstract_controller/helpers.rb
@@ -4,7 +4,7 @@ module AbstractController
   module Helpers
     extend ActiveSupport::Concern
 
-    include RenderingController
+    include Rendering
 
     def self.next_serial
       @helper_serial ||= 0
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index c71cef42b2..46760bba7c 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -2,7 +2,7 @@ module AbstractController
   module Layouts
     extend ActiveSupport::Concern
 
-    include RenderingController
+    include Rendering
 
     included do
       extlib_inheritable_accessor(:_layout_conditions) { Hash.new }
diff --git a/actionpack/lib/abstract_controller/logger.rb b/actionpack/lib/abstract_controller/logger.rb
index 27ba5be45f..e3bcd28da7 100644
--- a/actionpack/lib/abstract_controller/logger.rb
+++ b/actionpack/lib/abstract_controller/logger.rb
@@ -29,33 +29,5 @@ module AbstractController
         @str.send(*args, &block)
       end
     end
-
-    # Override process_action in the AbstractController::Base
-    # to log details about the method.
-    def process_action(action)
-      result = ActiveSupport::Notifications.instrument(:process_action,
-                :controller => self, :action => action) do
-        super
-      end
-
-      if logger
-        log = DelayedLog.new do
-          "\n\nProcessing #{self.class.name}\##{action_name} " \
-          "to #{request.formats} (for #{request_origin}) " \
-          "[#{request.method.to_s.upcase}]"
-        end
-
-        logger.info(log)
-      end
-
-      result
-    end
-
-  private
-    # Returns the request origin with the IP and time. This needs to be cached,
-    # otherwise we would get different results for each time it calls.
-    def request_origin
-      @request_origin ||= "#{request.remote_ip} at #{Time.now.to_s(:db)}"
-    end
   end
 end
diff --git a/actionpack/lib/abstract_controller/rendering_controller.rb b/actionpack/lib/abstract_controller/rendering.rb
index 7054b9cf26..64a8a5f241 100644
--- a/actionpack/lib/abstract_controller/rendering_controller.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -1,13 +1,21 @@
+require "abstract_controller/base"
 require "abstract_controller/logger"
 
 module AbstractController
-  module RenderingController
+  class DoubleRenderError < Error
+    DEFAULT_MESSAGE = "Render and/or redirect were called multiple times in this action. Please note that you may only call render OR redirect, and at most once per action. Also note that neither redirect nor render terminate execution of the action, so if you want to exit an action after redirecting, you need to do something like \"redirect_to(...) and return\"."
+
+    def initialize(message = nil)
+      super(message || DEFAULT_MESSAGE)
+    end
+  end
+
+  module Rendering
     extend ActiveSupport::Concern
 
     include AbstractController::Logger
 
     included do
-      attr_internal :formats
       extlib_inheritable_accessor :_view_paths
       self._view_paths ||= ActionView::PathSet.new
     end
@@ -21,7 +29,7 @@ module AbstractController
     # An instance of a view class. The default view class is ActionView::Base
     #
     # The view class must have the following methods:
-    # View.for_controller[controller] Create a new ActionView instance for a 
+    # View.for_controller[controller] Create a new ActionView instance for a
     #   controller
     # View#render_partial[options]
     #   - responsible for setting options[:_template]
@@ -71,7 +79,7 @@ module AbstractController
     #
     # :api: plugin
     def render_to_string(options = {})
-      AbstractController::RenderingController.body_to_s(render_to_body(options))
+      AbstractController::Rendering.body_to_s(render_to_body(options))
     end
 
     # Renders the template from an object.
@@ -115,10 +123,10 @@ module AbstractController
     # _partial<TrueClass, FalseClass>:: Whether or not the file to look up is a partial
     def _determine_template(options)
       if options.key?(:text)
-        options[:_template] = ActionView::TextTemplate.new(options[:text], format_for_text)
+        options[:_template] = ActionView::Template::Text.new(options[:text], format_for_text)
       elsif options.key?(:inline)
-        handler = ActionView::Template.handler_class_for_extension(options[:type] || "erb")
-        template = ActionView::Template.new(options[:inline], "inline #{options[:inline].inspect}", handler, {})
+        handler  = ActionView::Template.handler_class_for_extension(options[:type] || "erb")
+        template = ActionView::Template.new(options[:inline], "inline template", handler, {})
         options[:_template] = template
       elsif options.key?(:template)
         options[:_template_name] = options[:template]
@@ -152,12 +160,12 @@ module AbstractController
     module ClassMethods
       def clear_template_caches!
       end
-      
+
       # Append a path to the list of view paths for this controller.
       #
       # ==== Parameters
-      # path<String, ViewPath>:: If a String is provided, it gets converted into 
-      # the default view path. You may also provide a custom view path 
+      # path<String, ViewPath>:: If a String is provided, it gets converted into
+      # the default view path. You may also provide a custom view path
       # (see ActionView::ViewPathSet for more information)
       def append_view_path(path)
         self.view_paths << path
@@ -166,8 +174,8 @@ module AbstractController
       # Prepend a path to the list of view paths for this controller.
       #
       # ==== Parameters
-      # path<String, ViewPath>:: If a String is provided, it gets converted into 
-      # the default view path. You may also provide a custom view path 
+      # path<String, ViewPath>:: If a String is provided, it gets converted into
+      # the default view path. You may also provide a custom view path
       # (see ActionView::ViewPathSet for more information)
       def prepend_view_path(path)
         clear_template_caches!
@@ -186,9 +194,8 @@ module AbstractController
       #   otherwise, process the parameter into a ViewPathSet.
       def view_paths=(paths)
         clear_template_caches!
-        self._view_paths = paths.is_a?(ActionView::PathSet) ?
-                            paths : ActionView::Base.process_view_paths(paths)
+        self._view_paths = paths.is_a?(ActionView::PathSet) ? paths : ActionView::Base.process_view_paths(paths)
       end
     end
   end
-end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 03a40e4fce..26a85d4de8 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -1,66 +1,78 @@
+activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
+$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
+require 'active_support/ruby/shim'
+
 module ActionController
-  autoload :Base,                 "action_controller/base"
-  autoload :Benchmarking,         "action_controller/metal/benchmarking"
-  autoload :ConditionalGet,       "action_controller/metal/conditional_get"
-  autoload :Configuration,        "action_controller/metal/configuration"
-  autoload :Head,                 "action_controller/metal/head"
-  autoload :Helpers,              "action_controller/metal/helpers"
-  autoload :HideActions,          "action_controller/metal/hide_actions"
-  autoload :Layouts,              "action_controller/metal/layouts"
-  autoload :Metal,                "action_controller/metal"
-  autoload :Middleware,           "action_controller/middleware"
-  autoload :RackConvenience,      "action_controller/metal/rack_convenience"
-  autoload :Rails2Compatibility,  "action_controller/metal/compatibility"
-  autoload :Redirector,           "action_controller/metal/redirector"
-  autoload :RenderingController,  "action_controller/metal/rendering_controller"
-  autoload :RenderOptions,        "action_controller/metal/render_options"
-  autoload :Rescue,               "action_controller/metal/rescuable"
-  autoload :Responder,            "action_controller/metal/responder"
-  autoload :Session,              "action_controller/metal/session"
-  autoload :Testing,              "action_controller/metal/testing"
-  autoload :UrlFor,               "action_controller/metal/url_for"
+  extend ActiveSupport::Autoload
 
-  autoload :Caching,           'action_controller/caching'
-  autoload :Dispatcher,        'action_controller/dispatch/dispatcher'
-  autoload :Integration,       'action_controller/deprecated/integration_test'
-  autoload :IntegrationTest,   'action_controller/deprecated/integration_test'
-  autoload :MimeResponds,      'action_controller/metal/mime_responds'
-  autoload :PerformanceTest,   'action_controller/deprecated/performance_test'
-  autoload :PolymorphicRoutes, 'action_controller/polymorphic_routes'
-  autoload :RecordIdentifier,  'action_controller/record_identifier'
-  autoload :Routing,           'action_controller/deprecated'
-  autoload :SessionManagement, 'action_controller/metal/session_management'
-  autoload :TestCase,          'action_controller/testing/test_case'
-  autoload :TestProcess,       'action_controller/testing/process'
-  autoload :UrlRewriter,       'action_controller/url_rewriter'
-  autoload :UrlWriter,         'action_controller/url_rewriter'
+  autoload :Base
+  autoload :Caching
+  autoload :PolymorphicRoutes
+  autoload :Translation
+  autoload :Metal
+  autoload :Middleware
 
-  autoload :Verification,             'action_controller/metal/verification'
-  autoload :Flash,                    'action_controller/metal/flash'
-  autoload :RequestForgeryProtection, 'action_controller/metal/request_forgery_protection'
-  autoload :Streaming,                'action_controller/metal/streaming'
-  autoload :HttpAuthentication,       'action_controller/metal/http_authentication'
-  autoload :FilterParameterLogging,   'action_controller/metal/filter_parameter_logging'
-  autoload :Translation,              'action_controller/translation'
-  autoload :Cookies,                  'action_controller/metal/cookies'
+  autoload_under "metal" do
+    autoload :Benchmarking
+    autoload :ConditionalGet
+    autoload :Configuration
+    autoload :Head
+    autoload :Helpers
+    autoload :HideActions
+    autoload :Layouts
+    autoload :Logger
+    autoload :MimeResponds
+    autoload :RackDelegation
+    autoload :Compatibility
+    autoload :Redirecting
+    autoload :Rendering
+    autoload :Renderers
+    autoload :Rescue
+    autoload :Responder
+    autoload :SessionManagement
+    autoload :UrlFor
+    autoload :Verification
+    autoload :Flash
+    autoload :RequestForgeryProtection
+    autoload :Streaming
+    autoload :HttpAuthentication
+    autoload :FilterParameterLogging
+    autoload :Cookies
+  end
 
-  autoload :ActionControllerError,    'action_controller/metal/exceptions'
-  autoload :RenderError,              'action_controller/metal/exceptions'
-  autoload :RoutingError,             'action_controller/metal/exceptions'
-  autoload :MethodNotAllowed,         'action_controller/metal/exceptions'
-  autoload :NotImplemented,           'action_controller/metal/exceptions'
-  autoload :UnknownController,        'action_controller/metal/exceptions'
-  autoload :MissingFile,              'action_controller/metal/exceptions'
-  autoload :RenderError,              'action_controller/metal/exceptions'
-  autoload :SessionOverflowError,     'action_controller/metal/exceptions'
-  autoload :UnknownHttpMethod,        'action_controller/metal/exceptions'
-end
+  autoload :Dispatcher,      'action_controller/dispatch/dispatcher'
+  autoload :PerformanceTest, 'action_controller/deprecated/performance_test'
+  autoload :Routing,         'action_controller/deprecated'
+  autoload :Integration,     'action_controller/deprecated/integration_test'
+  autoload :IntegrationTest, 'action_controller/deprecated/integration_test'
 
-autoload :HTML, 'action_controller/vendor/html-scanner'
-autoload :AbstractController, 'abstract_controller'
+  eager_autoload do
+    autoload :RecordIdentifier
+    autoload :UrlRewriter
+    autoload :UrlWriter,                'action_controller/url_rewriter'
+
+    # TODO: Don't autoload exceptions, setup explicit
+    # requires for files that need them
+    autoload_at "action_controller/metal/exceptions" do
+      autoload :ActionControllerError
+      autoload :RenderError
+      autoload :RoutingError
+      autoload :MethodNotAllowed
+      autoload :NotImplemented
+      autoload :UnknownController
+      autoload :MissingFile
+      autoload :RenderError
+      autoload :SessionOverflowError
+      autoload :UnknownHttpMethod
+    end
+  end
+end
 
+# All of these simply register additional autoloads
+require 'abstract_controller'
 require 'action_dispatch'
 require 'action_view'
+require 'action_controller/vendor/html-scanner'
 
 # Common ActiveSupport usage in ActionController
 require "active_support/concern"
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 4c026fe5f7..dbba69f637 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -8,26 +8,25 @@ module ActionController
     include ActionController::Helpers
     include ActionController::HideActions
     include ActionController::UrlFor
-    include ActionController::Redirector
-    include ActionController::RenderingController
-    include ActionController::RenderOptions::All
+    include ActionController::Redirecting
+    include ActionController::Rendering
+    include ActionController::Renderers::All
     include ActionController::Layouts
     include ActionController::ConditionalGet
-    include ActionController::RackConvenience
+    include ActionController::RackDelegation
+    include ActionController::Logger
     include ActionController::Benchmarking
     include ActionController::Configuration
 
     # Legacy modules
     include SessionManagement
-    include ActionDispatch::StatusCodes
     include ActionController::Caching
     include ActionController::MimeResponds
 
     # Rails 2.x compatibility
-    include ActionController::Rails2Compatibility
+    include ActionController::Compatibility
 
     include ActionController::Cookies
-    include ActionController::Session
     include ActionController::Flash
     include ActionController::Verification
     include ActionController::RequestForgeryProtection
@@ -91,7 +90,7 @@ module ActionController
       end
 
       if options[:status]
-        options[:status] = interpret_status(options[:status]).to_i
+        options[:status] = Rack::Utils.status_code(options[:status])
       end
 
       options[:update] = blk if block_given?
@@ -107,62 +106,5 @@ module ActionController
       options = _normalize_options(action, options, &blk)
       super(options)
     end
-
-    # Redirects the browser to the target specified in +options+. This parameter can take one of three forms:
-    #
-    # * <tt>Hash</tt> - The URL will be generated by calling url_for with the +options+.
-    # * <tt>Record</tt> - The URL will be generated by calling url_for with the +options+, which will reference a named URL for that record.
-    # * <tt>String</tt> starting with <tt>protocol://</tt> (like <tt>http://</tt>) - Is passed straight through as the target for redirection.
-    # * <tt>String</tt> not containing a protocol - The current protocol and host is prepended to the string.
-    # * <tt>:back</tt> - Back to the page that issued the request. Useful for forms that are triggered from multiple places.
-    #   Short-hand for <tt>redirect_to(request.env["HTTP_REFERER"])</tt>
-    #
-    # Examples:
-    #   redirect_to :action => "show", :id => 5
-    #   redirect_to post
-    #   redirect_to "http://www.rubyonrails.org"
-    #   redirect_to "/images/screenshot.jpg"
-    #   redirect_to articles_url
-    #   redirect_to :back
-    #
-    # The redirection happens as a "302 Moved" header unless otherwise specified.
-    #
-    # Examples:
-    #   redirect_to post_url(@post), :status=>:found
-    #   redirect_to :action=>'atom', :status=>:moved_permanently
-    #   redirect_to post_url(@post), :status=>301
-    #   redirect_to :action=>'atom', :status=>302
-    #
-    # When using <tt>redirect_to :back</tt>, if there is no referrer,
-    # RedirectBackError will be raised. You may specify some fallback
-    # behavior for this case by rescuing RedirectBackError.
-    def redirect_to(options = {}, response_status = {}) #:doc:
-      raise ActionControllerError.new("Cannot redirect to nil!") if options.nil?
-
-      status = if options.is_a?(Hash) && options.key?(:status)
-        interpret_status(options.delete(:status))
-      elsif response_status.key?(:status)
-        interpret_status(response_status[:status])
-      else
-        302
-      end
-
-      url = case options
-      # The scheme name consist of a letter followed by any combination of
-      # letters, digits, and the plus ("+"), period ("."), or hyphen ("-")
-      # characters; and is terminated by a colon (":").
-      when %r{^\w[\w\d+.-]*:.*}
-        options
-      when String
-        request.protocol + request.host_with_port + options
-      when :back
-        raise RedirectBackError unless refer = request.headers["Referer"]
-        refer
-      else
-        url_for(options)
-      end
-
-      super(url, status)
-    end
   end
 end
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index 3caf759032..d784138ebe 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -30,12 +30,15 @@ module ActionController #:nodoc:
   #   config.action_controller.cache_store = MyOwnStore.new("parameter")
   module Caching
     extend ActiveSupport::Concern
+    extend ActiveSupport::Autoload
 
-    autoload :Actions, 'action_controller/caching/actions'
-    autoload :Fragments, 'action_controller/caching/fragments'
-    autoload :Pages, 'action_controller/caching/pages'
-    autoload :Sweeper, 'action_controller/caching/sweeping'
-    autoload :Sweeping, 'action_controller/caching/sweeping'
+    eager_autoload do
+      autoload :Actions
+      autoload :Fragments
+      autoload :Pages
+      autoload :Sweeper, 'action_controller/caching/sweeping'
+      autoload :Sweeping, 'action_controller/caching/sweeping'
+    end
 
     included do
       @@cache_store = nil
diff --git a/actionpack/lib/action_controller/dispatch/dispatcher.rb b/actionpack/lib/action_controller/dispatch/dispatcher.rb
index e04da42637..cf02757cf6 100644
--- a/actionpack/lib/action_controller/dispatch/dispatcher.rb
+++ b/actionpack/lib/action_controller/dispatch/dispatcher.rb
@@ -13,11 +13,6 @@ module ActionController
           # Run prepare callbacks before every request in development mode
           self.prepare_each_request = true
 
-          # Development mode callbacks
-          ActionDispatch::Callbacks.before_dispatch do |app|
-            ActionController::Routing::Routes.reload
-          end
-
           ActionDispatch::Callbacks.after_dispatch do
             # Cleanup the application before processing the current request.
             ActiveRecord::Base.reset_subclasses if defined?(ActiveRecord)
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index 60b3f9a89b..b436de9878 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -45,7 +45,7 @@ module ActionController
 
     # The details below can be overridden to support a specific
     # Request and Response object. The default ActionController::Base
-    # implementation includes RackConvenience, which makes a request
+    # implementation includes RackDelegation, which makes a request
     # and response object available. You might wish to control the
     # environment and response manually for performance reasons.
 
@@ -57,7 +57,7 @@ module ActionController
     end
 
     # Basic implementations for content_type=, location=, and headers are
-    # provided to reduce the dependency on the RackConvenience module
+    # provided to reduce the dependency on the RackDelegation module
     # in Renderer and Redirector.
 
     def content_type=(type)
@@ -68,6 +68,10 @@ module ActionController
       headers["Location"] = url
     end
 
+    def status=(status)
+      @_status = Rack::Utils.status_code(status)
+    end
+
     # :api: private
     def dispatch(name, env)
       @_env = env
@@ -92,6 +96,7 @@ module ActionController
 
       def initialize(controller, action)
         @controller, @action = controller, action
+        @_formats = [Mime::HTML]
       end
 
       def call(env)
diff --git a/actionpack/lib/action_controller/metal/benchmarking.rb b/actionpack/lib/action_controller/metal/benchmarking.rb
index e58df69172..f73f635b0d 100644
--- a/actionpack/lib/action_controller/metal/benchmarking.rb
+++ b/actionpack/lib/action_controller/metal/benchmarking.rb
@@ -53,7 +53,6 @@ module ActionController #:nodoc:
           log_message << " [#{complete_request_uri rescue "unknown"}]"
 
           logger.info(log_message)
-          response.headers["X-Runtime"] = "%.0f" % ms
         else
           super
         end
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index c251d79f4e..a90f798cd5 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -1,5 +1,5 @@
 module ActionController
-  module Rails2Compatibility
+  module Compatibility
     extend ActiveSupport::Concern
 
     class ::ActionController::ActionControllerError < StandardError #:nodoc:
@@ -46,11 +46,8 @@ module ActionController
       cattr_accessor :use_accept_header
       self.use_accept_header = true
 
-      cattr_accessor :page_cache_directory
       self.page_cache_directory = defined?(Rails.public_path) ? Rails.public_path : ""
 
-      cattr_reader :cache_store
-
       cattr_accessor :consider_all_requests_local
       self.consider_all_requests_local = true
 
@@ -116,7 +113,7 @@ module ActionController
       details[:prefix] = nil if name =~ /\blayouts/
       super
     end
-    
+
     # Move this into a "don't run in production" module
     def _default_layout(details, require_layout = false)
       super
diff --git a/actionpack/lib/action_controller/metal/conditional_get.rb b/actionpack/lib/action_controller/metal/conditional_get.rb
index 5156fbc1d5..61e7ece90d 100644
--- a/actionpack/lib/action_controller/metal/conditional_get.rb
+++ b/actionpack/lib/action_controller/metal/conditional_get.rb
@@ -2,7 +2,7 @@ module ActionController
   module ConditionalGet
     extend ActiveSupport::Concern
 
-    include RackConvenience
+    include RackDelegation
     include Head
 
     # Sets the etag, last_modified, or both on the response and renders a
diff --git a/actionpack/lib/action_controller/metal/cookies.rb b/actionpack/lib/action_controller/metal/cookies.rb
index 6855ca1478..8d5f0d7199 100644
--- a/actionpack/lib/action_controller/metal/cookies.rb
+++ b/actionpack/lib/action_controller/metal/cookies.rb
@@ -46,60 +46,152 @@ module ActionController #:nodoc:
   module Cookies
     extend ActiveSupport::Concern
 
-    include RackConvenience
+    include RackDelegation
 
     included do
       helper_method :cookies
+      cattr_accessor :cookie_verifier_secret
     end
 
-  protected
-    # Returns the cookie container, which operates as described above.
-    def cookies
-      @cookies ||= CookieJar.build(request, response)
+    protected
+      # Returns the cookie container, which operates as described above.
+      def cookies
+        @cookies ||= CookieJar.build(request, response)
+      end
     end
-  end
 
-  class CookieJar < Hash #:nodoc:
-    def self.build(request, response)
-      new.tap do |hash|
-        hash.update(request.cookies)
-        hash.response = response
+    class CookieJar < Hash #:nodoc:
+      def self.build(request, response)
+        new.tap do |hash|
+          hash.update(request.cookies)
+          hash.response = response
+        end
       end
-    end
 
-    attr_accessor :response
+      attr_accessor :response
 
-    # Returns the value of the cookie by +name+, or +nil+ if no such cookie exists.
-    def [](name)
-      super(name.to_s)
-    end
+      # Returns the value of the cookie by +name+, or +nil+ if no such cookie exists.
+      def [](name)
+        super(name.to_s)
+      end
+
+      # Sets the cookie named +name+. The second argument may be the very cookie
+      # value, or a hash of options as documented above.
+      def []=(key, options)
+        if options.is_a?(Hash)
+          options.symbolize_keys!
+          value = options[:value]
+        else
+          value = options
+          options = { :value => value }
+        end
 
-    # Sets the cookie named +name+. The second argument may be the very cookie
-    # value, or a hash of options as documented above.
-    def []=(key, options)
-      if options.is_a?(Hash)
+        super(key.to_s, value)
+      
+        options[:path] ||= "/"
+        response.set_cookie(key, options)
+      end
+
+      # Removes the cookie on the client machine by setting the value to an empty string
+      # and setting its expiration date into the past. Like <tt>[]=</tt>, you can pass in
+      # an options hash to delete cookies with extra data such as a <tt>:path</tt>.
+      def delete(key, options = {})
         options.symbolize_keys!
-        value = options[:value]
-      else
-        value = options
-        options = { :value => value }
+        options[:path] ||= "/"
+        value = super(key.to_s)
+        response.delete_cookie(key, options)
+        value
       end
 
-      super(key.to_s, value)
-      
-      options[:path] ||= "/"
-      response.set_cookie(key, options)
+      # Returns a jar that'll automatically set the assigned cookies to have an expiration date 20 years from now. Example:
+      #
+      #   cookies.permanent[:prefers_open_id] = true
+      #   # => Set-Cookie: prefers_open_id=true; path=/; expires=Sun, 16-Dec-2029 03:24:16 GMT
+      #
+      # This jar is only meant for writing. You'll read permanent cookies through the regular accessor.
+      #
+      # This jar allows chaining with the signed jar as well, so you can set permanent, signed cookies. Examples:
+      #
+      #   cookies.permanent.signed[:remember_me] = current_user.id
+      #   # => Set-Cookie: discount=BAhU--848956038e692d7046deab32b7131856ab20e14e; path=/; expires=Sun, 16-Dec-2029 03:24:16 GMT
+      def permanent
+        @permanent ||= PermanentCookieJar.new(self)
+      end
+    
+      # Returns a jar that'll automatically generate a signed representation of cookie value and verify it when reading from
+      # the cookie again. This is useful for creating cookies with values that the user is not supposed to change. If a signed
+      # cookie was tampered with by the user (or a 3rd party), an ActiveSupport::MessageVerifier::InvalidSignature exception will
+      # be raised.
+      #
+      # This jar requires that you set a suitable secret for the verification on ActionController::Base.cookie_verifier_secret.
+      #
+      # Example:
+      #
+      #   cookies.signed[:discount] = 45
+      #   # => Set-Cookie: discount=BAhpMg==--2c1c6906c90a3bc4fd54a51ffb41dffa4bf6b5f7; path=/
+      #
+      #   cookies.signed[:discount] # => 45
+      def signed
+        @signed ||= SignedCookieJar.new(self)
+      end
     end
-
-    # Removes the cookie on the client machine by setting the value to an empty string
-    # and setting its expiration date into the past. Like <tt>[]=</tt>, you can pass in
-    # an options hash to delete cookies with extra data such as a <tt>:path</tt>.
-    def delete(key, options = {})
-      options.symbolize_keys!
-      options[:path] ||= "/"
-      value = super(key.to_s)
-      response.delete_cookie(key, options)
-      value
+    
+    class PermanentCookieJar < CookieJar #:nodoc:
+      def initialize(parent_jar)
+        @parent_jar = parent_jar
+      end
+    
+      def []=(key, options)
+        if options.is_a?(Hash)
+          options.symbolize_keys!
+        else
+          options = { :value => options }
+        end
+        
+        options[:expires] = 20.years.from_now
+        @parent_jar[key] = options
+      end
+    
+      def signed
+        @signed ||= SignedCookieJar.new(self)
+      end
+    
+      def controller
+        @parent_jar.controller
+      end
+    
+      def method_missing(method, *arguments, &block)
+        @parent_jar.send(method, *arguments, &block)
+      end
     end
+    
+    class SignedCookieJar < CookieJar #:nodoc:
+      def initialize(parent_jar)
+        unless ActionController::Base.cookie_verifier_secret
+          raise "You must set ActionController::Base.cookie_verifier_secret to use signed cookies"
+        end
+    
+        @parent_jar = parent_jar
+        @verifier = ActiveSupport::MessageVerifier.new(ActionController::Base.cookie_verifier_secret)
+      end
+      
+      def [](name)
+        @verifier.verify(@parent_jar[name])
+      end
+      
+      def []=(key, options)
+        if options.is_a?(Hash)
+          options.symbolize_keys!
+          options[:value] = @verifier.generate(options[:value])
+        else
+          options = { :value => @verifier.generate(options) }
+        end
+        
+        @parent_jar[key] = options
+      end
+      
+      def method_missing(method, *arguments, &block)
+        @parent_jar.send(method, *arguments, &block)
+      end
   end
 end
diff --git a/actionpack/lib/action_controller/metal/exceptions.rb b/actionpack/lib/action_controller/metal/exceptions.rb
index b9d23da3e0..07024d0a9a 100644
--- a/actionpack/lib/action_controller/metal/exceptions.rb
+++ b/actionpack/lib/action_controller/metal/exceptions.rb
@@ -18,18 +18,9 @@ module ActionController
 
     def initialize(*allowed_methods)
       super("Only #{allowed_methods.to_sentence(:locale => :en)} requests are allowed.")
-      @allowed_methods = allowed_methods
-    end
-
-    def allowed_methods_header
-      allowed_methods.map { |method_symbol| method_symbol.to_s.upcase } * ', '
-    end
-
-    def handle_response!(response)
-      response.headers['Allow'] ||= allowed_methods_header
     end
   end
-  
+
   class NotImplemented < MethodNotAllowed #:nodoc:
   end
 
diff --git a/actionpack/lib/action_controller/metal/flash.rb b/actionpack/lib/action_controller/metal/flash.rb
index f43900faa0..581ff6109e 100644
--- a/actionpack/lib/action_controller/metal/flash.rb
+++ b/actionpack/lib/action_controller/metal/flash.rb
@@ -28,7 +28,9 @@ module ActionController #:nodoc:
   module Flash
     extend ActiveSupport::Concern
 
-    include Session
+    included do
+      helper_method :alert, :notice
+    end
 
     class FlashNow #:nodoc:
       def initialize(flash)
@@ -133,10 +135,44 @@ module ActionController #:nodoc:
         Array(key || keys).each { |k| used ? @used << k : @used.delete(k) }
         return key ? self[key] : self
       end
+  end
+
+  # Access the contents of the flash. Use <tt>flash["notice"]</tt> to
+  # read a notice you put there or <tt>flash["notice"] = "hello"</tt>
+  # to put a new one.
+  def flash #:doc:
+    unless @_flash
+      @_flash = session["flash"] || FlashHash.new
+      @_flash.sweep
     end
 
+    @_flash
+  end
+
+  # Convenience accessor for flash[:alert]
+  def alert
+    flash[:alert]
+  end
+
+  # Convenience accessor for flash[:alert]=
+  def alert=(message)
+    flash[:alert] = message
+  end
+
+  # Convenience accessor for flash[:notice]
+  def notice
+    flash[:notice]
+  end
+
+  # Convenience accessor for flash[:notice]=
+  def notice=(message)
+    flash[:notice] = message
+  end
+
+
   protected
     def process_action(method_name)
+      @_flash = nil
       super
       @_flash.store(session) if @_flash
       @_flash = nil
@@ -147,16 +183,20 @@ module ActionController #:nodoc:
       @_flash = nil
     end
 
-    # Access the contents of the flash. Use <tt>flash["notice"]</tt> to
-    # read a notice you put there or <tt>flash["notice"] = "hello"</tt>
-    # to put a new one.
-    def flash #:doc:
-      unless @_flash
-        @_flash = session["flash"] || FlashHash.new
-        @_flash.sweep
+    def redirect_to(options = {}, response_status_and_flash = {}) #:doc:
+      if alert = response_status_and_flash.delete(:alert)
+        flash[:alert] = alert
+      end
+
+      if notice = response_status_and_flash.delete(:notice)
+        flash[:notice] = notice
+      end
+
+      if other_flashes = response_status_and_flash.delete(:flash)
+        flash.update(other_flashes)
       end
 
-      @_flash
+      super(options, response_status_and_flash)
     end
   end
 end
diff --git a/actionpack/lib/action_controller/metal/head.rb b/actionpack/lib/action_controller/metal/head.rb
index 68fa0a0402..c82d9cf369 100644
--- a/actionpack/lib/action_controller/metal/head.rb
+++ b/actionpack/lib/action_controller/metal/head.rb
@@ -1,5 +1,7 @@
 module ActionController
   module Head
+    include UrlFor
+
     # Return a response that has no content (merely headers). The options
     # argument is interpreted to be a hash of header names and values.
     # This allows you to easily return a response that consists only of
@@ -21,7 +23,10 @@ module ActionController
         headers[key.to_s.dasherize.split(/-/).map { |v| v.capitalize }.join("-")] = value.to_s
       end
 
-      render :nothing => true, :status => status, :location => location
+      self.status = status
+      self.location = url_for(location) if location
+      self.content_type = Mime[formats.first]
+      self.response_body = " "
     end
   end
 end
\ No newline at end of file
diff --git a/actionpack/lib/action_controller/metal/helpers.rb b/actionpack/lib/action_controller/metal/helpers.rb
index b4325e24ad..d0402e5bad 100644
--- a/actionpack/lib/action_controller/metal/helpers.rb
+++ b/actionpack/lib/action_controller/metal/helpers.rb
@@ -52,7 +52,7 @@ module ActionController
     included do
       # Set the default directory for helpers
       extlib_inheritable_accessor(:helpers_dir) do
-        defined?(Rails) ? "#{Rails.root}/app/helpers" : "app/helpers"
+        defined?(Rails.root) ? "#{Rails.root}/app/helpers" : "app/helpers"
       end
     end
 
diff --git a/actionpack/lib/action_controller/metal/layouts.rb b/actionpack/lib/action_controller/metal/layouts.rb
index cc7088248a..f44498a884 100644
--- a/actionpack/lib/action_controller/metal/layouts.rb
+++ b/actionpack/lib/action_controller/metal/layouts.rb
@@ -158,7 +158,7 @@ module ActionController
   module Layouts
     extend ActiveSupport::Concern
 
-    include ActionController::RenderingController
+    include ActionController::Rendering
     include AbstractController::Layouts
 
     module ClassMethods
diff --git a/actionpack/lib/action_controller/metal/logger.rb b/actionpack/lib/action_controller/metal/logger.rb
new file mode 100644
index 0000000000..956d7dd371
--- /dev/null
+++ b/actionpack/lib/action_controller/metal/logger.rb
@@ -0,0 +1,34 @@
+require 'abstract_controller/logger'
+
+module ActionController
+  module Logger
+    # Override process_action in the AbstractController::Base
+    # to log details about the method.
+    def process_action(action)
+      result = ActiveSupport::Notifications.instrument(:process_action,
+                :controller => self, :action => action) do
+        super
+      end
+
+      if logger
+        log = AbstractController::Logger::DelayedLog.new do
+          "\n\nProcessing #{self.class.name}\##{action_name} " \
+          "to #{request.formats} (for #{request_origin}) " \
+          "[#{request.method.to_s.upcase}]"
+        end
+
+        logger.info(log)
+      end
+
+      result
+    end
+
+  private
+
+    # Returns the request origin with the IP and time. This needs to be cached,
+    # otherwise we would get different results for each time it calls.
+    def request_origin
+      @request_origin ||= "#{request.remote_ip} at #{Time.now.to_s(:db)}"
+    end
+  end
+end
diff --git a/actionpack/lib/action_controller/metal/rack_convenience.rb b/actionpack/lib/action_controller/metal/rack_delegation.rb
index 131d20114d..bb55383631 100644
--- a/actionpack/lib/action_controller/metal/rack_convenience.rb
+++ b/actionpack/lib/action_controller/metal/rack_delegation.rb
@@ -1,8 +1,12 @@
+require 'action_dispatch/http/request'
+require 'action_dispatch/http/response'
+
 module ActionController
-  module RackConvenience
+  module RackDelegation
     extend ActiveSupport::Concern
 
     included do
+      delegate :session, :to => "@_request"
       delegate :headers, :status=, :location=, :content_type=,
                :status, :location, :content_type, :to => "@_response"
       attr_internal :request
@@ -23,5 +27,9 @@ module ActionController
       response.body = body if response
       super
     end
+
+    def reset_session
+      @_request.reset_session
+    end
   end
 end
diff --git a/actionpack/lib/action_controller/metal/redirecting.rb b/actionpack/lib/action_controller/metal/redirecting.rb
new file mode 100644
index 0000000000..7a2f9a6fc5
--- /dev/null
+++ b/actionpack/lib/action_controller/metal/redirecting.rb
@@ -0,0 +1,90 @@
+module ActionController
+  class RedirectBackError < AbstractController::Error #:nodoc:
+    DEFAULT_MESSAGE = 'No HTTP_REFERER was set in the request to this action, so redirect_to :back could not be called successfully. If this is a test, make sure to specify request.env["HTTP_REFERER"].'
+
+    def initialize(message = nil)
+      super(message || DEFAULT_MESSAGE)
+    end
+  end
+
+  module Redirecting
+    extend ActiveSupport::Concern
+    include AbstractController::Logger
+
+    # Redirects the browser to the target specified in +options+. This parameter can take one of three forms:
+    #
+    # * <tt>Hash</tt> - The URL will be generated by calling url_for with the +options+.
+    # * <tt>Record</tt> - The URL will be generated by calling url_for with the +options+, which will reference a named URL for that record.
+    # * <tt>String</tt> starting with <tt>protocol://</tt> (like <tt>http://</tt>) - Is passed straight through as the target for redirection.
+    # * <tt>String</tt> not containing a protocol - The current protocol and host is prepended to the string.
+    # * <tt>:back</tt> - Back to the page that issued the request. Useful for forms that are triggered from multiple places.
+    #   Short-hand for <tt>redirect_to(request.env["HTTP_REFERER"])</tt>
+    #
+    # Examples:
+    #   redirect_to :action => "show", :id => 5
+    #   redirect_to post
+    #   redirect_to "http://www.rubyonrails.org"
+    #   redirect_to "/images/screenshot.jpg"
+    #   redirect_to articles_url
+    #   redirect_to :back
+    #
+    # The redirection happens as a "302 Moved" header unless otherwise specified.
+    #
+    # Examples:
+    #   redirect_to post_url(@post), :status => :found
+    #   redirect_to :action=>'atom', :status => :moved_permanently
+    #   redirect_to post_url(@post), :status => 301
+    #   redirect_to :action=>'atom', :status => 302
+    #
+    # It is also possible to assign a flash message as part of the redirection. There are two special accessors for commonly used the flash names
+    # +alert+ and +notice+ as well as a general purpose +flash+ bucket.
+    #
+    # Examples:
+    #   redirect_to post_url(@post), :alert => "Watch it, mister!"
+    #   redirect_to post_url(@post), :status=> :found, :notice => "Pay attention to the road"
+    #   redirect_to post_url(@post), :status => 301, :flash => { :updated_post_id => @post.id }
+    #   redirect_to { :action=>'atom' }, :alert => "Something serious happened"
+    #
+    # When using <tt>redirect_to :back</tt>, if there is no referrer,
+    # RedirectBackError will be raised. You may specify some fallback
+    # behavior for this case by rescuing RedirectBackError.
+    def redirect_to(options = {}, response_status = {}) #:doc:
+      raise ActionControllerError.new("Cannot redirect to nil!") if options.nil?
+      raise AbstractController::DoubleRenderError if response_body
+
+      self.status        = _extract_redirect_to_status(options, response_status)
+      self.location      = _compute_redirect_to_location(options)
+      self.response_body = "<html><body>You are being <a href=\"#{ERB::Util.h(location)}\">redirected</a>.</body></html>"
+
+      logger.info("Redirected to #{location}") if logger && logger.info?
+    end
+
+    private
+      def _extract_redirect_to_status(options, response_status)
+        status = if options.is_a?(Hash) && options.key?(:status)
+          Rack::Utils.status_code(options.delete(:status))
+        elsif response_status.key?(:status)
+          Rack::Utils.status_code(response_status[:status])
+        else
+          302
+        end
+      end
+
+      def _compute_redirect_to_location(options)
+        case options
+        # The scheme name consist of a letter followed by any combination of
+        # letters, digits, and the plus ("+"), period ("."), or hyphen ("-")
+        # characters; and is terminated by a colon (":").
+        when %r{^\w[\w\d+.-]*:.*}
+          options
+        when String
+          request.protocol + request.host_with_port + options
+        when :back
+          raise RedirectBackError unless refer = request.headers["Referer"]
+          refer
+        else
+          url_for(options)
+        end.gsub(/[\r\n]/, '')
+      end
+  end
+end
diff --git a/actionpack/lib/action_controller/metal/redirector.rb b/actionpack/lib/action_controller/metal/redirector.rb
deleted file mode 100644
index b55f5e7bfc..0000000000
--- a/actionpack/lib/action_controller/metal/redirector.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-module ActionController
-  class RedirectBackError < AbstractController::Error #:nodoc:
-    DEFAULT_MESSAGE = 'No HTTP_REFERER was set in the request to this action, so redirect_to :back could not be called successfully. If this is a test, make sure to specify request.env["HTTP_REFERER"].'
-
-    def initialize(message = nil)
-      super(message || DEFAULT_MESSAGE)
-    end
-  end
-
-  module Redirector
-    extend ActiveSupport::Concern
-    include AbstractController::Logger
-
-    def redirect_to(url, status) #:doc:
-      raise AbstractController::DoubleRenderError if response_body
-      logger.info("Redirected to #{url}") if logger && logger.info?
-      self.status = status
-      self.location = url.gsub(/[\r\n]/, '')
-      self.response_body = "<html><body>You are being <a href=\"#{ERB::Util.h(url)}\">redirected</a>.</body></html>"
-    end
-  end
-end
diff --git a/actionpack/lib/action_controller/metal/render_options.rb b/actionpack/lib/action_controller/metal/render_options.rb
deleted file mode 100644
index 0d69ca10df..0000000000
--- a/actionpack/lib/action_controller/metal/render_options.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-module ActionController
-  module RenderOptions
-    extend ActiveSupport::Concern
-
-    included do
-      extlib_inheritable_accessor :_renderers
-      self._renderers = []
-    end
-
-    module ClassMethods
-      def _write_render_options
-        renderers = _renderers.map do |r|
-          <<-RUBY_EVAL
-            if options.key?(:#{r})
-              _process_options(options)
-              return render_#{r}(options[:#{r}], options)
-            end
-          RUBY_EVAL
-        end
-
-        class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-          def _handle_render_options(options)
-            #{renderers.join}
-          end
-        RUBY_EVAL
-      end
-
-      def _add_render_option(name)
-        _renderers << name
-        _write_render_options
-      end
-    end
-
-    def render_to_body(options)
-      _handle_render_options(options) || super
-    end
-  end
-
-  module RenderOption #:nodoc:
-    def self.extended(base)
-      base.extend ActiveSupport::Concern
-      base.send :include, ::ActionController::RenderOptions
-
-      def base.register_renderer(name)
-        included { _add_render_option(name) }
-      end
-    end
-  end
-
-  module RenderOptions
-    module Json
-      extend RenderOption
-      register_renderer :json
-
-      def render_json(json, options)
-        json = ActiveSupport::JSON.encode(json) unless json.respond_to?(:to_str)
-        json = "#{options[:callback]}(#{json})" unless options[:callback].blank?
-        self.content_type ||= Mime::JSON
-        self.response_body = json
-      end
-    end
-
-    module Js
-      extend RenderOption
-      register_renderer :js
-
-      def render_js(js, options)
-        self.content_type ||= Mime::JS
-        self.response_body  = js.respond_to?(:to_js) ? js.to_js : js
-      end
-    end
-
-    module Xml
-      extend RenderOption
-      register_renderer :xml
-
-      def render_xml(xml, options)
-        self.content_type ||= Mime::XML
-        self.response_body  = xml.respond_to?(:to_xml) ? xml.to_xml : xml
-      end
-    end
-
-    module RJS
-      extend RenderOption
-      register_renderer :update
-
-      def render_update(proc, options)
-        generator = ActionView::Helpers::PrototypeHelper::JavaScriptGenerator.new(view_context, &proc)
-        self.content_type = Mime::JS
-        self.response_body = generator.to_s
-      end
-    end
-
-    module All
-      extend ActiveSupport::Concern
-
-      include ActionController::RenderOptions::Json
-      include ActionController::RenderOptions::Js
-      include ActionController::RenderOptions::Xml
-      include ActionController::RenderOptions::RJS
-    end
-  end
-end
diff --git a/actionpack/lib/action_controller/metal/renderers.rb b/actionpack/lib/action_controller/metal/renderers.rb
new file mode 100644
index 0000000000..c1ba47927a
--- /dev/null
+++ b/actionpack/lib/action_controller/metal/renderers.rb
@@ -0,0 +1,91 @@
+module ActionController
+  def self.add_renderer(key, &block)
+    Renderers.add(key, &block)
+  end
+
+  module Renderers
+    extend ActiveSupport::Concern
+
+    included do
+      extlib_inheritable_accessor :_renderers
+      self._renderers = {}
+    end
+
+    module ClassMethods
+      def _write_render_options
+        renderers = _renderers.map do |name, value|
+          <<-RUBY_EVAL
+            if options.key?(:#{name})
+              _process_options(options)
+              return _render_option_#{name}(options[:#{name}], options)
+            end
+          RUBY_EVAL
+        end
+
+        class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
+          def _handle_render_options(options)
+            #{renderers.join}
+          end
+        RUBY_EVAL
+      end
+
+      def use_renderers(*args)
+        args.each do |key|
+          _renderers[key] = RENDERERS[key]
+        end
+        _write_render_options
+      end
+      alias use_renderer use_renderers
+    end
+
+    def render_to_body(options)
+      _handle_render_options(options) || super
+    end
+
+    RENDERERS = {}
+    def self.add(key, &block)
+      define_method("_render_option_#{key}", &block)
+      RENDERERS[key] = block
+      All._write_render_options
+    end
+
+    module All
+      extend ActiveSupport::Concern
+      include Renderers
+
+      INCLUDED = []
+      included do
+        self._renderers = RENDERERS
+        _write_render_options
+        INCLUDED << self
+      end
+
+      def self._write_render_options
+        INCLUDED.each(&:_write_render_options)
+      end
+    end
+
+    add :json do |json, options|
+      json = ActiveSupport::JSON.encode(json) unless json.respond_to?(:to_str)
+      json = "#{options[:callback]}(#{json})" unless options[:callback].blank?
+      self.content_type ||= Mime::JSON
+      self.response_body  = json
+    end
+
+    add :js do |js, options|
+      self.content_type ||= Mime::JS
+      self.response_body  = js.respond_to?(:to_js) ? js.to_js : js
+    end
+
+    add :xml do |xml, options|
+      self.content_type ||= Mime::XML
+      self.response_body  = xml.respond_to?(:to_xml) ? xml.to_xml : xml
+    end
+
+    add :update do |proc, options|
+      generator = ActionView::Helpers::PrototypeHelper::JavaScriptGenerator.new(view_context, &proc)
+      self.content_type = Mime::JS
+      self.response_body = generator.to_s
+    end
+  end
+end
diff --git a/actionpack/lib/action_controller/metal/rendering_controller.rb b/actionpack/lib/action_controller/metal/rendering.rb
index 237299cd30..20eb524e50 100644
--- a/actionpack/lib/action_controller/metal/rendering_controller.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -1,9 +1,9 @@
 module ActionController
-  module RenderingController
+  module Rendering
     extend ActiveSupport::Concern
 
     included do
-      include AbstractController::RenderingController
+      include AbstractController::Rendering
       include AbstractController::LocalizedCache
     end
 
diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
index 173df79ee7..2826b1e34c 100644
--- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb
+++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
@@ -5,7 +5,7 @@ module ActionController #:nodoc:
   module RequestForgeryProtection
     extend ActiveSupport::Concern
 
-    include AbstractController::Helpers, Session
+    include AbstractController::Helpers
 
     included do
       # Sets the token parameter name for RequestForgery. Calling +protect_from_forgery+
@@ -19,31 +19,31 @@ module ActionController #:nodoc:
       helper_method :form_authenticity_token
       helper_method :protect_against_forgery?
     end
-    
-    # Protecting controller actions from CSRF attacks by ensuring that all forms are coming from the current 
-    # web application, not a forged link from another site, is done by embedding a token based on a random 
+
+    # Protecting controller actions from CSRF attacks by ensuring that all forms are coming from the current
+    # web application, not a forged link from another site, is done by embedding a token based on a random
     # string stored in the session (which an attacker wouldn't know) in all forms and Ajax requests generated
-    # by Rails and then verifying the authenticity of that token in the controller.  Only HTML/JavaScript 
-    # requests are checked, so this will not protect your XML API (presumably you'll have a different 
-    # authentication scheme there anyway).  Also, GET requests are not protected as these should be 
+    # by Rails and then verifying the authenticity of that token in the controller.  Only HTML/JavaScript
+    # requests are checked, so this will not protect your XML API (presumably you'll have a different
+    # authentication scheme there anyway).  Also, GET requests are not protected as these should be
     # idempotent anyway.
     #
     # This is turned on with the <tt>protect_from_forgery</tt> method, which will check the token and raise an
-    # ActionController::InvalidAuthenticityToken if it doesn't match what was expected. You can customize the 
+    # ActionController::InvalidAuthenticityToken if it doesn't match what was expected. You can customize the
     # error message in production by editing public/422.html.  A call to this method in ApplicationController is
     # generated by default in post-Rails 2.0 applications.
     #
-    # The token parameter is named <tt>authenticity_token</tt> by default. If you are generating an HTML form 
-    # manually (without the use of Rails' <tt>form_for</tt>, <tt>form_tag</tt> or other helpers), you have to 
-    # include a hidden field named like that and set its value to what is returned by 
+    # The token parameter is named <tt>authenticity_token</tt> by default. If you are generating an HTML form
+    # manually (without the use of Rails' <tt>form_for</tt>, <tt>form_tag</tt> or other helpers), you have to
+    # include a hidden field named like that and set its value to what is returned by
     # <tt>form_authenticity_token</tt>.
     #
-    # Request forgery protection is disabled by default in test environment. If you are upgrading from Rails 
+    # Request forgery protection is disabled by default in test environment. If you are upgrading from Rails
     # 1.x, add this to config/environments/test.rb:
     #
     #   # Disable request forgery protection in test environment
     #   config.action_controller.allow_forgery_protection = false
-    # 
+    #
     # == Learn more about CSRF (Cross-Site Request Forgery) attacks
     #
     # Here are some resources:
@@ -52,11 +52,11 @@ module ActionController #:nodoc:
     #
     # Keep in mind, this is NOT a silver-bullet, plug 'n' play, warm security blanket for your rails application.
     # There are a few guidelines you should follow:
-    # 
+    #
     # * Keep your GET requests safe and idempotent.  More reading material:
     #   * http://www.xml.com/pub/a/2002/04/24/deviant.html
     #   * http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.1.1
-    #   * Make sure the session cookies that Rails creates are non-persistent.  Check in Firefox and look 
+    #   * Make sure the session cookies that Rails creates are non-persistent.  Check in Firefox and look
     #     for "Expires: at end of session"
     #
     module ClassMethods
@@ -92,7 +92,7 @@ module ActionController #:nodoc:
       # * is it a GET request?  Gets should be safe and idempotent
       # * Does the form_authenticity_token match the given token value from the params?
       def verified_request?
-        !protect_against_forgery? || request.forgery_whitelisted? || 
+        !protect_against_forgery? || request.forgery_whitelisted? ||
           form_authenticity_token == params[request_forgery_protection_token]
       end
 
diff --git a/actionpack/lib/action_controller/metal/rescuable.rb b/actionpack/lib/action_controller/metal/rescue.rb
index bbca1b2179..bbca1b2179 100644
--- a/actionpack/lib/action_controller/metal/rescuable.rb
+++ b/actionpack/lib/action_controller/metal/rescue.rb
diff --git a/actionpack/lib/action_controller/metal/responder.rb b/actionpack/lib/action_controller/metal/responder.rb
index e8e88e7479..cb0e600871 100644
--- a/actionpack/lib/action_controller/metal/responder.rb
+++ b/actionpack/lib/action_controller/metal/responder.rb
@@ -80,6 +80,11 @@ module ActionController #:nodoc:
   class Responder
     attr_reader :controller, :request, :format, :resource, :resources, :options
 
+    ACTIONS_FOR_VERBS = {
+      :post => :new,
+      :put => :edit
+    }
+
     def initialize(controller, resources, options={})
       @controller = controller
       @request = controller.request
@@ -102,9 +107,14 @@ module ActionController #:nodoc:
     # not defined, call to_format.
     #
     def self.call(*args)
-      responder = new(*args)
-      method = :"to_#{responder.format}"
-      responder.respond_to?(method) ? responder.send(method) : responder.to_format
+      new(*args).respond
+    end
+
+    # Main entry point for responder responsible to dispatch to the proper format.
+    #
+    def respond
+      method = :"to_#{format}"
+      respond_to?(method) ? send(method) : to_format
     end
 
     # HTML format does not render the resource, it always attempt to render a
@@ -133,7 +143,7 @@ module ActionController #:nodoc:
     def navigation_behavior(error)
       if get?
         raise error
-      elsif has_errors?
+      elsif has_errors? && default_action
         render :action => default_action
       else
         redirect_to resource_location
@@ -204,7 +214,7 @@ module ActionController #:nodoc:
     # the verb is post.
     #
     def default_action
-      @action || (request.post? ? :new : :edit)
+      @action ||= ACTIONS_FOR_VERBS[request.method]
     end
   end
 end
diff --git a/actionpack/lib/action_controller/metal/session.rb b/actionpack/lib/action_controller/metal/session.rb
deleted file mode 100644
index bcedd6e1c7..0000000000
--- a/actionpack/lib/action_controller/metal/session.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module ActionController
-  module Session
-    extend ActiveSupport::Concern
-
-    include RackConvenience
-
-    def session
-      @_request.session
-    end
-
-    def reset_session
-      @_request.reset_session
-    end
-  end
-end
diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb
index 43c661bef4..288b5d7c99 100644
--- a/actionpack/lib/action_controller/metal/streaming.rb
+++ b/actionpack/lib/action_controller/metal/streaming.rb
@@ -4,7 +4,7 @@ module ActionController #:nodoc:
   module Streaming
     extend ActiveSupport::Concern
 
-    include ActionController::RenderingController
+    include ActionController::Rendering
 
     DEFAULT_SEND_FILE_OPTIONS = {
       :type         => 'application/octet-stream'.freeze,
diff --git a/actionpack/lib/action_controller/metal/testing.rb b/actionpack/lib/action_controller/metal/testing.rb
index a4a1116d9e..c193a5eff4 100644
--- a/actionpack/lib/action_controller/metal/testing.rb
+++ b/actionpack/lib/action_controller/metal/testing.rb
@@ -2,7 +2,7 @@ module ActionController
   module Testing
     extend ActiveSupport::Concern
 
-    include RackConvenience
+    include RackDelegation
 
     # OMG MEGA HAX
     def process_with_new_base_test(request, response)
diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb
index 14c6523045..8c3810ebcb 100644
--- a/actionpack/lib/action_controller/metal/url_for.rb
+++ b/actionpack/lib/action_controller/metal/url_for.rb
@@ -2,7 +2,7 @@ module ActionController
   module UrlFor
     extend ActiveSupport::Concern
 
-    include RackConvenience
+    include RackDelegation
 
     # Overwrite to implement a number of default options that all url_for-based methods will use. The default options should come in
     # the form of a hash, just like the one you would use for url_for directly. Example:
diff --git a/actionpack/lib/action_controller/metal/verification.rb b/actionpack/lib/action_controller/metal/verification.rb
index 500cced539..bce942b588 100644
--- a/actionpack/lib/action_controller/metal/verification.rb
+++ b/actionpack/lib/action_controller/metal/verification.rb
@@ -2,7 +2,7 @@ module ActionController #:nodoc:
   module Verification #:nodoc:
     extend ActiveSupport::Concern
 
-    include AbstractController::Callbacks, Session, Flash, RenderingController
+    include AbstractController::Callbacks, Flash, Rendering
 
     # This module provides a class-level method for specifying that certain
     # actions are guarded against being called without certain prerequisites
@@ -35,7 +35,7 @@ module ActionController #:nodoc:
     #            :add_flash => { "alert" => "Failed to create your message" },
     #            :redirect_to => :category_url
     #
-    # Note that these prerequisites are not business rules. They do not examine 
+    # Note that these prerequisites are not business rules. They do not examine
     # the content of the session or the parameters. That level of validation should
     # be encapsulated by your domain model or helper methods in the controller.
     module ClassMethods
@@ -43,40 +43,40 @@ module ActionController #:nodoc:
       # the user is redirected to a different action. The +options+ parameter
       # is a hash consisting of the following key/value pairs:
       #
-      # <tt>:params</tt>:: 
-      #   a single key or an array of keys that must be in the <tt>params</tt> 
+      # <tt>:params</tt>::
+      #   a single key or an array of keys that must be in the <tt>params</tt>
       #   hash in order for the action(s) to be safely called.
-      # <tt>:session</tt>:: 
-      #   a single key or an array of keys that must be in the <tt>session</tt> 
+      # <tt>:session</tt>::
+      #   a single key or an array of keys that must be in the <tt>session</tt>
       #   in order for the action(s) to be safely called.
-      # <tt>:flash</tt>:: 
-      #   a single key or an array of keys that must be in the flash in order 
+      # <tt>:flash</tt>::
+      #   a single key or an array of keys that must be in the flash in order
       #   for the action(s) to be safely called.
-      # <tt>:method</tt>:: 
-      #   a single key or an array of keys--any one of which must match the 
-      #   current request method in order for the action(s) to be safely called. 
-      #   (The key should be a symbol: <tt>:get</tt> or <tt>:post</tt>, for 
+      # <tt>:method</tt>::
+      #   a single key or an array of keys--any one of which must match the
+      #   current request method in order for the action(s) to be safely called.
+      #   (The key should be a symbol: <tt>:get</tt> or <tt>:post</tt>, for
       #   example.)
-      # <tt>:xhr</tt>:: 
-      #   true/false option to ensure that the request is coming from an Ajax 
-      #   call or not. 
-      # <tt>:add_flash</tt>:: 
-      #   a hash of name/value pairs that should be merged into the session's 
+      # <tt>:xhr</tt>::
+      #   true/false option to ensure that the request is coming from an Ajax
+      #   call or not.
+      # <tt>:add_flash</tt>::
+      #   a hash of name/value pairs that should be merged into the session's
       #   flash if the prerequisites cannot be satisfied.
-      # <tt>:add_headers</tt>:: 
-      #   a hash of name/value pairs that should be merged into the response's 
+      # <tt>:add_headers</tt>::
+      #   a hash of name/value pairs that should be merged into the response's
       #   headers hash if the prerequisites cannot be satisfied.
-      # <tt>:redirect_to</tt>:: 
-      #   the redirection parameters to be used when redirecting if the 
-      #   prerequisites cannot be satisfied. You can redirect either to named 
+      # <tt>:redirect_to</tt>::
+      #   the redirection parameters to be used when redirecting if the
+      #   prerequisites cannot be satisfied. You can redirect either to named
       #   route or to the action in some controller.
-      # <tt>:render</tt>:: 
+      # <tt>:render</tt>::
       #   the render parameters to be used when the prerequisites cannot be satisfied.
-      # <tt>:only</tt>:: 
-      #   only apply this verification to the actions specified in the associated 
+      # <tt>:only</tt>::
+      #   only apply this verification to the actions specified in the associated
       #   array (may also be a single value).
-      # <tt>:except</tt>:: 
-      #   do not apply this verification to the actions specified in the associated 
+      # <tt>:except</tt>::
+      #   do not apply this verification to the actions specified in the associated
       #   array (may also be a single value).
       def verify(options={})
         before_filter :only => options[:only], :except => options[:except] do
@@ -94,31 +94,31 @@ module ActionController #:nodoc:
         apply_remaining_actions(options)               unless performed?
       end
     end
-    
+
     def prereqs_invalid?(options) # :nodoc:
-      verify_presence_of_keys_in_hash_flash_or_params(options) || 
-      verify_method(options) || 
+      verify_presence_of_keys_in_hash_flash_or_params(options) ||
+      verify_method(options) ||
       verify_request_xhr_status(options)
     end
- 
+
     def verify_presence_of_keys_in_hash_flash_or_params(options) # :nodoc:
       [*options[:params] ].find { |v| v && params[v.to_sym].nil?  } ||
       [*options[:session]].find { |v| session[v].nil? } ||
       [*options[:flash]  ].find { |v| flash[v].nil?   }
     end
-    
+
     def verify_method(options) # :nodoc:
       [*options[:method]].all? { |v| request.method != v.to_sym } if options[:method]
     end
-    
+
     def verify_request_xhr_status(options) # :nodoc:
       request.xhr? != options[:xhr] unless options[:xhr].nil?
     end
-    
+
     def apply_redirect_to(redirect_to_option) # :nodoc:
       (redirect_to_option.is_a?(Symbol) && redirect_to_option != :back) ? self.__send__(redirect_to_option) : redirect_to_option
     end
-    
+
     def apply_remaining_actions(options) # :nodoc:
       case
         when options[:render]      ; render(options[:render])
diff --git a/actionpack/lib/action_controller/notifications.rb b/actionpack/lib/action_controller/notifications.rb
deleted file mode 100644
index 1a4f29e0e2..0000000000
--- a/actionpack/lib/action_controller/notifications.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'active_support/notifications'
-
-ActiveSupport::Notifications.subscribe(/(read|write|cache|expire|exist)_(fragment|page)\??/) do |*args|
-  event = ActiveSupport::Notifications::Event.new(*args)
-
-  if logger = ActionController::Base.logger
-    human_name = event.name.to_s.humanize
-    logger.info("#{human_name} (%.1fms)" % event.duration)
-  end
-end
diff --git a/actionpack/lib/action_controller/rails.rb b/actionpack/lib/action_controller/rails.rb
new file mode 100644
index 0000000000..36a52b3149
--- /dev/null
+++ b/actionpack/lib/action_controller/rails.rb
@@ -0,0 +1,102 @@
+module ActionController
+  class Plugin < Rails::Plugin
+    plugin_name :action_controller
+
+    initializer "action_controller.set_configs" do |app|
+      app.config.action_controller.each do |k,v|
+        ActionController::Base.send "#{k}=", v
+      end
+    end
+
+    # TODO: ActionController::Base.logger should delegate to its own config.logger
+    initializer "action_controller.logger" do
+      ActionController::Base.logger ||= Rails.logger
+    end
+
+    # Routing must be initialized after plugins to allow the former to extend the routes
+    # ---
+    # If Action Controller is not one of the loaded frameworks (Configuration#frameworks)
+    # this does nothing. Otherwise, it loads the routing definitions and sets up
+    # loading module used to lazily load controllers (Configuration#controller_paths).
+    initializer "action_controller.initialize_routing" do |app|
+      app.route_configuration_files << app.config.routes_configuration_file
+      app.route_configuration_files << app.config.builtin_routes_configuration_file
+      app.reload_routes!
+    end
+
+    # Include middleware to serve up static assets
+    initializer "action_controller.initialize_static_server" do |app|
+      if app.config.serve_static_assets
+        app.config.middleware.use(ActionDispatch::Static, Rails.public_path)
+      end
+    end
+
+    initializer "action_controller.initialize_middleware_stack" do |app|
+      middleware = app.config.middleware
+      middleware.use(::Rack::Lock, :if => lambda { ActionController::Base.allow_concurrency })
+      middleware.use(::Rack::Runtime)
+      middleware.use(ActionDispatch::ShowExceptions, lambda { ActionController::Base.consider_all_requests_local })
+      middleware.use(ActionDispatch::Callbacks, lambda { ActionController::Dispatcher.prepare_each_request })
+      middleware.use(lambda { ActionController::Base.session_store }, lambda { ActionController::Base.session_options })
+      middleware.use(ActionDispatch::ParamsParser)
+      middleware.use(::Rack::MethodOverride)
+      middleware.use(::Rack::Head)
+      middleware.use(ActionDispatch::StringCoercion)
+    end
+
+    initializer "action_controller.initialize_framework_caches" do
+      ActionController::Base.cache_store ||= RAILS_CACHE
+    end
+
+    # Sets +ActionController::Base#view_paths+ and +ActionMailer::Base#template_root+
+    # (but only for those frameworks that are to be loaded). If the framework's
+    # paths have already been set, it is not changed, otherwise it is
+    # set to use Configuration#view_path.
+    initializer "action_controller.initialize_framework_views" do |app|
+      # TODO: this should be combined with the logic for default config.action_controller.view_paths
+      view_path = ActionView::PathSet.type_cast(app.config.view_path, app.config.cache_classes)
+      ActionController::Base.view_paths = view_path if ActionController::Base.view_paths.blank?
+    end
+
+    initializer "action_controller.initialize_metal" do |app|
+      Rails::Rack::Metal.requested_metals = app.config.metals
+
+      app.config.middleware.insert_before(:"ActionDispatch::ParamsParser",
+        Rails::Rack::Metal, :if => Rails::Rack::Metal.metals.any?)
+    end
+
+    # # Prepare dispatcher callbacks and run 'prepare' callbacks
+    initializer "action_controller.prepare_dispatcher" do |app|
+      # TODO: This used to say unless defined?(Dispatcher). Find out why and fix.
+      require 'rails/dispatcher'
+
+      Dispatcher.define_dispatcher_callbacks(app.config.cache_classes)
+
+      unless app.config.cache_classes
+        # Setup dev mode route reloading
+        routes_last_modified = app.routes_changed_at
+        reload_routes = lambda do
+          unless app.routes_changed_at == routes_last_modified
+            routes_last_modified = app.routes_changed_at
+            app.reload_routes!
+          end
+        end
+        ActionDispatch::Callbacks.before_dispatch { |callbacks| reload_routes.call }
+      end
+    end
+
+    initializer "action_controller.notifications" do |app|
+      require 'active_support/notifications'
+
+      ActiveSupport::Notifications.subscribe(/(read|write|cache|expire|exist)_(fragment|page)\??/) do |*args|
+        event = ActiveSupport::Notifications::Event.new(*args)
+
+        if logger = ActionController::Base.logger
+          human_name = event.name.to_s.humanize
+          logger.info("#{human_name} (%.1fms)" % event.duration)
+        end
+      end
+    end
+
+  end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_controller/testing/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 01a55fe930..398ea52495 100644
--- a/actionpack/lib/action_controller/testing/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -1,5 +1,6 @@
 require 'active_support/test_case'
 require 'rack/session/abstract/id'
+require 'action_controller/metal/testing'
 
 module ActionController
   class TestRequest < ActionDispatch::TestRequest #:nodoc:
@@ -180,7 +181,7 @@ module ActionController
   #
   #  assert_redirected_to page_url(:title => 'foo')
   class TestCase < ActiveSupport::TestCase
-    include TestProcess
+    include ActionDispatch::TestProcess
 
     # Executes a request simulating GET HTTP method and set/volley the response
     def get(action, parameters = nil, session = nil, flash = nil)
diff --git a/actionpack/lib/action_controller/testing/process.rb b/actionpack/lib/action_controller/testing/process.rb
deleted file mode 100644
index 323cce6a2f..0000000000
--- a/actionpack/lib/action_controller/testing/process.rb
+++ /dev/null
@@ -1,111 +0,0 @@
-require 'active_support/core_ext/object/conversions'
-require "rack/test"
-
-module ActionController #:nodoc:
-  # Essentially generates a modified Tempfile object similar to the object
-  # you'd get from the standard library CGI module in a multipart
-  # request. This means you can use an ActionController::TestUploadedFile
-  # object in the params of a test request in order to simulate
-  # a file upload.
-  #
-  # Usage example, within a functional test:
-  #   post :change_avatar, :avatar => ActionController::TestUploadedFile.new(ActionController::TestCase.fixture_path + '/files/spongebob.png', 'image/png')
-  #
-  # Pass a true third parameter to ensure the uploaded file is opened in binary mode (only required for Windows):
-  #   post :change_avatar, :avatar => ActionController::TestUploadedFile.new(ActionController::TestCase.fixture_path + '/files/spongebob.png', 'image/png', :binary)
-  TestUploadedFile = Rack::Test::UploadedFile
-
-  module TestProcess
-    def assigns(key = nil)
-      assigns = {}
-      @controller.instance_variable_names.each do |ivar|
-        next if ActionController::Base.protected_instance_variables.include?(ivar)
-        assigns[ivar[1..-1]] = @controller.instance_variable_get(ivar)
-      end
-
-      key.nil? ? assigns : assigns[key.to_s]
-    end
-
-    def session
-      @request.session
-    end
-
-    def flash
-      @request.flash
-    end
-
-    def cookies
-      @request.cookies.merge(@response.cookies)
-    end
-
-    def redirect_to_url
-      @response.redirect_url
-    end
-
-    def html_document
-      xml = @response.content_type =~ /xml$/
-      @html_document ||= HTML::Document.new(@response.body, false, xml)
-    end
-
-    def find_tag(conditions)
-      html_document.find(conditions)
-    end
-
-    def find_all_tag(conditions)
-      html_document.find_all(conditions)
-    end
-
-    def method_missing(selector, *args, &block)
-      if @controller && ActionController::Routing::Routes.named_routes.helpers.include?(selector)
-        @controller.send(selector, *args, &block)
-      else
-        super
-      end
-    end
-
-    # Shortcut for <tt>ActionController::TestUploadedFile.new(ActionController::TestCase.fixture_path + path, type)</tt>:
-    #
-    #   post :change_avatar, :avatar => fixture_file_upload('/files/spongebob.png', 'image/png')
-    #
-    # To upload binary files on Windows, pass <tt>:binary</tt> as the last parameter.
-    # This will not affect other platforms:
-    #
-    #   post :change_avatar, :avatar => fixture_file_upload('/files/spongebob.png', 'image/png', :binary)
-    def fixture_file_upload(path, mime_type = nil, binary = false)
-      fixture_path = ActionController::TestCase.send(:fixture_path) if ActionController::TestCase.respond_to?(:fixture_path)
-      ActionController::TestUploadedFile.new("#{fixture_path}#{path}", mime_type, binary)
-    end
-
-    # A helper to make it easier to test different route configurations.
-    # This method temporarily replaces ActionController::Routing::Routes
-    # with a new RouteSet instance.
-    #
-    # The new instance is yielded to the passed block. Typically the block
-    # will create some routes using <tt>map.draw { map.connect ... }</tt>:
-    #
-    #   with_routing do |set|
-    #     set.draw do |map|
-    #       map.connect ':controller/:action/:id'
-    #         assert_equal(
-    #           ['/content/10/show', {}],
-    #           map.generate(:controller => 'content', :id => 10, :action => 'show')
-    #       end
-    #     end
-    #   end
-    #
-    def with_routing
-      real_routes = ActionController::Routing::Routes
-      ActionController::Routing.module_eval { remove_const :Routes }
-
-      temporary_routes = ActionController::Routing::RouteSet.new
-      ActionController::Routing.module_eval { const_set :Routes, temporary_routes }
-
-      yield temporary_routes
-    ensure
-      if ActionController::Routing.const_defined? :Routes
-        ActionController::Routing.module_eval { remove_const :Routes }
-      end
-      ActionController::Routing.const_set(:Routes, real_routes) if real_routes
-    end
-  end
-end
diff --git a/actionpack/lib/action_controller/vendor/html-scanner.rb b/actionpack/lib/action_controller/vendor/html-scanner.rb
index f622d195ee..879b31e60e 100644
--- a/actionpack/lib/action_controller/vendor/html-scanner.rb
+++ b/actionpack/lib/action_controller/vendor/html-scanner.rb
@@ -1,16 +1,20 @@
 $LOAD_PATH << "#{File.dirname(__FILE__)}/html-scanner"
 
 module HTML
-  autoload :CDATA, 'html/node'
-  autoload :Document, 'html/document'
-  autoload :FullSanitizer, 'html/sanitizer'
-  autoload :LinkSanitizer, 'html/sanitizer'
-  autoload :Node, 'html/node'
-  autoload :Sanitizer, 'html/sanitizer'
-  autoload :Selector, 'html/selector'
-  autoload :Tag, 'html/node'
-  autoload :Text, 'html/node'
-  autoload :Tokenizer, 'html/tokenizer'
-  autoload :Version, 'html/version'
-  autoload :WhiteListSanitizer, 'html/sanitizer'
+  extend ActiveSupport::Autoload
+
+  eager_autoload do
+    autoload :CDATA, 'html/node'
+    autoload :Document, 'html/document'
+    autoload :FullSanitizer, 'html/sanitizer'
+    autoload :LinkSanitizer, 'html/sanitizer'
+    autoload :Node, 'html/node'
+    autoload :Sanitizer, 'html/sanitizer'
+    autoload :Selector, 'html/selector'
+    autoload :Tag, 'html/node'
+    autoload :Text, 'html/node'
+    autoload :Tokenizer, 'html/tokenizer'
+    autoload :Version, 'html/version'
+    autoload :WhiteListSanitizer, 'html/sanitizer'
+  end
 end
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index 259814a322..0696cb017c 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -21,6 +21,10 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
+activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
+$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
+require 'active_support/ruby/shim'
+
 require 'rack'
 
 module Rack
@@ -28,29 +32,25 @@ module Rack
 end
 
 module ActionDispatch
-  autoload :Request, 'action_dispatch/http/request'
-  autoload :Response, 'action_dispatch/http/response'
-  autoload :StatusCodes, 'action_dispatch/http/status_codes'
-  autoload :Utils, 'action_dispatch/http/utils'
-
-  autoload :Callbacks, 'action_dispatch/middleware/callbacks'
-  autoload :MiddlewareStack, 'action_dispatch/middleware/stack'
-  autoload :ParamsParser, 'action_dispatch/middleware/params_parser'
-  autoload :Rescue, 'action_dispatch/middleware/rescue'
-  autoload :ShowExceptions, 'action_dispatch/middleware/show_exceptions'
-  autoload :Static, 'action_dispatch/middleware/static'
-  autoload :StringCoercion, 'action_dispatch/middleware/string_coercion'
+  extend ActiveSupport::Autoload
 
-  autoload :Routing, 'action_dispatch/routing'
+  autoload_under 'http' do
+    autoload :Request
+    autoload :Response
+  end
 
-  autoload :Assertions, 'action_dispatch/testing/assertions'
-  autoload :Integration, 'action_dispatch/testing/integration'
-  autoload :IntegrationTest, 'action_dispatch/testing/integration'
-  autoload :PerformanceTest, 'action_dispatch/testing/performance_test'
-  autoload :TestRequest, 'action_dispatch/testing/test_request'
-  autoload :TestResponse, 'action_dispatch/testing/test_response'
+  autoload_under 'middleware' do
+    autoload :Callbacks
+    autoload :Cascade
+    autoload :ParamsParser
+    autoload :Rescue
+    autoload :ShowExceptions
+    autoload :Static
+    autoload :StringCoercion
+  end
 
-  autoload :HTML, 'action_controller/vendor/html-scanner'
+  autoload :MiddlewareStack, 'action_dispatch/middleware/stack'
+  autoload :Routing
 
   module Http
     autoload :Headers, 'action_dispatch/http/headers'
@@ -58,13 +58,18 @@ module ActionDispatch
 
   module Session
     autoload :AbstractStore, 'action_dispatch/middleware/session/abstract_store'
-    autoload :CookieStore, 'action_dispatch/middleware/session/cookie_store'
+    autoload :CookieStore,   'action_dispatch/middleware/session/cookie_store'
     autoload :MemCacheStore, 'action_dispatch/middleware/session/mem_cache_store'
   end
+
+  autoload_under 'testing' do
+    autoload :Assertions
+    autoload :Integration
+    autoload :PerformanceTest
+    autoload :TestProcess
+    autoload :TestRequest
+    autoload :TestResponse
+  end
 end
 
 autoload :Mime, 'action_dispatch/http/mime_type'
-
-activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
-$:.unshift activesupport_path if File.directory?(activesupport_path)
-require 'active_support'
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 6a52854961..6e8a5dcb8a 100755
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -6,6 +6,7 @@ require 'active_support/memoizable'
 require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/string/access'
+require 'action_dispatch/http/headers'
 
 module ActionDispatch
   class Request < Rack::Request
@@ -17,7 +18,7 @@ module ActionDispatch
 
         HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ACCEPT_ENCODING
         HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_FROM
-        HTTP_NEGOTIATE HTTP_PRAGMA HTTP_REFERER HTTP_USER_AGENT ].each do |env|
+        HTTP_NEGOTIATE HTTP_PRAGMA ].each do |env|
       define_method(env.sub(/^HTTP_/n, '').downcase) do
         @env[env]
       end
@@ -117,7 +118,7 @@ module ActionDispatch
         end
       end
     end
-    
+
     def if_modified_since
       if since = env['HTTP_IF_MODIFIED_SINCE']
         Time.rfc2822(since) rescue nil
@@ -464,6 +465,15 @@ EOM
       session['flash'] || {}
     end
 
+    # Returns the authorization header regardless of whether it was specified directly or through one of the
+    # proxy alternatives.
+    def authorization
+      @env['HTTP_AUTHORIZATION']   ||
+      @env['X-HTTP_AUTHORIZATION'] ||
+      @env['X_HTTP_AUTHORIZATION'] ||
+      @env['REDIRECT_X_HTTP_AUTHORIZATION']
+    end
+
     # Receives an array of mimes and return the first user sent mime that
     # matches the order array.
     #
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index b3ed7c9d1a..8524bbd993 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -33,7 +33,6 @@ module ActionDispatch # :nodoc:
   #  end
   class Response < Rack::Response
     attr_accessor :request, :blank
-    attr_reader :cache_control
 
     attr_writer :header, :sending_file
     alias_method :headers=, :header=
@@ -50,6 +49,9 @@ module ActionDispatch # :nodoc:
       @body, @cookie = [], []
       @sending_file = false
 
+      @blank = false
+      @etag = nil
+
       yield self if block_given?
     end
 
@@ -57,14 +59,8 @@ module ActionDispatch # :nodoc:
       @cache_control ||= {}
     end
 
-    def write(str)
-      s = str.to_s
-      @writer.call s
-      str
-    end
-
     def status=(status)
-      @status = status.to_i
+      @status = Rack::Utils.status_code(status)
     end
 
     # The response code of the request
@@ -78,7 +74,7 @@ module ActionDispatch # :nodoc:
     end
 
     def message
-      StatusCodes::STATUS_CODES[@status]
+      Rack::Utils::HTTP_STATUS_CODES[@status]
     end
     alias_method :status_message, :message
 
@@ -149,18 +145,6 @@ module ActionDispatch # :nodoc:
 
     cattr_accessor(:default_charset) { "utf-8" }
 
-    def assign_default_content_type_and_charset!
-      return if headers[CONTENT_TYPE].present?
-
-      @content_type ||= Mime::HTML
-      @charset      ||= self.class.default_charset
-
-      type = @content_type.to_s.dup
-      type << "; charset=#{@charset}" unless @sending_file
-
-      headers[CONTENT_TYPE] = type
-    end
-
     def to_a
       assign_default_content_type_and_charset!
       handle_conditional_get!
@@ -263,6 +247,18 @@ module ActionDispatch # :nodoc:
         !@blank && @body.respond_to?(:all?) && @body.all? { |part| part.is_a?(String) }
       end
 
+      def assign_default_content_type_and_charset!
+        return if headers[CONTENT_TYPE].present?
+
+        @content_type ||= Mime::HTML
+        @charset      ||= self.class.default_charset
+
+        type = @content_type.to_s.dup
+        type << "; charset=#{@charset}" unless @sending_file
+
+        headers[CONTENT_TYPE] = type
+      end
+
       DEFAULT_CACHE_CONTROL = "max-age=0, private, must-revalidate"
 
       def set_conditional_cache_control!
@@ -277,14 +273,13 @@ module ActionDispatch # :nodoc:
           max_age = control[:max_age]
 
           options = []
-          options << "max-age=#{max_age}" if max_age
+          options << "max-age=#{max_age.to_i}" if max_age
           options << (control[:public] ? "public" : "private")
           options << "must-revalidate" if control[:must_revalidate]
           options.concat(extras) if extras
 
           headers["Cache-Control"] = options.join(", ")
         end
-
       end
   end
 end
diff --git a/actionpack/lib/action_dispatch/http/status_codes.rb b/actionpack/lib/action_dispatch/http/status_codes.rb
deleted file mode 100644
index 5bac842ec1..0000000000
--- a/actionpack/lib/action_dispatch/http/status_codes.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'active_support/inflector'
-
-module ActionDispatch
-  module StatusCodes #:nodoc:
-    STATUS_CODES = Rack::Utils::HTTP_STATUS_CODES.merge({
-      102 => "Processing",
-      207 => "Multi-Status",
-      226 => "IM Used",
-      422 => "Unprocessable Entity",
-      423 => "Locked",
-      424 => "Failed Dependency",
-      426 => "Upgrade Required",
-      507 => "Insufficient Storage",
-      510 => "Not Extended"
-    }).freeze
-
-    # Provides a symbol-to-fixnum lookup for converting a symbol (like
-    # :created or :not_implemented) into its corresponding HTTP status
-    # code (like 200 or 501).
-    SYMBOL_TO_STATUS_CODE = STATUS_CODES.inject({}) { |hash, (code, message)|
-      hash[ActiveSupport::Inflector.underscore(message.gsub(/ /, "")).to_sym] = code
-      hash
-    }.freeze
-
-    private
-      # Given a status parameter, determine whether it needs to be converted
-      # to a string. If it is a fixnum, use the STATUS_CODES hash to lookup
-      # the default message. If it is a symbol, use the SYMBOL_TO_STATUS_CODE
-      # hash to convert it.
-      def interpret_status(status)
-        case status
-        when Fixnum then
-          "#{status} #{STATUS_CODES[status]}".strip
-        when Symbol then
-          interpret_status(SYMBOL_TO_STATUS_CODE[status] ||
-            "500 Unknown Status #{status.inspect}")
-        else
-          status.to_s
-        end
-      end
-  end
-end
diff --git a/actionpack/lib/action_dispatch/http/utils.rb b/actionpack/lib/action_dispatch/http/utils.rb
deleted file mode 100644
index e04a39935e..0000000000
--- a/actionpack/lib/action_dispatch/http/utils.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-module ActionDispatch
-  module Utils
-    # TODO: Pull this into rack core
-    # http://github.com/halorgium/rack/commit/feaf071c1de743fbd10bc316830180a9af607278
-    def parse_config(config)
-      if config =~ /\.ru$/
-        cfgfile = ::File.read(config)
-        if cfgfile[/^#\\(.*)/]
-          opts.parse! $1.split(/\s+/)
-        end
-        inner_app = eval "Rack::Builder.new {( " + cfgfile + "\n )}.to_app",
-                         nil, config
-      else
-        require config
-        inner_app = Object.const_get(::File.basename(config, '.rb').capitalize)
-      end
-    end
-    module_function :parse_config
-  end
-end
diff --git a/actionpack/lib/action_dispatch/middleware/cascade.rb b/actionpack/lib/action_dispatch/middleware/cascade.rb
new file mode 100644
index 0000000000..9f5c9891f0
--- /dev/null
+++ b/actionpack/lib/action_dispatch/middleware/cascade.rb
@@ -0,0 +1,29 @@
+module ActionDispatch
+  class Cascade
+    def self.new(*apps)
+      apps = apps.flatten
+
+      case apps.length
+      when 0
+        raise ArgumentError, "app is required"
+      when 1
+        apps.first
+      else
+        super(apps)
+      end
+    end
+
+    def initialize(apps)
+      @apps = apps
+    end
+
+    def call(env)
+      result = nil
+      @apps.each do |app|
+        result = app.call(env)
+        break unless result[1]["X-Cascade"] == "pass"
+      end
+      result
+    end
+  end
+end
diff --git a/actionpack/lib/action_dispatch/middleware/params_parser.rb b/actionpack/lib/action_dispatch/middleware/params_parser.rb
index 32ccb5c931..534390d4aa 100644
--- a/actionpack/lib/action_dispatch/middleware/params_parser.rb
+++ b/actionpack/lib/action_dispatch/middleware/params_parser.rb
@@ -1,4 +1,5 @@
 require 'active_support/json'
+require 'action_dispatch/http/request'
 
 module ActionDispatch
   class ParamsParser
@@ -31,41 +32,39 @@ module ActionDispatch
         return false unless strategy
 
         case strategy
-          when Proc
-            strategy.call(request.raw_post)
-          when :xml_simple, :xml_node
-            request.body.size == 0 ? {} : Hash.from_xml(request.body).with_indifferent_access
-          when :yaml
-            YAML.load(request.body)
-          when :json
-            if request.body.size == 0
-              {}
-            else
-              data = ActiveSupport::JSON.decode(request.body)
-              data = {:_json => data} unless data.is_a?(Hash)
-              data.with_indifferent_access
-            end
+        when Proc
+          strategy.call(request.raw_post)
+        when :xml_simple, :xml_node
+          request.body.size == 0 ? {} : Hash.from_xml(request.body).with_indifferent_access
+        when :yaml
+          YAML.load(request.body)
+        when :json
+          if request.body.size == 0
+            {}
           else
-            false
+            data = ActiveSupport::JSON.decode(request.body)
+            data = {:_json => data} unless data.is_a?(Hash)
+            data.with_indifferent_access
+          end
+        else
+          false
         end
       rescue Exception => e # YAML, XML or Ruby code block errors
         logger.debug "Error occurred while parsing request parameters.\nContents:\n\n#{request.raw_post}"
 
         raise
-          { "body" => request.raw_post,
-            "content_type" => request.content_type,
+          { "body"           => request.raw_post,
+            "content_type"   => request.content_type,
             "content_length" => request.content_length,
-            "exception" => "#{e.message} (#{e.class})",
-            "backtrace" => e.backtrace }
+            "exception"      => "#{e.message} (#{e.class})",
+            "backtrace"      => e.backtrace }
       end
 
       def content_type_from_legacy_post_data_format_header(env)
         if x_post_format = env['HTTP_X_POST_DATA_FORMAT']
           case x_post_format.to_s.downcase
-            when 'yaml'
-              return Mime::YAML
-            when 'xml'
-              return Mime::XML
+          when 'yaml' then return Mime::YAML
+          when 'xml'  then return Mime::XML
           end
         end
 
@@ -76,4 +75,4 @@ module ActionDispatch
         defined?(Rails.logger) ? Rails.logger : Logger.new($stderr)
       end
   end
-end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
index c5c06f74a2..7d4f0998ce 100644
--- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
@@ -1,4 +1,5 @@
 require 'rack/utils'
+require 'rack/request'
 
 module ActionDispatch
   module Session
diff --git a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
index bd552b458a..f27f22c7e7 100644
--- a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
@@ -1,4 +1,5 @@
-require "active_support/core_ext/hash/keys"
+require 'active_support/core_ext/hash/keys'
+require 'rack/request'
 
 module ActionDispatch
   module Session
@@ -49,7 +50,7 @@ module ActionDispatch
         :expire_after => nil,
         :httponly     => true
       }.freeze
-      
+
       class OptionsHash < Hash
         def initialize(by, env, default_options)
           @session_data = env[CookieStore::ENV_SESSION_KEY]
@@ -60,7 +61,7 @@ module ActionDispatch
           key == :id ? @session_data[:session_id] : super(key)
         end
       end
-      
+
       ENV_SESSION_KEY = "rack.session".freeze
       ENV_SESSION_OPTIONS_KEY = "rack.session.options".freeze
       HTTP_SET_COOKIE = "Set-Cookie".freeze
@@ -102,7 +103,7 @@ module ActionDispatch
       def call(env)
         env[ENV_SESSION_KEY] = AbstractStore::SessionHash.new(self, env)
         env[ENV_SESSION_OPTIONS_KEY] = OptionsHash.new(self, env, @default_options)
-        
+
         status, headers, body = @app.call(env)
 
         session_data = env[ENV_SESSION_KEY]
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index 036deec6d2..4ebc8a2ab9 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -1,9 +1,8 @@
-require "active_support/core_ext/exception"
+require 'active_support/core_ext/exception'
+require 'action_dispatch/http/request'
 
 module ActionDispatch
   class ShowExceptions
-    include StatusCodes
-
     LOCALHOST = '127.0.0.1'.freeze
 
     RESCUES_TEMPLATE_PATH = File.join(File.dirname(__FILE__), 'templates')
@@ -12,8 +11,7 @@ module ActionDispatch
     @@rescue_responses = Hash.new(:internal_server_error)
     @@rescue_responses.update({
       'ActionController::RoutingError'             => :not_found,
-      # TODO: Clean this up after the switch
-      ActionController::UnknownAction.name         => :not_found,
+      'AbstractController::ActionNotFound'         => :not_found,
       'ActiveRecord::RecordNotFound'               => :not_found,
       'ActiveRecord::StaleObjectError'             => :conflict,
       'ActiveRecord::RecordInvalid'                => :unprocessable_entity,
@@ -28,8 +26,8 @@ module ActionDispatch
     @@rescue_templates.update({
       'ActionView::MissingTemplate'         => 'missing_template',
       'ActionController::RoutingError'      => 'routing_error',
-      ActionController::UnknownAction.name  => 'unknown_action',
-      'ActionView::TemplateError'           => 'template_error'
+      'AbstractController::ActionNotFound'  => 'unknown_action',
+      'ActionView::Template::Error'         => 'template_error'
     })
 
     FAILSAFE_RESPONSE = [500, {'Content-Type' => 'text/html'},
@@ -104,7 +102,7 @@ module ActionDispatch
       end
 
       def status_code(exception)
-        interpret_status(@@rescue_responses[exception.class.name]).to_i
+        Rack::Utils.status_code(@@rescue_responses[exception.class.name])
       end
 
       def render(status, body)
@@ -119,7 +117,7 @@ module ActionDispatch
         return unless logger
 
         ActiveSupport::Deprecation.silence do
-          if ActionView::TemplateError === exception
+          if ActionView::Template::Error === exception
             logger.fatal(exception.to_s)
           else
             logger.fatal(
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/_trace.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/_trace.erb
index f8f6b424ca..07b4919934 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/_trace.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/_trace.erb
@@ -7,7 +7,7 @@
   names = traces.collect {|name, trace| name}
 %>
 
-<p><code>RAILS_ROOT: <%= defined?(RAILS_ROOT) ? RAILS_ROOT : "unset" %></code></p>
+<p><code>Rails.root: <%= defined?(Rails) && Rails.respond_to?(:root) ? Rails.root : "unset" %></code></p>
 
 <div id="traces">
   <% names.each do |name| %>
diff --git a/actionpack/lib/action_dispatch/routing.rb b/actionpack/lib/action_dispatch/routing.rb
index 68ed1e3340..e99f979197 100644
--- a/actionpack/lib/action_dispatch/routing.rb
+++ b/actionpack/lib/action_dispatch/routing.rb
@@ -264,118 +264,11 @@ module ActionDispatch
     autoload :RouteSet, 'action_dispatch/routing/route_set'
 
     SEPARATORS = %w( / . ? )
-
     HTTP_METHODS = [:get, :head, :post, :put, :delete, :options]
 
-    ALLOWED_REQUIREMENTS_FOR_OPTIMISATION = [:controller, :action].to_set
-
-    # The root paths which may contain controller files
-    mattr_accessor :controller_paths
-    self.controller_paths = []
-
     # A helper module to hold URL related helpers.
     module Helpers
       include ActionController::PolymorphicRoutes
     end
-
-    class << self
-      # Expects an array of controller names as the first argument.
-      # Executes the passed block with only the named controllers named available.
-      # This method is used in internal Rails testing.
-      def with_controllers(names)
-        prior_controllers = @possible_controllers
-        use_controllers! names
-        yield
-      ensure
-        use_controllers! prior_controllers
-      end
-
-      # Returns an array of paths, cleaned of double-slashes and relative path references.
-      # * "\\\" and "//"  become "\\" or "/".
-      # * "/foo/bar/../config" becomes "/foo/config".
-      # The returned array is sorted by length, descending.
-      def normalize_paths(paths)
-        # do the hokey-pokey of path normalization...
-        paths = paths.collect do |path|
-          path = path.
-            gsub("//", "/").           # replace double / chars with a single
-            gsub("\\\\", "\\").        # replace double \ chars with a single
-            gsub(%r{(.)[\\/]$}, '\1')  # drop final / or \ if path ends with it
-
-          # eliminate .. paths where possible
-          re = %r{[^/\\]+[/\\]\.\.[/\\]}
-          path.gsub!(re, "") while path.match(re)
-          path
-        end
-
-        # start with longest path, first
-        paths = paths.uniq.sort_by { |path| - path.length }
-      end
-
-      # Returns the array of controller names currently available to ActionController::Routing.
-      def possible_controllers
-        unless @possible_controllers
-          @possible_controllers = []
-
-          paths = controller_paths.select { |path| File.directory?(path) && path != "." }
-
-          seen_paths = Hash.new {|h, k| h[k] = true; false}
-          normalize_paths(paths).each do |load_path|
-            Dir["#{load_path}/**/*_controller.rb"].collect do |path|
-              next if seen_paths[path.gsub(%r{^\.[/\\]}, "")]
-
-              controller_name = path[(load_path.length + 1)..-1]
-
-              controller_name.gsub!(/_controller\.rb\Z/, '')
-              @possible_controllers << controller_name
-            end
-          end
-
-          # remove duplicates
-          @possible_controllers.uniq!
-        end
-        @possible_controllers
-      end
-
-      # Replaces the internal list of controllers available to ActionController::Routing with the passed argument.
-      #   ActionController::Routing.use_controllers!([ "posts", "comments", "admin/comments" ])
-      def use_controllers!(controller_names)
-        @possible_controllers = controller_names
-      end
-
-      # Returns a controller path for a new +controller+ based on a +previous+ controller path.
-      # Handles 4 scenarios:
-      #
-      # * stay in the previous controller:
-      #     controller_relative_to( nil, "groups/discussion" ) # => "groups/discussion"
-      #
-      # * stay in the previous namespace:
-      #     controller_relative_to( "posts", "groups/discussion" ) # => "groups/posts"
-      #
-      # * forced move to the root namespace:
-      #     controller_relative_to( "/posts", "groups/discussion" ) # => "posts"
-      #
-      # * previous namespace is root:
-      #     controller_relative_to( "posts", "anything_with_no_slashes" ) # =>"posts"
-      #
-      def controller_relative_to(controller, previous)
-        if controller.nil?           then previous
-        elsif controller[0] == ?/    then controller[1..-1]
-        elsif %r{^(.*)/} =~ previous then "#{$1}/#{controller}"
-        else controller
-        end
-      end
-    end
-
-    ActiveSupport::Inflector.module_eval do
-      # Ensures that routes are reloaded when Rails inflections are updated.
-      def inflections_with_route_reloading(&block)
-        returning(inflections_without_route_reloading(&block)) {
-          ActionDispatch::Routing::Routes.reload! if block_given?
-        }
-      end
-
-      alias_method_chain :inflections, :route_reloading
-    end
   end
 end
diff --git a/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb b/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb
index 0564ba9797..8ce6b2f6d5 100644
--- a/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb
@@ -113,8 +113,7 @@ module ActionDispatch
           end
         end
 
-        possible_names = Routing.possible_controllers.collect { |n| Regexp.escape(n) }
-        requirements[:controller] ||= Regexp.union(*possible_names)
+        requirements[:controller] ||= @set.controller_constraints
 
         if defaults[:controller]
           defaults[:action] ||= 'index'
@@ -176,7 +175,7 @@ module ActionDispatch
               optional = false
             elsif segment =~ /^:(\w+)$/
               if defaults.has_key?($1.to_sym)
-                defaults.delete($1.to_sym)
+                defaults.delete($1.to_sym) if defaults[$1.to_sym].nil?
               else
                 optional = false
               end
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 6e112c9b54..e655d6a708 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1,153 +1,247 @@
 module ActionDispatch
   module Routing
     class Mapper
-      module Resources
-        def resource(*resources, &block)
-          options = resources.last.is_a?(Hash) ? resources.pop : {}
-
-          if resources.length > 1
-            raise ArgumentError if block_given?
-            resources.each { |r| resource(r, options) }
-            return self
+      class Constraints
+        def self.new(app, constraints = [])
+          if constraints.any?
+            super(app, constraints)
+          else
+            app
           end
+        end
 
-          resource = resources.pop
+        def initialize(app, constraints = [])
+          @app, @constraints = app, constraints
+        end
 
-          if @scope[:scope_level] == :resources
-            member do
-              resource(resource, options, &block)
+        def call(env)
+          req = Rack::Request.new(env)
+
+          @constraints.each { |constraint|
+            if constraint.respond_to?(:matches?) && !constraint.matches?(req)
+              return [ 404, {'X-Cascade' => 'pass'}, [] ]
+            elsif constraint.respond_to?(:call) && !constraint.call(req)
+              return [ 404, {'X-Cascade' => 'pass'}, [] ]
             end
-            return self
-          end
+          }
+
+          @app.call(env)
+        end
+      end
 
-          singular = resource.to_s
-          plural   = singular.pluralize
+      class Mapping
+        def initialize(set, scope, args)
+          @set, @scope    = set, scope
+          @path, @options = extract_path_and_options(args)
+        end
 
-          controller(plural) do
-            namespace(resource) do
-              with_scope_level(:resource) do
-                yield if block_given?
+        def to_route
+          [ app, conditions, requirements, defaults, @options[:as] ]
+        end
 
-                get "", :to => :show, :as => "#{singular}"
-                post "", :to => :create
-                put "", :to => :update
-                delete "", :to => :destroy
-                get "new", :to => :new, :as => "new_#{singular}"
-                get "edit", :to => :edit, :as => "edit_#{singular}"
-              end
+        private
+          def extract_path_and_options(args)
+            options = args.extract_options!
+
+            if args.empty?
+              path, to = options.find { |name, value| name.is_a?(String) }
+              options.merge!(:to => to).delete(path) if path
+            else
+              path = args.first
             end
+
+            [ normalize_path(path), options ]
           end
 
-          self
-        end
+          def normalize_path(path)
+            path = nil if path == ""
+            path = "#{@scope[:path]}#{path}" if @scope[:path]
+            path = Rack::Mount::Utils.normalize_path(path) if path
 
-        def resources(*resources, &block)
-          options = resources.last.is_a?(Hash) ? resources.pop : {}
+            raise ArgumentError, "path is required" unless path
 
-          if resources.length > 1
-            raise ArgumentError if block_given?
-            resources.each { |r| resources(r, options) }
-            return self
+            path
           end
 
-          resource = resources.pop
 
-          plural   = resource.to_s
-          singular = plural.singularize
+          def app
+            Constraints.new(
+              to.respond_to?(:call) ? to : Routing::RouteSet::Dispatcher.new(:defaults => defaults),
+              blocks
+            )
+          end
 
-          if @scope[:scope_level] == :resources
-            parent_resource = @scope[:scope_level_options][:name]
-            with_scope_level(:member) do
-              scope(":#{parent_resource}_id", :name_prefix => parent_resource) do
-                resources(resource, options, &block)
-              end
-            end
-            return self
+          def conditions
+            { :path_info => @path }.merge(constraints).merge(request_method_condition)
           end
 
-          if @scope[:options] && (prefix = @scope[:options][:name_prefix])
-            plural   = "#{prefix}_#{plural}"
-            singular = "#{prefix}_#{singular}"
+          def requirements
+            @requirements ||= returning(@options[:constraints] || {}) do |requirements|
+              requirements.reverse_merge!(@scope[:constraints]) if @scope[:constraints]
+              @options.each { |k, v| requirements[k] = v if v.is_a?(Regexp) }
+              requirements[:controller] ||= @set.controller_constraints
+            end
           end
 
-          controller(resource) do
-            namespace(resource) do
-              with_scope_level(:resources, :name => singular) do
-                yield if block_given?
+          def defaults
+            @defaults ||= if to.respond_to?(:call)
+              { }
+            else
+              defaults = case to
+              when String
+                controller, action = to.split('#')
+                { :controller => controller, :action => action }
+              when Symbol
+                { :action => to.to_s }.merge(default_controller ? { :controller => default_controller } : {})
+              else
+                default_controller ? { :controller => default_controller } : {}
+              end
 
-                member do
-                  get "", :to => :show, :as => singular
-                  put "", :to => :update
-                  delete "", :to => :destroy
-                  get "edit", :to => :edit, :as => "edit_#{singular}"
-                end
+              if defaults[:controller].blank? && segment_keys.exclude?("controller")
+                raise ArgumentError, "missing :controller"
+              end
 
-                collection do
-                  get "", :to => :index, :as => plural
-                  post "", :to => :create
-                  get "new", :to => :new, :as => "new_#{singular}"
-                end
+              if defaults[:action].blank? && segment_keys.exclude?("action")
+                raise ArgumentError, "missing :action"
               end
+
+              defaults
             end
           end
 
-          self
-        end
 
-        def collection
-          unless @scope[:scope_level] == :resources
-            raise ArgumentError, "can't use collection outside resources scope"
-          end
+          def blocks
+            if @options[:constraints].present? && !@options[:constraints].is_a?(Hash)
+              block = @options[:constraints]
+            else
+              block = nil
+            end
 
-          with_scope_level(:collection) do
-            yield
+            ((@scope[:blocks] || []) + [ block ]).compact
           end
-        end
 
-        def member
-          unless @scope[:scope_level] == :resources
-            raise ArgumentError, "can't use member outside resources scope"
+          def constraints
+            @constraints ||= requirements.reject { |k, v| segment_keys.include?(k.to_s) || k == :controller }
           end
 
-          with_scope_level(:member) do
-            scope(":id") do
-              yield
+          def request_method_condition
+            if via = @options[:via]
+              via = Array(via).map { |m| m.to_s.upcase }
+              { :request_method => Regexp.union(*via) }
+            else
+              { }
             end
           end
+
+          def segment_keys
+            @segment_keys ||= Rack::Mount::RegexpWithNamedGroups.new(
+                Rack::Mount::Strexp.compile(@path, requirements, SEPARATORS)
+              ).names
+          end
+
+          def to
+            @options[:to]
+          end
+
+          def default_controller
+            @scope[:controller].to_s if @scope[:controller]
+          end
+      end
+
+      module Base
+        def initialize(set)
+          @set = set
+        end
+
+        def root(options = {})
+          match '/', options.reverse_merge(:as => :root)
         end
 
         def match(*args)
+          @set.add_route(*Mapping.new(@set, @scope, args).to_route)
+          self
+        end
+      end
+
+      module HttpHelpers
+        def get(*args, &block)
+          map_method(:get, *args, &block)
+        end
+
+        def post(*args, &block)
+          map_method(:post, *args, &block)
+        end
+
+        def put(*args, &block)
+          map_method(:put, *args, &block)
+        end
+
+        def delete(*args, &block)
+          map_method(:delete, *args, &block)
+        end
+
+        def redirect(*args, &block)
           options = args.last.is_a?(Hash) ? args.pop : {}
-          args.push(options)
 
-          case options.delete(:on)
-          when :collection
-            return collection { match(*args) }
-          when :member
-            return member { match(*args) }
-          end
+          path      = args.shift || block
+          path_proc = path.is_a?(Proc) ? path : proc { |params| path % params }
+          status    = options[:status] || 301
 
-          if @scope[:scope_level] == :resources
-            raise ArgumentError, "can't define route directly in resources scope"
-          end
+          lambda do |env|
+            req    = Rack::Request.new(env)
+            params = path_proc.call(env["action_dispatch.request.path_parameters"])
+            url    = req.scheme + '://' + req.host + params
 
-          super
+            [ status, {'Location' => url, 'Content-Type' => 'text/html'}, ['Moved Permanently'] ]
+          end
         end
 
         private
-          def with_scope_level(kind, options = {})
-            old, @scope[:scope_level] = @scope[:scope_level], kind
-            old_options, @scope[:scope_level_options] = @scope[:scope_level_options], options
-            yield
-          ensure
-            @scope[:scope_level] = old
-            @scope[:scope_level_options] = old_options
+          def map_method(method, *args, &block)
+            options = args.extract_options!
+            options[:via] = method
+            args.push(options)
+            match(*args, &block)
+            self
           end
       end
 
       module Scoping
+        def initialize(*args)
+          @scope = {}
+          super
+        end
+
         def scope(*args)
-          options = args.last.is_a?(Hash) ? args.pop : {}
+          options = args.extract_options!
+
+          case args.first
+          when String
+            options[:path] = args.first
+          when Symbol
+            options[:controller] = args.first
+          end
+
+          if path = options.delete(:path)
+            path_set = true
+            path, @scope[:path] = @scope[:path], Rack::Mount::Utils.normalize_path(@scope[:path].to_s + path.to_s)
+          else
+            path_set = false
+          end
+
+          if name_prefix = options.delete(:name_prefix)
+            name_prefix_set = true
+            name_prefix, @scope[:name_prefix] = @scope[:name_prefix], (@scope[:name_prefix] ? "#{@scope[:name_prefix]}_#{name_prefix}" : name_prefix)
+          else
+            name_prefix_set = false
+          end
+
+          if controller = options.delete(:controller)
+            controller_set = true
+            controller, @scope[:controller] = @scope[:controller], controller
+          else
+            controller_set = false
+          end
 
           constraints = options.delete(:constraints) || {}
           unless constraints.is_a?(Hash)
@@ -158,27 +252,15 @@ module ActionDispatch
 
           options, @scope[:options] = @scope[:options], (@scope[:options] || {}).merge(options)
 
-          path_set = controller_set = false
-
-          case args.first
-          when String
-            path_set = true
-            path = args.first
-            path, @scope[:path] = @scope[:path], "#{@scope[:path]}#{Rack::Mount::Utils.normalize_path(path)}"
-          when Symbol
-            controller_set = true
-            controller = args.first
-            controller, @scope[:controller] = @scope[:controller], controller
-          end
-
           yield
 
           self
         ensure
-          @scope[:path] = path if path_set
-          @scope[:controller] = controller if controller_set
-          @scope[:options] = options
-          @scope[:blocks] = blocks
+          @scope[:path]        = path        if path_set
+          @scope[:name_prefix] = name_prefix if name_prefix_set
+          @scope[:controller]  = controller  if controller_set
+          @scope[:options]     = options
+          @scope[:blocks]      = blocks
           @scope[:constraints] = constraints
         end
 
@@ -187,151 +269,255 @@ module ActionDispatch
         end
 
         def namespace(path)
-          scope(path.to_s) { yield }
+          scope("/#{path}") { yield }
         end
 
         def constraints(constraints = {})
           scope(:constraints => constraints) { yield }
         end
-      end
 
-      class Constraints
-        def initialize(app, constraints = [])
-          @app, @constraints = app, constraints
-        end
+        def match(*args)
+          options = args.extract_options!
 
-        def call(env)
-          req = Rack::Request.new(env)
+          options = (@scope[:options] || {}).merge(options)
 
-          @constraints.each { |constraint|
-            if constraint.respond_to?(:matches?) && !constraint.matches?(req)
-              return [417, {}, []]
-            elsif constraint.respond_to?(:call) && !constraint.call(req)
-              return [417, {}, []]
-            end
-          }
+          if @scope[:name_prefix] && !options[:as].blank?
+            options[:as] = "#{@scope[:name_prefix]}_#{options[:as]}"
+          elsif @scope[:name_prefix] && options[:as] == ""
+            options[:as] = @scope[:name_prefix].to_s
+          end
 
-          @app.call(env)
+          args.push(options)
+          super(*args)
         end
       end
 
-      def initialize(set)
-        @set = set
-        @scope = {}
-
-        extend Scoping
-        extend Resources
-      end
+      module Resources
+        class Resource #:nodoc:
+          attr_reader :plural, :singular
 
-      def get(*args, &block)
-        map_method(:get, *args, &block)
-      end
+          def initialize(entities, options = {})
+            entities = entities.to_s
 
-      def post(*args, &block)
-        map_method(:post, *args, &block)
-      end
+            @plural   = entities.pluralize
+            @singular = entities.singularize
+          end
 
-      def put(*args, &block)
-        map_method(:put, *args, &block)
-      end
+          def name
+            plural
+          end
 
-      def delete(*args, &block)
-        map_method(:delete, *args, &block)
-      end
+          def controller
+            plural
+          end
 
-      def root(options = {})
-        match '/', options.merge(:as => :root)
-      end
+          def member_name
+            singular
+          end
 
-      def match(*args)
-        options = args.last.is_a?(Hash) ? args.pop : {}
+          def collection_name
+            plural
+          end
 
-        if args.length > 1
-          args.each { |path| match(path, options) }
-          return self
+          def id_segment
+            ":#{singular}_id"
+          end
         end
 
-        if args.first.is_a?(Symbol)
-          return match(args.first.to_s, options.merge(:to => args.first.to_sym))
+        class SingletonResource < Resource #:nodoc:
+          def initialize(entity, options = {})
+            super
+          end
+
+          def name
+            singular
+          end
         end
 
-        path = args.first
+        def resource(*resources, &block)
+          options = resources.extract_options!
+
+          if resources.length > 1
+            raise ArgumentError if block_given?
+            resources.each { |r| resource(r, options) }
+            return self
+          end
+
+          resource = SingletonResource.new(resources.pop)
 
-        options = (@scope[:options] || {}).merge(options)
-        conditions, defaults = {}, {}
+          if @scope[:scope_level] == :resources
+            nested do
+              resource(resource.name, options, &block)
+            end
+            return self
+          end
 
-        path = nil if path == ""
-        path = Rack::Mount::Utils.normalize_path(path) if path
-        path = "#{@scope[:path]}#{path}" if @scope[:path]
+          scope(:path => "/#{resource.name}", :controller => resource.controller) do
+            with_scope_level(:resource, resource) do
+              yield if block_given?
 
-        raise ArgumentError, "path is required" unless path
+              get    "(.:format)",      :to => :show, :as => resource.member_name
+              post   "(.:format)",      :to => :create
+              put    "(.:format)",      :to => :update
+              delete "(.:format)",      :to => :destroy
+              get    "/new(.:format)",  :to => :new,  :as => "new_#{resource.singular}"
+              get    "/edit(.:format)", :to => :edit, :as => "edit_#{resource.singular}"
+            end
+          end
 
-        constraints = options[:constraints] || {}
-        unless constraints.is_a?(Hash)
-          block, constraints = constraints, {}
+          self
         end
-        blocks = ((@scope[:blocks] || []) + [block]).compact
-        constraints = (@scope[:constraints] || {}).merge(constraints)
-        options.each { |k, v| constraints[k] = v if v.is_a?(Regexp) }
 
-        conditions[:path_info] = path
-        requirements = constraints.dup
+        def resources(*resources, &block)
+          options = resources.extract_options!
+
+          if resources.length > 1
+            raise ArgumentError if block_given?
+            resources.each { |r| resources(r, options) }
+            return self
+          end
+
+          resource = Resource.new(resources.pop)
+
+          if @scope[:scope_level] == :resources
+            nested do
+              resources(resource.name, options, &block)
+            end
+            return self
+          end
+
+          scope(:path => "/#{resource.name}", :controller => resource.controller) do
+            with_scope_level(:resources, resource) do
+              yield if block_given?
+
+              with_scope_level(:collection) do
+                get  "(.:format)", :to => :index, :as => resource.collection_name
+                post "(.:format)", :to => :create
+
+                with_exclusive_name_prefix :new do
+                  get "/new(.:format)", :to => :new, :as => resource.singular
+                end
+              end
+
+              with_scope_level(:member) do
+                scope("/:id") do
+                  get    "(.:format)", :to => :show, :as => resource.member_name
+                  put    "(.:format)", :to => :update
+                  delete "(.:format)", :to => :destroy
+
+                  with_exclusive_name_prefix :edit do
+                    get "/edit(.:format)", :to => :edit, :as => resource.singular
+                  end
+                end
+              end
+            end
+          end
+
+          self
+        end
 
-        path_regexp = Rack::Mount::Strexp.compile(path, constraints, SEPARATORS)
-        segment_keys = Rack::Mount::RegexpWithNamedGroups.new(path_regexp).names
-        constraints.reject! { |k, v| segment_keys.include?(k.to_s) }
-        conditions.merge!(constraints)
+        def collection
+          unless @scope[:scope_level] == :resources
+            raise ArgumentError, "can't use collection outside resources scope"
+          end
 
-        if via = options[:via]
-          via = Array(via).map { |m| m.to_s.upcase }
-          conditions[:request_method] = Regexp.union(*via)
+          with_scope_level(:collection) do
+            scope(:name_prefix => parent_resource.collection_name, :as => "") do
+              yield
+            end
+          end
         end
 
-        defaults[:controller] = @scope[:controller].to_s if @scope[:controller]
+        def member
+          unless @scope[:scope_level] == :resources
+            raise ArgumentError, "can't use member outside resources scope"
+          end
 
-        if options[:to].respond_to?(:call)
-          app = options[:to]
-          defaults.delete(:controller)
-          defaults.delete(:action)
-        elsif options[:to].is_a?(String)
-          defaults[:controller], defaults[:action] = options[:to].split('#')
-        elsif options[:to].is_a?(Symbol)
-          defaults[:action] = options[:to].to_s
+          with_scope_level(:member) do
+            scope("/:id", :name_prefix => parent_resource.member_name, :as => "") do
+              yield
+            end
+          end
         end
-        app ||= Routing::RouteSet::Dispatcher.new(:defaults => defaults)
 
-        if app.is_a?(Routing::RouteSet::Dispatcher)
-          unless defaults.include?(:controller) || segment_keys.include?("controller")
-            raise ArgumentError, "missing :controller"
+        def nested
+          unless @scope[:scope_level] == :resources
+            raise ArgumentError, "can't use nested outside resources scope"
           end
-          unless defaults.include?(:action) || segment_keys.include?("action")
-            raise ArgumentError, "missing :action"
+
+          with_scope_level(:nested) do
+            scope("/#{parent_resource.id_segment}", :name_prefix => parent_resource.member_name) do
+              yield
+            end
           end
         end
 
-        app = Constraints.new(app, blocks) if blocks.any?
-        @set.add_route(app, conditions, requirements, defaults, options[:as])
+        def match(*args)
+          options = args.extract_options!
 
-        self
-      end
+          if args.length > 1
+            args.each { |path| match(path, options) }
+            return self
+          end
 
-      def redirect(path, options = {})
-        status = options[:status] || 301
-        lambda { |env|
-          req = Rack::Request.new(env)
-          url = req.scheme + '://' + req.host + path
-          [status, {'Location' => url, 'Content-Type' => 'text/html'}, ['Moved Permanently']]
-        }
-      end
+          if args.first.is_a?(Symbol)
+            with_exclusive_name_prefix(args.first) do
+              return match("/#{args.first}(.:format)", options.merge(:to => args.first.to_sym))
+            end
+          end
 
-      private
-        def map_method(method, *args, &block)
-          options = args.last.is_a?(Hash) ? args.pop : {}
-          options[:via] = method
           args.push(options)
-          match(*args, &block)
-          self
+
+          case options.delete(:on)
+          when :collection
+            return collection { match(*args) }
+          when :member
+            return member { match(*args) }
+          end
+
+          if @scope[:scope_level] == :resources
+            raise ArgumentError, "can't define route directly in resources scope"
+          end
+
+          super
         end
+
+        protected
+          def parent_resource
+            @scope[:scope_level_resource]
+          end
+
+        private
+          def with_exclusive_name_prefix(prefix)
+            begin
+              old_name_prefix = @scope[:name_prefix]
+
+              if !old_name_prefix.blank?
+                @scope[:name_prefix] = "#{prefix}_#{@scope[:name_prefix]}"
+              else
+                @scope[:name_prefix] = prefix.to_s
+              end
+
+              yield
+            ensure
+              @scope[:name_prefix] = old_name_prefix
+            end
+          end
+
+          def with_scope_level(kind, resource = parent_resource)
+            old, @scope[:scope_level] = @scope[:scope_level], kind
+            old_resource, @scope[:scope_level_resource] = @scope[:scope_level_resource], resource
+            yield
+          ensure
+            @scope[:scope_level] = old
+            @scope[:scope_level_resource] = old_resource
+          end
+      end
+
+      include Base
+      include HttpHelpers
+      include Scoping
+      include Resources
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index c15aaceb5b..bd397432ce 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -5,7 +5,7 @@ module ActionDispatch
   module Routing
     class RouteSet #:nodoc:
       NotFound = lambda { |env|
-        raise ActionController::RoutingError, "No route matches #{env['PATH_INFO'].inspect} with #{env.inspect}"
+        raise ActionController::RoutingError, "No route matches #{env['PATH_INFO'].inspect}"
       }
 
       PARAMETERS_KEY = 'action_dispatch.request.path_parameters'
@@ -18,31 +18,37 @@ module ActionDispatch
 
         def call(env)
           params = env[PARAMETERS_KEY]
+          prepare_params!(params)
+
+          unless controller = controller(params)
+            return [404, {'X-Cascade' => 'pass'}, []]
+          end
+
+          controller.action(params[:action]).call(env)
+        end
+
+        def prepare_params!(params)
           merge_default_action!(params)
           split_glob_param!(params) if @glob_param
+
           params.each do |key, value|
             if value.is_a?(String)
               value = value.dup.force_encoding(Encoding::BINARY) if value.respond_to?(:force_encoding)
               params[key] = URI.unescape(value)
             end
           end
+        end
 
-          if env['action_controller.recognize']
-            [200, {}, params]
-          else
-            controller = controller(params)
-            controller.action(params[:action]).call(env)
+        def controller(params)
+          if params && params.has_key?(:controller)
+            controller = "#{params[:controller].camelize}Controller"
+            ActiveSupport::Inflector.constantize(controller)
           end
+        rescue NameError
+          nil
         end
 
         private
-          def controller(params)
-            if params && params.has_key?(:controller)
-              controller = "#{params[:controller].camelize}Controller"
-              ActiveSupport::Inflector.constantize(controller)
-            end
-          end
-
           def merge_default_action!(params)
             params[:action] ||= 'index'
           end
@@ -197,26 +203,40 @@ module ActionDispatch
           end
       end
 
-      attr_accessor :routes, :named_routes, :configuration_files
+      attr_accessor :routes, :named_routes
+      attr_accessor :disable_clear_and_finalize
 
       def initialize
-        self.configuration_files = []
-
         self.routes = []
         self.named_routes = NamedRouteCollection.new
 
-        clear!
+        @disable_clear_and_finalize = false
       end
 
       def draw(&block)
-        clear!
-        Mapper.new(self).instance_exec(DeprecatedMapper.new(self), &block)
+        clear! unless @disable_clear_and_finalize
+
+        mapper = Mapper.new(self)
+        if block.arity == 1
+          mapper.instance_exec(DeprecatedMapper.new(self), &block)
+        else
+          mapper.instance_exec(&block)
+        end
+
+        finalize! unless @disable_clear_and_finalize
+
+        nil
+      end
+
+      def finalize!
         @set.add_route(NotFound)
         install_helpers
         @set.freeze
       end
 
       def clear!
+        # Clear the controller cache so we may discover new ones
+        @controller_constraints = nil
         routes.clear
         named_routes.clear
         @set = ::Rack::Mount::RouteSet.new(:parameters_key => PARAMETERS_KEY)
@@ -231,63 +251,38 @@ module ActionDispatch
         routes.empty?
       end
 
-      def add_configuration_file(path)
-        self.configuration_files << path
-      end
-
-      # Deprecated accessor
-      def configuration_file=(path)
-        add_configuration_file(path)
-      end
-
-      # Deprecated accessor
-      def configuration_file
-        configuration_files
-      end
-
-      def load!
-        Routing.use_controllers!(nil) # Clear the controller cache so we may discover new ones
-        load_routes!
-      end
-
-      # reload! will always force a reload whereas load checks the timestamp first
-      alias reload! load!
-
-      def reload
-        if configuration_files.any? && @routes_last_modified
-          if routes_changed_at == @routes_last_modified
-            return # routes didn't change, don't reload
-          else
-            @routes_last_modified = routes_changed_at
-          end
-        end
+      CONTROLLER_REGEXP = /[_a-zA-Z0-9]+/
 
-        load!
-      end
-
-      def load_routes!
-        if configuration_files.any?
-          configuration_files.each { |config| load(config) }
-          @routes_last_modified = routes_changed_at
-        else
-          draw do |map|
-            map.connect ":controller/:action/:id"
-          end
+      def controller_constraints
+        @controller_constraints ||= begin
+          source = controller_namespaces.map { |ns| "#{Regexp.escape(ns)}/#{CONTROLLER_REGEXP.source}" }
+          source << CONTROLLER_REGEXP.source
+          Regexp.compile(source.sort.reverse.join('|'))
         end
       end
 
-      def routes_changed_at
-        routes_changed_at = nil
+      def controller_namespaces
+        namespaces = Set.new
 
-        configuration_files.each do |config|
-          config_changed_at = File.stat(config).mtime
+        # Find any nested controllers already in memory
+        ActionController::Base.subclasses.each do |klass|
+          controller_name = klass.underscore
+          namespaces << controller_name.split('/')[0...-1].join('/')
+        end
 
-          if routes_changed_at.nil? || config_changed_at > routes_changed_at
-            routes_changed_at = config_changed_at
+        # TODO: Move this into Railties
+        if defined?(Rails.application)
+          # Find namespaces in controllers/ directory
+          Rails.application.config.controller_paths.each do |load_path|
+            load_path = File.expand_path(load_path)
+            Dir["#{load_path}/**/*_controller.rb"].collect do |path|
+              namespaces << File.dirname(path).sub(/#{load_path}\/?/, '')
+            end
           end
         end
 
-        routes_changed_at
+        namespaces.delete('')
+        namespaces
       end
 
       def add_route(app, conditions = {}, requirements = {}, defaults = {}, name = nil)
@@ -372,7 +367,8 @@ module ActionDispatch
         end
         recall[:action] = options.delete(:action) if options[:action] == 'index'
 
-        parameterize = lambda { |name, value|
+        opts = {}
+        opts[:parameterize] = lambda { |name, value|
           if name == :controller
             value
           elsif value.is_a?(Array)
@@ -382,14 +378,23 @@ module ActionDispatch
           end
         }
 
-        path = @set.url(named_route, options, recall, :parameterize => parameterize)
+        unless result = @set.generate(:path_info, named_route, options, recall, opts)
+          raise ActionController::RoutingError, "No route matches #{options.inspect}"
+        end
+
+        path, params = result
+        params.each do |k, v|
+          if v
+            params[k] = v
+          else
+            params.delete(k)
+          end
+        end
+
         if path && method == :generate_extras
-          uri = URI(path)
-          extras = uri.query ?
-            Rack::Utils.parse_nested_query(uri.query).keys.map { |k| k.to_sym } :
-            []
-          [uri.path, extras]
+          [path, params.keys]
         elsif path
+          path << "?#{params.to_query}" if params.any?
           path
         else
           raise ActionController::RoutingError, "No route matches #{options.inspect}"
@@ -400,37 +405,11 @@ module ActionDispatch
 
       def call(env)
         @set.call(env)
-      rescue ActionController::RoutingError => e
-        raise e if env['action_controller.rescue_error'] == false
-
-        method, path = env['REQUEST_METHOD'].downcase.to_sym, env['PATH_INFO']
-
-        # Route was not recognized. Try to find out why (maybe wrong verb).
-        allows = HTTP_METHODS.select { |verb|
-          begin
-            recognize_path(path, {:method => verb}, false)
-          rescue ActionController::RoutingError
-            nil
-          end
-        }
-
-        if !HTTP_METHODS.include?(method)
-          raise ActionController::NotImplemented.new(*allows)
-        elsif !allows.empty?
-          raise ActionController::MethodNotAllowed.new(*allows)
-        else
-          raise e
-        end
-      end
-
-      def recognize(request)
-        params = recognize_path(request.path, extract_request_environment(request))
-        request.path_parameters = params.with_indifferent_access
-        "#{params[:controller].to_s.camelize}Controller".constantize
       end
 
-      def recognize_path(path, environment = {}, rescue_error = true)
+      def recognize_path(path, environment = {})
         method = (environment[:method] || "GET").to_s.upcase
+        path = Rack::Mount::Utils.normalize_path(path)
 
         begin
           env = Rack::MockRequest.env_for(path, {:method => method})
@@ -438,16 +417,16 @@ module ActionDispatch
           raise ActionController::RoutingError, e.message
         end
 
-        env['action_controller.recognize'] = true
-        env['action_controller.rescue_error'] = rescue_error
-        status, headers, body = call(env)
-        body
-      end
+        req = Rack::Request.new(env)
+        @set.recognize(req) do |route, params|
+          dispatcher = route.app
+          if dispatcher.is_a?(Dispatcher) && dispatcher.controller(params)
+            dispatcher.prepare_params!(params)
+            return params
+          end
+        end
 
-      # Subclasses and plugins may override this method to extract further attributes
-      # from the request, for use by route conditions and such.
-      def extract_request_environment(request)
-        { :method => request.method }
+        raise ActionController::RoutingError, "No route matches #{path.inspect}"
       end
     end
   end
diff --git a/actionpack/lib/action_dispatch/testing/assertions/dom.rb b/actionpack/lib/action_dispatch/testing/assertions/dom.rb
index 9a917f704a..9c215de743 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/dom.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/dom.rb
@@ -1,3 +1,5 @@
+require 'action_controller/vendor/html-scanner'
+
 module ActionDispatch
   module Assertions
     module DomAssertions
@@ -15,7 +17,7 @@ module ActionDispatch
 
         assert_block(full_message) { expected_dom == actual_dom }
       end
-      
+
       # The negated form of +assert_dom_equivalent+.
       #
       # ==== Examples
diff --git a/actionpack/lib/action_dispatch/testing/assertions/response.rb b/actionpack/lib/action_dispatch/testing/assertions/response.rb
index 501a7c4dfb..5686bbdbde 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/response.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/response.rb
@@ -28,7 +28,7 @@ module ActionDispatch
           assert_block("") { true } # to count the assertion
         elsif type.is_a?(Fixnum) && @response.response_code == type
           assert_block("") { true } # to count the assertion
-        elsif type.is_a?(Symbol) && @response.response_code == ActionDispatch::StatusCodes::SYMBOL_TO_STATUS_CODE[type]
+        elsif type.is_a?(Symbol) && @response.response_code == Rack::Utils::SYMBOL_TO_STATUS_CODE[type]
           assert_block("") { true } # to count the assertion
         else
           assert_block(build_message(message, "Expected response to be a <?>, but was <?>", type, @response.response_code)) { false }
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
index e6d6b5a3ef..fc477afb17 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
@@ -46,7 +46,6 @@ module ActionDispatch
           request_method = nil
         end
 
-        ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty?
         request = recognized_request_for(path, request_method)
 
         expected_options = expected_options.clone
@@ -80,7 +79,6 @@ module ActionDispatch
       def assert_generates(expected_path, options, defaults={}, extras = {}, message=nil)
         expected_path = "/#{expected_path}" unless expected_path[0] == ?/
         # Load routes.rb if it hasn't been loaded.
-        ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty?
 
         generated_path, extra_keys = ActionController::Routing::Routes.generate_extras(options, defaults)
         found_extras = options.reject {|k, v| ! extra_keys.include? k}
@@ -126,6 +124,46 @@ module ActionDispatch
         assert_generates(path.is_a?(Hash) ? path[:path] : path, options, defaults, extras, message)
       end
 
+      # A helper to make it easier to test different route configurations.
+      # This method temporarily replaces ActionController::Routing::Routes
+      # with a new RouteSet instance.
+      #
+      # The new instance is yielded to the passed block. Typically the block
+      # will create some routes using <tt>map.draw { map.connect ... }</tt>:
+      #
+      #   with_routing do |set|
+      #     set.draw do |map|
+      #       map.connect ':controller/:action/:id'
+      #         assert_equal(
+      #           ['/content/10/show', {}],
+      #           map.generate(:controller => 'content', :id => 10, :action => 'show')
+      #       end
+      #     end
+      #   end
+      #
+      def with_routing
+        real_routes = ActionController::Routing::Routes
+        ActionController::Routing.module_eval { remove_const :Routes }
+
+        temporary_routes = ActionController::Routing::RouteSet.new
+        ActionController::Routing.module_eval { const_set :Routes, temporary_routes }
+
+        yield temporary_routes
+      ensure
+        if ActionController::Routing.const_defined? :Routes
+          ActionController::Routing.module_eval { remove_const :Routes }
+        end
+        ActionController::Routing.const_set(:Routes, real_routes) if real_routes
+      end
+
+      def method_missing(selector, *args, &block)
+        if @controller && ActionController::Routing::Routes.named_routes.helpers.include?(selector)
+          @controller.send(selector, *args, &block)
+        else
+          super
+        end
+      end
+
       private
         # Recognizes the route for a given path.
         def recognized_request_for(path, request_method = nil)
@@ -134,9 +172,11 @@ module ActionDispatch
           # Assume given controller
           request = ActionController::TestRequest.new
           request.env["REQUEST_METHOD"] = request_method.to_s.upcase if request_method
-          request.path   = path
+          request.path = path
+
+          params = ActionController::Routing::Routes.recognize_path(path, { :method => request.method })
+          request.path_parameters = params.with_indifferent_access
 
-          ActionController::Routing::Routes.recognize(request)
           request
         end
     end
diff --git a/actionpack/lib/action_dispatch/testing/assertions/selector.rb b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
index d22adfa749..c2dc591ff7 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/selector.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
@@ -1,3 +1,5 @@
+require 'action_controller/vendor/html-scanner'
+
 #--
 # Copyright (c) 2006 Assaf Arkin (http://labnotes.org)
 # Under MIT and/or CC By license.
@@ -16,7 +18,7 @@ module ActionDispatch
     #
     # Use +css_select+ to select elements without making an assertions, either
     # from the response HTML or elements selected by the enclosing assertion.
-    # 
+    #
     # In addition to HTML responses, you can make the following assertions:
     # * +assert_select_rjs+ - Assertions on HTML content of RJS update and insertion operations.
     # * +assert_select_encoded+ - Assertions on HTML encoded inside XML, for example for dealing with feed item descriptions.
@@ -53,8 +55,8 @@ module ActionDispatch
       #   end
       #
       #   # Selects all list items in unordered lists
-      #   items = css_select("ul>li") 
-      #      
+      #   items = css_select("ul>li")
+      #
       #   # Selects all form tags and then all inputs inside the form
       #   forms = css_select("form")
       #   forms.each do |form|
@@ -212,7 +214,7 @@ module ActionDispatch
           # Otherwise just operate on the response document.
           root = response_from_page_or_rjs
         end
-        
+
         # First or second argument is the selector: string and we pass
         # all remaining arguments. Array and we pass the argument. Also
         # accepts selector itself.
@@ -225,7 +227,7 @@ module ActionDispatch
             selector = arg
           else raise ArgumentError, "Expecting a selector as the first argument"
         end
-        
+
         # Next argument is used for equality tests.
         equals = {}
         case arg = args.shift
@@ -315,10 +317,10 @@ module ActionDispatch
         # Returns all matches elements.
         matches
       end
-      
+
       def count_description(min, max) #:nodoc:
         pluralize = lambda {|word, quantity| word << (quantity == 1 ? '' : 's')}
-        
+
         if min && max && (max != min)
           "between #{min} and #{max} elements"
         elsif min && !(min == 1 && max == 1)
@@ -327,7 +329,7 @@ module ActionDispatch
           "at most #{max} #{pluralize['element', max]}"
         end
       end
-      
+
       # :call-seq:
       #   assert_select_rjs(id?) { |elements| ... }
       #   assert_select_rjs(statement, id?) { |elements| ... }
@@ -344,7 +346,7 @@ module ActionDispatch
       # that update or insert an element with that identifier.
       #
       # Use the first argument to narrow down assertions to only statements
-      # of that type. Possible values are <tt>:replace</tt>, <tt>:replace_html</tt>, 
+      # of that type. Possible values are <tt>:replace</tt>, <tt>:replace_html</tt>,
       # <tt>:show</tt>, <tt>:hide</tt>, <tt>:toggle</tt>, <tt>:remove</tta>,
       # <tt>:insert_html</tt> and <tt>:redirect</tt>.
       #
@@ -494,7 +496,7 @@ module ActionDispatch
       #       end
       #     end
       #   end
-      #   
+      #
       #
       #   # Selects all paragraph tags from within the description of an RSS feed
       #   assert_select_feed :rss, 2.0 do
diff --git a/actionpack/lib/action_dispatch/testing/assertions/tag.rb b/actionpack/lib/action_dispatch/testing/assertions/tag.rb
index ef6867576e..5c735e61b2 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/tag.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/tag.rb
@@ -1,3 +1,5 @@
+require 'action_controller/vendor/html-scanner'
+
 module ActionDispatch
   module Assertions
     # Pair of assertions to testing elements in the HTML output of the response.
@@ -76,10 +78,10 @@ module ActionDispatch
       #   # Assert that there is a "span" containing between 2 and 4 "em" tags
       #   # as immediate children
       #   assert_tag :tag => "span",
-      #              :children => { :count => 2..4, :only => { :tag => "em" } } 
+      #              :children => { :count => 2..4, :only => { :tag => "em" } }
       #
       #   # Get funky: assert that there is a "div", with an "ul" ancestor
-      #   # and an "li" parent (with "class" = "enum"), and containing a 
+      #   # and an "li" parent (with "class" = "enum"), and containing a
       #   # "span" descendant that contains text matching /hello world/
       #   assert_tag :tag => "div",
       #              :ancestor => { :tag => "ul" },
@@ -98,7 +100,7 @@ module ActionDispatch
         tag = find_tag(opts)
         assert tag, "expected tag, but no tag found matching #{opts.inspect} in:\n#{@response.body.inspect}"
       end
-      
+
       # Identical to +assert_tag+, but asserts that a matching tag does _not_
       # exist. (See +assert_tag+ for a full discussion of the syntax.)
       #
@@ -118,6 +120,19 @@ module ActionDispatch
         tag = find_tag(opts)
         assert !tag, "expected no tag, but found tag matching #{opts.inspect} in:\n#{@response.body.inspect}"
       end
+
+      def find_tag(conditions)
+        html_document.find(conditions)
+      end
+
+      def find_all_tag(conditions)
+        html_document.find_all(conditions)
+      end
+
+      def html_document
+        xml = @response.content_type =~ /xml$/
+        @html_document ||= HTML::Document.new(@response.body, false, xml)
+      end
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 40d6f97b2a..2a5f5dcd5c 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -2,9 +2,7 @@ require 'stringio'
 require 'uri'
 require 'active_support/test_case'
 require 'active_support/core_ext/object/metaclass'
-
-# TODO: Remove circular dependency on ActionController
-require 'action_controller/testing/process'
+require 'rack/test'
 
 module ActionDispatch
   module Integration #:nodoc:
@@ -128,9 +126,7 @@ module ActionDispatch
       DEFAULT_HOST = "www.example.com"
 
       include Test::Unit::Assertions
-      include ActionDispatch::Assertions
-      include ActionController::TestProcess
-      include RequestHelpers
+      include TestProcess, RequestHelpers, Assertions
 
       %w( status status_message headers body redirect? ).each do |method|
         delegate method, :to => :response, :allow_nil => true
@@ -415,7 +411,7 @@ module ActionDispatch
   # At its simplest, you simply extend IntegrationTest and write your tests
   # using the get/post methods:
   #
-  #   require "#{File.dirname(__FILE__)}/test_helper"
+  #   require "test_helper"
   #
   #   class ExampleTest < ActionController::IntegrationTest
   #     fixtures :people
@@ -439,7 +435,7 @@ module ActionDispatch
   # powerful testing DSL that is specific for your application. You can even
   # reference any named routes you happen to have defined!
   #
-  #   require "#{File.dirname(__FILE__)}/test_helper"
+  #   require "test_helper"
   #
   #   class AdvancedTest < ActionController::IntegrationTest
   #     fixtures :people, :rooms
diff --git a/actionpack/lib/action_dispatch/testing/performance_test.rb b/actionpack/lib/action_dispatch/testing/performance_test.rb
index b1ed9d31f4..1b9a6c18b7 100644
--- a/actionpack/lib/action_dispatch/testing/performance_test.rb
+++ b/actionpack/lib/action_dispatch/testing/performance_test.rb
@@ -1,15 +1,17 @@
 require 'active_support/testing/performance'
 require 'active_support/testing/default'
 
-module ActionDispatch
-  # An integration test that runs a code profiler on your test methods.
-  # Profiling output for combinations of each test method, measurement, and
-  # output format are written to your tmp/performance directory.
-  #
-  # By default, process_time is measured and both flat and graph_html output
-  # formats are written, so you'll have two output files per test method.
-  class PerformanceTest < ActionDispatch::IntegrationTest
-    include ActiveSupport::Testing::Performance
-    include ActiveSupport::Testing::Default
+if defined?(ActiveSupport::Testing::Performance)
+  module ActionDispatch
+    # An integration test that runs a code profiler on your test methods.
+    # Profiling output for combinations of each test method, measurement, and
+    # output format are written to your tmp/performance directory.
+    #
+    # By default, process_time is measured and both flat and graph_html output
+    # formats are written, so you'll have two output files per test method.
+    class PerformanceTest < ActionDispatch::IntegrationTest
+      include ActiveSupport::Testing::Performance
+      include ActiveSupport::Testing::Default
+    end
   end
-end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_dispatch/testing/test_process.rb b/actionpack/lib/action_dispatch/testing/test_process.rb
new file mode 100644
index 0000000000..eae703e1b6
--- /dev/null
+++ b/actionpack/lib/action_dispatch/testing/test_process.rb
@@ -0,0 +1,42 @@
+module ActionDispatch
+  module TestProcess
+    def assigns(key = nil)
+      assigns = {}
+      @controller.instance_variable_names.each do |ivar|
+        next if ActionController::Base.protected_instance_variables.include?(ivar)
+        assigns[ivar[1..-1]] = @controller.instance_variable_get(ivar)
+      end
+
+      key.nil? ? assigns : assigns[key.to_s]
+    end
+
+    def session
+      @request.session
+    end
+
+    def flash
+      @request.flash
+    end
+
+    def cookies
+      @request.cookies.merge(@response.cookies)
+    end
+
+    def redirect_to_url
+      @response.redirect_url
+    end
+
+    # Shortcut for <tt>ARack::Test::UploadedFile.new(ActionController::TestCase.fixture_path + path, type)</tt>:
+    #
+    #   post :change_avatar, :avatar => fixture_file_upload('/files/spongebob.png', 'image/png')
+    #
+    # To upload binary files on Windows, pass <tt>:binary</tt> as the last parameter.
+    # This will not affect other platforms:
+    #
+    #   post :change_avatar, :avatar => fixture_file_upload('/files/spongebob.png', 'image/png', :binary)
+    def fixture_file_upload(path, mime_type = nil, binary = false)
+      fixture_path = ActionController::TestCase.send(:fixture_path) if ActionController::TestCase.respond_to?(:fixture_path)
+      Rack::Test::UploadedFile.new("#{fixture_path}#{path}", mime_type, binary)
+    end
+  end
+end
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index e95e84aeb5..8ce6e82524 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -21,38 +21,40 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-require File.join(File.dirname(__FILE__), "action_pack")
+activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
+$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
+require 'active_support/ruby/shim'
+require 'active_support/core_ext/class/attribute_accessors'
+
+require 'action_pack'
 
 module ActionView
-  def self.load_all!
-    [Context, Base, InlineTemplate, TemplateError]
-  end
+  extend ActiveSupport::Autoload
+
+  eager_autoload do
+    autoload :Context
+    autoload :Template
+    autoload :Helpers
+    autoload :SafeBuffer
+
+    autoload_under "render" do
+      autoload :Partials
+      autoload :Rendering
+    end
 
-  autoload :Base,              'action_view/base'
-  autoload :Context,           'action_view/context'
-  autoload :Helpers,           'action_view/helpers'
-  autoload :MissingTemplate,   'action_view/base'
-  autoload :Partials,          'action_view/render/partials'
-  autoload :Resolver,          'action_view/template/resolver'
-  autoload :PathResolver,      'action_view/template/resolver'
-  autoload :PathSet,           'action_view/paths'
-  autoload :Rendering,         'action_view/render/rendering'
-  autoload :Template,          'action_view/template/template'
-  autoload :TemplateError,     'action_view/template/error'
-  autoload :TemplateHandler,   'action_view/template/handler'
-  autoload :TemplateHandlers,  'action_view/template/handlers'
-  autoload :TextTemplate,      'action_view/template/text'
-  autoload :Helpers,           'action_view/helpers'
-  autoload :FileSystemResolverWithFallback, 'action_view/template/resolver'
-  autoload :SafeBuffer,        'action_view/safe_buffer'
+    autoload :MissingTemplate,   'action_view/base'
+    autoload :Resolver,          'action_view/template/resolver'
+    autoload :PathResolver,      'action_view/template/resolver'
+    autoload :PathSet,           'action_view/paths'
+    autoload :FileSystemResolverWithFallback, 'action_view/template/resolver'
+
+    autoload :TemplateError,     'action_view/template/error'
+    autoload :TemplateHandler,   'action_view/template'
+    autoload :TemplateHandlers,  'action_view/template'
+  end
 end
 
 require 'action_view/erb/util'
-
+require 'action_view/base'
 
 I18n.load_path << "#{File.dirname(__FILE__)}/action_view/locale/en.yml"
-
-activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
-$:.unshift activesupport_path if File.directory?(activesupport_path)
-require 'active_support'
-require 'active_support/core_ext/class/attribute_accessors'
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index c33695770f..d69e5109fa 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -196,7 +196,7 @@ module ActionView #:nodoc:
     end
 
     class << self
-      delegate :erb_trim_mode=, :to => 'ActionView::TemplateHandlers::ERB'
+      delegate :erb_trim_mode=, :to => 'ActionView::Template::Handlers::ERB'
       delegate :logger, :to => 'ActionController::Base', :allow_nil => true
     end
 
diff --git a/actionpack/lib/action_view/helpers/sanitize_helper.rb b/actionpack/lib/action_view/helpers/sanitize_helper.rb
index 69d0d0fb67..f03ffe5ef4 100644
--- a/actionpack/lib/action_view/helpers/sanitize_helper.rb
+++ b/actionpack/lib/action_view/helpers/sanitize_helper.rb
@@ -1,3 +1,4 @@
+require 'action_controller/vendor/html-scanner'
 require 'action_view/helpers/tag_helper'
 
 module ActionView
diff --git a/actionpack/lib/action_view/helpers/translation_helper.rb b/actionpack/lib/action_view/helpers/translation_helper.rb
index 564f12c955..35c431d78d 100644
--- a/actionpack/lib/action_view/helpers/translation_helper.rb
+++ b/actionpack/lib/action_view/helpers/translation_helper.rb
@@ -12,7 +12,7 @@ module ActionView
       # prepend the key with a period, nothing is converted.
       def translate(key, options = {})
         options[:raise] = true
-        I18n.translate(scope_key_by_partial(key), options)
+        I18n.translate(scope_key_by_partial(key), options).html_safe!
       rescue I18n::MissingTranslationData => e
         keys = I18n.send(:normalize_translation_keys, e.locale, e.key, e.options[:scope])
         content_tag('span', keys.join(', '), :class => 'translation_missing')
diff --git a/actionpack/lib/action_view/paths.rb b/actionpack/lib/action_view/paths.rb
index 23bde61f9c..0059b79e5f 100644
--- a/actionpack/lib/action_view/paths.rb
+++ b/actionpack/lib/action_view/paths.rb
@@ -4,7 +4,7 @@ module ActionView #:nodoc:
       # TODO: Clean this up
       if obj.is_a?(String)
         if cache.nil?
-          cache = !defined?(Rails) || Rails.application.config.cache_classes
+          cache = !defined?(Rails.application) || Rails.application.config.cache_classes
         end
         FileSystemResolverWithFallback.new(obj, :cache => cache)
       else
diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index 2eb88ae3e5..aeaf1ee4ff 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -181,20 +181,20 @@ module ActionView
       def initialize(view_context, options, block)
         @view           = view_context
         @partial_names  = PARTIAL_NAMES[@view.controller.class]
-        
+
         key = Thread.current[:format_locale_key]
         @templates      = TEMPLATES[key] if key
-        
+
         setup(options, block)
       end
-      
+
       def setup(options, block)
         partial = options[:partial]
-        
+
         @options    = options
         @locals     = options[:locals] || {}
         @block      = block
-        
+
         if String === partial
           @object = options[:object]
           @path   = partial
@@ -240,7 +240,7 @@ module ActionView
 
           segments << template.render(@view, locals)
         end
-        
+
         @template = template
         segments
       end
@@ -294,7 +294,7 @@ module ActionView
           path && @templates[path] ||= _find_template(path)
         end
       end
-      
+
       def _find_template(path)
         if controller = @view.controller
           prefix = controller.controller_path unless path.include?(?/)
@@ -319,7 +319,7 @@ module ActionView
       _evaluate_assigns_and_ivars
 
       details = options[:_details]
-      
+
       # Is this needed
       self.formats = details[:formats] if details
       renderer = PartialRenderer.new(self, options, nil)
@@ -329,12 +329,12 @@ module ActionView
     end
 
     def _render_partial(options, &block) #:nodoc:
-      if @renderer
+      if defined? @renderer
         @renderer.setup(options, block)
       else
         @renderer = PartialRenderer.new(self, options, block)
       end
-      
+
       @renderer.render
     end
 
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index 7006a5b968..d4d16b4d98 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -78,12 +78,12 @@ module ActionView
     end
 
     def _render_inline(inline, layout, options)
-      handler = Template.handler_class_for_extension(options[:type] || "erb")
-      template = Template.new(options[:inline],
-        "inline #{options[:inline].inspect}", handler, {})
+      handler  = Template.handler_class_for_extension(options[:type] || "erb")
+      template = Template.new(options[:inline], "inline template", handler, {})
 
-      locals = options[:locals]
+      locals  = options[:locals]
       content = template.render(self, locals)
+
       _render_text(content, layout, locals)
     end
 
@@ -91,6 +91,7 @@ module ActionView
       content = layout.render(self, locals) do |*name|
         _layout_for(*name) { content }
       end if layout
+
       content
     end
 
@@ -113,21 +114,16 @@ module ActionView
         msg
       end
 
-      locals = options[:locals] || {}
-
-      content = if partial
-        _render_partial_object(template, options)
-      else
-        template.render(self, locals)
-      end
-
+      locals  = options[:locals] || {}
+      content = partial ? _render_partial_object(template, options) : template.render(self, locals)
       @_content_for[:layout] = content
 
       if layout
         @_layout = layout.identifier
         logger.info("Rendering template within #{layout.inspect}") if logger
-        content = layout.render(self, locals) {|*name| _layout_for(*name) }
+        content = layout.render(self, locals) { |*name| _layout_for(*name) }
       end
+
       content
     end
   end
diff --git a/actionpack/lib/action_view/safe_buffer.rb b/actionpack/lib/action_view/safe_buffer.rb
index 09f44ab26f..6be05b9e1e 100644
--- a/actionpack/lib/action_view/safe_buffer.rb
+++ b/actionpack/lib/action_view/safe_buffer.rb
@@ -1,4 +1,3 @@
-
 module ActionView #:nodoc:
   class SafeBuffer < String
     def <<(value)
diff --git a/actionpack/lib/action_view/template/template.rb b/actionpack/lib/action_view/template.rb
index d1970ca3c7..d46c989d11 100644
--- a/actionpack/lib/action_view/template/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -6,7 +6,16 @@ require "action_view/template/resolver"
 
 module ActionView
   class Template
-    extend TemplateHandlers
+    extend ActiveSupport::Autoload
+
+    eager_autoload do
+      autoload :Error
+      autoload :Handler
+      autoload :Handlers
+      autoload :Text
+    end
+
+    extend Template::Handlers
     attr_reader :source, :identifier, :handler, :mime_type, :formats, :details
 
     def initialize(source, identifier, handler, details)
@@ -32,11 +41,11 @@ module ActionView
         view.send(method_name, locals, &block)
       end
     rescue Exception => e
-      if e.is_a?(TemplateError)
+      if e.is_a?(Template::Error)
         e.sub_template_of(self)
         raise e
       else
-        raise TemplateError.new(self, view.assigns, e)
+        raise Template::Error.new(self, view.assigns, e)
       end
     end
 
@@ -103,23 +112,8 @@ module ActionView
             logger.debug "Backtrace: #{e.backtrace.join("\n")}"
           end
 
-          raise ActionView::TemplateError.new(self, {}, e)
-        end
-      end
-
-      class LocalsKey
-        @hash_keys = Hash.new {|h,k| h[k] = Hash.new {|h,k| h[k] = {} } }
-
-        def self.get(*locals)
-          @hash_keys[*locals] ||= new(klass, format, locale)
+          raise ActionView::Template::Error.new(self, {}, e)
         end
-
-        attr_accessor :hash
-        def initialize(klass, format, locale)
-          @hash = locals.hash
-        end
-
-        alias_method :eql?, :equal?
       end
 
       def build_method_name(locals)
diff --git a/actionpack/lib/action_view/template/error.rb b/actionpack/lib/action_view/template/error.rb
index aa21606f76..648f708d3d 100644
--- a/actionpack/lib/action_view/template/error.rb
+++ b/actionpack/lib/action_view/template/error.rb
@@ -1,101 +1,105 @@
 require "active_support/core_ext/enumerable"
 
 module ActionView
-  # The TemplateError exception is raised when the compilation of the template fails. This exception then gathers a
-  # bunch of intimate details and uses it to report a very precise exception message.
-  class TemplateError < ActionViewError #:nodoc:
-    SOURCE_CODE_RADIUS = 3
+  class Template
+    # The Template::Error exception is raised when the compilation of the template fails. This exception then gathers a
+    # bunch of intimate details and uses it to report a very precise exception message.
+    class Error < ActionViewError #:nodoc:
+      SOURCE_CODE_RADIUS = 3
 
-    attr_reader :original_exception
+      attr_reader :original_exception
 
-    def initialize(template, assigns, original_exception)
-      @template, @assigns, @original_exception = template, assigns.dup, original_exception
-      @backtrace = compute_backtrace
-    end
+      def initialize(template, assigns, original_exception)
+        @template, @assigns, @original_exception = template, assigns.dup, original_exception
+        @backtrace = compute_backtrace
+      end
 
-    def file_name
-      @template.identifier
-    end
+      def file_name
+        @template.identifier
+      end
 
-    def message
-      ActiveSupport::Deprecation.silence { original_exception.message }
-    end
+      def message
+        ActiveSupport::Deprecation.silence { original_exception.message }
+      end
 
-    def clean_backtrace
-      if defined?(Rails) && Rails.respond_to?(:backtrace_cleaner)
-        Rails.backtrace_cleaner.clean(original_exception.backtrace)
-      else
-        original_exception.backtrace
+      def clean_backtrace
+        if defined?(Rails) && Rails.respond_to?(:backtrace_cleaner)
+          Rails.backtrace_cleaner.clean(original_exception.backtrace)
+        else
+          original_exception.backtrace
+        end
       end
-    end
 
-    def sub_template_message
-      if @sub_templates
-        "Trace of template inclusion: " +
-        @sub_templates.collect { |template| template.inspect }.join(", ")
-      else
-        ""
+      def sub_template_message
+        if @sub_templates
+          "Trace of template inclusion: " +
+          @sub_templates.collect { |template| template.inspect }.join(", ")
+        else
+          ""
+        end
       end
-    end
 
-    def source_extract(indentation = 0)
-      return unless num = line_number
-      num = num.to_i
+      def source_extract(indentation = 0)
+        return unless num = line_number
+        num = num.to_i
 
-      source_code = @template.source.split("\n")
+        source_code = @template.source.split("\n")
 
-      start_on_line = [ num - SOURCE_CODE_RADIUS - 1, 0 ].max
-      end_on_line   = [ num + SOURCE_CODE_RADIUS - 1, source_code.length].min
+        start_on_line = [ num - SOURCE_CODE_RADIUS - 1, 0 ].max
+        end_on_line   = [ num + SOURCE_CODE_RADIUS - 1, source_code.length].min
 
-      indent = ' ' * indentation
-      line_counter = start_on_line
-      return unless source_code = source_code[start_on_line..end_on_line]
+        indent = ' ' * indentation
+        line_counter = start_on_line
+        return unless source_code = source_code[start_on_line..end_on_line]
 
-      source_code.sum do |line|
-        line_counter += 1
-        "#{indent}#{line_counter}: #{line}\n"
+        source_code.sum do |line|
+          line_counter += 1
+          "#{indent}#{line_counter}: #{line}\n"
+        end
       end
-    end
-
-    def sub_template_of(template_path)
-      @sub_templates ||= []
-      @sub_templates << template_path
-    end
-
-    def line_number
-      @line_number ||=
-        if file_name
-          regexp = /#{Regexp.escape File.basename(file_name)}:(\d+)/
 
-          $1 if message =~ regexp or clean_backtrace.find { |line| line =~ regexp }
-        end
-    end
+      def sub_template_of(template_path)
+        @sub_templates ||= []
+        @sub_templates << template_path
+      end
 
-    def to_s
-      "\n#{self.class} (#{message}) #{source_location}:\n" + 
-      "#{source_extract}\n    #{clean_backtrace.join("\n    ")}\n\n"
-    end
+      def line_number
+        @line_number ||=
+          if file_name
+            regexp = /#{Regexp.escape File.basename(file_name)}:(\d+)/
 
-    # don't do anything nontrivial here. Any raised exception from here becomes fatal 
-    # (and can't be rescued).
-    def backtrace
-      @backtrace
-    end
+            $1 if message =~ regexp or clean_backtrace.find { |line| line =~ regexp }
+          end
+      end
 
-    private
-      def compute_backtrace
-        [
-          "#{source_location.capitalize}\n\n#{source_extract(4)}\n    " +
-          clean_backtrace.join("\n    ")
-        ]
+      def to_s
+        "\n#{self.class} (#{message}) #{source_location}:\n" + 
+        "#{source_extract}\n    #{clean_backtrace.join("\n    ")}\n\n"
       end
 
-      def source_location
-        if line_number
-          "on line ##{line_number} of "
-        else
-          'in '
-        end + file_name
+      # don't do anything nontrivial here. Any raised exception from here becomes fatal 
+      # (and can't be rescued).
+      def backtrace
+        @backtrace
       end
+
+      private
+        def compute_backtrace
+          [
+            "#{source_location.capitalize}\n\n#{source_extract(4)}\n    " +
+            clean_backtrace.join("\n    ")
+          ]
+        end
+
+        def source_location
+          if line_number
+            "on line ##{line_number} of "
+          else
+            'in '
+          end + file_name
+        end
+    end
   end
-end
\ No newline at end of file
+
+  TemplateError = Template::Error
+end
diff --git a/actionpack/lib/action_view/template/handler.rb b/actionpack/lib/action_view/template/handler.rb
index 4bf58b9fa8..5a46a27893 100644
--- a/actionpack/lib/action_view/template/handler.rb
+++ b/actionpack/lib/action_view/template/handler.rb
@@ -3,34 +3,39 @@ require "action_dispatch/http/mime_type"
 
 # Legacy TemplateHandler stub
 module ActionView
-  module TemplateHandlers #:nodoc:
-    module Compilable
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
+  class Template
+    module Handlers #:nodoc:
+      module Compilable
+        def self.included(base)
+          base.extend(ClassMethods)
+        end
 
-      module ClassMethods
-        def call(template)
-          new.compile(template)
+        module ClassMethods
+          def call(template)
+            new.compile(template)
+          end
         end
-      end
 
-      def compile(template)
-         raise "Need to implement #{self.class.name}#compile(template)"
-       end
+        def compile(template)
+           raise "Need to implement #{self.class.name}#compile(template)"
+         end
+      end
     end
-  end
 
-  class TemplateHandler
-    extlib_inheritable_accessor :default_format
-    self.default_format = Mime::HTML
+    class Template::Handler
+      extlib_inheritable_accessor :default_format
+      self.default_format = Mime::HTML
 
-    def self.call(template)
-      raise "Need to implement #{self.class.name}#call(template)"
-    end
+      def self.call(template)
+        raise "Need to implement #{self.class.name}#call(template)"
+      end
 
-    def render(template, local_assigns)
-      raise "Need to implement #{self.class.name}#render(template, local_assigns)"
+      def render(template, local_assigns)
+        raise "Need to implement #{self.class.name}#render(template, local_assigns)"
+      end
     end
   end
+  
+  TemplateHandlers = Template::Handlers
+  TemplateHandler = Template::Handler
 end
diff --git a/actionpack/lib/action_view/template/handlers.rb b/actionpack/lib/action_view/template/handlers.rb
index faf54b9fe5..35488c0391 100644
--- a/actionpack/lib/action_view/template/handlers.rb
+++ b/actionpack/lib/action_view/template/handlers.rb
@@ -1,52 +1,54 @@
 module ActionView #:nodoc:
-  module TemplateHandlers #:nodoc:
-    autoload :ERB, 'action_view/template/handlers/erb'
-    autoload :RJS, 'action_view/template/handlers/rjs'
-    autoload :Builder, 'action_view/template/handlers/builder'
-
-    def self.extended(base)
-      base.register_default_template_handler :erb, TemplateHandlers::ERB
-      base.register_template_handler :rjs, TemplateHandlers::RJS
-      base.register_template_handler :builder, TemplateHandlers::Builder
-
-      # TODO: Depreciate old template extensions
-      base.register_template_handler :rhtml, TemplateHandlers::ERB
-      base.register_template_handler :rxml, TemplateHandlers::Builder
-    end
-
-    @@template_handlers = {}
-    @@default_template_handlers = nil
+  class Template
+    module Handlers #:nodoc:
+      autoload :ERB, 'action_view/template/handlers/erb'
+      autoload :RJS, 'action_view/template/handlers/rjs'
+      autoload :Builder, 'action_view/template/handlers/builder'
+
+      def self.extended(base)
+        base.register_default_template_handler :erb, ERB
+        base.register_template_handler :rjs, RJS
+        base.register_template_handler :builder, Builder
+
+        # TODO: Depreciate old template extensions
+        base.register_template_handler :rhtml, ERB
+        base.register_template_handler :rxml, Builder
+      end
+
+      @@template_handlers = {}
+      @@default_template_handlers = nil
     
-    def self.extensions
-      @@template_handlers.keys
-    end
-
-    # Register a class that knows how to handle template files with the given
-    # extension. This can be used to implement new template types.
-    # The constructor for the class must take the ActiveView::Base instance
-    # as a parameter, and the class must implement a +render+ method that
-    # takes the contents of the template to render as well as the Hash of
-    # local assigns available to the template. The +render+ method ought to
-    # return the rendered template as a string.
-    def register_template_handler(extension, klass)
-      @@template_handlers[extension.to_sym] = klass
-    end
-
-    def template_handler_extensions
-      @@template_handlers.keys.map {|key| key.to_s }.sort
-    end
-
-    def registered_template_handler(extension)
-      extension && @@template_handlers[extension.to_sym]
-    end
-
-    def register_default_template_handler(extension, klass)
-      register_template_handler(extension, klass)
-      @@default_template_handlers = klass
-    end
-
-    def handler_class_for_extension(extension)
-      (extension && registered_template_handler(extension.to_sym)) || @@default_template_handlers
+      def self.extensions
+        @@template_handlers.keys
+      end
+
+      # Register a class that knows how to handle template files with the given
+      # extension. This can be used to implement new template types.
+      # The constructor for the class must take the ActiveView::Base instance
+      # as a parameter, and the class must implement a +render+ method that
+      # takes the contents of the template to render as well as the Hash of
+      # local assigns available to the template. The +render+ method ought to
+      # return the rendered template as a string.
+      def register_template_handler(extension, klass)
+        @@template_handlers[extension.to_sym] = klass
+      end
+
+      def template_handler_extensions
+        @@template_handlers.keys.map {|key| key.to_s }.sort
+      end
+
+      def registered_template_handler(extension)
+        extension && @@template_handlers[extension.to_sym]
+      end
+
+      def register_default_template_handler(extension, klass)
+        register_template_handler(extension, klass)
+        @@default_template_handlers = klass
+      end
+
+      def handler_class_for_extension(extension)
+        (extension && registered_template_handler(extension.to_sym)) || @@default_template_handlers
+      end
     end
   end
 end
diff --git a/actionpack/lib/action_view/template/handlers/builder.rb b/actionpack/lib/action_view/template/handlers/builder.rb
index 5f381f7bf0..a93cfca8aa 100644
--- a/actionpack/lib/action_view/template/handlers/builder.rb
+++ b/actionpack/lib/action_view/template/handlers/builder.rb
@@ -1,6 +1,6 @@
 module ActionView
-  module TemplateHandlers
-    class Builder < TemplateHandler
+  module Template::Handlers
+    class Builder < Template::Handler
       include Compilable
 
       self.default_format = Mime::XML
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index 88aeb4b053..93a4315108 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -3,14 +3,15 @@ require 'active_support/core_ext/string/output_safety'
 require 'erubis'
 
 module ActionView
-  module TemplateHandlers
+  module Template::Handlers
     class Erubis < ::Erubis::Eruby
       def add_preamble(src)
         src << "@output_buffer = ActionView::SafeBuffer.new;"
       end
 
       def add_text(src, text)
-        src << "@output_buffer << ('" << escape_text(text) << "'.html_safe!);"
+        return if text.empty?
+        src << "@output_buffer.safe_concat('" << escape_text(text) << "');"
       end
 
       def add_expr_literal(src, code)
@@ -26,7 +27,7 @@ module ActionView
       end
     end
 
-    class ERB < TemplateHandler
+    class ERB < Template::Handler
       include Compilable
 
       ##
diff --git a/actionpack/lib/action_view/template/handlers/rjs.rb b/actionpack/lib/action_view/template/handlers/rjs.rb
index b1d15dc209..63e7dc0902 100644
--- a/actionpack/lib/action_view/template/handlers/rjs.rb
+++ b/actionpack/lib/action_view/template/handlers/rjs.rb
@@ -1,6 +1,6 @@
 module ActionView
-  module TemplateHandlers
-    class RJS < TemplateHandler
+  module Template::Handlers
+    class RJS < Template::Handler
       include Compilable
 
       self.default_format = Mime::JS
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index 7336114e1b..a2f4ab2ef5 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -1,6 +1,6 @@
 require "pathname"
 require "active_support/core_ext/class"
-require "action_view/template/template"
+require "action_view/template"
 
 module ActionView
   # Abstract superclass
@@ -20,7 +20,7 @@ module ActionView
     register_detail(:locale)  { [I18n.locale] }
     register_detail(:formats) { Mime::SET.symbols }
     register_detail(:handlers, :allow_nil => false) do
-      TemplateHandlers.extensions
+      Template::Handlers.extensions
     end
 
     def initialize(options = {})
@@ -65,7 +65,7 @@ module ActionView
     # as well as incorrectly putting part of the path in the template
     # name instead of the prefix.
     def normalize_name(name, prefix)
-      handlers = TemplateHandlers.extensions.join('|')
+      handlers = Template::Handlers.extensions.join('|')
       name = name.to_s.gsub(/\.(?:#{handlers})$/, '')
 
       parts = name.split('/')
diff --git a/actionpack/lib/action_view/template/text.rb b/actionpack/lib/action_view/template/text.rb
index f6e011a5ab..67e086d8bd 100644
--- a/actionpack/lib/action_view/template/text.rb
+++ b/actionpack/lib/action_view/template/text.rb
@@ -1,38 +1,40 @@
 module ActionView #:nodoc:
-  class TextTemplate < String #:nodoc:
-    HTML = Mime[:html]
-
-    def initialize(string, content_type = HTML)
-      super(string.to_s)
-      @content_type = Mime[content_type] || content_type
-    end
-
-    def details
-      {:formats => [@content_type.to_sym]}
-    end
-
-    def identifier
-      self
-    end
-
-    def inspect
-      'text template'
-    end
-
-    def render(*args)
-      to_s
-    end
-
-    def mime_type
-      @content_type
-    end
-
-    def formats
-      [mime_type]
-    end
-
-    def partial?
-      false
+  class Template
+    class Text < String #:nodoc:
+      HTML = Mime[:html]
+
+      def initialize(string, content_type = HTML)
+        super(string.to_s)
+        @content_type = Mime[content_type] || content_type
+      end
+
+      def details
+        {:formats => [@content_type.to_sym]}
+      end
+
+      def identifier
+        self
+      end
+
+      def inspect
+        'text template'
+      end
+
+      def render(*args)
+        to_s
+      end
+
+      def mime_type
+        @content_type
+      end
+
+      def formats
+        [mime_type]
+      end
+
+      def partial?
+        false
+      end
     end
   end
 end
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index 86bbad822d..be9a2ed50d 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -1,5 +1,5 @@
 require 'active_support/test_case'
-require 'action_controller/testing/test_case'
+require 'action_controller/test_case'
 
 module ActionView
   class Base
@@ -39,8 +39,7 @@ module ActionView
       end
     end
 
-    include ActionDispatch::Assertions
-    include ActionController::TestProcess
+    include ActionDispatch::Assertions, ActionDispatch::TestProcess
     include ActionView::Context
 
     include ActionController::PolymorphicRoutes
diff --git a/actionpack/test/abstract/abstract_controller_test.rb b/actionpack/test/abstract/abstract_controller_test.rb
index 524381509d..4ad87d9762 100644
--- a/actionpack/test/abstract/abstract_controller_test.rb
+++ b/actionpack/test/abstract/abstract_controller_test.rb
@@ -28,7 +28,7 @@ module AbstractController
     # Test Render mixin
     # ====
     class RenderingController < AbstractController::Base
-      include ::AbstractController::RenderingController
+      include ::AbstractController::Rendering
 
       def _prefix() end
 
diff --git a/actionpack/test/abstract/helper_test.rb b/actionpack/test/abstract/helper_test.rb
index efcd68e5c8..ade29140ba 100644
--- a/actionpack/test/abstract/helper_test.rb
+++ b/actionpack/test/abstract/helper_test.rb
@@ -6,7 +6,7 @@ module AbstractController
   module Testing
   
     class ControllerWithHelpers < AbstractController::Base
-      include AbstractController::RenderingController
+      include AbstractController::Rendering
       include Helpers
 
       def with_module
diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb
index ae2f1bf1f2..df73d948f0 100644
--- a/actionpack/test/abstract/layouts_test.rb
+++ b/actionpack/test/abstract/layouts_test.rb
@@ -6,7 +6,7 @@ module AbstractControllerTests
 
     # Base controller for these tests
     class Base < AbstractController::Base
-      include AbstractController::RenderingController
+      include AbstractController::Rendering
       include AbstractController::Layouts
 
       self.view_paths = [ActionView::FixtureResolver.new(
@@ -23,7 +23,7 @@ module AbstractControllerTests
       self.view_paths = []
       
       def index
-        render :_template => ActionView::TextTemplate.new("Hello blank!")
+        render :_template => ActionView::Template::Text.new("Hello blank!")
       end
     end
     
@@ -31,19 +31,19 @@ module AbstractControllerTests
       layout "hello"
       
       def index
-        render :_template => ActionView::TextTemplate.new("Hello string!")
+        render :_template => ActionView::Template::Text.new("Hello string!")
       end
 
       def overwrite_default
-        render :_template => ActionView::TextTemplate.new("Hello string!"), :layout => :default
+        render :_template => ActionView::Template::Text.new("Hello string!"), :layout => :default
       end
 
       def overwrite_false
-        render :_template => ActionView::TextTemplate.new("Hello string!"), :layout => false
+        render :_template => ActionView::Template::Text.new("Hello string!"), :layout => false
       end
 
       def overwrite_string
-        render :_template => ActionView::TextTemplate.new("Hello string!"), :layout => "omg"
+        render :_template => ActionView::Template::Text.new("Hello string!"), :layout => "omg"
       end
 
       def overwrite_skip
@@ -72,7 +72,7 @@ module AbstractControllerTests
       layout :hello
       
       def index
-        render :_template => ActionView::TextTemplate.new("Hello symbol!")
+        render :_template => ActionView::Template::Text.new("Hello symbol!")
       end
     private  
       def hello
@@ -84,7 +84,7 @@ module AbstractControllerTests
       layout :no_hello
       
       def index
-        render :_template => ActionView::TextTemplate.new("Hello missing symbol!")
+        render :_template => ActionView::Template::Text.new("Hello missing symbol!")
       end
     private  
       def no_hello
@@ -96,7 +96,7 @@ module AbstractControllerTests
       layout :nilz
       
       def index
-        render :_template => ActionView::TextTemplate.new("Hello nilz!")
+        render :_template => ActionView::Template::Text.new("Hello nilz!")
       end
       
       def nilz() end
@@ -106,7 +106,7 @@ module AbstractControllerTests
       layout :objekt
       
       def index
-        render :_template => ActionView::TextTemplate.new("Hello nilz!")
+        render :_template => ActionView::Template::Text.new("Hello nilz!")
       end
       
       def objekt
@@ -118,7 +118,7 @@ module AbstractControllerTests
       layout :omg_no_method
       
       def index
-        render :_template => ActionView::TextTemplate.new("Hello boom!")
+        render :_template => ActionView::Template::Text.new("Hello boom!")
       end
     end
     
@@ -126,7 +126,7 @@ module AbstractControllerTests
       layout "missing"
       
       def index
-        render :_template => ActionView::TextTemplate.new("Hello missing!")
+        render :_template => ActionView::Template::Text.new("Hello missing!")
       end
     end
     
@@ -134,7 +134,7 @@ module AbstractControllerTests
       layout false
       
       def index
-        render :_template => ActionView::TextTemplate.new("Hello false!")
+        render :_template => ActionView::Template::Text.new("Hello false!")
       end
     end
     
@@ -142,7 +142,7 @@ module AbstractControllerTests
       layout nil
       
       def index
-        render :_template => ActionView::TextTemplate.new("Hello nil!")
+        render :_template => ActionView::Template::Text.new("Hello nil!")
       end
     end
     
diff --git a/actionpack/test/abstract/localized_cache_test.rb b/actionpack/test/abstract/localized_cache_test.rb
index 6f9bb693f7..8b0b0fff03 100644
--- a/actionpack/test/abstract/localized_cache_test.rb
+++ b/actionpack/test/abstract/localized_cache_test.rb
@@ -4,7 +4,7 @@ module AbstractController
   module Testing
   
     class CachedController < AbstractController::Base
-      include AbstractController::RenderingController
+      include AbstractController::Rendering
       include AbstractController::LocalizedCache
 
       self.view_paths = [ActionView::FixtureResolver.new(
diff --git a/actionpack/test/abstract/render_test.rb b/actionpack/test/abstract/render_test.rb
index 45a4763fe4..be0478b638 100644
--- a/actionpack/test/abstract/render_test.rb
+++ b/actionpack/test/abstract/render_test.rb
@@ -4,7 +4,7 @@ module AbstractController
   module Testing
 
     class ControllerRenderer < AbstractController::Base
-      include AbstractController::RenderingController
+      include AbstractController::Rendering
 
       self.view_paths = [ActionView::FixtureResolver.new(
         "default.erb" => "With Default",
@@ -38,7 +38,7 @@ module AbstractController
       end
 
       def object
-        render :_template => ActionView::TextTemplate.new("With Object")
+        render :_template => ActionView::Template::Text.new("With Object")
       end
     end
 
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 775cfc82bf..a9341b60df 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -1,12 +1,9 @@
-root = File.expand_path('../../..', __FILE__)
 begin
-  require "#{root}/vendor/gems/environment"
+  require File.expand_path('../../../vendor/gems/environment', __FILE__)
 rescue LoadError
-  $:.unshift "#{root}/activesupport/lib"
-  $:.unshift "#{root}/activemodel/lib"
 end
 
-lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
+lib = File.expand_path('../../lib', __FILE__)
 $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
 
 $:.unshift(File.dirname(__FILE__) + '/lib')
@@ -16,18 +13,20 @@ $:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers')
 ENV['TMPDIR'] = File.join(File.dirname(__FILE__), 'tmp')
 
 require 'test/unit'
-require 'active_support'
-require 'active_support/test_case'
 require 'abstract_controller'
 require 'action_controller'
 require 'action_view'
 require 'action_view/base'
 require 'action_dispatch'
-require 'active_model'
 require 'fixture_template'
+require 'active_support/test_case'
 require 'action_view/test_case'
 require 'active_support/dependencies'
 
+activemodel_path = File.expand_path('../../../activemodel/lib', __FILE__)
+$:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include?(activemodel_path)
+require 'active_model'
+
 begin
   require 'ruby-debug'
   Debugger.settings[:autoeval] = true
@@ -83,7 +82,7 @@ class ActiveSupport::TestCase
   # have been loaded.
   setup_once do
     ActionController::Routing::Routes.draw do |map|
-      map.connect ':controller/:action/:id'
+      match ':controller(/:action(/:id))'
     end
   end
 end
@@ -191,26 +190,14 @@ class ::ApplicationController < ActionController::Base
 end
 
 module ActionController
-  module Routing
-    def self.possible_controllers
-      @@possible_controllers ||= []
-    end
-  end
-
   class Base
     include ActionController::Testing
-
-    def self.inherited(klass)
-      name = klass.name.underscore.sub(/_controller$/, '')
-      ActionController::Routing.possible_controllers << name unless name.blank?
-      super
-    end
   end
 
   Base.view_paths = FIXTURE_LOAD_PATH
 
   class TestCase
-    include TestProcess
+    include ActionDispatch::TestProcess
 
     def assert_template(options = {}, message = nil)
       validate_request!
diff --git a/actionpack/test/active_record_unit.rb b/actionpack/test/active_record_unit.rb
index 9e0c66055d..9a094cf66b 100644
--- a/actionpack/test/active_record_unit.rb
+++ b/actionpack/test/active_record_unit.rb
@@ -11,19 +11,15 @@ class ActiveRecordTestConnector
 end
 
 # Try to grab AR
-if defined?(ActiveRecord) && defined?(Fixtures)
-  $stderr.puts 'Active Record is already loaded, running tests'
-else
-  $stderr.print 'Attempting to load Active Record... '
+unless defined?(ActiveRecord) && defined?(Fixtures)
   begin
     PATH_TO_AR = "#{File.dirname(__FILE__)}/../../activerecord/lib"
     raise LoadError, "#{PATH_TO_AR} doesn't exist" unless File.directory?(PATH_TO_AR)
     $LOAD_PATH.unshift PATH_TO_AR
     require 'active_record'
     require 'active_record/fixtures'
-    $stderr.puts 'success'
   rescue LoadError => e
-    $stderr.print "failed. Skipping Active Record assertion tests: #{e}"
+    $stderr.print "Failed to load Active Record. Skipping Active Record assertion tests: #{e}"
     ActiveRecordTestConnector.able_to_connect = false
   end
 end
diff --git a/actionpack/test/activerecord/active_record_store_test.rb b/actionpack/test/activerecord/active_record_store_test.rb
index c6c079f88c..61bee1b66c 100644
--- a/actionpack/test/activerecord/active_record_store_test.rb
+++ b/actionpack/test/activerecord/active_record_store_test.rb
@@ -155,7 +155,7 @@ class ActiveRecordStoreTest < ActionController::IntegrationTest
     def with_test_route_set(options = {})
       with_routing do |set|
         set.draw do |map|
-          map.connect "/:action", :controller => "active_record_store_test/test"
+          match ':action', :to => 'active_record_store_test/test'
         end
         @app = ActiveRecord::SessionStore.new(set, options.reverse_merge(:key => '_session_id'))
         yield
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index 901cb940ea..d54be9bdc0 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -221,8 +221,8 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
   def test_assert_redirect_to_named_route
     with_routing do |set|
       set.draw do |map|
-        map.route_one 'route_one', :controller => 'action_pack_assertions', :action => 'nothing'
-        map.connect   ':controller/:action/:id'
+        match 'route_one', :to => 'action_pack_assertions#nothing', :as => :route_one
+        match ':controller/:action'
       end
       set.install_helpers
 
@@ -235,9 +235,9 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
   def test_assert_redirect_to_named_route_failure
     with_routing do |set|
       set.draw do |map|
-        map.route_one 'route_one', :controller => 'action_pack_assertions', :action => 'nothing', :id => 'one'
-        map.route_two 'route_two', :controller => 'action_pack_assertions', :action => 'nothing', :id => 'two'
-        map.connect   ':controller/:action/:id'
+        match 'route_one', :to => 'action_pack_assertions#nothing', :as => :route_one
+        match 'route_two', :to => 'action_pack_assertions#nothing', :id => 'two', :as => :route_two
+        match ':controller/:action'
       end
       process :redirect_to_named_route
       assert_raise(ActiveSupport::TestCase::Assertion) do
@@ -255,8 +255,8 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
   def test_assert_redirect_to_nested_named_route
     with_routing do |set|
       set.draw do |map|
-        map.admin_inner_module 'admin/inner_module', :controller => 'admin/inner_module', :action => 'index'
-        map.connect            ':controller/:action/:id'
+        match 'admin/inner_module', :to => 'admin/inner_module#index', :as => :admin_inner_module
+        match ':controller/:action'
       end
       @controller = Admin::InnerModuleController.new
       process :redirect_to_index
@@ -268,8 +268,8 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
   def test_assert_redirected_to_top_level_named_route_from_nested_controller
     with_routing do |set|
       set.draw do |map|
-        map.top_level '/action_pack_assertions/:id', :controller => 'action_pack_assertions', :action => 'index'
-        map.connect   ':controller/:action/:id'
+        match '/action_pack_assertions/:id', :to => 'action_pack_assertions#index', :as => :top_level
+        match ':controller/:action'
       end
       @controller = Admin::InnerModuleController.new
       process :redirect_to_top_level_named_route
@@ -282,8 +282,8 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
     with_routing do |set|
       set.draw do |map|
         # this controller exists in the admin namespace as well which is the only difference from previous test
-        map.top_level '/user/:id', :controller => 'user', :action => 'index'
-        map.connect   ':controller/:action/:id'
+        match '/user/:id', :to => 'user#index', :as => :top_level
+        match ':controller/:action'
       end
       @controller = Admin::InnerModuleController.new
       process :redirect_to_top_level_named_route
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb
index b57550a69a..8f8ada8d8c 100644
--- a/actionpack/test/controller/base_test.rb
+++ b/actionpack/test/controller/base_test.rb
@@ -179,8 +179,8 @@ class DefaultUrlOptionsTest < ActionController::TestCase
   def test_default_url_options_are_used_if_set
     with_routing do |set|
       set.draw do |map|
-        map.default_url_options 'default_url_options', :controller => 'default_url_options'
-        map.connect ':controller/:action/:id'
+        match 'default_url_options', :to => 'default_url_options#default_url_options_action', :as => :default_url_options
+        match ':controller/:action'
       end
 
       get :default_url_options_action # Make a dummy request so that the controller is initialized properly.
@@ -210,7 +210,7 @@ class EnsureNamedRoutesWorksTicket22BugTest < ActionController::TestCase
   def test_named_routes_still_work
     with_routing do |set|
       set.draw do |map|
-        map.resources :things
+        resources :things
       end
       EmptyController.send :include, ActionController::UrlWriter
 
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 3ce90b6ccf..4ea2e57741 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -70,8 +70,8 @@ class PageCachingTest < ActionController::TestCase
   def test_page_caching_resources_saves_to_correct_path_with_extension_even_if_default_route
     with_routing do |set|
       set.draw do |map|
-        map.main '', :controller => 'posts', :format => nil
-        map.formatted_posts 'posts.:format', :controller => 'posts'
+        match 'posts.:format', :to => 'posts#index', :as => :formatted_posts
+        match '/', :to => 'posts#index', :as => :main
       end
       @params[:format] = 'rss'
       assert_equal '/posts.rss', @rewriter.rewrite(@params)
@@ -422,8 +422,7 @@ class ActionCacheTest < ActionController::TestCase
   def test_xml_version_of_resource_is_treated_as_different_cache
     with_routing do |set|
       set.draw do |map|
-        map.connect ':controller/:action.:format'
-        map.connect ':controller/:action'
+        match ':controller(/:action(.:format))'
       end
 
       get :index, :format => 'xml'
@@ -632,13 +631,16 @@ class FragmentCachingTest < ActionController::TestCase
 
   def test_fragment_for_logging
     fragment_computed = false
-    ActiveSupport::Notifications.queue.expects(:publish).times(2)
+    events = []
+    ActiveSupport::Notifications.subscribe { |*args| events << args }
 
     buffer = 'generated till now -> '
     @controller.fragment_for(buffer, 'expensive') { fragment_computed = true }
 
     assert fragment_computed
     assert_equal 'generated till now -> ', buffer
+    ActiveSupport::Notifications.notifier.wait
+    assert_equal [:fragment_exist?, :write_fragment], events.map(&:first)
   end
 
 end
diff --git a/actionpack/test/controller/cookie_test.rb b/actionpack/test/controller/cookie_test.rb
index 53d4364576..84d5ce6ad4 100644
--- a/actionpack/test/controller/cookie_test.rb
+++ b/actionpack/test/controller/cookie_test.rb
@@ -1,5 +1,7 @@
 require 'abstract_unit'
 
+ActionController::Base.cookie_verifier_secret = "thisISverySECRET123"
+
 class CookieTest < ActionController::TestCase
   class TestController < ActionController::Base
     def authenticate
@@ -47,6 +49,21 @@ class CookieTest < ActionController::TestCase
       cookies["user_name"] = { :value => "david", :httponly => true }
       head :ok
     end
+
+    def set_permanent_cookie
+      cookies.permanent[:user_name] = "Jamie"
+      head :ok
+    end
+    
+    def set_signed_cookie
+      cookies.signed[:user_id] = 45
+      head :ok
+    end
+    
+    def set_permanent_signed_cookie
+      cookies.permanent.signed[:remember_me] = 100
+      head :ok
+    end
   end
 
   tests TestController
@@ -134,6 +151,24 @@ class CookieTest < ActionController::TestCase
     response = get :authenticate
     assert response.headers["Set-Cookie"] =~ /user_name=david/
   end
+
+  def test_permanent_cookie
+    get :set_permanent_cookie
+    assert_match /Jamie/, @response.headers["Set-Cookie"]
+    assert_match %r(#{20.years.from_now.year}), @response.headers["Set-Cookie"]
+  end
+  
+  def test_signed_cookie
+    get :set_signed_cookie
+    assert_equal 45, @controller.send(:cookies).signed[:user_id]
+  end
+  
+  def test_permanent_signed_cookie
+    get :set_permanent_signed_cookie
+    assert_match %r(#{20.years.from_now.year}), @response.headers["Set-Cookie"]
+    assert_equal 100, @controller.send(:cookies).signed[:remember_me]
+  end
+
   
   private
     def assert_cookie_header(expected)
diff --git a/actionpack/test/controller/dispatcher_test.rb b/actionpack/test/controller/dispatcher_test.rb
index 622d67287d..64f1ad7610 100644
--- a/actionpack/test/controller/dispatcher_test.rb
+++ b/actionpack/test/controller/dispatcher_test.rb
@@ -15,7 +15,6 @@ class DispatcherTest < Test::Unit::TestCase
     ActionDispatch::Callbacks.reset_callbacks(:call)
 
     ActionController::Routing::Routes.stubs(:call).returns([200, {}, 'response'])
-    ActionController::Routing::Routes.stubs(:reload)
     Dispatcher.stubs(:require_dependency)
   end
 
@@ -28,18 +27,6 @@ class DispatcherTest < Test::Unit::TestCase
     dispatch(false)
   end
 
-  def test_reloads_routes_before_dispatch_if_in_loading_mode
-    ActionController::Routing::Routes.expects(:reload).once
-    dispatch(false)
-  end
-
-  def test_leaves_dependencies_after_dispatch_if_not_in_loading_mode
-    ActionController::Routing::Routes.expects(:reload).never
-    ActiveSupport::Dependencies.expects(:clear).never
-
-    dispatch
-  end
-
   def test_prepare_callbacks
     a = b = c = nil
     ActionDispatch::Callbacks.to_prepare { |*args| a = b = c = 1 }
diff --git a/actionpack/test/controller/flash_test.rb b/actionpack/test/controller/flash_test.rb
index c448f36cb3..a9b60386f1 100644
--- a/actionpack/test/controller/flash_test.rb
+++ b/actionpack/test/controller/flash_test.rb
@@ -34,7 +34,7 @@ class FlashTest < ActionController::TestCase
       flash.keep
       render :inline => "hello"
     end
-    
+
     def use_flash_and_update_it
       flash.update("this" => "hello again")
       @flash_copy = {}.update flash
@@ -72,6 +72,18 @@ class FlashTest < ActionController::TestCase
       redirect_to :action => "std_action"
       @flash_copy = {}.update(flash)
     end
+
+    def redirect_with_alert
+      redirect_to '/nowhere', :alert => "Beware the nowheres!"
+    end
+
+    def redirect_with_notice
+      redirect_to '/somewhere', :notice => "Good luck in the somewheres!"
+    end
+
+    def redirect_with_other_flashes
+      redirect_to '/wonderland', :flash => { :joyride => "Horses!" }
+    end
   end
 
   tests TestController
@@ -89,7 +101,7 @@ class FlashTest < ActionController::TestCase
 
   def test_keep_flash
     get :set_flash
-    
+
     get :use_flash_and_keep_it
     assert_equal "hello", assigns["flash_copy"]["that"]
     assert_equal "hello", assigns["flashy"]
@@ -100,7 +112,7 @@ class FlashTest < ActionController::TestCase
     get :use_flash
     assert_nil assigns["flash_copy"]["that"], "On third flash"
   end
-  
+
   def test_flash_now
     get :set_flash_now
     assert_equal "hello", assigns["flash_copy"]["that"]
@@ -111,8 +123,8 @@ class FlashTest < ActionController::TestCase
     assert_nil assigns["flash_copy"]["that"]
     assert_nil assigns["flash_copy"]["foo"]
     assert_nil assigns["flashy"]
-  end 
-  
+  end
+
   def test_update_flash
     get :set_flash
     get :use_flash_and_update_it
@@ -128,7 +140,7 @@ class FlashTest < ActionController::TestCase
     assert_equal "hello",    assigns["flashy_that"]
     assert_equal "good-bye", assigns["flashy_this"]
     assert_nil   assigns["flashy_that_reset"]
-  end 
+  end
 
   def test_does_not_set_the_session_if_the_flash_is_empty
     get :std_action
@@ -153,11 +165,26 @@ class FlashTest < ActionController::TestCase
     assert_equal(:foo_indeed, flash.discard(:foo)) # valid key passed
     assert_nil flash.discard(:unknown) # non existant key passed
     assert_equal({:foo => :foo_indeed, :bar => :bar_indeed}, flash.discard()) # nothing passed
-    assert_equal({:foo => :foo_indeed, :bar => :bar_indeed}, flash.discard(nil)) # nothing passed      
+    assert_equal({:foo => :foo_indeed, :bar => :bar_indeed}, flash.discard(nil)) # nothing passed
 
     assert_equal(:foo_indeed, flash.keep(:foo)) # valid key passed
     assert_nil flash.keep(:unknown) # non existant key passed
     assert_equal({:foo => :foo_indeed, :bar => :bar_indeed}, flash.keep()) # nothing passed
-    assert_equal({:foo => :foo_indeed, :bar => :bar_indeed}, flash.keep(nil)) # nothing passed     
+    assert_equal({:foo => :foo_indeed, :bar => :bar_indeed}, flash.keep(nil)) # nothing passed
+  end
+
+  def test_redirect_to_with_alert
+    get :redirect_with_alert
+    assert_equal "Beware the nowheres!", @controller.send(:flash)[:alert]
+  end
+
+  def test_redirect_to_with_notice
+    get :redirect_with_notice
+    assert_equal "Good luck in the somewheres!", @controller.send(:flash)[:notice]
+  end
+
+  def test_redirect_to_with_other_flashes
+    get :redirect_with_other_flashes
+    assert_equal "Horses!", @controller.send(:flash)[:joyride]
   end
-end
+end
\ No newline at end of file
diff --git a/actionpack/test/controller/helper_test.rb b/actionpack/test/controller/helper_test.rb
index b9be163904..9030e562bb 100644
--- a/actionpack/test/controller/helper_test.rb
+++ b/actionpack/test/controller/helper_test.rb
@@ -191,7 +191,7 @@ class IsolatedHelpersTest < Test::Unit::TestCase
   end
 
   def test_helper_in_a
-    assert_raise(ActionView::TemplateError) { call_controller(A, "index") }
+    assert_raise(ActionView::Template::Error) { call_controller(A, "index") }
   end
 
   def test_helper_in_b
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb
index feb2f81cc1..f635253156 100644
--- a/actionpack/test/controller/layout_test.rb
+++ b/actionpack/test/controller/layout_test.rb
@@ -115,7 +115,7 @@ class RendersNoLayoutController < LayoutTest
 end
 
 class LayoutSetInResponseTest < ActionController::TestCase
-  include ActionView::TemplateHandlers
+  include ActionView::Template::Handlers
   
   def test_layout_set_when_using_default_layout
     @controller = DefaultLayoutController.new
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index fee9cf46f9..6b9cace9cd 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -507,6 +507,13 @@ class RespondWithController < ActionController::Base
     end
   end
 
+  def using_responder_with_respond
+    responder = Class.new(ActionController::Responder) do
+      def respond; @controller.render :text => "respond #{format}"; end
+    end
+    respond_with(Customer.new("david", 13), :responder => responder)
+  end
+
 protected
 
   def _render_js(js, options)
@@ -592,14 +599,18 @@ class RespondWithControllerTest < ActionController::TestCase
     end
   end
 
-  def test_using_resource_for_post_with_html
+  def test_using_resource_for_post_with_html_redirects_on_success
     with_test_route_set do
       post :using_resource
       assert_equal "text/html", @response.content_type
       assert_equal 302, @response.status
       assert_equal "http://www.example.com/customers/13", @response.location
       assert @response.redirect?
+    end
+  end
 
+  def test_using_resource_for_post_with_html_rerender_on_failure
+    with_test_route_set do
       errors = { :name => :invalid }
       Customer.any_instance.stubs(:errors).returns(errors)
       post :using_resource
@@ -610,16 +621,20 @@ class RespondWithControllerTest < ActionController::TestCase
     end
   end
 
-  def test_using_resource_for_post_with_xml
+  def test_using_resource_for_post_with_xml_yields_created_on_success
     with_test_route_set do
       @request.accept = "application/xml"
-
       post :using_resource
       assert_equal "application/xml", @response.content_type
       assert_equal 201, @response.status
       assert_equal "<name>david</name>", @response.body
       assert_equal "http://www.example.com/customers/13", @response.location
+    end
+  end
 
+  def test_using_resource_for_post_with_xml_yields_unprocessable_entity_on_failure
+    with_test_route_set do
+      @request.accept = "application/xml"
       errors = { :name => :invalid }
       Customer.any_instance.stubs(:errors).returns(errors)
       post :using_resource
@@ -630,14 +645,18 @@ class RespondWithControllerTest < ActionController::TestCase
     end
   end
 
-  def test_using_resource_for_put_with_html
+  def test_using_resource_for_put_with_html_redirects_on_success
     with_test_route_set do
       put :using_resource
       assert_equal "text/html", @response.content_type
       assert_equal 302, @response.status
       assert_equal "http://www.example.com/customers/13", @response.location
       assert @response.redirect?
+    end
+  end
 
+  def test_using_resource_for_put_with_html_rerender_on_failure
+    with_test_route_set do
       errors = { :name => :invalid }
       Customer.any_instance.stubs(:errors).returns(errors)
       put :using_resource
@@ -648,14 +667,16 @@ class RespondWithControllerTest < ActionController::TestCase
     end
   end
 
-  def test_using_resource_for_put_with_xml
+  def test_using_resource_for_put_with_xml_yields_ok_on_success
     @request.accept = "application/xml"
-
     put :using_resource
     assert_equal "application/xml", @response.content_type
     assert_equal 200, @response.status
     assert_equal " ", @response.body
+  end
 
+  def test_using_resource_for_put_with_xml_yields_unprocessable_entity_on_failure
+    @request.accept = "application/xml"
     errors = { :name => :invalid }
     Customer.any_instance.stubs(:errors).returns(errors)
     put :using_resource
@@ -665,7 +686,7 @@ class RespondWithControllerTest < ActionController::TestCase
     assert_nil @response.location
   end
 
-  def test_using_resource_for_delete_with_html
+  def test_using_resource_for_delete_with_html_redirects_on_success
     with_test_route_set do
       Customer.any_instance.stubs(:destroyed?).returns(true)
       delete :using_resource
@@ -675,7 +696,7 @@ class RespondWithControllerTest < ActionController::TestCase
     end
   end
 
-  def test_using_resource_for_delete_with_xml
+  def test_using_resource_for_delete_with_xml_yields_ok_on_success
     Customer.any_instance.stubs(:destroyed?).returns(true)
     @request.accept = "application/xml"
     delete :using_resource
@@ -684,6 +705,18 @@ class RespondWithControllerTest < ActionController::TestCase
     assert_equal " ", @response.body
   end
 
+  def test_using_resource_for_delete_with_html_redirects_on_failure
+    with_test_route_set do
+      errors = { :name => :invalid }
+      Customer.any_instance.stubs(:errors).returns(errors)
+      Customer.any_instance.stubs(:destroyed?).returns(false)
+      delete :using_resource
+      assert_equal "text/html", @response.content_type
+      assert_equal 302, @response.status
+      assert_equal "http://www.example.com/customers/13", @response.location
+    end
+  end
+
   def test_using_resource_with_parent_for_get
     @request.accept = "application/xml"
     get :using_resource_with_parent
@@ -735,6 +768,16 @@ class RespondWithControllerTest < ActionController::TestCase
     assert_equal "foo - #{[:html].to_s}", @controller.response_body
   end
 
+  def test_respond_as_responder_entry_point
+    @request.accept = "text/html"
+    get :using_responder_with_respond
+    assert_equal "respond html", @response.body
+
+    @request.accept = "application/xml"
+    get :using_responder_with_respond
+    assert_equal "respond xml", @response.body
+  end
+
   def test_clear_respond_to
     @controller = InheritedRespondWithController.new
     @request.accept = "text/html"
@@ -810,9 +853,11 @@ class RespondWithControllerTest < ActionController::TestCase
     def with_test_route_set
       with_routing do |set|
         set.draw do |map|
-          map.resources :customers
-          map.resources :quiz_stores, :has_many => :customers
-          map.connect ":controller/:action/:id"
+          resources :customers
+          resources :quiz_stores do
+            resources :customers
+          end
+          match ":controller/:action"
         end
         yield
       end
diff --git a/actionpack/test/controller/redirect_test.rb b/actionpack/test/controller/redirect_test.rb
index ea278fd8f0..570ff4a41b 100644
--- a/actionpack/test/controller/redirect_test.rb
+++ b/actionpack/test/controller/redirect_test.rb
@@ -233,8 +233,8 @@ class RedirectTest < ActionController::TestCase
   def test_redirect_to_record
     with_routing do |set|
       set.draw do |map|
-        map.resources :workshops
-        map.connect ':controller/:action/:id'
+        resources :workshops
+        match ':controller/:action'
       end
 
       get :redirect_to_existing_record
diff --git a/actionpack/test/controller/render_other_test.rb b/actionpack/test/controller/render_other_test.rb
index 51c3c55545..dfc4f2db8c 100644
--- a/actionpack/test/controller/render_other_test.rb
+++ b/actionpack/test/controller/render_other_test.rb
@@ -2,6 +2,11 @@ require 'abstract_unit'
 require 'controller/fake_models'
 require 'pathname'
 
+ActionController.add_renderer :simon do |says, options|
+  self.content_type  = Mime::TEXT
+  self.response_body = "Simon says: #{says}"
+end
+
 class RenderOtherTest < ActionController::TestCase
   class TestController < ActionController::Base
     protect_from_forgery
@@ -109,6 +114,10 @@ class RenderOtherTest < ActionController::TestCase
       end
     end
 
+    def render_simon_says
+      render :simon => "foo"
+    end
+
     private
       def default_render
         if @alternate_default_render
@@ -240,4 +249,9 @@ class RenderOtherTest < ActionController::TestCase
     xhr :get, :render_alternate_default
     assert_equal %(Element.replace("foo", "partial html");), @response.body
   end
+
+  def test_using_custom_render_option
+    get :render_simon_says
+    assert_equal "Simon says: foo", @response.body
+  end
 end
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index b32325fa20..54f2739d38 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -39,35 +39,35 @@ class TestController < ActionController::Base
       render :action => 'hello_world'
     end
   end
-  
+
   def conditional_hello_with_public_header
     if stale?(:last_modified => Time.now.utc.beginning_of_day, :etag => [:foo, 123], :public => true)
       render :action => 'hello_world'
     end
   end
-  
+
   def conditional_hello_with_public_header_and_expires_at
     expires_in 1.minute
     if stale?(:last_modified => Time.now.utc.beginning_of_day, :etag => [:foo, 123], :public => true)
       render :action => 'hello_world'
     end
   end
-  
+
   def conditional_hello_with_expires_in
-    expires_in 1.minute
+    expires_in 60.1.seconds
     render :action => 'hello_world'
   end
-  
+
   def conditional_hello_with_expires_in_with_public
     expires_in 1.minute, :public => true
     render :action => 'hello_world'
   end
-  
+
   def conditional_hello_with_expires_in_with_public_with_more_keys
     expires_in 1.minute, :public => true, 'max-stale' => 5.hours
     render :action => 'hello_world'
   end
-  
+
   def conditional_hello_with_expires_in_with_public_with_more_keys_old_syntax
     expires_in 1.minute, :public => true, :private => nil, 'max-stale' => 5.hours
     render :action => 'hello_world'
@@ -272,7 +272,7 @@ class TestController < ActionController::Base
   def builder_layout_test
     render :action => "hello", :layout => "layouts/builder"
   end
-  
+
   # :move: test this in ActionView
   def builder_partial_test
     render :action => "hello_world_container"
@@ -1093,8 +1093,8 @@ class RenderTest < ActionController::TestCase
   def test_head_with_location_object
     with_routing do |set|
       set.draw do |map|
-        map.resources :customers
-        map.connect ':controller/:action/:id'
+        resources :customers
+        match ':controller/:action'
       end
 
       get :head_with_location_object
@@ -1125,7 +1125,7 @@ class RenderTest < ActionController::TestCase
     assert !@response.headers.include?('Content-Length')
     assert_response :no_content
 
-    ActionDispatch::StatusCodes::SYMBOL_TO_STATUS_CODE.each do |status, code|
+    Rack::Utils::SYMBOL_TO_STATUS_CODE.each do |status, code|
       get :head_with_symbolic_status, :status => status.to_s
       assert_equal code, @response.response_code
       assert_response status
@@ -1133,7 +1133,7 @@ class RenderTest < ActionController::TestCase
   end
 
   def test_head_with_integer_status
-    ActionDispatch::StatusCodes::STATUS_CODES.each do |code, message|
+    Rack::Utils::HTTP_STATUS_CODES.each do |code, message|
       get :head_with_integer_status, :status => code.to_s
       assert_equal message, @response.message
     end
@@ -1306,22 +1306,22 @@ class ExpiresInRenderTest < ActionController::TestCase
   def setup
     @request.host = "www.nextangle.com"
   end
-  
+
   def test_expires_in_header
     get :conditional_hello_with_expires_in
     assert_equal "max-age=60, private", @response.headers["Cache-Control"]
   end
-  
+
   def test_expires_in_header_with_public
     get :conditional_hello_with_expires_in_with_public
     assert_equal "max-age=60, public", @response.headers["Cache-Control"]
   end
-  
+
   def test_expires_in_header_with_additional_headers
     get :conditional_hello_with_expires_in_with_public_with_more_keys
     assert_equal "max-age=60, public, max-stale=18000", @response.headers["Cache-Control"]
   end
-  
+
   def test_expires_in_old_syntax
     get :conditional_hello_with_expires_in_with_public_with_more_keys_old_syntax
     assert_equal "max-age=60, public, max-stale=18000", @response.headers["Cache-Control"]
@@ -1425,12 +1425,12 @@ class EtagRenderTest < ActionController::TestCase
     get :conditional_hello_with_bangs
     assert_response :not_modified
   end
-  
+
   def test_etag_with_public_true_should_set_header
     get :conditional_hello_with_public_header
     assert_equal "public", @response.headers['Cache-Control']
   end
-  
+
   def test_etag_with_public_true_should_set_header_and_retain_other_headers
     get :conditional_hello_with_public_header_and_expires_at
     assert_equal "max-age=60, public", @response.headers['Cache-Control']
diff --git a/actionpack/test/controller/render_xml_test.rb b/actionpack/test/controller/render_xml_test.rb
index 68a52c3e8c..b5b0d0b9d5 100644
--- a/actionpack/test/controller/render_xml_test.rb
+++ b/actionpack/test/controller/render_xml_test.rb
@@ -61,8 +61,8 @@ class RenderXmlTest < ActionController::TestCase
   def test_rendering_with_object_location_should_set_header_with_url_for
     with_routing do |set|
       set.draw do |map|
-        map.resources :customers
-        map.connect ':controller/:action/:id'
+        resources :customers
+        match ':controller/:action'
       end
 
       get :render_with_object_location
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index 04e9acf855..1a03396ae9 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -403,7 +403,7 @@ class ResourcesTest < ActionController::TestCase
     with_restful_routing :messages do
       assert_restful_routes_for :messages do |options|
         assert_recognizes(options.merge(:action => "new"), :path => "/messages/new", :method => :get)
-        assert_raise(ActionController::MethodNotAllowed) do
+        assert_raise(ActionController::RoutingError) do
           ActionController::Routing::Routes.recognize_path("/messages/new", :method => :post)
         end
       end
@@ -689,11 +689,11 @@ class ResourcesTest < ActionController::TestCase
       options = { :controller => controller_name.to_s }
       collection_path = "/#{controller_name}"
 
-      assert_raise(ActionController::MethodNotAllowed) do
+      assert_raise(ActionController::RoutingError) do
         assert_recognizes(options.merge(:action => 'update'), :path => collection_path, :method => :put)
       end
 
-      assert_raise(ActionController::MethodNotAllowed) do
+      assert_raise(ActionController::RoutingError) do
         assert_recognizes(options.merge(:action => 'destroy'), :path => collection_path, :method => :delete)
       end
     end
@@ -1378,7 +1378,7 @@ class ResourcesTest < ActionController::TestCase
     end
 
     def assert_not_recognizes(expected_options, path)
-      assert_raise ActionController::RoutingError, ActionController::MethodNotAllowed, Assertion do
+      assert_raise ActionController::RoutingError, Assertion do
         assert_recognizes(expected_options, path)
       end
     end
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 4eaf309c41..c15eaade58 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -51,30 +51,6 @@ class UriReservedCharactersRoutingTest < Test::Unit::TestCase
   end
 end
 
-class RoutingTest < Test::Unit::TestCase
-  def test_normalize_unix_paths
-    load_paths = %w(. config/../app/controllers config/../app//helpers script/../config/../vendor/rails/actionpack/lib vendor/rails/railties/builtin/rails_info app/models lib script/../config/../foo/bar/../../app/models .foo/../.bar foo.bar/../config)
-    paths = ActionController::Routing.normalize_paths(load_paths)
-    assert_equal %w(vendor/rails/railties/builtin/rails_info vendor/rails/actionpack/lib app/controllers app/helpers app/models config .bar lib .), paths
-  end
-
-  def test_normalize_windows_paths
-    load_paths = %w(. config\\..\\app\\controllers config\\..\\app\\\\helpers script\\..\\config\\..\\vendor\\rails\\actionpack\\lib vendor\\rails\\railties\\builtin\\rails_info app\\models lib script\\..\\config\\..\\foo\\bar\\..\\..\\app\\models .foo\\..\\.bar foo.bar\\..\\config)
-    paths = ActionController::Routing.normalize_paths(load_paths)
-    assert_equal %w(vendor\\rails\\railties\\builtin\\rails_info vendor\\rails\\actionpack\\lib app\\controllers app\\helpers app\\models config .bar lib .), paths
-  end
-
-  def test_routing_helper_module
-    assert_kind_of Module, ActionController::Routing::Helpers
-
-    h = ActionController::Routing::Helpers
-    c = Class.new
-    assert ! c.ancestors.include?(h)
-    ActionController::Routing::Routes.install_helpers c
-    assert c.ancestors.include?(h)
-  end
-end
-
 class MockController
   attr_accessor :routes
 
@@ -578,10 +554,6 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def setup_request_method_routes_for(method)
-    @request = ActionController::TestRequest.new
-    @request.env["REQUEST_METHOD"] = method
-    @request.request_uri = "/match"
-
     rs.draw do |r|
       r.connect '/match', :controller => 'books', :action => 'get', :conditions => { :method => :get }
       r.connect '/match', :controller => 'books', :action => 'post', :conditions => { :method => :post }
@@ -593,8 +565,8 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   %w(GET POST PUT DELETE).each do |request_method|
     define_method("test_request_method_recognized_with_#{request_method}") do
       setup_request_method_routes_for(request_method)
-      assert_nothing_raised { rs.recognize(@request) }
-      assert_equal request_method.downcase, @request.path_parameters[:action]
+      params = rs.recognize_path("/match", :method => request_method)
+      assert_equal request_method.downcase, params[:action]
     end
   end
 
@@ -604,18 +576,11 @@ class LegacyRouteSetTests < Test::Unit::TestCase
       r.connect '/match', :controller => 'books', :action => 'not_get_or_post'
     end
 
-    @request = ActionController::TestRequest.new
-    @request.env["REQUEST_METHOD"] = 'POST'
-    @request.request_uri = "/match"
-    assert_nothing_raised { rs.recognize(@request) }
-    assert_equal 'get_or_post', @request.path_parameters[:action]
+    params = rs.recognize_path("/match", :method => :post)
+    assert_equal 'get_or_post', params[:action]
 
-    # have to recreate or else the RouteSet uses a cached version:
-    @request = ActionController::TestRequest.new
-    @request.env["REQUEST_METHOD"] = 'PUT'
-    @request.request_uri = "/match"
-    assert_nothing_raised { rs.recognize(@request) }
-    assert_equal 'not_get_or_post', @request.path_parameters[:action]
+    params = rs.recognize_path("/match", :method => :put)
+    assert_equal 'not_get_or_post', params[:action]
   end
 
   def test_subpath_recognized
@@ -769,9 +734,7 @@ class RouteSetTest < ActiveSupport::TestCase
     set.draw do |map|
       map.connect '/users/index', :controller => :users, :action => :index
     end
-    @request = ActionController::TestRequest.new
-    @request.request_uri = '/users/index'
-    assert_nothing_raised { set.recognize(@request) }
+    params = set.recognize_path('/users/index', :method => :get)
     assert_equal 1, set.routes.size
   end
 
@@ -1004,55 +967,34 @@ class RouteSetTest < ActiveSupport::TestCase
       end
     end
 
-    request.request_uri = "/people"
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("index", request.path_parameters[:action])
-    request.recycle!
+    params = set.recognize_path("/people", :method => :get)
+    assert_equal("index", params[:action])
 
-    request.env["REQUEST_METHOD"] = "POST"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("create", request.path_parameters[:action])
-    request.recycle!
+    params = set.recognize_path("/people", :method => :post)
+    assert_equal("create", params[:action])
 
-    request.env["REQUEST_METHOD"] = "PUT"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("update", request.path_parameters[:action])
-    request.recycle!
+    params = set.recognize_path("/people", :method => :put)
+    assert_equal("update", params[:action])
 
-    assert_raise(ActionController::UnknownHttpMethod) {
-      request.env["REQUEST_METHOD"] = "BACON"
-      set.recognize(request)
+    assert_raise(ActionController::RoutingError) {
+      set.recognize_path("/people", :method => :bacon)
     }
-    request.recycle!
 
-    request.request_uri = "/people/5"
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("show", request.path_parameters[:action])
-    assert_equal("5", request.path_parameters[:id])
-    request.recycle!
+    params = set.recognize_path("/people/5", :method => :get)
+    assert_equal("show", params[:action])
+    assert_equal("5", params[:id])
 
-    request.env["REQUEST_METHOD"] = "PUT"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("update", request.path_parameters[:action])
-    assert_equal("5", request.path_parameters[:id])
-    request.recycle!
+    params = set.recognize_path("/people/5", :method => :put)
+    assert_equal("update", params[:action])
+    assert_equal("5", params[:id])
 
-    request.env["REQUEST_METHOD"] = "DELETE"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("destroy", request.path_parameters[:action])
-    assert_equal("5", request.path_parameters[:id])
-    request.recycle!
+    params = set.recognize_path("/people/5", :method => :delete)
+    assert_equal("destroy", params[:action])
+    assert_equal("5", params[:id])
 
-    begin
-      request.env["REQUEST_METHOD"] = "POST"
-      set.recognize(request)
-      flunk 'Should have raised MethodNotAllowed'
-    rescue ActionController::MethodNotAllowed => e
-      assert_equal [:get, :put, :delete], e.allowed_methods
-    end
-    request.recycle!
+    assert_raise(ActionController::RoutingError) {
+      set.recognize_path("/people/5", :method => :post)
+    }
   end
 
   def test_recognize_with_alias_in_conditions
@@ -1062,17 +1004,13 @@ class RouteSetTest < ActiveSupport::TestCase
       map.root   :people
     end
 
-    request.path = "/people"
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("people", request.path_parameters[:controller])
-    assert_equal("index", request.path_parameters[:action])
+    params = set.recognize_path("/people", :method => :get)
+    assert_equal("people", params[:controller])
+    assert_equal("index", params[:action])
 
-    request.path = "/"
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("people", request.path_parameters[:controller])
-    assert_equal("index", request.path_parameters[:action])
+    params = set.recognize_path("/", :method => :get)
+    assert_equal("people", params[:controller])
+    assert_equal("index", params[:action])
   end
 
   def test_typo_recognition
@@ -1082,14 +1020,12 @@ class RouteSetTest < ActiveSupport::TestCase
              :year => /\d{4}/, :day => /\d{1,2}/, :month => /\d{1,2}/
     end
 
-    request.path = "/articles/2005/11/05/a-very-interesting-article"
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("permalink", request.path_parameters[:action])
-    assert_equal("2005", request.path_parameters[:year])
-    assert_equal("11", request.path_parameters[:month])
-    assert_equal("05", request.path_parameters[:day])
-    assert_equal("a-very-interesting-article", request.path_parameters[:title])
+    params = set.recognize_path("/articles/2005/11/05/a-very-interesting-article", :method => :get)
+    assert_equal("permalink", params[:action])
+    assert_equal("2005", params[:year])
+    assert_equal("11", params[:month])
+    assert_equal("05", params[:day])
+    assert_equal("a-very-interesting-article", params[:title])
   end
 
   def test_routing_traversal_does_not_load_extra_classes
@@ -1098,9 +1034,7 @@ class RouteSetTest < ActiveSupport::TestCase
       map.connect '/profile', :controller => 'profile'
     end
 
-    request.path = '/profile'
-
-    set.recognize(request) rescue nil
+    params = set.recognize_path("/profile") rescue nil
 
     assert !Object.const_defined?("Profiler__"), "Profiler should not be loaded"
   end
@@ -1114,24 +1048,17 @@ class RouteSetTest < ActiveSupport::TestCase
       end
     end
 
-    request.request_uri = "/people/5"
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("show", request.path_parameters[:action])
-    assert_equal("5", request.path_parameters[:id])
-    request.recycle!
+    params = set.recognize_path("/people/5", :method => :get)
+    assert_equal("show", params[:action])
+    assert_equal("5", params[:id])
 
-    request.env["REQUEST_METHOD"] = "PUT"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("update", request.path_parameters[:action])
-    request.recycle!
+    params = set.recognize_path("/people/5", :method => :put)
+    assert_equal("update", params[:action])
 
-    request.request_uri = "/people/5.png"
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("show", request.path_parameters[:action])
-    assert_equal("5", request.path_parameters[:id])
-    assert_equal("png", request.path_parameters[:_format])
+    params = set.recognize_path("/people/5.png", :method => :get)
+    assert_equal("show", params[:action])
+    assert_equal("5", params[:id])
+    assert_equal("png", params[:_format])
   end
 
   def test_generate_with_default_action
@@ -1147,11 +1074,9 @@ class RouteSetTest < ActiveSupport::TestCase
   def test_root_map
     set.draw { |map| map.root :controller => "people" }
 
-    request.path = ""
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("people", request.path_parameters[:controller])
-    assert_equal("index", request.path_parameters[:action])
+    params = set.recognize_path("", :method => :get)
+    assert_equal("people", params[:controller])
+    assert_equal("index", params[:action])
   end
 
   def test_namespace
@@ -1163,11 +1088,9 @@ class RouteSetTest < ActiveSupport::TestCase
 
     end
 
-    request.path = "/api/inventory"
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("api/products", request.path_parameters[:controller])
-    assert_equal("inventory", request.path_parameters[:action])
+    params = set.recognize_path("/api/inventory", :method => :get)
+    assert_equal("api/products", params[:controller])
+    assert_equal("inventory", params[:action])
   end
 
   def test_namespaced_root_map
@@ -1179,11 +1102,9 @@ class RouteSetTest < ActiveSupport::TestCase
 
     end
 
-    request.path = "/api"
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("api/products", request.path_parameters[:controller])
-    assert_equal("index", request.path_parameters[:action])
+    params = set.recognize_path("/api", :method => :get)
+    assert_equal("api/products", params[:controller])
+    assert_equal("index", params[:action])
   end
 
   def test_namespace_with_path_prefix
@@ -1193,11 +1114,9 @@ class RouteSetTest < ActiveSupport::TestCase
       end
     end
 
-    request.path = "/prefix/inventory"
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("api/products", request.path_parameters[:controller])
-    assert_equal("inventory", request.path_parameters[:action])
+    params = set.recognize_path("/prefix/inventory", :method => :get)
+    assert_equal("api/products", params[:controller])
+    assert_equal("inventory", params[:action])
   end
 
   def test_namespace_with_blank_path_prefix
@@ -1207,11 +1126,9 @@ class RouteSetTest < ActiveSupport::TestCase
       end
     end
 
-    request.path = "/inventory"
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("api/products", request.path_parameters[:controller])
-    assert_equal("inventory", request.path_parameters[:action])
+    params = set.recognize_path("/inventory", :method => :get)
+    assert_equal("api/products", params[:controller])
+    assert_equal("inventory", params[:action])
   end
 
   def test_generate_changes_controller_module
@@ -1340,11 +1257,9 @@ class RouteSetTest < ActiveSupport::TestCase
       end
     end
 
-    request.path = "/projects/1/milestones"
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("milestones", request.path_parameters[:controller])
-    assert_equal("index", request.path_parameters[:action])
+    params = set.recognize_path("/projects/1/milestones", :method => :get)
+    assert_equal("milestones", params[:controller])
+    assert_equal("index", params[:action])
   end
 
   def test_setting_root_in_namespace_using_symbol
@@ -1461,15 +1376,13 @@ class RouteSetTest < ActiveSupport::TestCase
                                     )/x}
     end
 
-    pending do
-      url = set.generate({:controller => 'pages', :action => 'show', :name => 'david'})
-      assert_equal "/page/david", url
-      assert_raise ActionController::RoutingError do
-        url = set.generate({:controller => 'pages', :action => 'show', :name => 'davidjamis'})
-      end
-      assert_raise ActionController::RoutingError do
-        url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
-      end
+    url = set.generate({:controller => 'pages', :action => 'show', :name => 'david'})
+    assert_equal "/page/david", url
+    assert_raise ActionController::RoutingError do
+      url = set.generate({:controller => 'pages', :action => 'show', :name => 'davidjamis'})
+    end
+    assert_raise ActionController::RoutingError do
+      url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
     end
   end
 
@@ -1485,10 +1398,8 @@ class RouteSetTest < ActiveSupport::TestCase
                                     )/xi}
     end
 
-    pending do
-      url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
-      assert_equal "/page/JAMIS", url
-    end
+    url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
+    assert_equal "/page/JAMIS", url
   end
 
   def test_route_requirement_recognize_with_xi_modifiers
@@ -1645,7 +1556,7 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_expand_array_build_query_string
-    assert_uri_equal '/foo?x%5B%5D=1&x%5B%5D=2', default_route_set.generate({:controller => 'foo', :x => [1, 2]})
+    assert_uri_equal '/foo?x[]=1&x[]=2', default_route_set.generate({:controller => 'foo', :x => [1, 2]})
   end
 
   def test_escape_spaces_build_query_string_selected_keys
@@ -1663,9 +1574,7 @@ class RouteSetTest < ActiveSupport::TestCase
       map.connect ':controller/:action/:id'
     end
 
-    pending do
-      assert_equal '/ibocorp', set.generate({:controller => 'ibocorp', :page => 1})
-    end
+    assert_equal '/ibocorp', set.generate({:controller => 'ibocorp', :page => 1})
   end
 
   def test_generate_with_optional_params_recalls_last_request
@@ -1698,9 +1607,7 @@ class RouteSetTest < ActiveSupport::TestCase
     assert_equal("/blog/2006/07/25", set.generate({:day => 25}, last_request))
     assert_equal("/blog/2005", set.generate({:year => 2005}, last_request))
     assert_equal("/blog/show/123", set.generate({:action => "show" , :id => 123}, last_request))
-    pending do
-      assert_equal("/blog/2006/07/28", set.generate({:year => 2006}, last_request))
-    end
+    assert_equal("/blog/2006", set.generate({:year => 2006}, last_request))
     assert_equal("/blog/2006", set.generate({:year => 2006, :month => nil}, last_request))
   end
 
@@ -1716,85 +1623,6 @@ class RouteSetTest < ActiveSupport::TestCase
     end
 end
 
-class RouteLoadingTest < Test::Unit::TestCase
-  def setup
-    routes.instance_variable_set '@routes_last_modified', nil
-    Object.remove_const(:RAILS_ROOT) if defined?(::RAILS_ROOT)
-    Object.const_set :RAILS_ROOT, '.'
-    routes.add_configuration_file(File.join(RAILS_ROOT, 'config', 'routes.rb'))
-
-    @stat = stub_everything
-  end
-
-  def teardown
-    ActionController::Routing::Routes.configuration_files.clear
-    Object.send :remove_const, :RAILS_ROOT
-  end
-
-  def test_load
-    File.expects(:stat).returns(@stat)
-    routes.expects(:load).with(regexp_matches(/routes\.rb$/))
-
-    routes.reload
-  end
-
-  def test_no_reload_when_not_modified
-    @stat.expects(:mtime).times(2).returns(1)
-    File.expects(:stat).times(2).returns(@stat)
-    routes.expects(:load).with(regexp_matches(/routes\.rb$/)).at_most_once
-
-    2.times { routes.reload }
-  end
-
-  def test_reload_when_modified
-    @stat.expects(:mtime).at_least(2).returns(1, 2)
-    File.expects(:stat).at_least(2).returns(@stat)
-    routes.expects(:load).with(regexp_matches(/routes\.rb$/)).times(2)
-
-    2.times { routes.reload }
-  end
-
-  def test_bang_forces_reload
-    @stat.expects(:mtime).at_least(2).returns(1)
-    File.expects(:stat).at_least(2).returns(@stat)
-    routes.expects(:load).with(regexp_matches(/routes\.rb$/)).times(2)
-
-    2.times { routes.reload! }
-  end
-
-  def test_adding_inflections_forces_reload
-    ActiveSupport::Inflector::Inflections.instance.expects(:uncountable).with('equipment')
-    routes.expects(:reload!)
-
-    ActiveSupport::Inflector.inflections { |inflect| inflect.uncountable('equipment') }
-  end
-
-  def test_load_with_configuration
-    routes.configuration_files.clear
-    routes.add_configuration_file("foobarbaz")
-    File.expects(:stat).returns(@stat)
-    routes.expects(:load).with("foobarbaz")
-
-    routes.reload
-  end
-
-  def test_load_multiple_configurations
-    routes.add_configuration_file("engines.rb")
-
-    File.expects(:stat).at_least_once.returns(@stat)
-
-    routes.expects(:load).with('./config/routes.rb')
-    routes.expects(:load).with('engines.rb')
-
-    routes.reload
-  end
-
-  private
-    def routes
-      ActionController::Routing::Routes
-    end
-end
-
 class RackMountIntegrationTests < ActiveSupport::TestCase
   Model = Struct.new(:to_param)
 
@@ -1884,11 +1712,9 @@ class RackMountIntegrationTests < ActiveSupport::TestCase
     assert_equal({:controller => 'posts', :action => 'show_date', :year => '2009'}, @routes.recognize_path('/blog/2009', :method => :get))
     assert_equal({:controller => 'posts', :action => 'show_date', :year => '2009', :month => '01'}, @routes.recognize_path('/blog/2009/01', :method => :get))
     assert_equal({:controller => 'posts', :action => 'show_date', :year => '2009', :month => '01', :day => '01'}, @routes.recognize_path('/blog/2009/01/01', :method => :get))
-    assert_raise(ActionController::ActionControllerError) { @routes.recognize_path('/blog/123456789', :method => :get) }
 
     assert_equal({:controller => 'archive', :action => 'index', :year => '2010'}, @routes.recognize_path('/archive/2010'))
     assert_equal({:controller => 'archive', :action => 'index'}, @routes.recognize_path('/archive'))
-    assert_raise(ActionController::ActionControllerError) { @routes.recognize_path('/archive/january') }
 
     assert_equal({:controller => 'people', :action => 'index'}, @routes.recognize_path('/people', :method => :get))
     assert_equal({:controller => 'people', :action => 'index', :format => 'xml'}, @routes.recognize_path('/people.xml', :method => :get))
@@ -2047,9 +1873,9 @@ class RackMountIntegrationTests < ActiveSupport::TestCase
     assert_equal '/posts', @routes.generate({:controller => 'posts'}, {:controller => 'posts', :action => 'index'})
     assert_equal '/posts/create', @routes.generate({:action => 'create'}, {:controller => 'posts'})
     assert_equal '/posts?foo=bar', @routes.generate(:controller => 'posts', :foo => 'bar')
-    assert_equal '/posts?foo%5B%5D=bar&foo%5B%5D=baz', @routes.generate(:controller => 'posts', :foo => ['bar', 'baz'])
+    assert_equal '/posts?foo[]=bar&foo[]=baz', @routes.generate(:controller => 'posts', :foo => ['bar', 'baz'])
     assert_equal '/posts?page=2', @routes.generate(:controller => 'posts', :page => 2)
-    assert_equal '/posts?q%5Bfoo%5D%5Ba%5D=b', @routes.generate(:controller => 'posts', :q => { :foo => { :a => 'b'}})
+    assert_equal '/posts?q[foo][a]=b', @routes.generate(:controller => 'posts', :q => { :foo => { :a => 'b'}})
 
     assert_equal '/', @routes.generate(:controller => 'news', :action => 'index')
     assert_equal '/', @routes.generate(:controller => 'news', :action => 'index', :format => nil)
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index 375878b755..0f074b32e6 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -456,8 +456,8 @@ XML
   def test_array_path_parameter_handled_properly
     with_routing do |set|
       set.draw do |map|
-        map.connect 'file/*path', :controller => 'test_test/test', :action => 'test_params'
-        map.connect ':controller/:action/:id'
+        match 'file/*path', :to => 'test_test/test#test_params'
+        match ':controller/:action'
       end
 
       get :test_params, :path => ['hello', 'world']
@@ -563,7 +563,7 @@ XML
     expected = File.read(path)
     expected.force_encoding(Encoding::BINARY) if expected.respond_to?(:force_encoding)
 
-    file = ActionController::TestUploadedFile.new(path, content_type)
+    file = Rack::Test::UploadedFile.new(path, content_type)
     assert_equal filename, file.original_filename
     assert_equal content_type, file.content_type
     assert_equal file.path, file.local_path
@@ -580,10 +580,10 @@ XML
     path = "#{FILES_DIR}/#{filename}"
     content_type = 'image/png'
 
-    binary_uploaded_file = ActionController::TestUploadedFile.new(path, content_type, :binary)
+    binary_uploaded_file = Rack::Test::UploadedFile.new(path, content_type, :binary)
     assert_equal File.open(path, READ_BINARY).read, binary_uploaded_file.read
 
-    plain_uploaded_file = ActionController::TestUploadedFile.new(path, content_type)
+    plain_uploaded_file = Rack::Test::UploadedFile.new(path, content_type)
     assert_equal File.open(path, READ_PLAIN).read, plain_uploaded_file.read
   end
 
@@ -605,7 +605,7 @@ XML
   end
 
   def test_test_uploaded_file_exception_when_file_doesnt_exist
-    assert_raise(RuntimeError) { ActionController::TestUploadedFile.new('non_existent_file') }
+    assert_raise(RuntimeError) { Rack::Test::UploadedFile.new('non_existent_file') }
   end
 
   def test_redirect_url_only_cares_about_location_header
@@ -628,17 +628,6 @@ XML
       assert_nothing_raised(NoMethodError) { @response.binary_content }
     end
   end
-
-  protected
-    def with_foo_routing
-      with_routing do |set|
-        set.draw do |map|
-          map.generate_url 'foo', :controller => 'test'
-          map.connect      ':controller/:action/:id'
-        end
-        yield set
-      end
-    end
 end
 
 class InferringClassNameTest < ActionController::TestCase
@@ -673,7 +662,7 @@ class NamedRoutesControllerTest < ActionController::TestCase
 
   def test_should_be_able_to_use_named_routes_before_a_request_is_done
     with_routing do |set|
-      set.draw { |map| map.resources :contents }
+      set.draw { |map| resources :contents }
       assert_equal 'http://test.host/contents/new', new_content_url
       assert_equal 'http://test.host/contents/1', content_url(:id => 1)
     end
diff --git a/actionpack/test/controller/url_rewriter_test.rb b/actionpack/test/controller/url_rewriter_test.rb
index 3b14cbb2d8..428f40b9f8 100644
--- a/actionpack/test/controller/url_rewriter_test.rb
+++ b/actionpack/test/controller/url_rewriter_test.rb
@@ -247,7 +247,7 @@ class UrlWriterTests < ActionController::TestCase
 
     with_routing do |set|
       set.draw do |map|
-        map.home '/home/sweet/home/:user', :controller => 'home', :action => 'index'
+        match '/home/sweet/home/:user', :to => 'home#index', :as => :home
       end
 
       kls = Class.new { include ActionController::UrlWriter }
@@ -264,7 +264,7 @@ class UrlWriterTests < ActionController::TestCase
     with_routing do |set|
       set.draw do |map|
         match 'home/sweet/home/:user', :to => 'home#index', :as => :home
-        map.connect ':controller/:action/:id'
+        match ':controller/:action/:id'
       end
 
       # We need to create a new class in order to install the new named route.
@@ -331,8 +331,8 @@ class UrlWriterTests < ActionController::TestCase
   def test_named_routes_with_nil_keys
     with_routing do |set|
       set.draw do |map|
-        map.main '', :controller => 'posts', :format => nil
-        map.resources :posts
+        match 'posts.:format', :to => 'posts#index', :as => :posts
+        match '/', :to => 'posts#index', :as => :main
       end
 
       # We need to create a new class in order to install the new named route.
@@ -350,7 +350,7 @@ class UrlWriterTests < ActionController::TestCase
   def test_formatted_url_methods_are_deprecated
     with_routing do |set|
       set.draw do |map|
-        map.resources :posts
+        resources :posts
       end
       # We need to create a new class in order to install the new named route.
       kls = Class.new { include ActionController::UrlWriter }
diff --git a/actionpack/test/controller/webservice_test.rb b/actionpack/test/controller/webservice_test.rb
index 0514c098bf..5882a8cfa3 100644
--- a/actionpack/test/controller/webservice_test.rb
+++ b/actionpack/test/controller/webservice_test.rb
@@ -255,9 +255,7 @@ class WebServiceTest < ActionController::IntegrationTest
     def with_test_route_set
       with_routing do |set|
         set.draw do |map|
-          map.with_options :controller => "web_service_test/test" do |c|
-            c.connect "/", :action => "assign_parameters"
-          end
+          match '/', :to => 'web_service_test/test#assign_parameters'
         end
         yield
       end
diff --git a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
index 301080842e..40c5ac2d09 100644
--- a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
@@ -151,7 +151,7 @@ class MultipartParamsParsingTest < ActionController::IntegrationTest
     def with_test_routing
       with_routing do |set|
         set.draw do |map|
-          map.connect ':action', :controller => "multipart_params_parsing_test/test"
+          match ':action', :to => 'multipart_params_parsing_test/test'
         end
         yield
       end
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb
index 256ed06a45..02f63f7006 100644
--- a/actionpack/test/dispatch/response_test.rb
+++ b/actionpack/test/dispatch/response_test.rb
@@ -7,7 +7,6 @@ class ResponseTest < ActiveSupport::TestCase
 
   test "simple output" do
     @response.body = "Hello, World!"
-    @response.prepare!
 
     status, headers, body = @response.to_a
     assert_equal 200, status
@@ -25,7 +24,6 @@ class ResponseTest < ActiveSupport::TestCase
 
   test "utf8 output" do
     @response.body = [1090, 1077, 1089, 1090].pack("U*")
-    @response.prepare!
 
     status, headers, body = @response.to_a
     assert_equal 200, status
@@ -41,7 +39,6 @@ class ResponseTest < ActiveSupport::TestCase
     @response.body = Proc.new do |response, output|
       5.times { |n| output.write(n) }
     end
-    @response.prepare!
 
     status, headers, body = @response.to_a
     assert_equal 200, status
@@ -59,14 +56,12 @@ class ResponseTest < ActiveSupport::TestCase
   test "content type" do
     [204, 304].each do |c|
       @response.status = c.to_s
-      @response.prepare!
       status, headers, body = @response.to_a
       assert !headers.has_key?("Content-Type"), "#{c} should not have Content-Type header"
     end
 
     [200, 302, 404, 500].each do |c|
       @response.status = c.to_s
-      @response.prepare!
       status, headers, body = @response.to_a
       assert headers.has_key?("Content-Type"), "#{c} did not have Content-Type header"
     end
@@ -74,7 +69,6 @@ class ResponseTest < ActiveSupport::TestCase
 
   test "does not include Status header" do
     @response.status = "200 OK"
-    @response.prepare!
     status, headers, body = @response.to_a
     assert !headers.has_key?('Status')
   end
@@ -114,15 +108,126 @@ class ResponseTest < ActiveSupport::TestCase
 
   test "cookies" do
     @response.set_cookie("user_name", :value => "david", :path => "/")
-    @response.prepare!
     status, headers, body = @response.to_a
     assert_equal "user_name=david; path=/", headers["Set-Cookie"]
     assert_equal({"user_name" => "david"}, @response.cookies)
 
     @response.set_cookie("login", :value => "foo&bar", :path => "/", :expires => Time.utc(2005, 10, 10,5))
-    @response.prepare!
     status, headers, body = @response.to_a
     assert_equal "user_name=david; path=/\nlogin=foo%26bar; path=/; expires=Mon, 10-Oct-2005 05:00:00 GMT", headers["Set-Cookie"]
     assert_equal({"login" => "foo&bar", "user_name" => "david"}, @response.cookies)
   end
+
+  test "read cache control" do
+    resp = ActionDispatch::Response.new.tap { |resp|
+      resp.cache_control[:public] = true
+      resp.etag = '123'
+      resp.body = 'Hello'
+    }
+    resp.to_a
+
+    assert_equal('"202cb962ac59075b964b07152d234b70"', resp.etag)
+    assert_equal({:public => true}, resp.cache_control)
+
+    assert_equal('public', resp.headers['Cache-Control'])
+    assert_equal('"202cb962ac59075b964b07152d234b70"', resp.headers['ETag'])
+  end
+
+  test "read charset and content type" do
+    resp = ActionDispatch::Response.new.tap { |resp|
+      resp.charset = 'utf-16'
+      resp.content_type = Mime::XML
+      resp.body = 'Hello'
+    }
+    resp.to_a
+
+    assert_equal('utf-16', resp.charset)
+    assert_equal(Mime::XML, resp.content_type)
+
+    assert_equal('application/xml; charset=utf-16', resp.headers['Content-Type'])
+  end
+end
+
+class ResponseIntegrationTest < ActionDispatch::IntegrationTest
+  def app
+    @app
+  end
+
+  test "response cache control from railsish app" do
+    @app = lambda { |env|
+      ActionDispatch::Response.new.tap { |resp|
+        resp.cache_control[:public] = true
+        resp.etag = '123'
+        resp.body = 'Hello'
+      }.to_a
+    }
+
+    get '/'
+    assert_response :success
+
+    assert_equal('public', @response.headers['Cache-Control'])
+    assert_equal('"202cb962ac59075b964b07152d234b70"', @response.headers['ETag'])
+
+    pending do
+      assert_equal('"202cb962ac59075b964b07152d234b70"', @response.etag)
+      assert_equal({:public => true}, @response.cache_control)
+    end
+  end
+
+  test "response cache control from rackish app" do
+    @app = lambda { |env|
+      [200,
+        {'ETag' => '"202cb962ac59075b964b07152d234b70"',
+          'Cache-Control' => 'public'}, ['Hello']]
+    }
+
+    get '/'
+    assert_response :success
+
+    assert_equal('public', @response.headers['Cache-Control'])
+    assert_equal('"202cb962ac59075b964b07152d234b70"', @response.headers['ETag'])
+
+    pending do
+      assert_equal('"202cb962ac59075b964b07152d234b70"', @response.etag)
+      assert_equal({:public => true}, @response.cache_control)
+    end
+  end
+
+  test "response charset and content type from railsish app" do
+    @app = lambda { |env|
+      ActionDispatch::Response.new.tap { |resp|
+        resp.charset = 'utf-16'
+        resp.content_type = Mime::XML
+        resp.body = 'Hello'
+      }.to_a
+    }
+
+    get '/'
+    assert_response :success
+
+    pending do
+      assert_equal('utf-16', @response.charset)
+      assert_equal(Mime::XML, @response.content_type)
+    end
+
+    assert_equal('application/xml; charset=utf-16', @response.headers['Content-Type'])
+  end
+
+  test "response charset and content type from rackish app" do
+    @app = lambda { |env|
+      [200,
+        {'Content-Type' => 'application/xml; charset=utf-16'},
+        ['Hello']]
+    }
+
+    get '/'
+    assert_response :success
+
+    pending do
+      assert_equal('utf-16', @response.charset)
+      assert_equal(Mime::XML, @response.content_type)
+    end
+
+    assert_equal('application/xml; charset=utf-16', @response.headers['Content-Type'])
+  end
 end
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 496445fc34..360ffe977b 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -14,7 +14,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
   stub_controllers do |routes|
     Routes = routes
-    Routes.draw do |map|
+    Routes.draw do
       controller :sessions do
         get  'login', :to => :new, :as => :login
         post 'login', :to => :create
@@ -22,8 +22,12 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         delete 'logout', :to => :destroy, :as => :logout
       end
 
+      match 'account/logout' => redirect("/logout"), :as => :logout_redirect
       match 'account/login', :to => redirect("/login")
 
+      match 'account/modulo/:name', :to => redirect("/%{name}s")
+      match 'account/proc/:name', :to => redirect {|params| "/#{params[:name].pluralize}" }
+
       match 'openid/login', :via => [:get, :post], :to => "openid#login"
 
       controller(:global) do
@@ -34,11 +38,11 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       end
 
       constraints(:ip => /192\.168\.1\.\d\d\d/) do
-        get 'admin', :to => "queenbee#index"
+        get 'admin' => "queenbee#index"
       end
 
       constraints ::TestRoutingMapper::IpRestrictor do
-        get 'admin/accounts', :to => "queenbee#accounts"
+        get 'admin/accounts' => "queenbee#accounts"
       end
 
       resources :projects, :controller => :project do
@@ -58,8 +62,10 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         end
 
         resources :people do
-          namespace ":access_token" do
-            resource :avatar
+          nested do
+            namespace ":access_token" do
+              resource :avatar
+            end
           end
 
           member do
@@ -80,7 +86,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         end
       end
 
-      match 'sprockets.js', :to => ::TestRoutingMapper::SprocketsApp
+      match 'sprockets.js' => ::TestRoutingMapper::SprocketsApp
 
       match 'people/:id/update', :to => 'people#update', :as => :update_person
       match '/projects/:project_id/people/:id/update', :to => 'people#update', :as => :update_project_person
@@ -93,9 +99,9 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       end
 
       controller :articles do
-        scope 'articles' do
-          scope ':title', :title => /[a-z]+/, :as => :with_title do
-            match ':id', :to => :with_id
+        scope '/articles', :name_prefix => 'article' do
+          scope :path => '/:title', :title => /[a-z]+/, :as => :with_title do
+            match '/:id', :to => :with_id
           end
         end
       end
@@ -103,6 +109,10 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       scope ':access_token', :constraints => { :access_token => /\w{5,5}/ } do
         resources :rooms
       end
+
+      match '/info' => 'projects#info', :as => 'info'
+
+      root :to => 'projects#index'
     end
   end
 
@@ -143,6 +153,34 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_logout_redirect_without_to
+    with_test_routes do
+      assert_equal '/account/logout', logout_redirect_path
+      get '/account/logout'
+      assert_equal 301, @response.status
+      assert_equal 'http://www.example.com/logout', @response.headers['Location']
+      assert_equal 'Moved Permanently', @response.body
+    end
+  end
+
+  def test_redirect_modulo
+    with_test_routes do
+      get '/account/modulo/name'
+      assert_equal 301, @response.status
+      assert_equal 'http://www.example.com/names', @response.headers['Location']
+      assert_equal 'Moved Permanently', @response.body
+    end
+  end
+
+  def test_redirect_proc
+    with_test_routes do
+      get '/account/proc/person'
+      assert_equal 301, @response.status
+      assert_equal 'http://www.example.com/people', @response.headers['Location']
+      assert_equal 'Moved Permanently', @response.body
+    end
+  end
+
   def test_openid
     with_test_routes do
       get '/openid/login'
@@ -194,14 +232,26 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       assert_equal 'projects#index', @response.body
       assert_equal '/projects', projects_path
 
+      get '/projects.xml'
+      assert_equal 'projects#index', @response.body
+      assert_equal '/projects.xml', projects_path(:format => 'xml')
+
       get '/projects/new'
       assert_equal 'projects#new', @response.body
       assert_equal '/projects/new', new_project_path
 
+      get '/projects/new.xml'
+      assert_equal 'projects#new', @response.body
+      assert_equal '/projects/new.xml', new_project_path(:format => 'xml')
+
       get '/projects/1'
       assert_equal 'projects#show', @response.body
       assert_equal '/projects/1', project_path(:id => '1')
 
+      get '/projects/1.xml'
+      assert_equal 'projects#show', @response.body
+      assert_equal '/projects/1.xml', project_path(:id => '1', :format => 'xml')
+
       get '/projects/1/edit'
       assert_equal 'projects#edit', @response.body
       assert_equal '/projects/1/edit', edit_project_path(:id => '1')
@@ -214,9 +264,23 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       assert_equal 'involvements#index', @response.body
       assert_equal '/projects/1/involvements', project_involvements_path(:project_id => '1')
 
+      get '/projects/1/involvements/new'
+      assert_equal 'involvements#new', @response.body
+      assert_equal '/projects/1/involvements/new', new_project_involvement_path(:project_id => '1')
+
       get '/projects/1/involvements/1'
       assert_equal 'involvements#show', @response.body
       assert_equal '/projects/1/involvements/1', project_involvement_path(:project_id => '1', :id => '1')
+
+      put '/projects/1/involvements/1'
+      assert_equal 'involvements#update', @response.body
+
+      delete '/projects/1/involvements/1'
+      assert_equal 'involvements#destroy', @response.body
+
+      get '/projects/1/involvements/1/edit'
+      assert_equal 'involvements#edit', @response.body
+      assert_equal '/projects/1/involvements/1/edit', edit_project_involvement_path(:project_id => '1', :id => '1')
     end
   end
 
@@ -236,10 +300,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       put '/projects/1/participants/update_all'
       assert_equal 'participants#update_all', @response.body
-
-      pending do
-        assert_equal '/projects/1/participants/update_all', update_all_project_participants_path(:project_id => '1')
-      end
+      assert_equal '/projects/1/participants/update_all', update_all_project_participants_path(:project_id => '1')
     end
   end
 
@@ -251,15 +312,11 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       get '/projects/1/companies/1/people'
       assert_equal 'people#index', @response.body
-      pending do
-        assert_equal '/projects/1/companies/1/people', project_company_people_path(:project_id => '1', :company_id => '1')
-      end
+      assert_equal '/projects/1/companies/1/people', project_company_people_path(:project_id => '1', :company_id => '1')
 
       get '/projects/1/companies/1/avatar'
       assert_equal 'avatars#show', @response.body
-      pending do
-        assert_equal '/projects/1/companies/1/avatar', project_company_avatar_path(:project_id => '1', :company_id => '1')
-      end
+      assert_equal '/projects/1/companies/1/avatar', project_company_avatar_path(:project_id => '1', :company_id => '1')
     end
   end
 
@@ -271,9 +328,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       post '/projects/1/images/1/revise'
       assert_equal 'images#revise', @response.body
-      pending do
-        assert_equal '/projects/1/images/1/revise', revise_project_image_path(:project_id => '1', :id => '1')
-      end
+      assert_equal '/projects/1/images/1/revise', revise_project_image_path(:project_id => '1', :id => '1')
     end
   end
 
@@ -289,27 +344,19 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       get '/projects/1/people/1/7a2dec8/avatar'
       assert_equal 'avatars#show', @response.body
-      pending do
-        assert_equal '/projects/1/people/1/7a2dec8/avatar', project_person_avatar_path(:project_id => '1', :person_id => '1', :access_token => '7a2dec8')
-      end
+      assert_equal '/projects/1/people/1/7a2dec8/avatar', project_person_avatar_path(:project_id => '1', :person_id => '1', :access_token => '7a2dec8')
 
       put '/projects/1/people/1/accessible_projects'
       assert_equal 'people#accessible_projects', @response.body
-      pending do
-        assert_equal '/projects/1/people/1/accessible_projects', accessible_projects_project_person_path(:project_id => '1', :id => '1')
-      end
+      assert_equal '/projects/1/people/1/accessible_projects', accessible_projects_project_person_path(:project_id => '1', :id => '1')
 
       post '/projects/1/people/1/resend'
       assert_equal 'people#resend', @response.body
-      pending do
-        assert_equal '/projects/1/people/1/resend', resend_project_person_path(:project_id => '1', :id => '1')
-      end
+      assert_equal '/projects/1/people/1/resend', resend_project_person_path(:project_id => '1', :id => '1')
 
       post '/projects/1/people/1/generate_new_password'
       assert_equal 'people#generate_new_password', @response.body
-      pending do
-        assert_equal '/projects/1/people/1/generate_new_password', generate_new_password_project_person_path(:project_id => '1', :id => '1')
-      end
+      assert_equal '/projects/1/people/1/generate_new_password', generate_new_password_project_person_path(:project_id => '1', :id => '1')
     end
   end
 
@@ -321,39 +368,27 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       get '/projects/1/posts/archive'
       assert_equal 'posts#archive', @response.body
-      pending do
-        assert_equal '/projects/1/posts/archive', archive_project_posts_path(:project_id => '1')
-      end
+      assert_equal '/projects/1/posts/archive', archive_project_posts_path(:project_id => '1')
 
       get '/projects/1/posts/toggle_view'
       assert_equal 'posts#toggle_view', @response.body
-      pending do
-        assert_equal '/projects/1/posts/toggle_view', toggle_view_project_posts_path(:project_id => '1')
-      end
+      assert_equal '/projects/1/posts/toggle_view', toggle_view_project_posts_path(:project_id => '1')
 
       post '/projects/1/posts/1/preview'
       assert_equal 'posts#preview', @response.body
-      pending do
-        assert_equal '/projects/1/posts/1/preview', preview_project_post_path(:project_id => '1', :id => '1')
-      end
+      assert_equal '/projects/1/posts/1/preview', preview_project_post_path(:project_id => '1', :id => '1')
 
       get '/projects/1/posts/1/subscription'
       assert_equal 'subscriptions#show', @response.body
-      pending do
-        assert_equal '/projects/1/posts/1/subscription', project_post_subscription_path(:project_id => '1', :post_id => '1')
-      end
+      assert_equal '/projects/1/posts/1/subscription', project_post_subscription_path(:project_id => '1', :post_id => '1')
 
       get '/projects/1/posts/1/comments'
       assert_equal 'comments#index', @response.body
-      pending do
-        assert_equal '/projects/1/posts/1/comments', project_post_comments_path(:project_id => '1', :post_id => '1')
-      end
+      assert_equal '/projects/1/posts/1/comments', project_post_comments_path(:project_id => '1', :post_id => '1')
 
       post '/projects/1/posts/1/comments/preview'
       assert_equal 'comments#preview', @response.body
-      pending do
-        assert_equal '/projects/1/posts/1/comments/preview', preview_project_post_comments_path(:project_id => '1', :post_id => '1')
-      end
+      assert_equal '/projects/1/posts/1/comments/preview', preview_project_post_comments_path(:project_id => '1', :post_id => '1')
     end
   end
 
@@ -411,7 +446,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       assert_raise(ActionController::RoutingError) { get '/articles/123/1' }
 
-      assert_equal '/articles/rails/1', with_title_path(:title => 'rails', :id => 1)
+      assert_equal '/articles/rails/1', article_with_title_path(:title => 'rails', :id => 1)
     end
   end
 
@@ -428,6 +463,30 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_root
+    with_test_routes do
+      assert_equal '/', root_path
+      get '/'
+      assert_equal 'projects#index', @response.body
+    end
+  end
+  
+  def test_index
+    with_test_routes do
+      assert_equal '/info', info_path
+      get '/info'
+      assert_equal 'projects#info', @response.body
+    end
+  end
+
+  def test_index
+    with_test_routes do
+      assert_equal '/info', info_path
+      get '/info'
+      assert_equal 'projects#info', @response.body
+    end
+  end
+
   private
     def with_test_routes
       real_routes, temp_routes = ActionController::Routing::Routes, Routes
diff --git a/actionpack/test/dispatch/test_request_test.rb b/actionpack/test/dispatch/test_request_test.rb
index 5da02b2ea6..e42ade73d1 100644
--- a/actionpack/test/dispatch/test_request_test.rb
+++ b/actionpack/test/dispatch/test_request_test.rb
@@ -18,7 +18,7 @@ class TestRequestTest < ActiveSupport::TestCase
     assert_equal "0.0.0.0", env.delete("REMOTE_ADDR")
     assert_equal "Rails Testing", env.delete("HTTP_USER_AGENT")
 
-    assert_equal [1, 0], env.delete("rack.version")
+    assert_equal [1, 1], env.delete("rack.version")
     assert_equal "", env.delete("rack.input").string
     assert_kind_of StringIO, env.delete("rack.errors")
     assert_equal true, env.delete("rack.multithread")
diff --git a/actionpack/test/lib/controller/fake_controllers.rb b/actionpack/test/lib/controller/fake_controllers.rb
index 250327e6dc..09692f77b5 100644
--- a/actionpack/test/lib/controller/fake_controllers.rb
+++ b/actionpack/test/lib/controller/fake_controllers.rb
@@ -1,37 +1,48 @@
 class << Object; alias_method :const_available?, :const_defined?; end
 
 class ContentController < ActionController::Base; end
-class NotAController; end
 
 module Admin
   class << self; alias_method :const_available?, :const_defined?; end
+  class AccountsController < ActionController::Base; end
   class NewsFeedController < ActionController::Base; end
   class PostsController < ActionController::Base; end
   class StuffController < ActionController::Base; end
   class UserController < ActionController::Base; end
+  class UsersController < ActionController::Base; end
 end
 
 module Api
+  class UsersController < ActionController::Base; end
   class ProductsController < ActionController::Base; end
 end
 
 # TODO: Reduce the number of test controllers we use
+class AccountController < ActionController::Base; end
 class AddressesController < ActionController::Base; end
+class ArchiveController < ActionController::Base; end
 class ArticlesController < ActionController::Base; end
 class BarController < ActionController::Base; end
+class BlogController < ActionController::Base; end
 class BooksController < ActionController::Base; end
 class BraveController < ActionController::Base; end
+class CarsController < ActionController::Base; end
+class CcController < ActionController::Base; end
 class CController < ActionController::Base; end
 class ElsewhereController < ActionController::Base; end
 class FooController < ActionController::Base; end
+class GeocodeController < ActionController::Base; end
 class HiController < ActionController::Base; end
 class ImageController < ActionController::Base; end
+class NewsController < ActionController::Base; end
 class NotesController < ActionController::Base; end
 class PeopleController < ActionController::Base; end
 class PostsController < ActionController::Base; end
 class SessionsController  < ActionController::Base; end
 class StuffController < ActionController::Base; end
 class SubpathBooksController < ActionController::Base; end
+class SymbolsController < ActionController::Base; end
+class UserController < ActionController::Base; end
 class WeblogController < ActionController::Base; end
 
 # For speed test
diff --git a/actionpack/test/template/ajax_test.rb b/actionpack/test/template/ajax_test.rb
index 670ba92697..aeb7c09b09 100644
--- a/actionpack/test/template/ajax_test.rb
+++ b/actionpack/test/template/ajax_test.rb
@@ -6,7 +6,7 @@ class AjaxTestCase < ActiveSupport::TestCase
 
   def assert_html(html, matches)
     matches.each do |match|
-      assert_match Regexp.new(Regexp.escape(match)), html
+      assert_match(Regexp.new(Regexp.escape(match)), html)
     end
   end
 
@@ -52,18 +52,18 @@ class LinkToRemoteTest < AjaxTestCase
 
   test "with a hash for :update" do
     link = link(:update => {:success => "#posts", :failure => "#error"})
-    assert_match /data-update-success="#posts"/, link
-    assert_match /data-update-failure="#error"/, link
+    assert_match(/data-update-success="#posts"/, link)
+    assert_match(/data-update-failure="#error"/, link)
   end
 
   test "with positional parameters" do
     link = link(:position => :top, :update => "#posts")
-    assert_match /data\-update\-position="top"/, link
+    assert_match(/data\-update\-position="top"/, link)
   end
 
   test "with an optional method" do
     link = link(:method => "delete")
-    assert_match /data-method="delete"/, link
+    assert_match(/data-method="delete"/, link)
   end
 
   class LegacyLinkToRemoteTest < AjaxTestCase
@@ -99,7 +99,7 @@ class ButtonToRemoteTest < AjaxTestCase
       button = button({:url => {:action => "whatnot"}}, {:class => "fine"})
       [/input/, /class="fine"/, /type="button"/, /value="Remote outpost"/,
        /data-url="\/whatnot"/].each do |match|
-         assert_match match, button
+         assert_match(match, button)
       end
     end
   end
diff --git a/actionpack/test/template/atom_feed_helper_test.rb b/actionpack/test/template/atom_feed_helper_test.rb
index 6a5fb0acff..347cb98303 100644
--- a/actionpack/test/template/atom_feed_helper_test.rb
+++ b/actionpack/test/template/atom_feed_helper_test.rb
@@ -187,10 +187,9 @@ class ScrollsController < ActionController::Base
   end
 
   protected
-
-  def rescue_action(e)
-    raise(e)
-  end
+    def rescue_action(e)
+      raise(e)
+    end
 end
 
 class AtomFeedTest < ActionController::TestCase
@@ -311,11 +310,12 @@ class AtomFeedTest < ActionController::TestCase
       assert_select "summary div p", :text => "after 2"
     end
   end
-private
+
+  private
     def with_restful_routing(resources)
       with_routing do |set|
         set.draw do |map|
-          map.resources(resources)
+          resources(resources)
         end
         yield
       end
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index 35c51ca7ea..fdf3db1cdb 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -106,8 +106,8 @@ module RenderTestCases
 
   def test_render_partial_with_errors
     @view.render(:partial => "test/raise")
-    flunk "Render did not raise TemplateError"
-  rescue ActionView::TemplateError => e
+    flunk "Render did not raise Template::Error"
+  rescue ActionView::Template::Error => e
     assert_match "undefined local variable or method `doesnt_exist'", e.message
     assert_equal "", e.sub_template_message
     assert_equal "1", e.line_number
@@ -116,8 +116,8 @@ module RenderTestCases
 
   def test_render_sub_template_with_errors
     @view.render(:file => "test/sub_template_raise")
-    flunk "Render did not raise TemplateError"
-  rescue ActionView::TemplateError => e
+    flunk "Render did not raise Template::Error"
+  rescue ActionView::Template::Error => e
     assert_match "undefined local variable or method `doesnt_exist'", e.message
     assert_equal "Trace of template inclusion: #{File.expand_path("#{FIXTURE_LOAD_PATH}/test/sub_template_raise.html.erb")}", e.sub_template_message
     assert_equal "1", e.line_number
diff --git a/actionpack/test/template/test_case_test.rb b/actionpack/test/template/test_case_test.rb
index 05a409d05a..9a448ce328 100644
--- a/actionpack/test/template/test_case_test.rb
+++ b/actionpack/test/template/test_case_test.rb
@@ -114,7 +114,7 @@ module ActionView
 
       test "is able to use named routes" do
         with_routing do |set|
-          set.draw { |map| map.resources :contents }
+          set.draw { |map| resources :contents }
           assert_equal 'http://test.host/contents/new', new_content_url
           assert_equal 'http://test.host/contents/1',   content_url(:id => 1)
         end
@@ -122,7 +122,7 @@ module ActionView
 
       test "named routes can be used from helper included in view" do
         with_routing do |set|
-          set.draw { |map| map.resources :contents }
+          set.draw { |map| resources :contents }
           _helpers.module_eval do
             def render_from_helper
               new_content_url
diff --git a/actionpack/test/template/translation_helper_test.rb b/actionpack/test/template/translation_helper_test.rb
index a20f3c394c..d67d2c7911 100644
--- a/actionpack/test/template/translation_helper_test.rb
+++ b/actionpack/test/template/translation_helper_test.rb
@@ -9,7 +9,7 @@ class TranslationHelperTest < Test::Unit::TestCase
   end
   
   def test_delegates_to_i18n_setting_the_raise_option
-    I18n.expects(:translate).with(:foo, :locale => 'en', :raise => true)
+    I18n.expects(:translate).with(:foo, :locale => 'en', :raise => true).returns("")
     translate :foo, :locale => 'en'
   end
   
@@ -26,7 +26,7 @@ class TranslationHelperTest < Test::Unit::TestCase
   
   def test_scoping_by_partial
     expects(:template).returns(stub(:path_without_format_and_extension => "people/index"))
-    I18n.expects(:translate).with("people.index.foo", :locale => 'en', :raise => true)
+    I18n.expects(:translate).with("people.index.foo", :locale => 'en', :raise => true).returns("")
     translate ".foo", :locale => 'en'
   end
 end
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index bf0b4ad3a7..d4b58efe1e 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -391,54 +391,47 @@ class UrlHelperTest < ActionView::TestCase
     end
 end
 
-class UrlHelperController < ActionController::Base
-  def self.controller_path; 'url_helper_with_controller' end
+class UrlHelperControllerTest < ActionController::TestCase
+  class UrlHelperController < ActionController::Base
+    def show_url_for
+      render :inline => "<%= url_for :controller => 'url_helper_controller_test/url_helper', :action => 'show_url_for' %>"
+    end
 
-  def show_url_for
-    render :inline => "<%= url_for :controller => 'url_helper_with_controller', :action => 'show_url_for' %>"
-  end
+    def show_named_route
+      render :inline => "<%= show_named_route_#{params[:kind]} %>"
+    end
 
-  def show_named_route
-    render :inline => "<%= show_named_route_#{params[:kind]} %>"
-  end
+    def nil_url_for
+      render :inline => '<%= url_for(nil) %>'
+    end
 
-  def nil_url_for
-    render :inline => '<%= url_for(nil) %>'
+    def rescue_action(e) raise e end
   end
 
-  def rescue_action(e) raise e end
-end
-
-class UrlHelperWithControllerTest < ActionController::TestCase
-  def setup
-    super
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @controller = UrlHelperController.new
-  end
+  tests UrlHelperController
 
   def test_url_for_shows_only_path
     get :show_url_for
-    assert_equal '/url_helper_with_controller/show_url_for', @response.body
+    assert_equal '/url_helper_controller_test/url_helper/show_url_for', @response.body
   end
 
   def test_named_route_url_shows_host_and_path
     with_url_helper_routing do
       get :show_named_route, :kind => 'url'
-      assert_equal 'http://test.host/url_helper_with_controller/show_named_route', @response.body
+      assert_equal 'http://test.host/url_helper_controller_test/url_helper/show_named_route', @response.body
     end
   end
 
   def test_named_route_path_shows_only_path
     with_url_helper_routing do
       get :show_named_route, :kind => 'path'
-      assert_equal '/url_helper_with_controller/show_named_route', @response.body
+      assert_equal '/url_helper_controller_test/url_helper/show_named_route', @response.body
     end
   end
 
   def test_url_for_nil_returns_current_path
     get :nil_url_for
-    assert_equal '/url_helper/nil_url_for', @response.body
+    assert_equal '/url_helper_controller_test/url_helper/nil_url_for', @response.body
   end
 
   def test_named_route_should_show_host_and_path_using_controller_default_url_options
@@ -450,7 +443,7 @@ class UrlHelperWithControllerTest < ActionController::TestCase
 
     with_url_helper_routing do
       get :show_named_route, :kind => 'url'
-      assert_equal 'http://testtwo.host/url_helper_with_controller/show_named_route', @response.body
+      assert_equal 'http://testtwo.host/url_helper_controller_test/url_helper/show_named_route', @response.body
     end
   end
 
@@ -458,7 +451,7 @@ class UrlHelperWithControllerTest < ActionController::TestCase
     def with_url_helper_routing
       with_routing do |set|
         set.draw do |map|
-          map.show_named_route 'url_helper_with_controller/show_named_route', :controller => 'url_helper', :action => 'show_named_route'
+          match 'url_helper_controller_test/url_helper/show_named_route', :to => 'url_helper_controller_test/url_helper#show_named_route', :as => :show_named_route
         end
         yield
       end
@@ -512,7 +505,7 @@ class LinkToUnlessCurrentWithControllerTest < ActionController::TestCase
     def with_restful_routing
       with_routing do |set|
         set.draw do |map|
-          map.resources :tasks
+          resources :tasks
         end
         yield
       end
@@ -632,8 +625,8 @@ class PolymorphicControllerTest < ActionController::TestCase
     def with_restful_routing
       with_routing do |set|
         set.draw do |map|
-          map.resources :workshops do |w|
-            w.resources :sessions
+          resources :workshops do
+            resources :sessions
           end
         end
         yield