From a63caa4c0c2a8aabc13c354a9193ebd9c5e8ba73 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Mon, 15 Jun 2009 11:44:45 -0700
Subject: [PATCH] Get tests to run (with failures) without old base around

---
 actionmailer/lib/action_mailer/base.rb        |    4 +-
 actionpack/lib/action_controller.rb           |  111 +-
 actionpack/lib/action_controller/base/base.rb | 1005 +++--------------
 .../{new_base => base}/compatibility.rb       |    0
 .../{new_base => base}/conditional_get.rb     |    0
 .../lib/action_controller/base/helpers.rb     |  277 ++---
 .../{new_base => base}/hide_actions.rb        |    0
 .../{new_base => base}/http.rb                |    0
 .../{new_base => base}/layouts.rb             |    0
 .../{new_base => base}/rack_convenience.rb    |    0
 .../{new_base => base}/redirector.rb          |    0
 .../{new_base => base}/render_options.rb      |    0
 .../{new_base => base}/renderer.rb            |    0
 .../{new_base => base}/rescuable.rb           |    0
 .../{new_base => base}/session.rb             |    0
 .../{new_base => base}/testing.rb             |    0
 .../{new_base => base}/url_for.rb             |    0
 actionpack/lib/action_controller/new_base.rb  |   47 -
 .../lib/action_controller/new_base/base.rb    |  173 ---
 .../lib/action_controller/new_base/helpers.rb |  178 ---
 actionpack/lib/action_controller/old_base.rb  |   84 ++
 .../lib/action_controller/old_base/base.rb    |  884 +++++++++++++++
 .../chained/benchmarking.rb                   |    0
 .../{base => old_base}/chained/filters.rb     |    0
 .../{base => old_base}/chained/flash.rb       |    0
 .../{base => old_base}/cookies.rb             |    0
 .../filter_parameter_logging.rb               |    0
 .../lib/action_controller/old_base/helpers.rb |  221 ++++
 .../{base => old_base}/http_authentication.rb |    0
 .../{base => old_base}/layout.rb              |    0
 .../{base => old_base}/mime_responds.rb       |    0
 .../{base => old_base}/redirect.rb            |    0
 .../{base => old_base}/render.rb              |    0
 .../request_forgery_protection.rb             |    0
 .../{base => old_base}/rescue.rb              |    0
 .../{base => old_base}/responder.rb           |    0
 .../{base => old_base}/session_management.rb  |    0
 .../{base => old_base}/streaming.rb           |    0
 .../{base => old_base}/verification.rb        |    0
 actionpack/test/abstract_unit.rb              |  169 ++-
 actionpack/test/new_base/abstract_unit.rb     |  173 ---
 actionpack/test/old_base/abstract_unit.rb     |   46 +
 42 files changed, 1687 insertions(+), 1685 deletions(-)
 rename actionpack/lib/action_controller/{new_base => base}/compatibility.rb (100%)
 rename actionpack/lib/action_controller/{new_base => base}/conditional_get.rb (100%)
 rename actionpack/lib/action_controller/{new_base => base}/hide_actions.rb (100%)
 rename actionpack/lib/action_controller/{new_base => base}/http.rb (100%)
 rename actionpack/lib/action_controller/{new_base => base}/layouts.rb (100%)
 rename actionpack/lib/action_controller/{new_base => base}/rack_convenience.rb (100%)
 rename actionpack/lib/action_controller/{new_base => base}/redirector.rb (100%)
 rename actionpack/lib/action_controller/{new_base => base}/render_options.rb (100%)
 rename actionpack/lib/action_controller/{new_base => base}/renderer.rb (100%)
 rename actionpack/lib/action_controller/{new_base => base}/rescuable.rb (100%)
 rename actionpack/lib/action_controller/{new_base => base}/session.rb (100%)
 rename actionpack/lib/action_controller/{new_base => base}/testing.rb (100%)
 rename actionpack/lib/action_controller/{new_base => base}/url_for.rb (100%)
 delete mode 100644 actionpack/lib/action_controller/new_base.rb
 delete mode 100644 actionpack/lib/action_controller/new_base/base.rb
 delete mode 100644 actionpack/lib/action_controller/new_base/helpers.rb
 create mode 100644 actionpack/lib/action_controller/old_base.rb
 create mode 100644 actionpack/lib/action_controller/old_base/base.rb
 rename actionpack/lib/action_controller/{base => old_base}/chained/benchmarking.rb (100%)
 rename actionpack/lib/action_controller/{base => old_base}/chained/filters.rb (100%)
 rename actionpack/lib/action_controller/{base => old_base}/chained/flash.rb (100%)
 rename actionpack/lib/action_controller/{base => old_base}/cookies.rb (100%)
 rename actionpack/lib/action_controller/{base => old_base}/filter_parameter_logging.rb (100%)
 create mode 100644 actionpack/lib/action_controller/old_base/helpers.rb
 rename actionpack/lib/action_controller/{base => old_base}/http_authentication.rb (100%)
 rename actionpack/lib/action_controller/{base => old_base}/layout.rb (100%)
 rename actionpack/lib/action_controller/{base => old_base}/mime_responds.rb (100%)
 rename actionpack/lib/action_controller/{base => old_base}/redirect.rb (100%)
 rename actionpack/lib/action_controller/{base => old_base}/render.rb (100%)
 rename actionpack/lib/action_controller/{base => old_base}/request_forgery_protection.rb (100%)
 rename actionpack/lib/action_controller/{base => old_base}/rescue.rb (100%)
 rename actionpack/lib/action_controller/{base => old_base}/responder.rb (100%)
 rename actionpack/lib/action_controller/{base => old_base}/session_management.rb (100%)
 rename actionpack/lib/action_controller/{base => old_base}/streaming.rb (100%)
 rename actionpack/lib/action_controller/{base => old_base}/verification.rb (100%)
 delete mode 100644 actionpack/test/new_base/abstract_unit.rb
 create mode 100644 actionpack/test/old_base/abstract_unit.rb

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 0ddb3f06212ce..a33302a222869 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -1,3 +1,5 @@
+require "active_support/core_ext/class"
+
 module ActionMailer #:nodoc:
   # Action Mailer allows you to send email from your application using a mailer model and views.
   #
@@ -248,7 +250,7 @@ class Base
     include AdvAttrAccessor, PartContainer, Quoting, Utils
     if Object.const_defined?(:ActionController)
       include ActionController::UrlWriter
-      include ActionController::Layout
+      include ActionController::Layouts
     end
 
     private_class_method :new #:nodoc:
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index dd22bfd617aa9..44724fc9cbff7 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -1,81 +1,44 @@
-#--
-# Copyright (c) 2004-2009 David Heinemeier Hansson
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-
-activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
-$:.unshift activesupport_path if File.directory?(activesupport_path)
-require 'active_support'
-
-require File.join(File.dirname(__FILE__), "action_pack")
-
 module ActionController
-  # TODO: Review explicit to see if they will automatically be handled by
-  # the initilizer if they are really needed.
-  def self.load_all!
-    [Base, Request, Response, UrlRewriter, UrlWriter]
-    [ActionDispatch::Http::Headers]
-  end
+  autoload :Base,                 "action_controller/base/base"
+  autoload :ConditionalGet,       "action_controller/base/conditional_get"
+  autoload :HideActions,          "action_controller/base/hide_actions"
+  autoload :Http,                 "action_controller/base/http"
+  autoload :Layouts,              "action_controller/base/layouts"
+  autoload :RackConvenience,      "action_controller/base/rack_convenience"
+  autoload :Rails2Compatibility,  "action_controller/base/compatibility"
+  autoload :Redirector,           "action_controller/base/redirector"
+  autoload :Renderer,             "action_controller/base/renderer"
+  autoload :RenderOptions,        "action_controller/base/render_options"
+  autoload :Renderers,            "action_controller/base/render_options"
+  autoload :Rescue,               "action_controller/base/rescuable"
+  autoload :Testing,              "action_controller/base/testing"
+  autoload :UrlFor,               "action_controller/base/url_for"
+  autoload :Session,              "action_controller/base/session"
+  autoload :Helpers,              "action_controller/base/helpers"
 
-  autoload :Base, 'action_controller/base/base'
-  autoload :Benchmarking, 'action_controller/base/chained/benchmarking'
-  autoload :Caching, 'action_controller/caching'
-  autoload :Cookies, 'action_controller/base/cookies'
-  autoload :Dispatcher, 'action_controller/dispatch/dispatcher'
-  autoload :Filters, 'action_controller/base/chained/filters'
-  autoload :Flash, 'action_controller/base/chained/flash'
-  autoload :Helpers, 'action_controller/base/helpers'
-  autoload :HttpAuthentication, 'action_controller/base/http_authentication'
-  autoload :Integration, 'action_controller/testing/integration'
-  autoload :IntegrationTest, 'action_controller/testing/integration'
-  autoload :Layout, 'action_controller/base/layout'
-  autoload :MimeResponds, 'action_controller/base/mime_responds'
+  # Ported modules
+  # require 'action_controller/routing'
+  autoload :Caching,           'action_controller/caching'
+  autoload :Dispatcher,        'action_controller/dispatch/dispatcher'
+  autoload :MimeResponds,      'action_controller/old_base/mime_responds'
   autoload :PolymorphicRoutes, 'action_controller/routing/generation/polymorphic_routes'
-  autoload :RecordIdentifier, 'action_controller/record_identifier'
-  autoload :Redirector, 'action_controller/base/redirect'
-  autoload :Renderer, 'action_controller/base/render'
-  autoload :RequestForgeryProtection, 'action_controller/base/request_forgery_protection'
-  autoload :Rescue, 'action_controller/base/rescue'
-  autoload :Resources, 'action_controller/routing/resources'
-  autoload :Responder, 'action_controller/base/responder'
-  autoload :Routing, 'action_controller/routing'
-  autoload :SessionManagement, 'action_controller/base/session_management'
-  autoload :Streaming, 'action_controller/base/streaming'
-  autoload :TestCase, 'action_controller/testing/test_case'
-  autoload :TestProcess, 'action_controller/testing/process'
-  autoload :Translation, 'action_controller/translation'
-  autoload :UrlEncodedPairParser, 'action_controller/dispatch/url_encoded_pair_parser'
-  autoload :UrlRewriter, 'action_controller/routing/generation/url_rewriter'
-  autoload :UrlWriter, 'action_controller/routing/generation/url_rewriter'
-  autoload :Verification, 'action_controller/base/verification'
-  autoload :FilterParameterLogging, 'action_controller/base/filter_parameter_logging'
+  autoload :RecordIdentifier,  'action_controller/record_identifier'
+  autoload :Resources,         'action_controller/routing/resources'
+  autoload :SessionManagement, 'action_controller/old_base/session_management'
+  autoload :TestCase,          'action_controller/testing/test_case'
+  autoload :UrlRewriter,       'action_controller/routing/generation/url_rewriter'
+  autoload :UrlWriter,         'action_controller/routing/generation/url_rewriter'
+
+  autoload :Verification,             'action_controller/old_base/verification'
+  autoload :Flash,                    'action_controller/old_base/chained/flash'
+  autoload :RequestForgeryProtection, 'action_controller/old_base/request_forgery_protection'
+  autoload :Streaming,                'action_controller/old_base/streaming'
+  autoload :HttpAuthentication,       'action_controller/old_base/http_authentication'
+  autoload :FilterParameterLogging,   'action_controller/old_base/filter_parameter_logging'
+  autoload :Translation,              'action_controller/translation'
+  autoload :Cookies,                  'action_controller/old_base/cookies'
 
-  module Assertions
-    autoload :DomAssertions, 'action_controller/testing/assertions/dom'
-    autoload :ModelAssertions, 'action_controller/testing/assertions/model'
-    autoload :ResponseAssertions, 'action_controller/testing/assertions/response'
-    autoload :RoutingAssertions, 'action_controller/testing/assertions/routing'
-    autoload :SelectorAssertions, 'action_controller/testing/assertions/selector'
-    autoload :TagAssertions, 'action_controller/testing/assertions/tag'
-  end
+  require 'action_controller/routing'
 end
 
 autoload :HTML, 'action_controller/vendor/html-scanner'
diff --git a/actionpack/lib/action_controller/base/base.rb b/actionpack/lib/action_controller/base/base.rb
index 67369eb12214d..e8fc153578a6c 100644
--- a/actionpack/lib/action_controller/base/base.rb
+++ b/actionpack/lib/action_controller/base/base.rb
@@ -1,884 +1,173 @@
-require 'action_controller/deprecated'
-require 'set'
-require 'active_support/core_ext/class/inheritable_attributes'
-require 'active_support/core_ext/module/attr_internal'
-
-module ActionController #:nodoc:
-  class ActionControllerError < StandardError #:nodoc:
-  end
-
-  class SessionRestoreError < ActionControllerError #:nodoc:
-  end
-
-  class RenderError < ActionControllerError #:nodoc:
-  end
-
-  class RoutingError < ActionControllerError #:nodoc:
-    attr_reader :failures
-    def initialize(message, failures=[])
-      super(message)
-      @failures = failures
-    end
-  end
-
-  class MethodNotAllowed < ActionControllerError #:nodoc:
-    attr_reader :allowed_methods
-
-    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
-  end
-
-  class NotImplemented < MethodNotAllowed #:nodoc:
-  end
-
-  class UnknownController < ActionControllerError #:nodoc:
-  end
-
-  class UnknownAction < ActionControllerError #:nodoc:
-  end
-
-  class MissingFile < ActionControllerError #:nodoc:
-  end
-
-  class RenderError < ActionControllerError #:nodoc:
-  end
-
-  class SessionOverflowError < ActionControllerError #:nodoc:
-    DEFAULT_MESSAGE = 'Your session data is larger than the data column in which it is to be stored. You must increase the size of your data column if you intend to store large data.'
-
-    def initialize(message = nil)
-      super(message || DEFAULT_MESSAGE)
-    end
-  end
-
-  class UnknownHttpMethod < ActionControllerError #:nodoc:
-  end
-
-  # Action Controllers are the core of a web request in Rails. They are made up of one or more actions that are executed
-  # on request and then either render a template or redirect to another action. An action is defined as a public method
-  # on the controller, which will automatically be made accessible to the web-server through Rails Routes.
-  #
-  # A sample controller could look like this:
-  #
-  #   class GuestBookController < ActionController::Base
-  #     def index
-  #       @entries = Entry.find(:all)
-  #     end
-  #
-  #     def sign
-  #       Entry.create(params[:entry])
-  #       redirect_to :action => "index"
-  #     end
-  #   end
-  #
-  # Actions, by default, render a template in the <tt>app/views</tt> directory corresponding to the name of the controller and action
-  # after executing code in the action. For example, the +index+ action of the GuestBookController would render the
-  # template <tt>app/views/guestbook/index.erb</tt> by default after populating the <tt>@entries</tt> instance variable.
-  #
-  # Unlike index, the sign action will not render a template. After performing its main purpose (creating a
-  # new entry in the guest book), it initiates a redirect instead. This redirect works by returning an external
-  # "302 Moved" HTTP response that takes the user to the index action.
-  #
-  # The index and sign represent the two basic action archetypes used in Action Controllers. Get-and-show and do-and-redirect.
-  # Most actions are variations of these themes.
-  #
-  # == Requests
-  #
-  # Requests are processed by the Action Controller framework by extracting the value of the "action" key in the request parameters.
-  # This value should hold the name of the action to be performed. Once the action has been identified, the remaining
-  # request parameters, the session (if one is available), and the full request with all the HTTP headers are made available to
-  # the action through instance variables. Then the action is performed.
-  #
-  # The full request object is available with the request accessor and is primarily used to query for HTTP headers. These queries
-  # are made by accessing the environment hash, like this:
-  #
-  #   def server_ip
-  #     location = request.env["SERVER_ADDR"]
-  #     render :text => "This server hosted at #{location}"
-  #   end
-  #
-  # == Parameters
-  #
-  # All request parameters, whether they come from a GET or POST request, or from the URL, are available through the params method
-  # which returns a hash. For example, an action that was performed through <tt>/weblog/list?category=All&limit=5</tt> will include
-  # <tt>{ "category" => "All", "limit" => 5 }</tt> in params.
-  #
-  # It's also possible to construct multi-dimensional parameter hashes by specifying keys using brackets, such as:
-  #
-  #   <input type="text" name="post[name]" value="david">
-  #   <input type="text" name="post[address]" value="hyacintvej">
-  #
-  # A request stemming from a form holding these inputs will include <tt>{ "post" => { "name" => "david", "address" => "hyacintvej" } }</tt>.
-  # If the address input had been named "post[address][street]", the params would have included
-  # <tt>{ "post" => { "address" => { "street" => "hyacintvej" } } }</tt>. There's no limit to the depth of the nesting.
-  #
-  # == Sessions
-  #
-  # Sessions allows you to store objects in between requests. This is useful for objects that are not yet ready to be persisted,
-  # such as a Signup object constructed in a multi-paged process, or objects that don't change much and are needed all the time, such
-  # as a User object for a system that requires login. The session should not be used, however, as a cache for objects where it's likely
-  # they could be changed unknowingly. It's usually too much work to keep it all synchronized -- something databases already excel at.
-  #
-  # You can place objects in the session by using the <tt>session</tt> method, which accesses a hash:
-  #
-  #   session[:person] = Person.authenticate(user_name, password)
-  #
-  # And retrieved again through the same hash:
-  #
-  #   Hello #{session[:person]}
-  #
-  # For removing objects from the session, you can either assign a single key to +nil+:
-  #
-  #   # removes :person from session
-  #   session[:person] = nil
-  #
-  # or you can remove the entire session with +reset_session+.
-  #
-  # Sessions are stored by default in a browser cookie that's cryptographically signed, but unencrypted.
-  # This prevents the user from tampering with the session but also allows him to see its contents.
-  #
-  # Do not put secret information in cookie-based sessions!
-  #
-  # Other options for session storage are:
-  #
-  # * ActiveRecord::SessionStore - Sessions are stored in your database, which works better than PStore with multiple app servers and,
-  #   unlike CookieStore, hides your session contents from the user. To use ActiveRecord::SessionStore, set
-  #
-  #     config.action_controller.session_store = :active_record_store
-  #
-  #   in your <tt>config/environment.rb</tt> and run <tt>rake db:sessions:create</tt>.
-  #
-  # * MemCacheStore - Sessions are stored as entries in your memcached cache.
-  #   Set the session store type in <tt>config/environment.rb</tt>:
-  #
-  #     config.action_controller.session_store = :mem_cache_store
-  #
-  #   This assumes that memcached has been installed and configured properly.
-  #   See the MemCacheStore docs for more information.
-  #
-  # == Responses
-  #
-  # Each action results in a response, which holds the headers and document to be sent to the user's browser. The actual response
-  # object is generated automatically through the use of renders and redirects and requires no user intervention.
-  #
-  # == Renders
-  #
-  # Action Controller sends content to the user by using one of five rendering methods. The most versatile and common is the rendering
-  # of a template. Included in the Action Pack is the Action View, which enables rendering of ERb templates. It's automatically configured.
-  # The controller passes objects to the view by assigning instance variables:
-  #
-  #   def show
-  #     @post = Post.find(params[:id])
-  #   end
-  #
-  # Which are then automatically available to the view:
-  #
-  #   Title: <%= @post.title %>
-  #
-  # You don't have to rely on the automated rendering. Especially actions that could result in the rendering of different templates will use
-  # the manual rendering methods:
-  #
-  #   def search
-  #     @results = Search.find(params[:query])
-  #     case @results
-  #       when 0 then render :action => "no_results"
-  #       when 1 then render :action => "show"
-  #       when 2..10 then render :action => "show_many"
-  #     end
-  #   end
-  #
-  # Read more about writing ERb and Builder templates in link:classes/ActionView/Base.html.
-  #
-  # == Redirects
-  #
-  # Redirects are used to move from one action to another. For example, after a <tt>create</tt> action, which stores a blog entry to a database,
-  # we might like to show the user the new entry. Because we're following good DRY principles (Don't Repeat Yourself), we're going to reuse (and redirect to)
-  # a <tt>show</tt> action that we'll assume has already been created. The code might look like this:
-  #
-  #   def create
-  #     @entry = Entry.new(params[:entry])
-  #     if @entry.save
-  #       # The entry was saved correctly, redirect to show
-  #       redirect_to :action => 'show', :id => @entry.id
-  #     else
-  #       # things didn't go so well, do something else
-  #     end
-  #   end
-  #
-  # In this case, after saving our new entry to the database, the user is redirected to the <tt>show</tt> method which is then executed.
-  #
-  # == Calling multiple redirects or renders
-  #
-  # An action may contain only a single render or a single redirect. Attempting to try to do either again will result in a DoubleRenderError:
-  #
-  #   def do_something
-  #     redirect_to :action => "elsewhere"
-  #     render :action => "overthere" # raises DoubleRenderError
-  #   end
-  #
-  # If you need to redirect on the condition of something, then be sure to add "and return" to halt execution.
-  #
-  #   def do_something
-  #     redirect_to(:action => "elsewhere") and return if monkeys.nil?
-  #     render :action => "overthere" # won't be called if monkeys is nil
-  #   end
-  #
-  class Base
-
+module ActionController
+  class Base < Http
+    abstract!
+
+    include AbstractController::Benchmarker
+    include AbstractController::Callbacks
+    include AbstractController::Logger
+
+    include ActionController::Helpers
+    include ActionController::HideActions
+    include ActionController::UrlFor
+    include ActionController::Redirector
+    include ActionController::Renderer
+    include ActionController::Renderers::All
+    include ActionController::Layouts
+    include ActionController::ConditionalGet
+    include ActionController::RackConvenience
+
+    # Legacy modules
+    include SessionManagement
     include ActionDispatch::StatusCodes
-
-    cattr_reader :protected_instance_variables
-    # Controller specific instance variables which will not be accessible inside views.
-    @@protected_instance_variables = %w(@assigns @performed_redirect @performed_render @variables_added @request_origin @url @parent_controller
-                                        @action_name @before_filter_chain_aborted @action_cache_path @_headers @_params
-                                        @_flash @_response)
-
-    # Prepends all the URL-generating helpers from AssetHelper. This makes it possible to easily move javascripts, stylesheets,
-    # and images to a dedicated asset server away from the main web server. Example:
-    #   ActionController::Base.asset_host = "http://assets.example.com"
-    cattr_accessor :asset_host
-
-    # All requests are considered local by default, so everyone will be exposed to detailed debugging screens on errors.
-    # When the application is ready to go public, this should be set to false, and the protected method <tt>local_request?</tt>
-    # should instead be implemented in the controller to determine when debugging screens should be shown.
-    @@consider_all_requests_local = true
-    cattr_accessor :consider_all_requests_local
-
-    # Indicates whether to allow concurrent action processing. Your
-    # controller actions and any other code they call must also behave well
-    # when called from concurrent threads. Turned off by default.
-    @@allow_concurrency = false
-    cattr_accessor :allow_concurrency
-
-    # Modern REST web services often need to submit complex data to the web application.
-    # The <tt>@@param_parsers</tt> hash lets you register handlers which will process the HTTP body and add parameters to the
-    # <tt>params</tt> hash. These handlers are invoked for POST and PUT requests.
-    #
-    # By default <tt>application/xml</tt> is enabled. A XmlSimple class with the same param name as the root will be instantiated
-    # in the <tt>params</tt>. This allows XML requests to mask themselves as regular form submissions, so you can have one
-    # action serve both regular forms and web service requests.
-    #
-    # Example of doing your own parser for a custom content type:
-    #
-    #   ActionController::Base.param_parsers[Mime::Type.lookup('application/atom+xml')] = Proc.new do |data|
-    #      node = REXML::Document.new(post)
-    #     { node.root.name => node.root }
-    #   end
-    #
-    # Note: Up until release 1.1 of Rails, Action Controller would default to using XmlSimple configured to discard the
-    # root node for such requests. The new default is to keep the root, such that "<r><name>David</name></r>" results
-    # in <tt>params[:r][:name]</tt> for "David" instead of <tt>params[:name]</tt>. To get the old behavior, you can
-    # re-register XmlSimple as application/xml handler ike this:
-    #
-    #   ActionController::Base.param_parsers[Mime::XML] =
-    #     Proc.new { |data| XmlSimple.xml_in(data, 'ForceArray' => false) }
-    #
-    # A YAML parser is also available and can be turned on with:
-    #
-    #   ActionController::Base.param_parsers[Mime::YAML] = :yaml
-    @@param_parsers = { Mime::MULTIPART_FORM   => :multipart_form,
-                        Mime::URL_ENCODED_FORM => :url_encoded_form,
-                        Mime::XML              => :xml_simple,
-                        Mime::JSON             => :json }
-    cattr_accessor :param_parsers
-
-    # Controls the default charset for all renders.
-    @@default_charset = "utf-8"
-    cattr_accessor :default_charset
-
-    # The logger is used for generating information on the action run-time (including benchmarking) if available.
-    # Can be set to nil for no logging. Compatible with both Ruby's own Logger and Log4r loggers.
-    cattr_accessor :logger
-
-    # Controls the resource action separator
-    @@resource_action_separator = "/"
-    cattr_accessor :resource_action_separator
-
-    # Allow to override path names for default resources' actions
-    @@resources_path_names = { :new => 'new', :edit => 'edit' }
-    cattr_accessor :resources_path_names
-
-    # Sets the token parameter name for RequestForgery. Calling +protect_from_forgery+
-    # sets it to <tt>:authenticity_token</tt> by default.
-    cattr_accessor :request_forgery_protection_token
-
-    # Controls the IP Spoofing check when determining the remote IP.
-    @@ip_spoofing_check = true
-    cattr_accessor :ip_spoofing_check
-
-    # Indicates whether or not optimise the generated named
-    # route helper methods
-    cattr_accessor :optimise_named_routes
-    self.optimise_named_routes = true
-
-    # Indicates whether the response format should be determined by examining the Accept HTTP header,
-    # or by using the simpler params + ajax rules.
-    #
-    # If this is set to +true+ (the default) then +respond_to+ and +Request#format+ will take the Accept
-    # header into account.  If it is set to false then the request format will be determined solely
-    # by examining params[:format].  If params format is missing, the format will be either HTML or
-    # Javascript depending on whether the request is an AJAX request.
-    cattr_accessor :use_accept_header
-    self.use_accept_header = true
-
-    # Controls whether request forgergy protection is turned on or not. Turned off by default only in test mode.
-    class_inheritable_accessor :allow_forgery_protection
-    self.allow_forgery_protection = true
-
-    # If you are deploying to a subdirectory, you will need to set
-    # <tt>config.action_controller.relative_url_root</tt>
-    # This defaults to ENV['RAILS_RELATIVE_URL_ROOT']
-    cattr_accessor :relative_url_root
-    self.relative_url_root = ENV['RAILS_RELATIVE_URL_ROOT']
-
-    # Holds the request object that's primarily used to get environment variables through access like
-    # <tt>request.env["REQUEST_URI"]</tt>.
-    attr_internal :request
-
-    # Holds a hash of all the GET, POST, and Url parameters passed to the action. Accessed like <tt>params["post_id"]</tt>
-    # to get the post_id. No type casts are made, so all values are returned as strings.
-    attr_internal :params
-
-    # Holds the response object that's primarily used to set additional HTTP headers through access like
-    # <tt>response.headers["Cache-Control"] = "no-cache"</tt>. Can also be used to access the final body HTML after a template
-    # has been rendered through response.body -- useful for <tt>after_filter</tt>s that wants to manipulate the output,
-    # such as a OutputCompressionFilter.
-    attr_internal :response
-
-    # Holds a hash of objects in the session. Accessed like <tt>session[:person]</tt> to get the object tied to the "person"
-    # key. The session will hold any type of object as values, but the key should be a string or symbol.
-    def session
-      request.session
-    end
-
-    # Holds a hash of header names and values. Accessed like <tt>headers["Cache-Control"]</tt> to get the value of the Cache-Control
-    # directive. Values should always be specified as strings.
-    attr_internal :headers
-
-    # Returns the name of the action this controller is processing.
-    attr_accessor :action_name
-
-    attr_reader :template
-
-    def action(name, env)
-      request  = ActionDispatch::Request.new(env)
-      response = ActionDispatch::Response.new
-      self.action_name = name && name.to_s
-      process(request, response).to_a
-    end
-
-
-    class << self
-      def action(name = nil)
-        @actions ||= {}
-        @actions[name] ||= proc do |env|
-          new.action(name, env)
-        end
-      end
-      
-      # Converts the class name from something like "OneModule::TwoModule::NeatController" to "NeatController".
-      def controller_class_name
-        @controller_class_name ||= name.demodulize
-      end
-
-      # Converts the class name from something like "OneModule::TwoModule::NeatController" to "neat".
-      def controller_name
-        @controller_name ||= controller_class_name.sub(/Controller$/, '').underscore
-      end
-
-      # Converts the class name from something like "OneModule::TwoModule::NeatController" to "one_module/two_module/neat".
-      def controller_path
-        @controller_path ||= name.gsub(/Controller$/, '').underscore
-      end
-
-      # Return an array containing the names of public methods that have been marked hidden from the action processor.
-      # By default, all methods defined in ActionController::Base and included modules are hidden.
-      # More methods can be hidden using <tt>hide_action</tt>.
-      def hidden_actions
-        read_inheritable_attribute(:hidden_actions) || write_inheritable_attribute(:hidden_actions, [])
-      end
-
-      # Hide each of the given methods from being callable as actions.
-      def hide_action(*names)
-        write_inheritable_attribute(:hidden_actions, hidden_actions | names.map { |name| name.to_s })
-      end
-
-      # View load paths determine the bases from which template references can be made. So a call to
-      # render("test/template") will be looked up in the view load paths array and the closest match will be
-      # returned.
-      def view_paths
-        if defined? @view_paths
-          @view_paths
-        else
-          superclass.view_paths
-        end
-      end
-
-      def view_paths=(value)
-        @view_paths = ActionView::Base.process_view_paths(value) if value
-      end
-
-      # Adds a view_path to the front of the view_paths array.
-      # If the current class has no view paths, copy them from
-      # the superclass.  This change will be visible for all future requests.
-      #
-      #   ArticleController.prepend_view_path("views/default")
-      #   ArticleController.prepend_view_path(["views/default", "views/custom"])
-      #
-      def prepend_view_path(path)
-        @view_paths = superclass.view_paths.dup if !defined?(@view_paths) || @view_paths.nil?
-        @view_paths.unshift(*path)
+    include ActionController::Caching
+    include ActionController::MimeResponds
+
+    # Rails 2.x compatibility
+    include ActionController::Rails2Compatibility
+
+    include ActionController::Cookies
+    include ActionController::Session
+    include ActionController::Flash
+    include ActionController::Verification
+    include ActionController::RequestForgeryProtection
+    include ActionController::Streaming
+    include ActionController::HttpAuthentication::Basic::ControllerMethods
+    include ActionController::HttpAuthentication::Digest::ControllerMethods
+    include ActionController::FilterParameterLogging
+    include ActionController::Translation
+
+    # TODO: Extract into its own module
+    # This should be moved together with other normalizing behavior
+    module ImplicitRender
+      def send_action(*)
+        ret = super
+        default_render unless performed?
+        ret
+      end
+
+      def default_render
+        render
       end
 
-      # Adds a view_path to the end of the view_paths array.
-      # If the current class has no view paths, copy them from
-      # the superclass. This change will be visible for all future requests.
-      #
-      #   ArticleController.append_view_path("views/default")
-      #   ArticleController.append_view_path(["views/default", "views/custom"])
-      #
-      def append_view_path(path)
-        @view_paths = superclass.view_paths.dup if @view_paths.nil?
-        @view_paths.push(*path)
-      end
-      
-      @@exempt_from_layout = [ActionView::TemplateHandlers::RJS]
-      
-      def exempt_from_layout(*types)
-        types.each do |type|
-          @@exempt_from_layout << 
-            ActionView::Template.handler_class_for_extension(type)
+      def method_for_action(action_name)
+        super || begin
+          if view_paths.find_by_parts?(action_name.to_s, {:formats => formats, :locales => [I18n.locale]}, controller_path)
+            "default_render"
+          end
         end
-        
-        @@exempt_from_layout
       end
-
     end
 
-    public
-      def call(env)
-        request = ActionDispatch::Request.new(env)
-        response = ActionDispatch::Response.new
-        process(request, response).to_a
-      end
-
-      # Extracts the action_name from the request parameters and performs that action.
-      def process(request, response, method = :perform_action, *arguments) #:nodoc:
-        response.request = request
-
-        assign_shortcuts(request, response)
-        initialize_template_class(response)
-        initialize_current_url
-
-        log_processing
-        send(method, *arguments)
-
-        send_response
-      ensure
-        process_cleanup
-      end
-
-      def send_response
-        response.prepare!
-        response
-      end
-
-      # Returns a URL that has been rewritten according to the options hash and the defined routes.
-      # (For doing a complete redirect, use +redirect_to+).
-      #
-      # <tt>url_for</tt> is used to:
-      #
-      # All keys given to +url_for+ are forwarded to the Route module, save for the following:
-      # * <tt>:anchor</tt> - Specifies the anchor name to be appended to the path. For example,
-      #   <tt>url_for :controller => 'posts', :action => 'show', :id => 10, :anchor => 'comments'</tt>
-      #   will produce "/posts/show/10#comments".
-      # * <tt>:only_path</tt> - If true, returns the relative URL (omitting the protocol, host name, and port) (<tt>false</tt> by default).
-      # * <tt>:trailing_slash</tt> - If true, adds a trailing slash, as in "/archive/2005/". Note that this
-      #   is currently not recommended since it breaks caching.
-      # * <tt>:host</tt> - Overrides the default (current) host if provided.
-      # * <tt>:protocol</tt> - Overrides the default (current) protocol if provided.
-      # * <tt>:port</tt> - Optionally specify the port to connect to.
-      # * <tt>:user</tt> - Inline HTTP authentication (only plucked out if <tt>:password</tt> is also present).
-      # * <tt>:password</tt> - Inline HTTP authentication (only plucked out if <tt>:user</tt> is also present).
-      # * <tt>:skip_relative_url_root</tt> - If true, the url is not constructed using the +relative_url_root+
-      #   of the request so the path will include the web server relative installation directory.
-      #
-      # The URL is generated from the remaining keys in the hash. A URL contains two key parts: the <base> and a query string.
-      # Routes composes a query string as the key/value pairs not included in the <base>.
-      #
-      # The default Routes setup supports a typical Rails path of "controller/action/id" where action and id are optional, with
-      # action defaulting to 'index' when not given. Here are some typical url_for statements and their corresponding URLs:
-      #
-      #   url_for :controller => 'posts', :action => 'recent'                # => 'proto://host.com/posts/recent'
-      #   url_for :controller => 'posts', :action => 'index'                 # => 'proto://host.com/posts'
-      #   url_for :controller => 'posts', :action => 'index', :port=>'8033'  # => 'proto://host.com:8033/posts'
-      #   url_for :controller => 'posts', :action => 'show', :id => 10       # => 'proto://host.com/posts/show/10'
-      #   url_for :controller => 'posts', :user => 'd', :password => '123'   # => 'proto://d:123@host.com/posts'
-      #
-      # When generating a new URL, missing values may be filled in from the current request's parameters. For example,
-      # <tt>url_for :action => 'some_action'</tt> will retain the current controller, as expected. This behavior extends to
-      # other parameters, including <tt>:controller</tt>, <tt>:id</tt>, and any other parameters that are placed into a Route's
-      # path.
-      #  
-      # The URL helpers such as <tt>url_for</tt> have a limited form of memory: when generating a new URL, they can look for
-      # missing values in the current request's parameters. Routes attempts to guess when a value should and should not be
-      # taken from the defaults. There are a few simple rules on how this is performed:
-      #
-      # * If the controller name begins with a slash no defaults are used:
-      #
-      #     url_for :controller => '/home'
-      #
-      #   In particular, a leading slash ensures no namespace is assumed. Thus,
-      #   while <tt>url_for :controller => 'users'</tt> may resolve to
-      #   <tt>Admin::UsersController</tt> if the current controller lives under
-      #   that module, <tt>url_for :controller => '/users'</tt> ensures you link
-      #   to <tt>::UsersController</tt> no matter what.
-      # * If the controller changes, the action will default to index unless provided
-      #
-      # The final rule is applied while the URL is being generated and is best illustrated by an example. Let us consider the
-      # route given by <tt>map.connect 'people/:last/:first/:action', :action => 'bio', :controller => 'people'</tt>.
-      #
-      # Suppose that the current URL is "people/hh/david/contacts". Let's consider a few different cases of URLs which are generated
-      # from this page.
-      #
-      # * <tt>url_for :action => 'bio'</tt> -- During the generation of this URL, default values will be used for the first and
-      # last components, and the action shall change. The generated URL will be, "people/hh/david/bio".
-      # * <tt>url_for :first => 'davids-little-brother'</tt> This generates the URL 'people/hh/davids-little-brother' -- note
-      #   that this URL leaves out the assumed action of 'bio'.
-      #
-      # However, you might ask why the action from the current request, 'contacts', isn't carried over into the new URL. The
-      # answer has to do with the order in which the parameters appear in the generated path. In a nutshell, since the
-      # value that appears in the slot for <tt>:first</tt> is not equal to default value for <tt>:first</tt> we stop using
-      # defaults. On its own, this rule can account for much of the typical Rails URL behavior.
-      #  
-      # Although a convenience, defaults can occasionally get in your way. In some cases a default persists longer than desired.
-      # The default may be cleared by adding <tt>:name => nil</tt> to <tt>url_for</tt>'s options.
-      # This is often required when writing form helpers, since the defaults in play may vary greatly depending upon where the
-      # helper is used from. The following line will redirect to PostController's default action, regardless of the page it is
-      # displayed on:
-      #
-      #   url_for :controller => 'posts', :action => nil
-      #
-      # If you explicitly want to create a URL that's almost the same as the current URL, you can do so using the
-      # <tt>:overwrite_params</tt> options. Say for your posts you have different views for showing and printing them.
-      # Then, in the show view, you get the URL for the print view like this
-      #
-      #   url_for :overwrite_params => { :action => 'print' }
-      #
-      # This takes the current URL as is and only exchanges the action. In contrast, <tt>url_for :action => 'print'</tt>
-      # would have slashed-off the path components after the changed action.
-      def url_for(options = {})
-        options ||= {}
-        case options
-          when String
-            options
-          when Hash
-            @url.rewrite(rewrite_options(options))
-          else
-            polymorphic_url(options)
-        end
-      end
-
-      # Converts the class name from something like "OneModule::TwoModule::NeatController" to "NeatController".
-      def controller_class_name
-        self.class.controller_class_name
-      end
-
-      # Converts the class name from something like "OneModule::TwoModule::NeatController" to "neat".
-      def controller_name
-        self.class.controller_name
-      end
-
-      # Converts the class name from something like "OneModule::TwoModule::NeatController" to "one_module/two_module/neat".
-      def controller_path
-        self.class.controller_path
-      end
-
-      def session_enabled?
-        ActiveSupport::Deprecation.warn("Sessions are now lazy loaded. So if you don't access them, consider them disabled.", caller)
-      end
-
-      self.view_paths = []
-
-      # View load paths for controller.
-      def view_paths
-        @template.view_paths
-      end
-
-      def view_paths=(value)
-        @template.view_paths = ActionView::Base.process_view_paths(value)
-      end
-
-      # Adds a view_path to the front of the view_paths array.
-      # This change affects the current request only.
-      #
-      #   self.prepend_view_path("views/default")
-      #   self.prepend_view_path(["views/default", "views/custom"])
-      #
-      def prepend_view_path(path)
-        @template.view_paths.unshift(*path)
-      end
-
-      # Adds a view_path to the end of the view_paths array.
-      # This change affects the current request only.
-      #
-      #   self.append_view_path("views/default")
-      #   self.append_view_path(["views/default", "views/custom"])
-      #
-      def append_view_path(path)
-        @template.view_paths.push(*path)
-      end
-
-      def rewrite_options(options) #:nodoc:
-        if defaults = default_url_options(options)
-          defaults.merge(options)
-        else
-          options
-        end
-      end
-
-      # 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:
-      #
-      #   def default_url_options(options)
-      #     { :project => @project.active? ? @project.url_name : "unknown" }
-      #   end
-      #
-      # As you can infer from the example, this is mostly useful for situations where you want to centralize dynamic decisions about the
-      # urls as they stem from the business domain. Please note that any individual url_for call can always override the defaults set
-      # by this method.
-      def default_url_options(options = nil)
-      end
-
-      # Sets the etag and/or last_modified on the response and checks it against
-      # the client request. If the request doesn't match the options provided, the
-      # request is considered stale and should be generated from scratch. Otherwise,
-      # it's fresh and we don't need to generate anything and a reply of "304 Not Modified" is sent.
-      #
-      # Parameters:
-      # * <tt>:etag</tt>
-      # * <tt>:last_modified</tt> 
-      # * <tt>:public</tt> By default the Cache-Control header is private, set this to true if you want your application to be cachable by other devices (proxy caches).
-      #
-      # Example:
-      #
-      #   def show
-      #     @article = Article.find(params[:id])
-      #
-      #     if stale?(:etag => @article, :last_modified => @article.created_at.utc)
-      #       @statistics = @article.really_expensive_call
-      #       respond_to do |format|
-      #         # all the supported formats
-      #       end
-      #     end
-      #   end
-      def stale?(options)
-        fresh_when(options)
-        !request.fresh?(response)
-      end
-
-      # Sets the etag, last_modified, or both on the response and renders a
-      # "304 Not Modified" response if the request is already fresh.
-      #
-      # Parameters:
-      # * <tt>:etag</tt>
-      # * <tt>:last_modified</tt> 
-      # * <tt>:public</tt> By default the Cache-Control header is private, set this to true if you want your application to be cachable by other devices (proxy caches).
-      #
-      # Example:
-      #
-      #   def show
-      #     @article = Article.find(params[:id])
-      #     fresh_when(:etag => @article, :last_modified => @article.created_at.utc, :public => true)
-      #   end
-      #
-      # This will render the show template if the request isn't sending a matching etag or
-      # If-Modified-Since header and just a "304 Not Modified" response if there's a match.
-      #
-      def fresh_when(options)
-        options.assert_valid_keys(:etag, :last_modified, :public)
-
-        response.etag          = options[:etag]          if options[:etag]
-        response.last_modified = options[:last_modified] if options[:last_modified]
-        
-        if options[:public] 
-          cache_control = response.headers["Cache-Control"].split(",").map {|k| k.strip }
-          cache_control.delete("private")
-          cache_control.delete("no-cache")
-          cache_control << "public"
-          response.headers["Cache-Control"] = cache_control.join(', ')
-        end
-
-        if request.fresh?(response)
-          head :not_modified
-        end
-      end
-
-      # Sets a HTTP 1.1 Cache-Control header. Defaults to issuing a "private" instruction, so that
-      # intermediate caches shouldn't cache the response.
-      #
-      # Examples:
-      #   expires_in 20.minutes
-      #   expires_in 3.hours, :public => true
-      #   expires in 3.hours, 'max-stale' => 5.hours, :public => true
-      #
-      # This method will overwrite an existing Cache-Control header.
-      # See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html for more possibilities.
-      def expires_in(seconds, options = {}) #:doc:
-        cache_control = response.headers["Cache-Control"].split(",").map {|k| k.strip }
-
-        cache_control << "max-age=#{seconds}"
-        cache_control.delete("no-cache")
-        if options[:public]
-          cache_control.delete("private")
-          cache_control << "public"
-        else
-          cache_control << "private"
-        end
-        
-        # This allows for additional headers to be passed through like 'max-stale' => 5.hours
-        cache_control += options.symbolize_keys.reject{|k,v| k == :public || k == :private }.map{ |k,v| v == true ? k.to_s : "#{k.to_s}=#{v.to_s}"}
-        
-        response.headers["Cache-Control"] = cache_control.join(', ')
-      end
-
-      # Sets a HTTP 1.1 Cache-Control header of "no-cache" so no caching should occur by the browser or
-      # intermediate caches (like caching proxy servers).
-      def expires_now #:doc:
-        response.headers["Cache-Control"] = "no-cache"
-      end
-
-      # Resets the session by clearing out all the objects stored within and initializing a new session object.
-      def reset_session #:doc:
-        request.reset_session
-      end
-
-    private
-      def _process_options(options)
-        if content_type = options[:content_type]
-          response.content_type = content_type.to_s
-        end
-
-        if location = options[:location]
-          response.headers["Location"] = url_for(location)
-        end
-
-        response.status = interpret_status(options[:status] || DEFAULT_RENDER_STATUS_CODE)
-      end
+    include ImplicitRender
 
-      def initialize_template_class(response)
-        @template = ActionView::Base.new(self.class.view_paths, {}, self, formats)
-        response.template = @template if response.respond_to?(:template=)
-        @template.helpers.send :include, self.class.master_helper_module
-        @performed_render = @performed_redirect = false
-      end
-
-      def assign_shortcuts(request, response)
-        @_request, @_response, @_params = request, response, request.parameters
-        @_headers = @_response.headers
-      end
+    include ActionController::Rescue
 
-      def initialize_current_url
-        @url = UrlRewriter.new(request, params.clone)
-      end
-
-      def log_processing
-        if logger && logger.info?
-          log_processing_for_request_id
-          log_processing_for_parameters
-        end
-      end
-
-      def log_processing_for_request_id
-        request_id = "\n\nProcessing #{self.class.name}\##{action_name} "
-        request_id << "to #{params[:format]} " if params[:format]
-        request_id << "(for #{request_origin}) [#{request.method.to_s.upcase}]"
+    def self.inherited(klass)
+      ::ActionController::Base.subclasses << klass.to_s
+      super
+    end
 
-        logger.info(request_id)
-      end
+    def self.subclasses
+      @subclasses ||= []
+    end
 
-      def default_render #:nodoc:
-        render
+    def self.app_loaded!
+      @subclasses.each do |subclass|
+        subclass.constantize._write_layout_method
       end
+    end
 
-      def perform_action
-        if called = action_methods.include?(action_name)
-          ret = send(action_name)
-        elsif called = respond_to?(:method_missing)
-          ret = method_missing(action_name)
-        end
-        
-        return (performed? ? ret : default_render) if called
-        
-        begin
-          view_paths.find_by_parts(action_name, {:formats => formats, :locales => [I18n.locale]}, controller_path)
-        rescue => e
-          raise UnknownAction, "No action responded to #{action_name}. Actions: " +
-            "#{action_methods.sort.to_sentence}", caller
+    def _normalize_options(action = nil, options = {}, &blk)
+      if action.is_a?(Hash)
+        options, action = action, nil
+      elsif action.is_a?(String) || action.is_a?(Symbol)
+        key = case action = action.to_s
+        when %r{^/} then :file
+        when %r{/}  then :template
+        else             :action
         end
-        
-        default_render
+        options.merge! key => action
+      elsif action
+        options.merge! :partial => action
       end
 
-      # Returns true if a render or redirect has already been performed.
-      def performed?
-        @performed_render || @performed_redirect
+      if options.key?(:action) && options[:action].to_s.index("/")
+        options[:template] = options.delete(:action)
       end
 
-      def reset_variables_added_to_assigns
-        @template.instance_variable_set("@assigns_added", nil)
+      if options[:status]
+        options[:status] = interpret_status(options[:status]).to_i
       end
 
-      def request_origin
-        # this *needs* to be cached!
-        # otherwise you'd get different results if calling it more than once
-        @request_origin ||= "#{request.remote_ip} at #{Time.now.to_s(:db)}"
-      end
-
-      # Returns the request URI used to get to the current location
-      def complete_request_uri
-        "#{request.protocol}#{request.host}#{request.request_uri}"
-      end
-
-      def default_template(action_name = self.action_name)
-        self.view_paths.find_template(default_template_name(action_name), default_template_format)
-      end
-
-      def default_template_name(action_name = self.action_name)
-        if action_name
-          action_name = action_name.to_s
-          if action_name.include?('/') && template_path_includes_controller?(action_name)
-            action_name = strip_out_controller(action_name)
-          end
-        end
-        "#{controller_path}/#{action_name}"
-      end
-
-      def strip_out_controller(path)
-        path.split('/', 2).last
-      end
+      options[:update] = blk if block_given?
+      options
+    end
 
-      def template_path_includes_controller?(path)
-        self.controller_path.split('/')[-1] == path.split('/')[0]
-      end
+    def render(action = nil, options = {}, &blk)
+      options = _normalize_options(action, options, &blk)
+      super(options)
+    end
 
-      def process_cleanup
-      end
-  end
+    def render_to_string(action = nil, options = {}, &blk)
+      options = _normalize_options(action, options, &blk)
+      super(options)
+    end
 
-  Base.class_eval do
-    [ Filters, Layout, Renderer, Redirector, Responder, Benchmarking, Rescue, Flash, MimeResponds, Helpers,
-      Cookies, Caching, Verification, Streaming, SessionManagement,
-      HttpAuthentication::Basic::ControllerMethods, HttpAuthentication::Digest::ControllerMethods, RecordIdentifier,
-      RequestForgeryProtection, Translation, FilterParameterLogging
-    ].each do |mod|
-      include mod
+    # 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/new_base/compatibility.rb b/actionpack/lib/action_controller/base/compatibility.rb
similarity index 100%
rename from actionpack/lib/action_controller/new_base/compatibility.rb
rename to actionpack/lib/action_controller/base/compatibility.rb
diff --git a/actionpack/lib/action_controller/new_base/conditional_get.rb b/actionpack/lib/action_controller/base/conditional_get.rb
similarity index 100%
rename from actionpack/lib/action_controller/new_base/conditional_get.rb
rename to actionpack/lib/action_controller/base/conditional_get.rb
diff --git a/actionpack/lib/action_controller/base/helpers.rb b/actionpack/lib/action_controller/base/helpers.rb
index f74158bc13782..2fa5ea65191cf 100644
--- a/actionpack/lib/action_controller/base/helpers.rb
+++ b/actionpack/lib/action_controller/base/helpers.rb
@@ -1,85 +1,80 @@
+require 'active_support/core_ext/load_error'
+require 'active_support/core_ext/name_error'
 require 'active_support/dependencies'
 
-# FIXME: helper { ... } is broken on Ruby 1.9
-module ActionController #:nodoc:
-  module Helpers #:nodoc:
+module ActionController
+  # The Rails framework provides a large number of helpers for working with +assets+, +dates+, +forms+,
+  # +numbers+ and model objects, to name a few. These helpers are available to all templates
+  # by default.
+  #
+  # In addition to using the standard template helpers provided in the Rails framework, creating custom helpers to
+  # extract complicated logic or reusable functionality is strongly encouraged. By default, the controller will
+  # include a helper whose name matches that of the controller, e.g., <tt>MyController</tt> will automatically
+  # include <tt>MyHelper</tt>.
+  #
+  # Additional helpers can be specified using the +helper+ class method in <tt>ActionController::Base</tt> or any
+  # controller which inherits from it.
+  #
+  # ==== Examples
+  # The +to_s+ method from the Time class can be wrapped in a helper method to display a custom message if
+  # the Time object is blank:
+  #
+  #   module FormattedTimeHelper
+  #     def format_time(time, format=:long, blank_message="&nbsp;")
+  #       time.blank? ? blank_message : time.to_s(format)
+  #     end
+  #   end
+  #
+  # FormattedTimeHelper can now be included in a controller, using the +helper+ class method:
+  #
+  #   class EventsController < ActionController::Base
+  #     helper FormattedTimeHelper
+  #     def index
+  #       @events = Event.find(:all)
+  #     end
+  #   end
+  #
+  # Then, in any view rendered by <tt>EventController</tt>, the <tt>format_time</tt> method can be called:
+  #
+  #   <% @events.each do |event| -%>
+  #     <p>
+  #       <% format_time(event.time, :short, "N/A") %> | <%= event.name %>
+  #     </p>
+  #   <% end -%>
+  #
+  # Finally, assuming we have two event instances, one which has a time and one which does not,
+  # the output might look like this:
+  #
+  #   23 Aug 11:30 | Carolina Railhawks Soccer Match
+  #   N/A | Carolina Railhaws Training Workshop
+  #
+  module Helpers
     extend ActiveSupport::Concern
 
-    included do
-      # Initialize the base module to aggregate its helpers.
-      class_inheritable_accessor :master_helper_module
-      self.master_helper_module = Module.new
+    include AbstractController::Helpers
 
+    included do
       # Set the default directory for helpers
-      class_inheritable_accessor :helpers_dir
-      self.helpers_dir = (defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/app/helpers" : "app/helpers")
-
-      class << self
-        alias_method_chain :inherited, :helper
+      extlib_inheritable_accessor(:helpers_dir) do
+        defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/app/helpers" : "app/helpers"
       end
     end
 
-    # The Rails framework provides a large number of helpers for working with +assets+, +dates+, +forms+, 
-    # +numbers+ and Active Record objects, to name a few. These helpers are available to all templates
-    # by default.
-    #
-    # In addition to using the standard template helpers provided in the Rails framework, creating custom helpers to
-    # extract complicated logic or reusable functionality is strongly encouraged.  By default, the controller will 
-    # include a helper whose name matches that of the controller, e.g., <tt>MyController</tt> will automatically
-    # include <tt>MyHelper</tt>.
-    # 
-    # Additional helpers can be specified using the +helper+ class method in <tt>ActionController::Base</tt> or any
-    # controller which inherits from it.
-    #
-    # ==== Examples
-    # The +to_s+ method from the Time class can be wrapped in a helper method to display a custom message if 
-    # the Time object is blank:
-    #
-    #   module FormattedTimeHelper
-    #     def format_time(time, format=:long, blank_message="&nbsp;")
-    #       time.blank? ? blank_message : time.to_s(format)
-    #     end
-    #   end
-    #
-    # FormattedTimeHelper can now be included in a controller, using the +helper+ class method:
-    #
-    #   class EventsController < ActionController::Base
-    #     helper FormattedTimeHelper
-    #     def index
-    #       @events = Event.find(:all)
-    #     end
-    #   end
-    #
-    # Then, in any view rendered by <tt>EventController</tt>, the <tt>format_time</tt> method can be called:
-    #
-    #   <% @events.each do |event| -%>
-    #     <p>
-    #       <% format_time(event.time, :short, "N/A") %> | <%= event.name %> 
-    #     </p>
-    #   <% end -%>
-    #
-    # Finally, assuming we have two event instances, one which has a time and one which does not, 
-    # the output might look like this:
-    #
-    #   23 Aug 11:30 | Carolina Railhawks Soccer Match 
-    #   N/A | Carolina Railhaws Training Workshop
-    #
     module ClassMethods
-      # Makes all the (instance) methods in the helper module available to templates rendered through this controller.
-      # See ActionView::Helpers (link:classes/ActionView/Helpers.html) for more about making your own helper modules
-      # available to the templates.
-      def add_template_helper(helper_module) #:nodoc:
-        master_helper_module.module_eval { include helper_module }
+      def inherited(klass)
+        klass.class_eval { default_helper_module! unless name.blank? }
+        super
       end
 
       # The +helper+ class method can take a series of helper module names, a block, or both.
       #
-      # * <tt>*args</tt>: One or more modules, strings or symbols, or the special symbol <tt>:all</tt>.
-      # * <tt>&block</tt>: A block defining helper methods.
-      # 
+      # ==== Parameters
+      # *args<Array[Module, Symbol, String, :all]>
+      # block<Block>:: A block defining helper methods
+      #
       # ==== Examples
-      # When the argument is a string or symbol, the method will provide the "_helper" suffix, require the file 
-      # and include the module in the template class.  The second form illustrates how to include custom helpers 
+      # When the argument is a string or symbol, the method will provide the "_helper" suffix, require the file
+      # and include the module in the template class.  The second form illustrates how to include custom helpers
       # when working with namespaced controllers, or other cases where the file containing the helper definition is not
       # in one of Rails' standard load paths:
       #   helper :foo             # => requires 'foo_helper' and includes FooHelper
@@ -92,78 +87,23 @@ def add_template_helper(helper_module) #:nodoc:
       # <tt>ActionController::Base.helpers_dir</tt> (defaults to <tt>app/helpers/**/*.rb</tt> under RAILS_ROOT).
       #   helper :all
       #
-      # Additionally, the +helper+ class method can receive and evaluate a block, making the methods defined available 
+      # Additionally, the +helper+ class method can receive and evaluate a block, making the methods defined available
       # to the template.
       #   # One line
       #   helper { def hello() "Hello, world!" end }
       #   # Multi-line
       #   helper do
-      #     def foo(bar) 
-      #       "#{bar} is the very best" 
+      #     def foo(bar)
+      #       "#{bar} is the very best"
       #     end
       #   end
-      # 
+      #
       # Finally, all the above styles can be mixed together, and the +helper+ method can be invoked with a mix of
       # +symbols+, +strings+, +modules+ and blocks.
       #   helper(:three, BlindHelper) { def mice() 'mice' end }
       #
       def helper(*args, &block)
-        args.flatten.each do |arg|
-          case arg
-            when Module
-              add_template_helper(arg)
-            when :all
-              helper(all_application_helpers)
-            when String, Symbol
-              file_name  = arg.to_s.underscore + '_helper'
-              class_name = file_name.camelize
-
-              begin
-                require_dependency(file_name)
-              rescue LoadError => load_error
-                requiree = / -- (.*?)(\.rb)?$/.match(load_error.message).to_a[1]
-                if requiree == file_name
-                  msg = "Missing helper file helpers/#{file_name}.rb"
-                  raise LoadError.new(msg).copy_blame!(load_error)
-                else
-                  raise
-                end
-              end
-
-              add_template_helper(class_name.constantize)
-            else
-              raise ArgumentError, "helper expects String, Symbol, or Module argument (was: #{args.inspect})"
-          end
-        end
-
-        # Evaluate block in template class if given.
-        master_helper_module.module_eval(&block) if block_given?
-      end
-
-      # Declare a controller method as a helper. For example, the following
-      # makes the +current_user+ controller method available to the view:
-      #   class ApplicationController < ActionController::Base
-      #     helper_method :current_user, :logged_in?
-      #
-      #     def current_user
-      #       @current_user ||= User.find_by_id(session[:user])
-      #     end
-      #
-      #      def logged_in?
-      #        current_user != nil
-      #      end
-      #   end
-      #
-      # In a view:
-      #  <% if logged_in? -%>Welcome, <%= current_user.name %><% end -%>
-      def helper_method(*methods)
-        methods.flatten.each do |method|
-          master_helper_module.module_eval <<-end_eval
-            def #{method}(*args, &block)                    # def current_user(*args, &block)
-              controller.send(%(#{method}), *args, &block)  #   controller.send(%(current_user), *args, &block)
-            end                                             # end
-          end_eval
-        end
+        super(*_modules_for_helpers(args), &block)
       end
 
       # Declares helper accessors for controller attributes. For example, the
@@ -171,51 +111,68 @@ def #{method}(*args, &block)                    # def current_user(*args, &block
       # controller and makes them available to the view:
       #   helper_attr :name
       #   attr_accessor :name
+      #
+      # ==== Parameters
+      # *attrs<Array[String, Symbol]>:: Names of attributes to be converted
+      #   into helpers.
       def helper_attr(*attrs)
         attrs.flatten.each { |attr| helper_method(attr, "#{attr}=") }
       end
 
       # Provides a proxy to access helpers methods from outside the view.
       def helpers
-        unless @helper_proxy
-          @helper_proxy = ActionView::Base.new
-          @helper_proxy.extend master_helper_module
-        else
-          @helper_proxy
-        end
+        @helper_proxy ||= ActionView::Base.new.extend(_helpers)
       end
 
-      private
-        def default_helper_module!
-          unless name.blank?
-            module_name = name.sub(/Controller$|$/, 'Helper')
-            module_path = module_name.split('::').map { |m| m.underscore }.join('/')
-            require_dependency module_path
-            helper module_name.constantize
+    private
+      # Returns a list of modules, normalized from the acceptable kinds of
+      # helpers with the following behavior:
+      # String or Symbol:: :FooBar or "FooBar" becomes "foo_bar_helper",
+      #   and "foo_bar_helper.rb" is loaded using require_dependency.
+      # :all:: Loads all modules in the #helpers_dir
+      # Module:: No further processing
+      #
+      # After loading the appropriate files, the corresponding modules
+      # are returned.
+      #
+      # ==== Parameters
+      # args<Array[String, Symbol, Module, all]>:: A list of helpers
+      #
+      # ==== Returns
+      # Array[Module]:: A normalized list of modules for the list of
+      #   helpers provided.
+      def _modules_for_helpers(args)
+        args.flatten.map! do |arg|
+          case arg
+          when :all
+            _modules_for_helpers all_application_helpers
+          when String, Symbol
+            file_name = "#{arg.to_s.underscore}_helper"
+            require_dependency(file_name, "Missing helper file helpers/%s.rb")
+            file_name.camelize.constantize
+          when Module
+            arg
+          else
+            raise ArgumentError, "helper must be a String, Symbol, or Module"
           end
-        rescue MissingSourceFile => e
-          raise unless e.is_missing? module_path
-        rescue NameError => e
-          raise unless e.missing_name? module_name
         end
+      end
 
-        def inherited_with_helper(child)
-          inherited_without_helper(child)
-
-          begin
-            child.master_helper_module = Module.new
-            child.master_helper_module.__send__ :include, master_helper_module
-            child.__send__ :default_helper_module!
-          rescue MissingSourceFile => e
-            raise unless e.is_missing?("helpers/#{child.controller_path}_helper")
-          end
-        end
+      def default_helper_module!
+        module_name = name.sub(/Controller$/, '')
+        module_path = module_name.underscore
+        helper module_path
+      rescue MissingSourceFile => e
+        raise e unless e.is_missing? "#{module_path}_helper"
+      rescue NameError => e
+        raise e unless e.missing_name? "#{module_name}Helper"
+      end
 
-        # Extract helper names from files in app/helpers/**/*.rb
-        def all_application_helpers
-          extract = /^#{Regexp.quote(helpers_dir)}\/?(.*)_helper.rb$/
-          Dir["#{helpers_dir}/**/*_helper.rb"].map { |file| file.sub extract, '\1' }
-        end
+      # Extract helper names from files in app/helpers/**/*.rb
+      def all_application_helpers
+        extract = /^#{Regexp.quote(helpers_dir)}\/?(.*)_helper.rb$/
+        Dir["#{helpers_dir}/**/*_helper.rb"].map { |file| file.sub extract, '\1' }
+      end
     end
   end
 end
diff --git a/actionpack/lib/action_controller/new_base/hide_actions.rb b/actionpack/lib/action_controller/base/hide_actions.rb
similarity index 100%
rename from actionpack/lib/action_controller/new_base/hide_actions.rb
rename to actionpack/lib/action_controller/base/hide_actions.rb
diff --git a/actionpack/lib/action_controller/new_base/http.rb b/actionpack/lib/action_controller/base/http.rb
similarity index 100%
rename from actionpack/lib/action_controller/new_base/http.rb
rename to actionpack/lib/action_controller/base/http.rb
diff --git a/actionpack/lib/action_controller/new_base/layouts.rb b/actionpack/lib/action_controller/base/layouts.rb
similarity index 100%
rename from actionpack/lib/action_controller/new_base/layouts.rb
rename to actionpack/lib/action_controller/base/layouts.rb
diff --git a/actionpack/lib/action_controller/new_base/rack_convenience.rb b/actionpack/lib/action_controller/base/rack_convenience.rb
similarity index 100%
rename from actionpack/lib/action_controller/new_base/rack_convenience.rb
rename to actionpack/lib/action_controller/base/rack_convenience.rb
diff --git a/actionpack/lib/action_controller/new_base/redirector.rb b/actionpack/lib/action_controller/base/redirector.rb
similarity index 100%
rename from actionpack/lib/action_controller/new_base/redirector.rb
rename to actionpack/lib/action_controller/base/redirector.rb
diff --git a/actionpack/lib/action_controller/new_base/render_options.rb b/actionpack/lib/action_controller/base/render_options.rb
similarity index 100%
rename from actionpack/lib/action_controller/new_base/render_options.rb
rename to actionpack/lib/action_controller/base/render_options.rb
diff --git a/actionpack/lib/action_controller/new_base/renderer.rb b/actionpack/lib/action_controller/base/renderer.rb
similarity index 100%
rename from actionpack/lib/action_controller/new_base/renderer.rb
rename to actionpack/lib/action_controller/base/renderer.rb
diff --git a/actionpack/lib/action_controller/new_base/rescuable.rb b/actionpack/lib/action_controller/base/rescuable.rb
similarity index 100%
rename from actionpack/lib/action_controller/new_base/rescuable.rb
rename to actionpack/lib/action_controller/base/rescuable.rb
diff --git a/actionpack/lib/action_controller/new_base/session.rb b/actionpack/lib/action_controller/base/session.rb
similarity index 100%
rename from actionpack/lib/action_controller/new_base/session.rb
rename to actionpack/lib/action_controller/base/session.rb
diff --git a/actionpack/lib/action_controller/new_base/testing.rb b/actionpack/lib/action_controller/base/testing.rb
similarity index 100%
rename from actionpack/lib/action_controller/new_base/testing.rb
rename to actionpack/lib/action_controller/base/testing.rb
diff --git a/actionpack/lib/action_controller/new_base/url_for.rb b/actionpack/lib/action_controller/base/url_for.rb
similarity index 100%
rename from actionpack/lib/action_controller/new_base/url_for.rb
rename to actionpack/lib/action_controller/base/url_for.rb
diff --git a/actionpack/lib/action_controller/new_base.rb b/actionpack/lib/action_controller/new_base.rb
deleted file mode 100644
index df256985ac40b..0000000000000
--- a/actionpack/lib/action_controller/new_base.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-module ActionController
-  autoload :Base,                 "action_controller/new_base/base"
-  autoload :ConditionalGet,       "action_controller/new_base/conditional_get"
-  autoload :HideActions,          "action_controller/new_base/hide_actions"
-  autoload :Http,                 "action_controller/new_base/http"
-  autoload :Layouts,              "action_controller/new_base/layouts"
-  autoload :RackConvenience,      "action_controller/new_base/rack_convenience"
-  autoload :Rails2Compatibility,  "action_controller/new_base/compatibility"
-  autoload :Redirector,           "action_controller/new_base/redirector"
-  autoload :Renderer,             "action_controller/new_base/renderer"
-  autoload :RenderOptions,        "action_controller/new_base/render_options"
-  autoload :Renderers,            "action_controller/new_base/render_options"
-  autoload :Rescue,               "action_controller/new_base/rescuable"
-  autoload :Testing,              "action_controller/new_base/testing"
-  autoload :UrlFor,               "action_controller/new_base/url_for"
-  autoload :Session,              "action_controller/new_base/session"
-  autoload :Helpers,              "action_controller/new_base/helpers"
-
-  # Ported modules
-  # require 'action_controller/routing'
-  autoload :Caching,           'action_controller/caching'
-  autoload :Dispatcher,        'action_controller/dispatch/dispatcher'
-  autoload :MimeResponds,      'action_controller/base/mime_responds'
-  autoload :PolymorphicRoutes, 'action_controller/routing/generation/polymorphic_routes'
-  autoload :RecordIdentifier,  'action_controller/record_identifier'
-  autoload :Resources,         'action_controller/routing/resources'
-  autoload :SessionManagement, 'action_controller/base/session_management'
-  autoload :TestCase,          'action_controller/testing/test_case'
-  autoload :UrlRewriter,       'action_controller/routing/generation/url_rewriter'
-  autoload :UrlWriter,         'action_controller/routing/generation/url_rewriter'
-
-  autoload :Verification,             'action_controller/base/verification'
-  autoload :Flash,                    'action_controller/base/chained/flash'
-  autoload :RequestForgeryProtection, 'action_controller/base/request_forgery_protection'
-  autoload :Streaming,                'action_controller/base/streaming'
-  autoload :HttpAuthentication,       'action_controller/base/http_authentication'
-  autoload :FilterParameterLogging,   'action_controller/base/filter_parameter_logging'
-  autoload :Translation,              'action_controller/translation'
-  autoload :Cookies,                  'action_controller/base/cookies'
-
-  require 'action_controller/routing'
-end
-
-autoload :HTML, 'action_controller/vendor/html-scanner'
-
-require 'action_dispatch'
-require 'action_view'
diff --git a/actionpack/lib/action_controller/new_base/base.rb b/actionpack/lib/action_controller/new_base/base.rb
deleted file mode 100644
index e8fc153578a6c..0000000000000
--- a/actionpack/lib/action_controller/new_base/base.rb
+++ /dev/null
@@ -1,173 +0,0 @@
-module ActionController
-  class Base < Http
-    abstract!
-
-    include AbstractController::Benchmarker
-    include AbstractController::Callbacks
-    include AbstractController::Logger
-
-    include ActionController::Helpers
-    include ActionController::HideActions
-    include ActionController::UrlFor
-    include ActionController::Redirector
-    include ActionController::Renderer
-    include ActionController::Renderers::All
-    include ActionController::Layouts
-    include ActionController::ConditionalGet
-    include ActionController::RackConvenience
-
-    # Legacy modules
-    include SessionManagement
-    include ActionDispatch::StatusCodes
-    include ActionController::Caching
-    include ActionController::MimeResponds
-
-    # Rails 2.x compatibility
-    include ActionController::Rails2Compatibility
-
-    include ActionController::Cookies
-    include ActionController::Session
-    include ActionController::Flash
-    include ActionController::Verification
-    include ActionController::RequestForgeryProtection
-    include ActionController::Streaming
-    include ActionController::HttpAuthentication::Basic::ControllerMethods
-    include ActionController::HttpAuthentication::Digest::ControllerMethods
-    include ActionController::FilterParameterLogging
-    include ActionController::Translation
-
-    # TODO: Extract into its own module
-    # This should be moved together with other normalizing behavior
-    module ImplicitRender
-      def send_action(*)
-        ret = super
-        default_render unless performed?
-        ret
-      end
-
-      def default_render
-        render
-      end
-
-      def method_for_action(action_name)
-        super || begin
-          if view_paths.find_by_parts?(action_name.to_s, {:formats => formats, :locales => [I18n.locale]}, controller_path)
-            "default_render"
-          end
-        end
-      end
-    end
-
-    include ImplicitRender
-
-    include ActionController::Rescue
-
-    def self.inherited(klass)
-      ::ActionController::Base.subclasses << klass.to_s
-      super
-    end
-
-    def self.subclasses
-      @subclasses ||= []
-    end
-
-    def self.app_loaded!
-      @subclasses.each do |subclass|
-        subclass.constantize._write_layout_method
-      end
-    end
-
-    def _normalize_options(action = nil, options = {}, &blk)
-      if action.is_a?(Hash)
-        options, action = action, nil
-      elsif action.is_a?(String) || action.is_a?(Symbol)
-        key = case action = action.to_s
-        when %r{^/} then :file
-        when %r{/}  then :template
-        else             :action
-        end
-        options.merge! key => action
-      elsif action
-        options.merge! :partial => action
-      end
-
-      if options.key?(:action) && options[:action].to_s.index("/")
-        options[:template] = options.delete(:action)
-      end
-
-      if options[:status]
-        options[:status] = interpret_status(options[:status]).to_i
-      end
-
-      options[:update] = blk if block_given?
-      options
-    end
-
-    def render(action = nil, options = {}, &blk)
-      options = _normalize_options(action, options, &blk)
-      super(options)
-    end
-
-    def render_to_string(action = nil, options = {}, &blk)
-      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/new_base/helpers.rb b/actionpack/lib/action_controller/new_base/helpers.rb
deleted file mode 100644
index 2fa5ea65191cf..0000000000000
--- a/actionpack/lib/action_controller/new_base/helpers.rb
+++ /dev/null
@@ -1,178 +0,0 @@
-require 'active_support/core_ext/load_error'
-require 'active_support/core_ext/name_error'
-require 'active_support/dependencies'
-
-module ActionController
-  # The Rails framework provides a large number of helpers for working with +assets+, +dates+, +forms+,
-  # +numbers+ and model objects, to name a few. These helpers are available to all templates
-  # by default.
-  #
-  # In addition to using the standard template helpers provided in the Rails framework, creating custom helpers to
-  # extract complicated logic or reusable functionality is strongly encouraged. By default, the controller will
-  # include a helper whose name matches that of the controller, e.g., <tt>MyController</tt> will automatically
-  # include <tt>MyHelper</tt>.
-  #
-  # Additional helpers can be specified using the +helper+ class method in <tt>ActionController::Base</tt> or any
-  # controller which inherits from it.
-  #
-  # ==== Examples
-  # The +to_s+ method from the Time class can be wrapped in a helper method to display a custom message if
-  # the Time object is blank:
-  #
-  #   module FormattedTimeHelper
-  #     def format_time(time, format=:long, blank_message="&nbsp;")
-  #       time.blank? ? blank_message : time.to_s(format)
-  #     end
-  #   end
-  #
-  # FormattedTimeHelper can now be included in a controller, using the +helper+ class method:
-  #
-  #   class EventsController < ActionController::Base
-  #     helper FormattedTimeHelper
-  #     def index
-  #       @events = Event.find(:all)
-  #     end
-  #   end
-  #
-  # Then, in any view rendered by <tt>EventController</tt>, the <tt>format_time</tt> method can be called:
-  #
-  #   <% @events.each do |event| -%>
-  #     <p>
-  #       <% format_time(event.time, :short, "N/A") %> | <%= event.name %>
-  #     </p>
-  #   <% end -%>
-  #
-  # Finally, assuming we have two event instances, one which has a time and one which does not,
-  # the output might look like this:
-  #
-  #   23 Aug 11:30 | Carolina Railhawks Soccer Match
-  #   N/A | Carolina Railhaws Training Workshop
-  #
-  module Helpers
-    extend ActiveSupport::Concern
-
-    include AbstractController::Helpers
-
-    included do
-      # Set the default directory for helpers
-      extlib_inheritable_accessor(:helpers_dir) do
-        defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/app/helpers" : "app/helpers"
-      end
-    end
-
-    module ClassMethods
-      def inherited(klass)
-        klass.class_eval { default_helper_module! unless name.blank? }
-        super
-      end
-
-      # The +helper+ class method can take a series of helper module names, a block, or both.
-      #
-      # ==== Parameters
-      # *args<Array[Module, Symbol, String, :all]>
-      # block<Block>:: A block defining helper methods
-      #
-      # ==== Examples
-      # When the argument is a string or symbol, the method will provide the "_helper" suffix, require the file
-      # and include the module in the template class.  The second form illustrates how to include custom helpers
-      # when working with namespaced controllers, or other cases where the file containing the helper definition is not
-      # in one of Rails' standard load paths:
-      #   helper :foo             # => requires 'foo_helper' and includes FooHelper
-      #   helper 'resources/foo'  # => requires 'resources/foo_helper' and includes Resources::FooHelper
-      #
-      # When the argument is a module it will be included directly in the template class.
-      #   helper FooHelper # => includes FooHelper
-      #
-      # When the argument is the symbol <tt>:all</tt>, the controller will include all helpers beneath
-      # <tt>ActionController::Base.helpers_dir</tt> (defaults to <tt>app/helpers/**/*.rb</tt> under RAILS_ROOT).
-      #   helper :all
-      #
-      # Additionally, the +helper+ class method can receive and evaluate a block, making the methods defined available
-      # to the template.
-      #   # One line
-      #   helper { def hello() "Hello, world!" end }
-      #   # Multi-line
-      #   helper do
-      #     def foo(bar)
-      #       "#{bar} is the very best"
-      #     end
-      #   end
-      #
-      # Finally, all the above styles can be mixed together, and the +helper+ method can be invoked with a mix of
-      # +symbols+, +strings+, +modules+ and blocks.
-      #   helper(:three, BlindHelper) { def mice() 'mice' end }
-      #
-      def helper(*args, &block)
-        super(*_modules_for_helpers(args), &block)
-      end
-
-      # Declares helper accessors for controller attributes. For example, the
-      # following adds new +name+ and <tt>name=</tt> instance methods to a
-      # controller and makes them available to the view:
-      #   helper_attr :name
-      #   attr_accessor :name
-      #
-      # ==== Parameters
-      # *attrs<Array[String, Symbol]>:: Names of attributes to be converted
-      #   into helpers.
-      def helper_attr(*attrs)
-        attrs.flatten.each { |attr| helper_method(attr, "#{attr}=") }
-      end
-
-      # Provides a proxy to access helpers methods from outside the view.
-      def helpers
-        @helper_proxy ||= ActionView::Base.new.extend(_helpers)
-      end
-
-    private
-      # Returns a list of modules, normalized from the acceptable kinds of
-      # helpers with the following behavior:
-      # String or Symbol:: :FooBar or "FooBar" becomes "foo_bar_helper",
-      #   and "foo_bar_helper.rb" is loaded using require_dependency.
-      # :all:: Loads all modules in the #helpers_dir
-      # Module:: No further processing
-      #
-      # After loading the appropriate files, the corresponding modules
-      # are returned.
-      #
-      # ==== Parameters
-      # args<Array[String, Symbol, Module, all]>:: A list of helpers
-      #
-      # ==== Returns
-      # Array[Module]:: A normalized list of modules for the list of
-      #   helpers provided.
-      def _modules_for_helpers(args)
-        args.flatten.map! do |arg|
-          case arg
-          when :all
-            _modules_for_helpers all_application_helpers
-          when String, Symbol
-            file_name = "#{arg.to_s.underscore}_helper"
-            require_dependency(file_name, "Missing helper file helpers/%s.rb")
-            file_name.camelize.constantize
-          when Module
-            arg
-          else
-            raise ArgumentError, "helper must be a String, Symbol, or Module"
-          end
-        end
-      end
-
-      def default_helper_module!
-        module_name = name.sub(/Controller$/, '')
-        module_path = module_name.underscore
-        helper module_path
-      rescue MissingSourceFile => e
-        raise e unless e.is_missing? "#{module_path}_helper"
-      rescue NameError => e
-        raise e unless e.missing_name? "#{module_name}Helper"
-      end
-
-      # Extract helper names from files in app/helpers/**/*.rb
-      def all_application_helpers
-        extract = /^#{Regexp.quote(helpers_dir)}\/?(.*)_helper.rb$/
-        Dir["#{helpers_dir}/**/*_helper.rb"].map { |file| file.sub extract, '\1' }
-      end
-    end
-  end
-end
diff --git a/actionpack/lib/action_controller/old_base.rb b/actionpack/lib/action_controller/old_base.rb
new file mode 100644
index 0000000000000..dd22bfd617aa9
--- /dev/null
+++ b/actionpack/lib/action_controller/old_base.rb
@@ -0,0 +1,84 @@
+#--
+# Copyright (c) 2004-2009 David Heinemeier Hansson
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
+$:.unshift activesupport_path if File.directory?(activesupport_path)
+require 'active_support'
+
+require File.join(File.dirname(__FILE__), "action_pack")
+
+module ActionController
+  # TODO: Review explicit to see if they will automatically be handled by
+  # the initilizer if they are really needed.
+  def self.load_all!
+    [Base, Request, Response, UrlRewriter, UrlWriter]
+    [ActionDispatch::Http::Headers]
+  end
+
+  autoload :Base, 'action_controller/base/base'
+  autoload :Benchmarking, 'action_controller/base/chained/benchmarking'
+  autoload :Caching, 'action_controller/caching'
+  autoload :Cookies, 'action_controller/base/cookies'
+  autoload :Dispatcher, 'action_controller/dispatch/dispatcher'
+  autoload :Filters, 'action_controller/base/chained/filters'
+  autoload :Flash, 'action_controller/base/chained/flash'
+  autoload :Helpers, 'action_controller/base/helpers'
+  autoload :HttpAuthentication, 'action_controller/base/http_authentication'
+  autoload :Integration, 'action_controller/testing/integration'
+  autoload :IntegrationTest, 'action_controller/testing/integration'
+  autoload :Layout, 'action_controller/base/layout'
+  autoload :MimeResponds, 'action_controller/base/mime_responds'
+  autoload :PolymorphicRoutes, 'action_controller/routing/generation/polymorphic_routes'
+  autoload :RecordIdentifier, 'action_controller/record_identifier'
+  autoload :Redirector, 'action_controller/base/redirect'
+  autoload :Renderer, 'action_controller/base/render'
+  autoload :RequestForgeryProtection, 'action_controller/base/request_forgery_protection'
+  autoload :Rescue, 'action_controller/base/rescue'
+  autoload :Resources, 'action_controller/routing/resources'
+  autoload :Responder, 'action_controller/base/responder'
+  autoload :Routing, 'action_controller/routing'
+  autoload :SessionManagement, 'action_controller/base/session_management'
+  autoload :Streaming, 'action_controller/base/streaming'
+  autoload :TestCase, 'action_controller/testing/test_case'
+  autoload :TestProcess, 'action_controller/testing/process'
+  autoload :Translation, 'action_controller/translation'
+  autoload :UrlEncodedPairParser, 'action_controller/dispatch/url_encoded_pair_parser'
+  autoload :UrlRewriter, 'action_controller/routing/generation/url_rewriter'
+  autoload :UrlWriter, 'action_controller/routing/generation/url_rewriter'
+  autoload :Verification, 'action_controller/base/verification'
+  autoload :FilterParameterLogging, 'action_controller/base/filter_parameter_logging'
+
+  module Assertions
+    autoload :DomAssertions, 'action_controller/testing/assertions/dom'
+    autoload :ModelAssertions, 'action_controller/testing/assertions/model'
+    autoload :ResponseAssertions, 'action_controller/testing/assertions/response'
+    autoload :RoutingAssertions, 'action_controller/testing/assertions/routing'
+    autoload :SelectorAssertions, 'action_controller/testing/assertions/selector'
+    autoload :TagAssertions, 'action_controller/testing/assertions/tag'
+  end
+end
+
+autoload :HTML, 'action_controller/vendor/html-scanner'
+
+require 'action_dispatch'
+require 'action_view'
diff --git a/actionpack/lib/action_controller/old_base/base.rb b/actionpack/lib/action_controller/old_base/base.rb
new file mode 100644
index 0000000000000..67369eb12214d
--- /dev/null
+++ b/actionpack/lib/action_controller/old_base/base.rb
@@ -0,0 +1,884 @@
+require 'action_controller/deprecated'
+require 'set'
+require 'active_support/core_ext/class/inheritable_attributes'
+require 'active_support/core_ext/module/attr_internal'
+
+module ActionController #:nodoc:
+  class ActionControllerError < StandardError #:nodoc:
+  end
+
+  class SessionRestoreError < ActionControllerError #:nodoc:
+  end
+
+  class RenderError < ActionControllerError #:nodoc:
+  end
+
+  class RoutingError < ActionControllerError #:nodoc:
+    attr_reader :failures
+    def initialize(message, failures=[])
+      super(message)
+      @failures = failures
+    end
+  end
+
+  class MethodNotAllowed < ActionControllerError #:nodoc:
+    attr_reader :allowed_methods
+
+    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
+  end
+
+  class NotImplemented < MethodNotAllowed #:nodoc:
+  end
+
+  class UnknownController < ActionControllerError #:nodoc:
+  end
+
+  class UnknownAction < ActionControllerError #:nodoc:
+  end
+
+  class MissingFile < ActionControllerError #:nodoc:
+  end
+
+  class RenderError < ActionControllerError #:nodoc:
+  end
+
+  class SessionOverflowError < ActionControllerError #:nodoc:
+    DEFAULT_MESSAGE = 'Your session data is larger than the data column in which it is to be stored. You must increase the size of your data column if you intend to store large data.'
+
+    def initialize(message = nil)
+      super(message || DEFAULT_MESSAGE)
+    end
+  end
+
+  class UnknownHttpMethod < ActionControllerError #:nodoc:
+  end
+
+  # Action Controllers are the core of a web request in Rails. They are made up of one or more actions that are executed
+  # on request and then either render a template or redirect to another action. An action is defined as a public method
+  # on the controller, which will automatically be made accessible to the web-server through Rails Routes.
+  #
+  # A sample controller could look like this:
+  #
+  #   class GuestBookController < ActionController::Base
+  #     def index
+  #       @entries = Entry.find(:all)
+  #     end
+  #
+  #     def sign
+  #       Entry.create(params[:entry])
+  #       redirect_to :action => "index"
+  #     end
+  #   end
+  #
+  # Actions, by default, render a template in the <tt>app/views</tt> directory corresponding to the name of the controller and action
+  # after executing code in the action. For example, the +index+ action of the GuestBookController would render the
+  # template <tt>app/views/guestbook/index.erb</tt> by default after populating the <tt>@entries</tt> instance variable.
+  #
+  # Unlike index, the sign action will not render a template. After performing its main purpose (creating a
+  # new entry in the guest book), it initiates a redirect instead. This redirect works by returning an external
+  # "302 Moved" HTTP response that takes the user to the index action.
+  #
+  # The index and sign represent the two basic action archetypes used in Action Controllers. Get-and-show and do-and-redirect.
+  # Most actions are variations of these themes.
+  #
+  # == Requests
+  #
+  # Requests are processed by the Action Controller framework by extracting the value of the "action" key in the request parameters.
+  # This value should hold the name of the action to be performed. Once the action has been identified, the remaining
+  # request parameters, the session (if one is available), and the full request with all the HTTP headers are made available to
+  # the action through instance variables. Then the action is performed.
+  #
+  # The full request object is available with the request accessor and is primarily used to query for HTTP headers. These queries
+  # are made by accessing the environment hash, like this:
+  #
+  #   def server_ip
+  #     location = request.env["SERVER_ADDR"]
+  #     render :text => "This server hosted at #{location}"
+  #   end
+  #
+  # == Parameters
+  #
+  # All request parameters, whether they come from a GET or POST request, or from the URL, are available through the params method
+  # which returns a hash. For example, an action that was performed through <tt>/weblog/list?category=All&limit=5</tt> will include
+  # <tt>{ "category" => "All", "limit" => 5 }</tt> in params.
+  #
+  # It's also possible to construct multi-dimensional parameter hashes by specifying keys using brackets, such as:
+  #
+  #   <input type="text" name="post[name]" value="david">
+  #   <input type="text" name="post[address]" value="hyacintvej">
+  #
+  # A request stemming from a form holding these inputs will include <tt>{ "post" => { "name" => "david", "address" => "hyacintvej" } }</tt>.
+  # If the address input had been named "post[address][street]", the params would have included
+  # <tt>{ "post" => { "address" => { "street" => "hyacintvej" } } }</tt>. There's no limit to the depth of the nesting.
+  #
+  # == Sessions
+  #
+  # Sessions allows you to store objects in between requests. This is useful for objects that are not yet ready to be persisted,
+  # such as a Signup object constructed in a multi-paged process, or objects that don't change much and are needed all the time, such
+  # as a User object for a system that requires login. The session should not be used, however, as a cache for objects where it's likely
+  # they could be changed unknowingly. It's usually too much work to keep it all synchronized -- something databases already excel at.
+  #
+  # You can place objects in the session by using the <tt>session</tt> method, which accesses a hash:
+  #
+  #   session[:person] = Person.authenticate(user_name, password)
+  #
+  # And retrieved again through the same hash:
+  #
+  #   Hello #{session[:person]}
+  #
+  # For removing objects from the session, you can either assign a single key to +nil+:
+  #
+  #   # removes :person from session
+  #   session[:person] = nil
+  #
+  # or you can remove the entire session with +reset_session+.
+  #
+  # Sessions are stored by default in a browser cookie that's cryptographically signed, but unencrypted.
+  # This prevents the user from tampering with the session but also allows him to see its contents.
+  #
+  # Do not put secret information in cookie-based sessions!
+  #
+  # Other options for session storage are:
+  #
+  # * ActiveRecord::SessionStore - Sessions are stored in your database, which works better than PStore with multiple app servers and,
+  #   unlike CookieStore, hides your session contents from the user. To use ActiveRecord::SessionStore, set
+  #
+  #     config.action_controller.session_store = :active_record_store
+  #
+  #   in your <tt>config/environment.rb</tt> and run <tt>rake db:sessions:create</tt>.
+  #
+  # * MemCacheStore - Sessions are stored as entries in your memcached cache.
+  #   Set the session store type in <tt>config/environment.rb</tt>:
+  #
+  #     config.action_controller.session_store = :mem_cache_store
+  #
+  #   This assumes that memcached has been installed and configured properly.
+  #   See the MemCacheStore docs for more information.
+  #
+  # == Responses
+  #
+  # Each action results in a response, which holds the headers and document to be sent to the user's browser. The actual response
+  # object is generated automatically through the use of renders and redirects and requires no user intervention.
+  #
+  # == Renders
+  #
+  # Action Controller sends content to the user by using one of five rendering methods. The most versatile and common is the rendering
+  # of a template. Included in the Action Pack is the Action View, which enables rendering of ERb templates. It's automatically configured.
+  # The controller passes objects to the view by assigning instance variables:
+  #
+  #   def show
+  #     @post = Post.find(params[:id])
+  #   end
+  #
+  # Which are then automatically available to the view:
+  #
+  #   Title: <%= @post.title %>
+  #
+  # You don't have to rely on the automated rendering. Especially actions that could result in the rendering of different templates will use
+  # the manual rendering methods:
+  #
+  #   def search
+  #     @results = Search.find(params[:query])
+  #     case @results
+  #       when 0 then render :action => "no_results"
+  #       when 1 then render :action => "show"
+  #       when 2..10 then render :action => "show_many"
+  #     end
+  #   end
+  #
+  # Read more about writing ERb and Builder templates in link:classes/ActionView/Base.html.
+  #
+  # == Redirects
+  #
+  # Redirects are used to move from one action to another. For example, after a <tt>create</tt> action, which stores a blog entry to a database,
+  # we might like to show the user the new entry. Because we're following good DRY principles (Don't Repeat Yourself), we're going to reuse (and redirect to)
+  # a <tt>show</tt> action that we'll assume has already been created. The code might look like this:
+  #
+  #   def create
+  #     @entry = Entry.new(params[:entry])
+  #     if @entry.save
+  #       # The entry was saved correctly, redirect to show
+  #       redirect_to :action => 'show', :id => @entry.id
+  #     else
+  #       # things didn't go so well, do something else
+  #     end
+  #   end
+  #
+  # In this case, after saving our new entry to the database, the user is redirected to the <tt>show</tt> method which is then executed.
+  #
+  # == Calling multiple redirects or renders
+  #
+  # An action may contain only a single render or a single redirect. Attempting to try to do either again will result in a DoubleRenderError:
+  #
+  #   def do_something
+  #     redirect_to :action => "elsewhere"
+  #     render :action => "overthere" # raises DoubleRenderError
+  #   end
+  #
+  # If you need to redirect on the condition of something, then be sure to add "and return" to halt execution.
+  #
+  #   def do_something
+  #     redirect_to(:action => "elsewhere") and return if monkeys.nil?
+  #     render :action => "overthere" # won't be called if monkeys is nil
+  #   end
+  #
+  class Base
+
+    include ActionDispatch::StatusCodes
+
+    cattr_reader :protected_instance_variables
+    # Controller specific instance variables which will not be accessible inside views.
+    @@protected_instance_variables = %w(@assigns @performed_redirect @performed_render @variables_added @request_origin @url @parent_controller
+                                        @action_name @before_filter_chain_aborted @action_cache_path @_headers @_params
+                                        @_flash @_response)
+
+    # Prepends all the URL-generating helpers from AssetHelper. This makes it possible to easily move javascripts, stylesheets,
+    # and images to a dedicated asset server away from the main web server. Example:
+    #   ActionController::Base.asset_host = "http://assets.example.com"
+    cattr_accessor :asset_host
+
+    # All requests are considered local by default, so everyone will be exposed to detailed debugging screens on errors.
+    # When the application is ready to go public, this should be set to false, and the protected method <tt>local_request?</tt>
+    # should instead be implemented in the controller to determine when debugging screens should be shown.
+    @@consider_all_requests_local = true
+    cattr_accessor :consider_all_requests_local
+
+    # Indicates whether to allow concurrent action processing. Your
+    # controller actions and any other code they call must also behave well
+    # when called from concurrent threads. Turned off by default.
+    @@allow_concurrency = false
+    cattr_accessor :allow_concurrency
+
+    # Modern REST web services often need to submit complex data to the web application.
+    # The <tt>@@param_parsers</tt> hash lets you register handlers which will process the HTTP body and add parameters to the
+    # <tt>params</tt> hash. These handlers are invoked for POST and PUT requests.
+    #
+    # By default <tt>application/xml</tt> is enabled. A XmlSimple class with the same param name as the root will be instantiated
+    # in the <tt>params</tt>. This allows XML requests to mask themselves as regular form submissions, so you can have one
+    # action serve both regular forms and web service requests.
+    #
+    # Example of doing your own parser for a custom content type:
+    #
+    #   ActionController::Base.param_parsers[Mime::Type.lookup('application/atom+xml')] = Proc.new do |data|
+    #      node = REXML::Document.new(post)
+    #     { node.root.name => node.root }
+    #   end
+    #
+    # Note: Up until release 1.1 of Rails, Action Controller would default to using XmlSimple configured to discard the
+    # root node for such requests. The new default is to keep the root, such that "<r><name>David</name></r>" results
+    # in <tt>params[:r][:name]</tt> for "David" instead of <tt>params[:name]</tt>. To get the old behavior, you can
+    # re-register XmlSimple as application/xml handler ike this:
+    #
+    #   ActionController::Base.param_parsers[Mime::XML] =
+    #     Proc.new { |data| XmlSimple.xml_in(data, 'ForceArray' => false) }
+    #
+    # A YAML parser is also available and can be turned on with:
+    #
+    #   ActionController::Base.param_parsers[Mime::YAML] = :yaml
+    @@param_parsers = { Mime::MULTIPART_FORM   => :multipart_form,
+                        Mime::URL_ENCODED_FORM => :url_encoded_form,
+                        Mime::XML              => :xml_simple,
+                        Mime::JSON             => :json }
+    cattr_accessor :param_parsers
+
+    # Controls the default charset for all renders.
+    @@default_charset = "utf-8"
+    cattr_accessor :default_charset
+
+    # The logger is used for generating information on the action run-time (including benchmarking) if available.
+    # Can be set to nil for no logging. Compatible with both Ruby's own Logger and Log4r loggers.
+    cattr_accessor :logger
+
+    # Controls the resource action separator
+    @@resource_action_separator = "/"
+    cattr_accessor :resource_action_separator
+
+    # Allow to override path names for default resources' actions
+    @@resources_path_names = { :new => 'new', :edit => 'edit' }
+    cattr_accessor :resources_path_names
+
+    # Sets the token parameter name for RequestForgery. Calling +protect_from_forgery+
+    # sets it to <tt>:authenticity_token</tt> by default.
+    cattr_accessor :request_forgery_protection_token
+
+    # Controls the IP Spoofing check when determining the remote IP.
+    @@ip_spoofing_check = true
+    cattr_accessor :ip_spoofing_check
+
+    # Indicates whether or not optimise the generated named
+    # route helper methods
+    cattr_accessor :optimise_named_routes
+    self.optimise_named_routes = true
+
+    # Indicates whether the response format should be determined by examining the Accept HTTP header,
+    # or by using the simpler params + ajax rules.
+    #
+    # If this is set to +true+ (the default) then +respond_to+ and +Request#format+ will take the Accept
+    # header into account.  If it is set to false then the request format will be determined solely
+    # by examining params[:format].  If params format is missing, the format will be either HTML or
+    # Javascript depending on whether the request is an AJAX request.
+    cattr_accessor :use_accept_header
+    self.use_accept_header = true
+
+    # Controls whether request forgergy protection is turned on or not. Turned off by default only in test mode.
+    class_inheritable_accessor :allow_forgery_protection
+    self.allow_forgery_protection = true
+
+    # If you are deploying to a subdirectory, you will need to set
+    # <tt>config.action_controller.relative_url_root</tt>
+    # This defaults to ENV['RAILS_RELATIVE_URL_ROOT']
+    cattr_accessor :relative_url_root
+    self.relative_url_root = ENV['RAILS_RELATIVE_URL_ROOT']
+
+    # Holds the request object that's primarily used to get environment variables through access like
+    # <tt>request.env["REQUEST_URI"]</tt>.
+    attr_internal :request
+
+    # Holds a hash of all the GET, POST, and Url parameters passed to the action. Accessed like <tt>params["post_id"]</tt>
+    # to get the post_id. No type casts are made, so all values are returned as strings.
+    attr_internal :params
+
+    # Holds the response object that's primarily used to set additional HTTP headers through access like
+    # <tt>response.headers["Cache-Control"] = "no-cache"</tt>. Can also be used to access the final body HTML after a template
+    # has been rendered through response.body -- useful for <tt>after_filter</tt>s that wants to manipulate the output,
+    # such as a OutputCompressionFilter.
+    attr_internal :response
+
+    # Holds a hash of objects in the session. Accessed like <tt>session[:person]</tt> to get the object tied to the "person"
+    # key. The session will hold any type of object as values, but the key should be a string or symbol.
+    def session
+      request.session
+    end
+
+    # Holds a hash of header names and values. Accessed like <tt>headers["Cache-Control"]</tt> to get the value of the Cache-Control
+    # directive. Values should always be specified as strings.
+    attr_internal :headers
+
+    # Returns the name of the action this controller is processing.
+    attr_accessor :action_name
+
+    attr_reader :template
+
+    def action(name, env)
+      request  = ActionDispatch::Request.new(env)
+      response = ActionDispatch::Response.new
+      self.action_name = name && name.to_s
+      process(request, response).to_a
+    end
+
+
+    class << self
+      def action(name = nil)
+        @actions ||= {}
+        @actions[name] ||= proc do |env|
+          new.action(name, env)
+        end
+      end
+      
+      # Converts the class name from something like "OneModule::TwoModule::NeatController" to "NeatController".
+      def controller_class_name
+        @controller_class_name ||= name.demodulize
+      end
+
+      # Converts the class name from something like "OneModule::TwoModule::NeatController" to "neat".
+      def controller_name
+        @controller_name ||= controller_class_name.sub(/Controller$/, '').underscore
+      end
+
+      # Converts the class name from something like "OneModule::TwoModule::NeatController" to "one_module/two_module/neat".
+      def controller_path
+        @controller_path ||= name.gsub(/Controller$/, '').underscore
+      end
+
+      # Return an array containing the names of public methods that have been marked hidden from the action processor.
+      # By default, all methods defined in ActionController::Base and included modules are hidden.
+      # More methods can be hidden using <tt>hide_action</tt>.
+      def hidden_actions
+        read_inheritable_attribute(:hidden_actions) || write_inheritable_attribute(:hidden_actions, [])
+      end
+
+      # Hide each of the given methods from being callable as actions.
+      def hide_action(*names)
+        write_inheritable_attribute(:hidden_actions, hidden_actions | names.map { |name| name.to_s })
+      end
+
+      # View load paths determine the bases from which template references can be made. So a call to
+      # render("test/template") will be looked up in the view load paths array and the closest match will be
+      # returned.
+      def view_paths
+        if defined? @view_paths
+          @view_paths
+        else
+          superclass.view_paths
+        end
+      end
+
+      def view_paths=(value)
+        @view_paths = ActionView::Base.process_view_paths(value) if value
+      end
+
+      # Adds a view_path to the front of the view_paths array.
+      # If the current class has no view paths, copy them from
+      # the superclass.  This change will be visible for all future requests.
+      #
+      #   ArticleController.prepend_view_path("views/default")
+      #   ArticleController.prepend_view_path(["views/default", "views/custom"])
+      #
+      def prepend_view_path(path)
+        @view_paths = superclass.view_paths.dup if !defined?(@view_paths) || @view_paths.nil?
+        @view_paths.unshift(*path)
+      end
+
+      # Adds a view_path to the end of the view_paths array.
+      # If the current class has no view paths, copy them from
+      # the superclass. This change will be visible for all future requests.
+      #
+      #   ArticleController.append_view_path("views/default")
+      #   ArticleController.append_view_path(["views/default", "views/custom"])
+      #
+      def append_view_path(path)
+        @view_paths = superclass.view_paths.dup if @view_paths.nil?
+        @view_paths.push(*path)
+      end
+      
+      @@exempt_from_layout = [ActionView::TemplateHandlers::RJS]
+      
+      def exempt_from_layout(*types)
+        types.each do |type|
+          @@exempt_from_layout << 
+            ActionView::Template.handler_class_for_extension(type)
+        end
+        
+        @@exempt_from_layout
+      end
+
+    end
+
+    public
+      def call(env)
+        request = ActionDispatch::Request.new(env)
+        response = ActionDispatch::Response.new
+        process(request, response).to_a
+      end
+
+      # Extracts the action_name from the request parameters and performs that action.
+      def process(request, response, method = :perform_action, *arguments) #:nodoc:
+        response.request = request
+
+        assign_shortcuts(request, response)
+        initialize_template_class(response)
+        initialize_current_url
+
+        log_processing
+        send(method, *arguments)
+
+        send_response
+      ensure
+        process_cleanup
+      end
+
+      def send_response
+        response.prepare!
+        response
+      end
+
+      # Returns a URL that has been rewritten according to the options hash and the defined routes.
+      # (For doing a complete redirect, use +redirect_to+).
+      #
+      # <tt>url_for</tt> is used to:
+      #
+      # All keys given to +url_for+ are forwarded to the Route module, save for the following:
+      # * <tt>:anchor</tt> - Specifies the anchor name to be appended to the path. For example,
+      #   <tt>url_for :controller => 'posts', :action => 'show', :id => 10, :anchor => 'comments'</tt>
+      #   will produce "/posts/show/10#comments".
+      # * <tt>:only_path</tt> - If true, returns the relative URL (omitting the protocol, host name, and port) (<tt>false</tt> by default).
+      # * <tt>:trailing_slash</tt> - If true, adds a trailing slash, as in "/archive/2005/". Note that this
+      #   is currently not recommended since it breaks caching.
+      # * <tt>:host</tt> - Overrides the default (current) host if provided.
+      # * <tt>:protocol</tt> - Overrides the default (current) protocol if provided.
+      # * <tt>:port</tt> - Optionally specify the port to connect to.
+      # * <tt>:user</tt> - Inline HTTP authentication (only plucked out if <tt>:password</tt> is also present).
+      # * <tt>:password</tt> - Inline HTTP authentication (only plucked out if <tt>:user</tt> is also present).
+      # * <tt>:skip_relative_url_root</tt> - If true, the url is not constructed using the +relative_url_root+
+      #   of the request so the path will include the web server relative installation directory.
+      #
+      # The URL is generated from the remaining keys in the hash. A URL contains two key parts: the <base> and a query string.
+      # Routes composes a query string as the key/value pairs not included in the <base>.
+      #
+      # The default Routes setup supports a typical Rails path of "controller/action/id" where action and id are optional, with
+      # action defaulting to 'index' when not given. Here are some typical url_for statements and their corresponding URLs:
+      #
+      #   url_for :controller => 'posts', :action => 'recent'                # => 'proto://host.com/posts/recent'
+      #   url_for :controller => 'posts', :action => 'index'                 # => 'proto://host.com/posts'
+      #   url_for :controller => 'posts', :action => 'index', :port=>'8033'  # => 'proto://host.com:8033/posts'
+      #   url_for :controller => 'posts', :action => 'show', :id => 10       # => 'proto://host.com/posts/show/10'
+      #   url_for :controller => 'posts', :user => 'd', :password => '123'   # => 'proto://d:123@host.com/posts'
+      #
+      # When generating a new URL, missing values may be filled in from the current request's parameters. For example,
+      # <tt>url_for :action => 'some_action'</tt> will retain the current controller, as expected. This behavior extends to
+      # other parameters, including <tt>:controller</tt>, <tt>:id</tt>, and any other parameters that are placed into a Route's
+      # path.
+      #  
+      # The URL helpers such as <tt>url_for</tt> have a limited form of memory: when generating a new URL, they can look for
+      # missing values in the current request's parameters. Routes attempts to guess when a value should and should not be
+      # taken from the defaults. There are a few simple rules on how this is performed:
+      #
+      # * If the controller name begins with a slash no defaults are used:
+      #
+      #     url_for :controller => '/home'
+      #
+      #   In particular, a leading slash ensures no namespace is assumed. Thus,
+      #   while <tt>url_for :controller => 'users'</tt> may resolve to
+      #   <tt>Admin::UsersController</tt> if the current controller lives under
+      #   that module, <tt>url_for :controller => '/users'</tt> ensures you link
+      #   to <tt>::UsersController</tt> no matter what.
+      # * If the controller changes, the action will default to index unless provided
+      #
+      # The final rule is applied while the URL is being generated and is best illustrated by an example. Let us consider the
+      # route given by <tt>map.connect 'people/:last/:first/:action', :action => 'bio', :controller => 'people'</tt>.
+      #
+      # Suppose that the current URL is "people/hh/david/contacts". Let's consider a few different cases of URLs which are generated
+      # from this page.
+      #
+      # * <tt>url_for :action => 'bio'</tt> -- During the generation of this URL, default values will be used for the first and
+      # last components, and the action shall change. The generated URL will be, "people/hh/david/bio".
+      # * <tt>url_for :first => 'davids-little-brother'</tt> This generates the URL 'people/hh/davids-little-brother' -- note
+      #   that this URL leaves out the assumed action of 'bio'.
+      #
+      # However, you might ask why the action from the current request, 'contacts', isn't carried over into the new URL. The
+      # answer has to do with the order in which the parameters appear in the generated path. In a nutshell, since the
+      # value that appears in the slot for <tt>:first</tt> is not equal to default value for <tt>:first</tt> we stop using
+      # defaults. On its own, this rule can account for much of the typical Rails URL behavior.
+      #  
+      # Although a convenience, defaults can occasionally get in your way. In some cases a default persists longer than desired.
+      # The default may be cleared by adding <tt>:name => nil</tt> to <tt>url_for</tt>'s options.
+      # This is often required when writing form helpers, since the defaults in play may vary greatly depending upon where the
+      # helper is used from. The following line will redirect to PostController's default action, regardless of the page it is
+      # displayed on:
+      #
+      #   url_for :controller => 'posts', :action => nil
+      #
+      # If you explicitly want to create a URL that's almost the same as the current URL, you can do so using the
+      # <tt>:overwrite_params</tt> options. Say for your posts you have different views for showing and printing them.
+      # Then, in the show view, you get the URL for the print view like this
+      #
+      #   url_for :overwrite_params => { :action => 'print' }
+      #
+      # This takes the current URL as is and only exchanges the action. In contrast, <tt>url_for :action => 'print'</tt>
+      # would have slashed-off the path components after the changed action.
+      def url_for(options = {})
+        options ||= {}
+        case options
+          when String
+            options
+          when Hash
+            @url.rewrite(rewrite_options(options))
+          else
+            polymorphic_url(options)
+        end
+      end
+
+      # Converts the class name from something like "OneModule::TwoModule::NeatController" to "NeatController".
+      def controller_class_name
+        self.class.controller_class_name
+      end
+
+      # Converts the class name from something like "OneModule::TwoModule::NeatController" to "neat".
+      def controller_name
+        self.class.controller_name
+      end
+
+      # Converts the class name from something like "OneModule::TwoModule::NeatController" to "one_module/two_module/neat".
+      def controller_path
+        self.class.controller_path
+      end
+
+      def session_enabled?
+        ActiveSupport::Deprecation.warn("Sessions are now lazy loaded. So if you don't access them, consider them disabled.", caller)
+      end
+
+      self.view_paths = []
+
+      # View load paths for controller.
+      def view_paths
+        @template.view_paths
+      end
+
+      def view_paths=(value)
+        @template.view_paths = ActionView::Base.process_view_paths(value)
+      end
+
+      # Adds a view_path to the front of the view_paths array.
+      # This change affects the current request only.
+      #
+      #   self.prepend_view_path("views/default")
+      #   self.prepend_view_path(["views/default", "views/custom"])
+      #
+      def prepend_view_path(path)
+        @template.view_paths.unshift(*path)
+      end
+
+      # Adds a view_path to the end of the view_paths array.
+      # This change affects the current request only.
+      #
+      #   self.append_view_path("views/default")
+      #   self.append_view_path(["views/default", "views/custom"])
+      #
+      def append_view_path(path)
+        @template.view_paths.push(*path)
+      end
+
+      def rewrite_options(options) #:nodoc:
+        if defaults = default_url_options(options)
+          defaults.merge(options)
+        else
+          options
+        end
+      end
+
+      # 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:
+      #
+      #   def default_url_options(options)
+      #     { :project => @project.active? ? @project.url_name : "unknown" }
+      #   end
+      #
+      # As you can infer from the example, this is mostly useful for situations where you want to centralize dynamic decisions about the
+      # urls as they stem from the business domain. Please note that any individual url_for call can always override the defaults set
+      # by this method.
+      def default_url_options(options = nil)
+      end
+
+      # Sets the etag and/or last_modified on the response and checks it against
+      # the client request. If the request doesn't match the options provided, the
+      # request is considered stale and should be generated from scratch. Otherwise,
+      # it's fresh and we don't need to generate anything and a reply of "304 Not Modified" is sent.
+      #
+      # Parameters:
+      # * <tt>:etag</tt>
+      # * <tt>:last_modified</tt> 
+      # * <tt>:public</tt> By default the Cache-Control header is private, set this to true if you want your application to be cachable by other devices (proxy caches).
+      #
+      # Example:
+      #
+      #   def show
+      #     @article = Article.find(params[:id])
+      #
+      #     if stale?(:etag => @article, :last_modified => @article.created_at.utc)
+      #       @statistics = @article.really_expensive_call
+      #       respond_to do |format|
+      #         # all the supported formats
+      #       end
+      #     end
+      #   end
+      def stale?(options)
+        fresh_when(options)
+        !request.fresh?(response)
+      end
+
+      # Sets the etag, last_modified, or both on the response and renders a
+      # "304 Not Modified" response if the request is already fresh.
+      #
+      # Parameters:
+      # * <tt>:etag</tt>
+      # * <tt>:last_modified</tt> 
+      # * <tt>:public</tt> By default the Cache-Control header is private, set this to true if you want your application to be cachable by other devices (proxy caches).
+      #
+      # Example:
+      #
+      #   def show
+      #     @article = Article.find(params[:id])
+      #     fresh_when(:etag => @article, :last_modified => @article.created_at.utc, :public => true)
+      #   end
+      #
+      # This will render the show template if the request isn't sending a matching etag or
+      # If-Modified-Since header and just a "304 Not Modified" response if there's a match.
+      #
+      def fresh_when(options)
+        options.assert_valid_keys(:etag, :last_modified, :public)
+
+        response.etag          = options[:etag]          if options[:etag]
+        response.last_modified = options[:last_modified] if options[:last_modified]
+        
+        if options[:public] 
+          cache_control = response.headers["Cache-Control"].split(",").map {|k| k.strip }
+          cache_control.delete("private")
+          cache_control.delete("no-cache")
+          cache_control << "public"
+          response.headers["Cache-Control"] = cache_control.join(', ')
+        end
+
+        if request.fresh?(response)
+          head :not_modified
+        end
+      end
+
+      # Sets a HTTP 1.1 Cache-Control header. Defaults to issuing a "private" instruction, so that
+      # intermediate caches shouldn't cache the response.
+      #
+      # Examples:
+      #   expires_in 20.minutes
+      #   expires_in 3.hours, :public => true
+      #   expires in 3.hours, 'max-stale' => 5.hours, :public => true
+      #
+      # This method will overwrite an existing Cache-Control header.
+      # See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html for more possibilities.
+      def expires_in(seconds, options = {}) #:doc:
+        cache_control = response.headers["Cache-Control"].split(",").map {|k| k.strip }
+
+        cache_control << "max-age=#{seconds}"
+        cache_control.delete("no-cache")
+        if options[:public]
+          cache_control.delete("private")
+          cache_control << "public"
+        else
+          cache_control << "private"
+        end
+        
+        # This allows for additional headers to be passed through like 'max-stale' => 5.hours
+        cache_control += options.symbolize_keys.reject{|k,v| k == :public || k == :private }.map{ |k,v| v == true ? k.to_s : "#{k.to_s}=#{v.to_s}"}
+        
+        response.headers["Cache-Control"] = cache_control.join(', ')
+      end
+
+      # Sets a HTTP 1.1 Cache-Control header of "no-cache" so no caching should occur by the browser or
+      # intermediate caches (like caching proxy servers).
+      def expires_now #:doc:
+        response.headers["Cache-Control"] = "no-cache"
+      end
+
+      # Resets the session by clearing out all the objects stored within and initializing a new session object.
+      def reset_session #:doc:
+        request.reset_session
+      end
+
+    private
+      def _process_options(options)
+        if content_type = options[:content_type]
+          response.content_type = content_type.to_s
+        end
+
+        if location = options[:location]
+          response.headers["Location"] = url_for(location)
+        end
+
+        response.status = interpret_status(options[:status] || DEFAULT_RENDER_STATUS_CODE)
+      end
+
+      def initialize_template_class(response)
+        @template = ActionView::Base.new(self.class.view_paths, {}, self, formats)
+        response.template = @template if response.respond_to?(:template=)
+        @template.helpers.send :include, self.class.master_helper_module
+        @performed_render = @performed_redirect = false
+      end
+
+      def assign_shortcuts(request, response)
+        @_request, @_response, @_params = request, response, request.parameters
+        @_headers = @_response.headers
+      end
+
+      def initialize_current_url
+        @url = UrlRewriter.new(request, params.clone)
+      end
+
+      def log_processing
+        if logger && logger.info?
+          log_processing_for_request_id
+          log_processing_for_parameters
+        end
+      end
+
+      def log_processing_for_request_id
+        request_id = "\n\nProcessing #{self.class.name}\##{action_name} "
+        request_id << "to #{params[:format]} " if params[:format]
+        request_id << "(for #{request_origin}) [#{request.method.to_s.upcase}]"
+
+        logger.info(request_id)
+      end
+
+      def default_render #:nodoc:
+        render
+      end
+
+      def perform_action
+        if called = action_methods.include?(action_name)
+          ret = send(action_name)
+        elsif called = respond_to?(:method_missing)
+          ret = method_missing(action_name)
+        end
+        
+        return (performed? ? ret : default_render) if called
+        
+        begin
+          view_paths.find_by_parts(action_name, {:formats => formats, :locales => [I18n.locale]}, controller_path)
+        rescue => e
+          raise UnknownAction, "No action responded to #{action_name}. Actions: " +
+            "#{action_methods.sort.to_sentence}", caller
+        end
+        
+        default_render
+      end
+
+      # Returns true if a render or redirect has already been performed.
+      def performed?
+        @performed_render || @performed_redirect
+      end
+
+      def reset_variables_added_to_assigns
+        @template.instance_variable_set("@assigns_added", nil)
+      end
+
+      def request_origin
+        # this *needs* to be cached!
+        # otherwise you'd get different results if calling it more than once
+        @request_origin ||= "#{request.remote_ip} at #{Time.now.to_s(:db)}"
+      end
+
+      # Returns the request URI used to get to the current location
+      def complete_request_uri
+        "#{request.protocol}#{request.host}#{request.request_uri}"
+      end
+
+      def default_template(action_name = self.action_name)
+        self.view_paths.find_template(default_template_name(action_name), default_template_format)
+      end
+
+      def default_template_name(action_name = self.action_name)
+        if action_name
+          action_name = action_name.to_s
+          if action_name.include?('/') && template_path_includes_controller?(action_name)
+            action_name = strip_out_controller(action_name)
+          end
+        end
+        "#{controller_path}/#{action_name}"
+      end
+
+      def strip_out_controller(path)
+        path.split('/', 2).last
+      end
+
+      def template_path_includes_controller?(path)
+        self.controller_path.split('/')[-1] == path.split('/')[0]
+      end
+
+      def process_cleanup
+      end
+  end
+
+  Base.class_eval do
+    [ Filters, Layout, Renderer, Redirector, Responder, Benchmarking, Rescue, Flash, MimeResponds, Helpers,
+      Cookies, Caching, Verification, Streaming, SessionManagement,
+      HttpAuthentication::Basic::ControllerMethods, HttpAuthentication::Digest::ControllerMethods, RecordIdentifier,
+      RequestForgeryProtection, Translation, FilterParameterLogging
+    ].each do |mod|
+      include mod
+    end
+  end
+end
diff --git a/actionpack/lib/action_controller/base/chained/benchmarking.rb b/actionpack/lib/action_controller/old_base/chained/benchmarking.rb
similarity index 100%
rename from actionpack/lib/action_controller/base/chained/benchmarking.rb
rename to actionpack/lib/action_controller/old_base/chained/benchmarking.rb
diff --git a/actionpack/lib/action_controller/base/chained/filters.rb b/actionpack/lib/action_controller/old_base/chained/filters.rb
similarity index 100%
rename from actionpack/lib/action_controller/base/chained/filters.rb
rename to actionpack/lib/action_controller/old_base/chained/filters.rb
diff --git a/actionpack/lib/action_controller/base/chained/flash.rb b/actionpack/lib/action_controller/old_base/chained/flash.rb
similarity index 100%
rename from actionpack/lib/action_controller/base/chained/flash.rb
rename to actionpack/lib/action_controller/old_base/chained/flash.rb
diff --git a/actionpack/lib/action_controller/base/cookies.rb b/actionpack/lib/action_controller/old_base/cookies.rb
similarity index 100%
rename from actionpack/lib/action_controller/base/cookies.rb
rename to actionpack/lib/action_controller/old_base/cookies.rb
diff --git a/actionpack/lib/action_controller/base/filter_parameter_logging.rb b/actionpack/lib/action_controller/old_base/filter_parameter_logging.rb
similarity index 100%
rename from actionpack/lib/action_controller/base/filter_parameter_logging.rb
rename to actionpack/lib/action_controller/old_base/filter_parameter_logging.rb
diff --git a/actionpack/lib/action_controller/old_base/helpers.rb b/actionpack/lib/action_controller/old_base/helpers.rb
new file mode 100644
index 0000000000000..f74158bc13782
--- /dev/null
+++ b/actionpack/lib/action_controller/old_base/helpers.rb
@@ -0,0 +1,221 @@
+require 'active_support/dependencies'
+
+# FIXME: helper { ... } is broken on Ruby 1.9
+module ActionController #:nodoc:
+  module Helpers #:nodoc:
+    extend ActiveSupport::Concern
+
+    included do
+      # Initialize the base module to aggregate its helpers.
+      class_inheritable_accessor :master_helper_module
+      self.master_helper_module = Module.new
+
+      # Set the default directory for helpers
+      class_inheritable_accessor :helpers_dir
+      self.helpers_dir = (defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/app/helpers" : "app/helpers")
+
+      class << self
+        alias_method_chain :inherited, :helper
+      end
+    end
+
+    # The Rails framework provides a large number of helpers for working with +assets+, +dates+, +forms+, 
+    # +numbers+ and Active Record objects, to name a few. These helpers are available to all templates
+    # by default.
+    #
+    # In addition to using the standard template helpers provided in the Rails framework, creating custom helpers to
+    # extract complicated logic or reusable functionality is strongly encouraged.  By default, the controller will 
+    # include a helper whose name matches that of the controller, e.g., <tt>MyController</tt> will automatically
+    # include <tt>MyHelper</tt>.
+    # 
+    # Additional helpers can be specified using the +helper+ class method in <tt>ActionController::Base</tt> or any
+    # controller which inherits from it.
+    #
+    # ==== Examples
+    # The +to_s+ method from the Time class can be wrapped in a helper method to display a custom message if 
+    # the Time object is blank:
+    #
+    #   module FormattedTimeHelper
+    #     def format_time(time, format=:long, blank_message="&nbsp;")
+    #       time.blank? ? blank_message : time.to_s(format)
+    #     end
+    #   end
+    #
+    # FormattedTimeHelper can now be included in a controller, using the +helper+ class method:
+    #
+    #   class EventsController < ActionController::Base
+    #     helper FormattedTimeHelper
+    #     def index
+    #       @events = Event.find(:all)
+    #     end
+    #   end
+    #
+    # Then, in any view rendered by <tt>EventController</tt>, the <tt>format_time</tt> method can be called:
+    #
+    #   <% @events.each do |event| -%>
+    #     <p>
+    #       <% format_time(event.time, :short, "N/A") %> | <%= event.name %> 
+    #     </p>
+    #   <% end -%>
+    #
+    # Finally, assuming we have two event instances, one which has a time and one which does not, 
+    # the output might look like this:
+    #
+    #   23 Aug 11:30 | Carolina Railhawks Soccer Match 
+    #   N/A | Carolina Railhaws Training Workshop
+    #
+    module ClassMethods
+      # Makes all the (instance) methods in the helper module available to templates rendered through this controller.
+      # See ActionView::Helpers (link:classes/ActionView/Helpers.html) for more about making your own helper modules
+      # available to the templates.
+      def add_template_helper(helper_module) #:nodoc:
+        master_helper_module.module_eval { include helper_module }
+      end
+
+      # The +helper+ class method can take a series of helper module names, a block, or both.
+      #
+      # * <tt>*args</tt>: One or more modules, strings or symbols, or the special symbol <tt>:all</tt>.
+      # * <tt>&block</tt>: A block defining helper methods.
+      # 
+      # ==== Examples
+      # When the argument is a string or symbol, the method will provide the "_helper" suffix, require the file 
+      # and include the module in the template class.  The second form illustrates how to include custom helpers 
+      # when working with namespaced controllers, or other cases where the file containing the helper definition is not
+      # in one of Rails' standard load paths:
+      #   helper :foo             # => requires 'foo_helper' and includes FooHelper
+      #   helper 'resources/foo'  # => requires 'resources/foo_helper' and includes Resources::FooHelper
+      #
+      # When the argument is a module it will be included directly in the template class.
+      #   helper FooHelper # => includes FooHelper
+      #
+      # When the argument is the symbol <tt>:all</tt>, the controller will include all helpers beneath
+      # <tt>ActionController::Base.helpers_dir</tt> (defaults to <tt>app/helpers/**/*.rb</tt> under RAILS_ROOT).
+      #   helper :all
+      #
+      # Additionally, the +helper+ class method can receive and evaluate a block, making the methods defined available 
+      # to the template.
+      #   # One line
+      #   helper { def hello() "Hello, world!" end }
+      #   # Multi-line
+      #   helper do
+      #     def foo(bar) 
+      #       "#{bar} is the very best" 
+      #     end
+      #   end
+      # 
+      # Finally, all the above styles can be mixed together, and the +helper+ method can be invoked with a mix of
+      # +symbols+, +strings+, +modules+ and blocks.
+      #   helper(:three, BlindHelper) { def mice() 'mice' end }
+      #
+      def helper(*args, &block)
+        args.flatten.each do |arg|
+          case arg
+            when Module
+              add_template_helper(arg)
+            when :all
+              helper(all_application_helpers)
+            when String, Symbol
+              file_name  = arg.to_s.underscore + '_helper'
+              class_name = file_name.camelize
+
+              begin
+                require_dependency(file_name)
+              rescue LoadError => load_error
+                requiree = / -- (.*?)(\.rb)?$/.match(load_error.message).to_a[1]
+                if requiree == file_name
+                  msg = "Missing helper file helpers/#{file_name}.rb"
+                  raise LoadError.new(msg).copy_blame!(load_error)
+                else
+                  raise
+                end
+              end
+
+              add_template_helper(class_name.constantize)
+            else
+              raise ArgumentError, "helper expects String, Symbol, or Module argument (was: #{args.inspect})"
+          end
+        end
+
+        # Evaluate block in template class if given.
+        master_helper_module.module_eval(&block) if block_given?
+      end
+
+      # Declare a controller method as a helper. For example, the following
+      # makes the +current_user+ controller method available to the view:
+      #   class ApplicationController < ActionController::Base
+      #     helper_method :current_user, :logged_in?
+      #
+      #     def current_user
+      #       @current_user ||= User.find_by_id(session[:user])
+      #     end
+      #
+      #      def logged_in?
+      #        current_user != nil
+      #      end
+      #   end
+      #
+      # In a view:
+      #  <% if logged_in? -%>Welcome, <%= current_user.name %><% end -%>
+      def helper_method(*methods)
+        methods.flatten.each do |method|
+          master_helper_module.module_eval <<-end_eval
+            def #{method}(*args, &block)                    # def current_user(*args, &block)
+              controller.send(%(#{method}), *args, &block)  #   controller.send(%(current_user), *args, &block)
+            end                                             # end
+          end_eval
+        end
+      end
+
+      # Declares helper accessors for controller attributes. For example, the
+      # following adds new +name+ and <tt>name=</tt> instance methods to a
+      # controller and makes them available to the view:
+      #   helper_attr :name
+      #   attr_accessor :name
+      def helper_attr(*attrs)
+        attrs.flatten.each { |attr| helper_method(attr, "#{attr}=") }
+      end
+
+      # Provides a proxy to access helpers methods from outside the view.
+      def helpers
+        unless @helper_proxy
+          @helper_proxy = ActionView::Base.new
+          @helper_proxy.extend master_helper_module
+        else
+          @helper_proxy
+        end
+      end
+
+      private
+        def default_helper_module!
+          unless name.blank?
+            module_name = name.sub(/Controller$|$/, 'Helper')
+            module_path = module_name.split('::').map { |m| m.underscore }.join('/')
+            require_dependency module_path
+            helper module_name.constantize
+          end
+        rescue MissingSourceFile => e
+          raise unless e.is_missing? module_path
+        rescue NameError => e
+          raise unless e.missing_name? module_name
+        end
+
+        def inherited_with_helper(child)
+          inherited_without_helper(child)
+
+          begin
+            child.master_helper_module = Module.new
+            child.master_helper_module.__send__ :include, master_helper_module
+            child.__send__ :default_helper_module!
+          rescue MissingSourceFile => e
+            raise unless e.is_missing?("helpers/#{child.controller_path}_helper")
+          end
+        end
+
+        # Extract helper names from files in app/helpers/**/*.rb
+        def all_application_helpers
+          extract = /^#{Regexp.quote(helpers_dir)}\/?(.*)_helper.rb$/
+          Dir["#{helpers_dir}/**/*_helper.rb"].map { |file| file.sub extract, '\1' }
+        end
+    end
+  end
+end
diff --git a/actionpack/lib/action_controller/base/http_authentication.rb b/actionpack/lib/action_controller/old_base/http_authentication.rb
similarity index 100%
rename from actionpack/lib/action_controller/base/http_authentication.rb
rename to actionpack/lib/action_controller/old_base/http_authentication.rb
diff --git a/actionpack/lib/action_controller/base/layout.rb b/actionpack/lib/action_controller/old_base/layout.rb
similarity index 100%
rename from actionpack/lib/action_controller/base/layout.rb
rename to actionpack/lib/action_controller/old_base/layout.rb
diff --git a/actionpack/lib/action_controller/base/mime_responds.rb b/actionpack/lib/action_controller/old_base/mime_responds.rb
similarity index 100%
rename from actionpack/lib/action_controller/base/mime_responds.rb
rename to actionpack/lib/action_controller/old_base/mime_responds.rb
diff --git a/actionpack/lib/action_controller/base/redirect.rb b/actionpack/lib/action_controller/old_base/redirect.rb
similarity index 100%
rename from actionpack/lib/action_controller/base/redirect.rb
rename to actionpack/lib/action_controller/old_base/redirect.rb
diff --git a/actionpack/lib/action_controller/base/render.rb b/actionpack/lib/action_controller/old_base/render.rb
similarity index 100%
rename from actionpack/lib/action_controller/base/render.rb
rename to actionpack/lib/action_controller/old_base/render.rb
diff --git a/actionpack/lib/action_controller/base/request_forgery_protection.rb b/actionpack/lib/action_controller/old_base/request_forgery_protection.rb
similarity index 100%
rename from actionpack/lib/action_controller/base/request_forgery_protection.rb
rename to actionpack/lib/action_controller/old_base/request_forgery_protection.rb
diff --git a/actionpack/lib/action_controller/base/rescue.rb b/actionpack/lib/action_controller/old_base/rescue.rb
similarity index 100%
rename from actionpack/lib/action_controller/base/rescue.rb
rename to actionpack/lib/action_controller/old_base/rescue.rb
diff --git a/actionpack/lib/action_controller/base/responder.rb b/actionpack/lib/action_controller/old_base/responder.rb
similarity index 100%
rename from actionpack/lib/action_controller/base/responder.rb
rename to actionpack/lib/action_controller/old_base/responder.rb
diff --git a/actionpack/lib/action_controller/base/session_management.rb b/actionpack/lib/action_controller/old_base/session_management.rb
similarity index 100%
rename from actionpack/lib/action_controller/base/session_management.rb
rename to actionpack/lib/action_controller/old_base/session_management.rb
diff --git a/actionpack/lib/action_controller/base/streaming.rb b/actionpack/lib/action_controller/old_base/streaming.rb
similarity index 100%
rename from actionpack/lib/action_controller/base/streaming.rb
rename to actionpack/lib/action_controller/old_base/streaming.rb
diff --git a/actionpack/lib/action_controller/base/verification.rb b/actionpack/lib/action_controller/old_base/verification.rb
similarity index 100%
rename from actionpack/lib/action_controller/base/verification.rb
rename to actionpack/lib/action_controller/old_base/verification.rb
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index c71da7fa6caeb..dab5061414461 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -1,19 +1,26 @@
-if ENV['new_base']
-  puts *caller
-  raise 'new_base/abstract_unit already loaded'
-end
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 $:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib')
+$:.unshift(File.dirname(__FILE__) + '/lib')
+
 $:.unshift(File.dirname(__FILE__) + '/fixtures/helpers')
 $:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers')
 
-require 'rubygems'
-require 'yaml'
-require 'stringio'
+ENV['new_base'] = "true"
+$stderr.puts "Running old tests on new_base"
+
 require 'test/unit'
+require 'active_support'
+
+require 'active_support/test_case'
+require 'action_controller/abstract'
+require 'action_controller'
+require 'fixture_template'
+require 'action_controller/testing/process2'
+require 'action_view/test_case'
+require 'action_controller/testing/integration'
+require 'active_support/dependencies'
 
-gem 'mocha', '>= 0.9.5'
-require 'mocha'
+$tags[:new_base] = true
 
 begin
   require 'ruby-debug'
@@ -23,24 +30,144 @@
   # Debugging disabled. `gem install ruby-debug` to enable.
 end
 
-require 'action_controller'
-require 'action_controller/testing/process'
-require 'action_view/test_case'
-
-$tags[:old_base] = true
+ActiveSupport::Dependencies.hook!
 
 # Show backtraces for deprecated behavior for quicker cleanup.
 ActiveSupport::Deprecation.debug = true
 
-ActionController::Base.logger = nil
-ActionController::Routing::Routes.reload rescue nil
-
-ActionController::Base.session_store = nil
-
 # Register danish language for testing
 I18n.backend.store_translations 'da', {}
 I18n.backend.store_translations 'pt-BR', {}
 ORIGINAL_LOCALES = I18n.available_locales.map {|locale| locale.to_s }.sort
 
-FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures')
-ActionController::Base.view_paths = FIXTURE_LOAD_PATH
+FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), '../fixtures')
+
+module ActionView
+  class TestCase
+    setup do
+      ActionController::Routing::Routes.draw do |map|
+        map.connect ':controller/:action/:id'
+      end
+    end
+  end
+end
+
+module ActionController
+  Base.session = {
+  :key         => '_testing_session',
+  :secret      => '8273f16463985e2b3747dc25e30f2528'
+}
+
+  class ActionControllerError < StandardError #:nodoc:
+  end
+
+  class SessionRestoreError < ActionControllerError #:nodoc:
+  end
+
+  class RenderError < ActionControllerError #:nodoc:
+  end
+
+  class RoutingError < ActionControllerError #:nodoc:
+    attr_reader :failures
+    def initialize(message, failures=[])
+      super(message)
+      @failures = failures
+    end
+  end
+
+  class MethodNotAllowed < ActionControllerError #:nodoc:
+    attr_reader :allowed_methods
+
+    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
+
+  class UnknownController < ActionControllerError #:nodoc:
+  end
+
+  class MissingFile < ActionControllerError #:nodoc:
+  end
+
+  class RenderError < ActionControllerError #:nodoc:
+  end
+
+  class SessionOverflowError < ActionControllerError #:nodoc:
+    DEFAULT_MESSAGE = 'Your session data is larger than the data column in which it is to be stored. You must increase the size of your data column if you intend to store large data.'
+
+    def initialize(message = nil)
+      super(message || DEFAULT_MESSAGE)
+    end
+  end
+
+  class UnknownHttpMethod < ActionControllerError #:nodoc:
+  end
+  
+  class Base
+    include ActionController::Testing
+  end
+  
+  Base.view_paths = FIXTURE_LOAD_PATH
+  
+  class TestCase
+    include TestProcess
+    setup do
+      ActionController::Routing::Routes.draw do |map|
+        map.connect ':controller/:action/:id'
+      end
+    end
+    
+    def assert_template(options = {}, message = nil)
+      validate_request!
+
+      hax = @controller._action_view.instance_variable_get(:@_rendered)
+
+      case options
+      when NilClass, String
+        rendered = (hax[:template] || []).map { |t| t.identifier }
+        msg = build_message(message,
+                "expecting <?> but rendering with <?>",
+                options, rendered.join(', '))
+        assert_block(msg) do
+          if options.nil?
+            hax[:template].blank?
+          else
+            rendered.any? { |t| t.match(options) }
+          end
+        end
+      when Hash
+        if expected_partial = options[:partial]
+          partials = hax[:partials]
+          if expected_count = options[:count]
+            found = partials.detect { |p, _| p.identifier.match(expected_partial) }
+            actual_count = found.nil? ? 0 : found.second
+            msg = build_message(message,
+                    "expecting ? to be rendered ? time(s) but rendered ? time(s)",
+                     expected_partial, expected_count, actual_count)
+            assert(actual_count == expected_count.to_i, msg)
+          else
+            msg = build_message(message,
+                    "expecting partial <?> but action rendered <?>",
+                    options[:partial], partials.keys)
+            assert(partials.keys.any? { |p| p.identifier.match(expected_partial) }, msg)
+          end
+        else
+          assert hax[:partials].empty?,
+            "Expected no partials to be rendered"
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/test/new_base/abstract_unit.rb b/actionpack/test/new_base/abstract_unit.rb
deleted file mode 100644
index 7d72f8393ba6f..0000000000000
--- a/actionpack/test/new_base/abstract_unit.rb
+++ /dev/null
@@ -1,173 +0,0 @@
-$:.unshift(File.dirname(__FILE__) + '/../../lib')
-$:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib')
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-
-$:.unshift(File.dirname(__FILE__) + '/../fixtures/helpers')
-$:.unshift(File.dirname(__FILE__) + '/../fixtures/alternate_helpers')
-
-ENV['new_base'] = "true"
-$stderr.puts "Running old tests on new_base"
-
-require 'test/unit'
-require 'active_support'
-
-require 'active_support/test_case'
-require 'action_controller/abstract'
-require 'action_controller/new_base'
-require 'fixture_template'
-require 'action_controller/testing/process2'
-require 'action_view/test_case'
-require 'action_controller/testing/integration'
-require 'active_support/dependencies'
-
-$tags[:new_base] = true
-
-begin
-  require 'ruby-debug'
-  Debugger.settings[:autoeval] = true
-  Debugger.start
-rescue LoadError
-  # Debugging disabled. `gem install ruby-debug` to enable.
-end
-
-ActiveSupport::Dependencies.hook!
-
-# Show backtraces for deprecated behavior for quicker cleanup.
-ActiveSupport::Deprecation.debug = true
-
-# Register danish language for testing
-I18n.backend.store_translations 'da', {}
-I18n.backend.store_translations 'pt-BR', {}
-ORIGINAL_LOCALES = I18n.available_locales.map {|locale| locale.to_s }.sort
-
-FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), '../fixtures')
-
-module ActionView
-  class TestCase
-    setup do
-      ActionController::Routing::Routes.draw do |map|
-        map.connect ':controller/:action/:id'
-      end
-    end
-  end
-end
-
-module ActionController
-  Base.session = {
-  :key         => '_testing_session',
-  :secret      => '8273f16463985e2b3747dc25e30f2528'
-}
-
-  class ActionControllerError < StandardError #:nodoc:
-  end
-
-  class SessionRestoreError < ActionControllerError #:nodoc:
-  end
-
-  class RenderError < ActionControllerError #:nodoc:
-  end
-
-  class RoutingError < ActionControllerError #:nodoc:
-    attr_reader :failures
-    def initialize(message, failures=[])
-      super(message)
-      @failures = failures
-    end
-  end
-
-  class MethodNotAllowed < ActionControllerError #:nodoc:
-    attr_reader :allowed_methods
-
-    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
-
-  class UnknownController < ActionControllerError #:nodoc:
-  end
-
-  class MissingFile < ActionControllerError #:nodoc:
-  end
-
-  class RenderError < ActionControllerError #:nodoc:
-  end
-
-  class SessionOverflowError < ActionControllerError #:nodoc:
-    DEFAULT_MESSAGE = 'Your session data is larger than the data column in which it is to be stored. You must increase the size of your data column if you intend to store large data.'
-
-    def initialize(message = nil)
-      super(message || DEFAULT_MESSAGE)
-    end
-  end
-
-  class UnknownHttpMethod < ActionControllerError #:nodoc:
-  end
-  
-  class Base
-    include ActionController::Testing
-  end
-  
-  Base.view_paths = FIXTURE_LOAD_PATH
-  
-  class TestCase
-    include TestProcess
-    setup do
-      ActionController::Routing::Routes.draw do |map|
-        map.connect ':controller/:action/:id'
-      end
-    end
-    
-    def assert_template(options = {}, message = nil)
-      validate_request!
-
-      hax = @controller._action_view.instance_variable_get(:@_rendered)
-
-      case options
-      when NilClass, String
-        rendered = (hax[:template] || []).map { |t| t.identifier }
-        msg = build_message(message,
-                "expecting <?> but rendering with <?>",
-                options, rendered.join(', '))
-        assert_block(msg) do
-          if options.nil?
-            hax[:template].blank?
-          else
-            rendered.any? { |t| t.match(options) }
-          end
-        end
-      when Hash
-        if expected_partial = options[:partial]
-          partials = hax[:partials]
-          if expected_count = options[:count]
-            found = partials.detect { |p, _| p.identifier.match(expected_partial) }
-            actual_count = found.nil? ? 0 : found.second
-            msg = build_message(message,
-                    "expecting ? to be rendered ? time(s) but rendered ? time(s)",
-                     expected_partial, expected_count, actual_count)
-            assert(actual_count == expected_count.to_i, msg)
-          else
-            msg = build_message(message,
-                    "expecting partial <?> but action rendered <?>",
-                    options[:partial], partials.keys)
-            assert(partials.keys.any? { |p| p.identifier.match(expected_partial) }, msg)
-          end
-        else
-          assert hax[:partials].empty?,
-            "Expected no partials to be rendered"
-        end
-      end
-    end
-  end
-end
diff --git a/actionpack/test/old_base/abstract_unit.rb b/actionpack/test/old_base/abstract_unit.rb
new file mode 100644
index 0000000000000..c71da7fa6caeb
--- /dev/null
+++ b/actionpack/test/old_base/abstract_unit.rb
@@ -0,0 +1,46 @@
+if ENV['new_base']
+  puts *caller
+  raise 'new_base/abstract_unit already loaded'
+end
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+$:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib')
+$:.unshift(File.dirname(__FILE__) + '/fixtures/helpers')
+$:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers')
+
+require 'rubygems'
+require 'yaml'
+require 'stringio'
+require 'test/unit'
+
+gem 'mocha', '>= 0.9.5'
+require 'mocha'
+
+begin
+  require 'ruby-debug'
+  Debugger.settings[:autoeval] = true
+  Debugger.start
+rescue LoadError
+  # Debugging disabled. `gem install ruby-debug` to enable.
+end
+
+require 'action_controller'
+require 'action_controller/testing/process'
+require 'action_view/test_case'
+
+$tags[:old_base] = true
+
+# Show backtraces for deprecated behavior for quicker cleanup.
+ActiveSupport::Deprecation.debug = true
+
+ActionController::Base.logger = nil
+ActionController::Routing::Routes.reload rescue nil
+
+ActionController::Base.session_store = nil
+
+# Register danish language for testing
+I18n.backend.store_translations 'da', {}
+I18n.backend.store_translations 'pt-BR', {}
+ORIGINAL_LOCALES = I18n.available_locales.map {|locale| locale.to_s }.sort
+
+FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures')
+ActionController::Base.view_paths = FIXTURE_LOAD_PATH