Merge commit 'rails/master'

35 files changed, 443 insertions, 2951 deletions

diff --git a/actionpack/lib/action_controller/abstract/layouts.rb b/actionpack/lib/action_controller/abstract/layouts.rb
index 9ff8e9beb1..2ac4e6068a 100644
--- a/actionpack/lib/action_controller/abstract/layouts.rb
+++ b/actionpack/lib/action_controller/abstract/layouts.rb
@@ -9,6 +9,11 @@ module AbstractController
     end
 
     module ClassMethods
+      def inherited(klass)
+        super
+        klass._write_layout_method
+      end
+
       # Specify the layout to use for this class.
       #
       # If the specified layout is a:
@@ -78,6 +83,7 @@ module AbstractController
             end
           ruby_eval
         end
+        self.class_eval { private :_layout }
       end
     end
 
diff --git a/actionpack/lib/action_controller/base/base.rb b/actionpack/lib/action_controller/base/base.rb
index 67369eb122..e541d24e31 100644
--- a/actionpack/lib/action_controller/base/base.rb
+++ b/actionpack/lib/action_controller/base/base.rb
@@ -1,884 +1,167 @@
-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
+    include ImplicitRender
 
-        assign_shortcuts(request, response)
-        initialize_template_class(response)
-        initialize_current_url
+    include ActionController::Rescue
 
-        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 self.inherited(klass)
+      ::ActionController::Base.subclasses << klass.to_s
+      super
+    end
 
-      def default_render #:nodoc:
-        render
-      end
+    def self.subclasses
+      @subclasses ||= []
+    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/base/chained/benchmarking.rb b/actionpack/lib/action_controller/base/chained/benchmarking.rb
deleted file mode 100644
index 57a1ac8314..0000000000
--- a/actionpack/lib/action_controller/base/chained/benchmarking.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-require 'active_support/core_ext/benchmark'
-
-module ActionController #:nodoc:
-  # The benchmarking module times the performance of actions and reports to the logger. If the Active Record
-  # package has been included, a separate timing section for database calls will be added as well.
-  module Benchmarking #:nodoc:
-    def self.included(base)
-      base.extend(ClassMethods)
-
-      base.class_eval do
-        alias_method_chain :perform_action, :benchmark
-        alias_method_chain :render, :benchmark
-      end
-    end
-
-    module ClassMethods
-      # Log and benchmark the workings of a single block and silence whatever logging that may have happened inside it 
-      # (unless <tt>use_silence</tt> is set to false).
-      #
-      # The benchmark is only recorded if the current level of the logger matches the <tt>log_level</tt>, which makes it
-      # easy to include benchmarking statements in production software that will remain inexpensive because the benchmark
-      # will only be conducted if the log level is low enough.
-      def benchmark(title, log_level = Logger::DEBUG, use_silence = true)
-        if logger && logger.level >= log_level
-          result = nil
-          ms = Benchmark.ms { result = use_silence ? silence { yield } : yield }
-          logger.add(log_level, "#{title} (#{('%.1f' % ms)}ms)")
-          result
-        else
-          yield
-        end
-      end
-
-      # Silences the logger for the duration of the block.
-      def silence
-        old_logger_level, logger.level = logger.level, Logger::ERROR if logger
-        yield
-      ensure
-        logger.level = old_logger_level if logger
-      end
-    end
-
-    protected
-      def render_with_benchmark(options = nil, extra_options = {}, &block)
-        if logger
-          if Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected?
-            db_runtime = ActiveRecord::Base.connection.reset_runtime
-          end
-
-          render_output = nil
-          @view_runtime = Benchmark.ms { render_output = render_without_benchmark(options, extra_options, &block) }
-
-          if Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected?
-            @db_rt_before_render = db_runtime
-            @db_rt_after_render = ActiveRecord::Base.connection.reset_runtime
-            @view_runtime -= @db_rt_after_render
-          end
-
-          render_output
-        else
-          render_without_benchmark(options, extra_options, &block)
-        end
-      end    
-
-    private
-      def perform_action_with_benchmark
-        if logger && logger.info?
-          ms = [Benchmark.ms { perform_action_without_benchmark }, 0.01].max
-          logging_view          = defined?(@view_runtime)
-          logging_active_record = Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected?
-
-          log_message  = 'Completed in %.0fms' % ms
-
-          if logging_view || logging_active_record
-            log_message << " ("
-            log_message << view_runtime if logging_view
-
-            if logging_active_record
-              log_message << ", " if logging_view
-              log_message << active_record_runtime + ")"
-            else
-              ")"
-            end
-          end
-
-          log_message << " | #{response.status}"
-          log_message << " [#{complete_request_uri rescue "unknown"}]"
-
-          logger.info(log_message)
-          response.headers["X-Runtime"] = "%.0f" % ms
-        else
-          perform_action_without_benchmark
-        end
-      end
-
-      def view_runtime
-        "View: %.0f" % @view_runtime
-      end
-
-      def active_record_runtime
-        db_runtime = ActiveRecord::Base.connection.reset_runtime
-        db_runtime += @db_rt_before_render if @db_rt_before_render
-        db_runtime += @db_rt_after_render if @db_rt_after_render
-        "DB: %.0f" % db_runtime
-      end
-  end
-end
diff --git a/actionpack/lib/action_controller/base/chained/filters.rb b/actionpack/lib/action_controller/base/chained/filters.rb
deleted file mode 100644
index f528dd0686..0000000000
--- a/actionpack/lib/action_controller/base/chained/filters.rb
+++ /dev/null
@@ -1,670 +0,0 @@
-module ActionController #:nodoc:
-  module Filters #:nodoc:
-    extend ActiveSupport::Concern
-
-    class FilterChain < ActiveSupport::Callbacks::CallbackChain #:nodoc:
-      def append_filter_to_chain(filters, filter_type, &block)
-        pos = find_filter_append_position(filters, filter_type)
-        update_filter_chain(filters, filter_type, pos, &block)
-      end
-
-      def prepend_filter_to_chain(filters, filter_type, &block)
-        pos = find_filter_prepend_position(filters, filter_type)
-        update_filter_chain(filters, filter_type, pos, &block)
-      end
-
-      def create_filters(filters, filter_type, &block)
-        filters, conditions = extract_options(filters, &block)
-        filters.map! { |filter| find_or_create_filter(filter, filter_type, conditions) }
-        filters
-      end
-
-      def skip_filter_in_chain(*filters, &test)
-        filters, conditions = extract_options(filters)
-        filters.each do |filter|
-          if callback = find(filter) then delete(callback) end
-        end if conditions.empty?
-        update_filter_in_chain(filters, :skip => conditions, &test)
-      end
-
-      private
-        def update_filter_chain(filters, filter_type, pos, &block)
-          new_filters = create_filters(filters, filter_type, &block)
-          insert(pos, new_filters).flatten!
-        end
-
-        def find_filter_append_position(filters, filter_type)
-          # appending an after filter puts it at the end of the call chain
-          # before and around filters go before the first after filter in the chain
-          unless filter_type == :after
-            each_with_index do |f,i|
-              return i if f.after?
-            end
-          end
-          return -1
-        end
-
-        def find_filter_prepend_position(filters, filter_type)
-          # prepending a before or around filter puts it at the front of the call chain
-          # after filters go before the first after filter in the chain
-          if filter_type == :after
-            each_with_index do |f,i|
-              return i if f.after?
-            end
-            return -1
-          end
-          return 0
-        end
-
-        def find_or_create_filter(filter, filter_type, options = {})
-          update_filter_in_chain([filter], options)
-
-          if found_filter = find(filter) { |f| f.type == filter_type }
-            found_filter
-          else
-            filter_kind = case
-            when filter.respond_to?(:before) && filter_type == :before
-              :before
-            when filter.respond_to?(:after) && filter_type == :after
-              :after
-            else
-              :filter
-            end
-
-            case filter_type
-            when :before
-              BeforeFilter.new(filter_kind, filter, options)
-            when :after
-              AfterFilter.new(filter_kind, filter, options)
-            else
-              AroundFilter.new(filter_kind, filter, options)
-            end
-          end
-        end
-
-        def update_filter_in_chain(filters, options, &test)
-          filters.map! { |f| block_given? ? find(f, &test) : find(f) }
-          filters.compact!
-
-          map! do |filter|
-            if filters.include?(filter)
-              new_filter = filter.dup
-              new_filter.update_options!(options)
-              new_filter
-            else
-              filter
-            end
-          end
-        end
-    end
-
-    class Filter < ActiveSupport::Callbacks::Callback #:nodoc:
-      def initialize(kind, method, options = {})
-        super
-        update_options! options
-      end
-
-      # override these to return true in appropriate subclass
-      def before?
-        false
-      end
-
-      def after?
-        false
-      end
-
-      def around?
-        false
-      end
-
-      # Make sets of strings from :only/:except options
-      def update_options!(other)
-        if other
-          convert_only_and_except_options_to_sets_of_strings(other)
-          if other[:skip]
-            convert_only_and_except_options_to_sets_of_strings(other[:skip])
-          end
-        end
-
-        options.update(other)
-      end
-
-      private
-        def should_not_skip?(controller)
-          if options[:skip]
-            !included_in_action?(controller, options[:skip])
-          else
-            true
-          end
-        end
-
-        def included_in_action?(controller, options)
-          if options[:only]
-            options[:only].include?(controller.action_name)
-          elsif options[:except]
-            !options[:except].include?(controller.action_name)
-          else
-            true
-          end
-        end
-
-        def should_run_callback?(controller)
-          should_not_skip?(controller) && included_in_action?(controller, options) && super
-        end
-
-        def convert_only_and_except_options_to_sets_of_strings(opts)
-          [:only, :except].each do |key|
-            if values = opts[key]
-              opts[key] = Array(values).map {|val| val.to_s }.to_set
-            end
-          end
-        end
-    end
-
-    class AroundFilter < Filter #:nodoc:
-      def type
-        :around
-      end
-
-      def around?
-        true
-      end
-
-      def call(controller, &block)
-        if should_run_callback?(controller)
-          method = filter_responds_to_before_and_after? ? around_proc : self.method
-
-          # For around_filter do |controller, action|
-          if method.is_a?(Proc) && method.arity == 2
-            evaluate_method(method, controller, block)
-          else
-            evaluate_method(method, controller, &block)
-          end
-        else
-          block.call
-        end
-      end
-
-      private
-        def filter_responds_to_before_and_after?
-          method.respond_to?(:before) && method.respond_to?(:after)
-        end
-
-        def around_proc
-          Proc.new do |controller, action|
-            method.before(controller)
-
-            if controller.__send__(:performed?)
-              controller.__send__(:halt_filter_chain, method, :rendered_or_redirected)
-            else
-              begin
-                action.call
-              ensure
-                method.after(controller)
-              end
-            end
-          end
-        end
-    end
-
-    class BeforeFilter < Filter #:nodoc:
-      def type
-        :before
-      end
-
-      def before?
-        true
-      end
-
-      def call(controller, &block)
-        super
-        if controller.__send__(:performed?)
-          controller.__send__(:halt_filter_chain, method, :rendered_or_redirected)
-        end
-      end
-    end
-
-    class AfterFilter < Filter #:nodoc:
-      def type
-        :after
-      end
-
-      def after?
-        true
-      end
-    end
-
-    # Filters enable controllers to run shared pre- and post-processing code for its actions. These filters can be used to do
-    # authentication, caching, or auditing before the intended action is performed. Or to do localization or output
-    # compression after the action has been performed. Filters have access to the request, response, and all the instance
-    # variables set by other filters in the chain or by the action (in the case of after filters).
-    #
-    # == Filter inheritance
-    #
-    # Controller inheritance hierarchies share filters downwards, but subclasses can also add or skip filters without
-    # affecting the superclass. For example:
-    #
-    #   class BankController < ActionController::Base
-    #     before_filter :audit
-    #
-    #     private
-    #       def audit
-    #         # record the action and parameters in an audit log
-    #       end
-    #   end
-    #
-    #   class VaultController < BankController
-    #     before_filter :verify_credentials
-    #
-    #     private
-    #       def verify_credentials
-    #         # make sure the user is allowed into the vault
-    #       end
-    #   end
-    #
-    # Now any actions performed on the BankController will have the audit method called before. On the VaultController,
-    # first the audit method is called, then the verify_credentials method. If the audit method renders or redirects, then
-    # verify_credentials and the intended action are never called.
-    #
-    # == Filter types
-    #
-    # A filter can take one of three forms: method reference (symbol), external class, or inline method (proc). The first
-    # is the most common and works by referencing a protected or private method somewhere in the inheritance hierarchy of
-    # the controller by use of a symbol. In the bank example above, both BankController and VaultController use this form.
-    #
-    # Using an external class makes for more easily reused generic filters, such as output compression. External filter classes
-    # are implemented by having a static +filter+ method on any class and then passing this class to the filter method. Example:
-    #
-    #   class OutputCompressionFilter
-    #     def self.filter(controller)
-    #       controller.response.body = compress(controller.response.body)
-    #     end
-    #   end
-    #
-    #   class NewspaperController < ActionController::Base
-    #     after_filter OutputCompressionFilter
-    #   end
-    #
-    # The filter method is passed the controller instance and is hence granted access to all aspects of the controller and can
-    # manipulate them as it sees fit.
-    #
-    # The inline method (using a proc) can be used to quickly do something small that doesn't require a lot of explanation.
-    # Or just as a quick test. It works like this:
-    #
-    #   class WeblogController < ActionController::Base
-    #     before_filter { |controller| head(400) if controller.params["stop_action"] }
-    #   end
-    #
-    # As you can see, the block expects to be passed the controller after it has assigned the request to the internal variables.
-    # This means that the block has access to both the request and response objects complete with convenience methods for params,
-    # session, template, and assigns. Note: The inline method doesn't strictly have to be a block; any object that responds to call
-    # and returns 1 or -1 on arity will do (such as a Proc or an Method object).
-    #
-    # Please note that around_filters function a little differently than the normal before and after filters with regard to filter
-    # types. Please see the section dedicated to around_filters below.
-    #
-    # == Filter chain ordering
-    #
-    # Using <tt>before_filter</tt> and <tt>after_filter</tt> appends the specified filters to the existing chain. That's usually
-    # just fine, but some times you care more about the order in which the filters are executed. When that's the case, you
-    # can use <tt>prepend_before_filter</tt> and <tt>prepend_after_filter</tt>. Filters added by these methods will be put at the
-    # beginning of their respective chain and executed before the rest. For example:
-    #
-    #   class ShoppingController < ActionController::Base
-    #     before_filter :verify_open_shop
-    #
-    #   class CheckoutController < ShoppingController
-    #     prepend_before_filter :ensure_items_in_cart, :ensure_items_in_stock
-    #
-    # The filter chain for the CheckoutController is now <tt>:ensure_items_in_cart, :ensure_items_in_stock,</tt>
-    # <tt>:verify_open_shop</tt>. So if either of the ensure filters renders or redirects, we'll never get around to see if the shop
-    # is open or not.
-    #
-    # You may pass multiple filter arguments of each type as well as a filter block.
-    # If a block is given, it is treated as the last argument.
-    #
-    # == Around filters
-    #
-    # Around filters wrap an action, executing code both before and after.
-    # They may be declared as method references, blocks, or objects responding
-    # to +filter+ or to both +before+ and +after+.
-    #
-    # To use a method as an +around_filter+, pass a symbol naming the Ruby method.
-    # Yield (or <tt>block.call</tt>) within the method to run the action.
-    #
-    #   around_filter :catch_exceptions
-    #
-    #   private
-    #     def catch_exceptions
-    #       yield
-    #     rescue => exception
-    #       logger.debug "Caught exception! #{exception}"
-    #       raise
-    #     end
-    #
-    # To use a block as an +around_filter+, pass a block taking as args both
-    # the controller and the action block. You can't call yield directly from
-    # an +around_filter+ block; explicitly call the action block instead:
-    #
-    #   around_filter do |controller, action|
-    #     logger.debug "before #{controller.action_name}"
-    #     action.call
-    #     logger.debug "after #{controller.action_name}"
-    #   end
-    #
-    # To use a filter object with +around_filter+, pass an object responding
-    # to <tt>:filter</tt> or both <tt>:before</tt> and <tt>:after</tt>. With a
-    # filter method, yield to the block as above:
-    #
-    #   around_filter BenchmarkingFilter
-    #
-    #   class BenchmarkingFilter
-    #     def self.filter(controller, &block)
-    #       Benchmark.measure(&block)
-    #     end
-    #   end
-    #
-    # With +before+ and +after+ methods:
-    #
-    #   around_filter Authorizer.new
-    #
-    #   class Authorizer
-    #     # This will run before the action. Redirecting aborts the action.
-    #     def before(controller)
-    #       unless user.authorized?
-    #         redirect_to(login_url)
-    #       end
-    #     end
-    #
-    #     # This will run after the action if and only if before did not render or redirect.
-    #     def after(controller)
-    #     end
-    #   end
-    #
-    # If the filter has +before+ and +after+ methods, the +before+ method will be
-    # called before the action. If +before+ renders or redirects, the filter chain is
-    # halted and +after+ will not be run. See Filter Chain Halting below for
-    # an example.
-    #
-    # == Filter chain skipping
-    #
-    # Declaring a filter on a base class conveniently applies to its subclasses,
-    # but sometimes a subclass should skip some of its superclass' filters:
-    #
-    #   class ApplicationController < ActionController::Base
-    #     before_filter :authenticate
-    #     around_filter :catch_exceptions
-    #   end
-    #
-    #   class WeblogController < ApplicationController
-    #     # Will run the :authenticate and :catch_exceptions filters.
-    #   end
-    #
-    #   class SignupController < ApplicationController
-    #     # Skip :authenticate, run :catch_exceptions.
-    #     skip_before_filter :authenticate
-    #   end
-    #
-    #   class ProjectsController < ApplicationController
-    #     # Skip :catch_exceptions, run :authenticate.
-    #     skip_filter :catch_exceptions
-    #   end
-    #
-    #   class ClientsController < ApplicationController
-    #     # Skip :catch_exceptions and :authenticate unless action is index.
-    #     skip_filter :catch_exceptions, :authenticate, :except => :index
-    #   end
-    #
-    # == Filter conditions
-    #
-    # Filters may be limited to specific actions by declaring the actions to
-    # include or exclude. Both options accept single actions
-    # (<tt>:only => :index</tt>) or arrays of actions
-    # (<tt>:except => [:foo, :bar]</tt>).
-    #
-    #   class Journal < ActionController::Base
-    #     # Require authentication for edit and delete.
-    #     before_filter :authorize, :only => [:edit, :delete]
-    #
-    #     # Passing options to a filter with a block.
-    #     around_filter(:except => :index) do |controller, action_block|
-    #       results = Profiler.run(&action_block)
-    #       controller.response.sub! "</body>", "#{results}</body>"
-    #     end
-    #
-    #     private
-    #       def authorize
-    #         # Redirect to login unless authenticated.
-    #       end
-    #   end
-    #
-    # == Filter Chain Halting
-    #
-    # <tt>before_filter</tt> and <tt>around_filter</tt> may halt the request
-    # before a controller action is run. This is useful, for example, to deny
-    # access to unauthenticated users or to redirect from HTTP to HTTPS.
-    # Simply call render or redirect. After filters will not be executed if the filter 
-    # chain is halted.
-    #
-    # Around filters halt the request unless the action block is called.
-    # Given these filters
-    #   after_filter :after
-    #   around_filter :around
-    #   before_filter :before
-    #
-    # The filter chain will look like:
-    #
-    #   ...
-    #   . \
-    #   .  #around (code before yield)
-    #   .  .  \
-    #   .  .  #before (actual filter code is run)
-    #   .  .  .  \
-    #   .  .  .  execute controller action
-    #   .  .  .  /
-    #   .  .  ...
-    #   .  .  /
-    #   .  #around (code after yield)
-    #   . /
-    #   #after (actual filter code is run, unless the around filter does not yield)
-    #
-    # If +around+ returns before yielding, +after+ will still not be run. The +before+
-    # filter and controller action will not be run. If +before+ renders or redirects,
-    # the second half of +around+ and will still run but +after+ and the
-    # action will not. If +around+ fails to yield, +after+ will not be run.
-    module ClassMethods
-      # The passed <tt>filters</tt> will be appended to the filter_chain and
-      # will execute before the action on this controller is performed.
-      def append_before_filter(*filters, &block)
-        filter_chain.append_filter_to_chain(filters, :before, &block)
-      end
-
-      # The passed <tt>filters</tt> will be prepended to the filter_chain and
-      # will execute before the action on this controller is performed.
-      def prepend_before_filter(*filters, &block)
-        filter_chain.prepend_filter_to_chain(filters, :before, &block)
-      end
-
-      # Shorthand for append_before_filter since it's the most common.
-      alias :before_filter :append_before_filter
-
-      # The passed <tt>filters</tt> will be appended to the array of filters
-      # that run _after_ actions on this controller are performed.
-      def append_after_filter(*filters, &block)
-        filter_chain.append_filter_to_chain(filters, :after, &block)
-      end
-
-      # The passed <tt>filters</tt> will be prepended to the array of filters
-      # that run _after_ actions on this controller are performed.
-      def prepend_after_filter(*filters, &block)
-        filter_chain.prepend_filter_to_chain(filters, :after, &block)
-      end
-
-      # Shorthand for append_after_filter since it's the most common.
-      alias :after_filter :append_after_filter
-
-      # If you <tt>append_around_filter A.new, B.new</tt>, the filter chain looks like
-      #
-      #   B#before
-      #     A#before
-      #       # run the action
-      #     A#after
-      #   B#after
-      #
-      # With around filters which yield to the action block, +before+ and +after+
-      # are the code before and after the yield.
-      def append_around_filter(*filters, &block)
-        filter_chain.append_filter_to_chain(filters, :around, &block)
-      end
-
-      # If you <tt>prepend_around_filter A.new, B.new</tt>, the filter chain looks like:
-      #
-      #   A#before
-      #     B#before
-      #       # run the action
-      #     B#after
-      #   A#after
-      #
-      # With around filters which yield to the action block, +before+ and +after+
-      # are the code before and after the yield.
-      def prepend_around_filter(*filters, &block)
-        filter_chain.prepend_filter_to_chain(filters, :around, &block)
-      end
-
-      # Shorthand for +append_around_filter+ since it's the most common.
-      alias :around_filter :append_around_filter
-
-      # Removes the specified filters from the +before+ filter chain. Note that this only works for skipping method-reference
-      # filters, not procs. This is especially useful for managing the chain in inheritance hierarchies where only one out
-      # of many sub-controllers need a different hierarchy.
-      #
-      # You can control the actions to skip the filter for with the <tt>:only</tt> and <tt>:except</tt> options,
-      # just like when you apply the filters.
-      def skip_before_filter(*filters)
-        filter_chain.skip_filter_in_chain(*filters, &:before?)
-      end
-
-      # Removes the specified filters from the +after+ filter chain. Note that this only works for skipping method-reference
-      # filters, not procs. This is especially useful for managing the chain in inheritance hierarchies where only one out
-      # of many sub-controllers need a different hierarchy.
-      #
-      # You can control the actions to skip the filter for with the <tt>:only</tt> and <tt>:except</tt> options,
-      # just like when you apply the filters.
-      def skip_after_filter(*filters)
-        filter_chain.skip_filter_in_chain(*filters, &:after?)
-      end
-
-      # Removes the specified filters from the filter chain. This only works for method reference (symbol)
-      # filters, not procs. This method is different from skip_after_filter and skip_before_filter in that
-      # it will match any before, after or yielding around filter.
-      #
-      # You can control the actions to skip the filter for with the <tt>:only</tt> and <tt>:except</tt> options,
-      # just like when you apply the filters.
-      def skip_filter(*filters)
-        filter_chain.skip_filter_in_chain(*filters)
-      end
-
-      # Returns an array of Filter objects for this controller.
-      def filter_chain
-        read_inheritable_attribute('filter_chain') || write_inheritable_attribute('filter_chain', FilterChain.new)
-      end
-
-      # Returns all the before filters for this class and all its ancestors.
-      # This method returns the actual filter that was assigned in the controller to maintain existing functionality.
-      def before_filters #:nodoc:
-        filter_chain.select(&:before?).map(&:method)
-      end
-
-      # Returns all the after filters for this class and all its ancestors.
-      # This method returns the actual filter that was assigned in the controller to maintain existing functionality.
-      def after_filters #:nodoc:
-        filter_chain.select(&:after?).map(&:method)
-      end
-    end
-
-    module InstanceMethods # :nodoc:
-      def self.included(base)
-        base.class_eval do
-          alias_method_chain :perform_action, :filters
-          alias_method_chain :process, :filters
-        end
-      end
-
-      protected
-        def process_with_filters(request, response, method = :perform_action, *arguments) #:nodoc:
-          @before_filter_chain_aborted = false
-          process_without_filters(request, response, method, *arguments)
-        end
-
-        def perform_action_with_filters
-          call_filters(self.class.filter_chain, 0, 0)
-        end
-
-      private
-        def call_filters(chain, index, nesting)
-          index = run_before_filters(chain, index, nesting)
-          aborted = @before_filter_chain_aborted
-          perform_action_without_filters unless performed? || aborted
-          return index if nesting != 0 || aborted
-          run_after_filters(chain, index)
-        end
-
-        def run_before_filters(chain, index, nesting)
-          while chain[index]
-            filter, index = chain[index], index
-            break unless filter # end of call chain reached
-
-            case filter
-            when BeforeFilter
-              filter.call(self)  # invoke before filter
-              index = index.next
-              break if @before_filter_chain_aborted
-            when AroundFilter
-              yielded = false
-
-              filter.call(self) do
-                yielded = true
-                # all remaining before and around filters will be run in this call
-                index = call_filters(chain, index.next, nesting.next)
-              end
-
-              halt_filter_chain(filter, :did_not_yield) unless yielded
-
-              break
-            else
-              break  # no before or around filters left
-            end
-          end
-
-          index
-        end
-
-        def run_after_filters(chain, index)
-          seen_after_filter = false
-
-          while chain[index]
-            filter, index = chain[index], index
-            break unless filter # end of call chain reached
-
-            case filter
-            when AfterFilter
-              seen_after_filter = true
-              filter.call(self)  # invoke after filter
-            else
-              # implementation error or someone has mucked with the filter chain
-              raise ActionControllerError, "filter #{filter.inspect} was in the wrong place!" if seen_after_filter
-            end
-
-            index = index.next
-          end
-
-          index.next
-        end
-
-        def halt_filter_chain(filter, reason)
-          @before_filter_chain_aborted = true
-          logger.info "Filter chain halted as [#{filter.inspect}] #{reason}." if logger
-        end
-    end
-  end
-end
diff --git a/actionpack/lib/action_controller/new_base/compatibility.rb b/actionpack/lib/action_controller/base/compatibility.rb
index 29ba43a879..29ba43a879 100644
--- a/actionpack/lib/action_controller/new_base/compatibility.rb
+++ b/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
index d287ec4994..d287ec4994 100644
--- a/actionpack/lib/action_controller/new_base/conditional_get.rb
+++ b/actionpack/lib/action_controller/base/conditional_get.rb
diff --git a/actionpack/lib/action_controller/base/exceptions.rb b/actionpack/lib/action_controller/base/exceptions.rb
new file mode 100644
index 0000000000..d0811254cb
--- /dev/null
+++ b/actionpack/lib/action_controller/base/exceptions.rb
@@ -0,0 +1,58 @@
+module ActionController
+  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
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_controller/base/chained/flash.rb b/actionpack/lib/action_controller/base/flash.rb
index 42c6e430ca..42c6e430ca 100644
--- a/actionpack/lib/action_controller/base/chained/flash.rb
+++ b/actionpack/lib/action_controller/base/flash.rb
diff --git a/actionpack/lib/action_controller/base/helpers.rb b/actionpack/lib/action_controller/base/helpers.rb
index f74158bc13..2fa5ea6519 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 @@ module ActionController #: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 @@ module ActionController #:nodoc:
       # 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
index af68c772b1..af68c772b1 100644
--- a/actionpack/lib/action_controller/new_base/hide_actions.rb
+++ b/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
index 2e73561f93..2e73561f93 100644
--- a/actionpack/lib/action_controller/new_base/http.rb
+++ b/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
index ace4b148c9..ace4b148c9 100644
--- a/actionpack/lib/action_controller/new_base/layouts.rb
+++ b/actionpack/lib/action_controller/base/layouts.rb
diff --git a/actionpack/lib/action_controller/base/mime_responds.rb b/actionpack/lib/action_controller/base/mime_responds.rb
index 3c17dda1a1..5c7218691e 100644
--- a/actionpack/lib/action_controller/base/mime_responds.rb
+++ b/actionpack/lib/action_controller/base/mime_responds.rb
@@ -125,7 +125,7 @@ module ActionController #:nodoc:
           end
 
           @controller.template.formats = [mime_type.to_sym]
-          @response.content_type = mime_type.to_s
+          @response.content_type = mime_type
 
           block_given? ? block.call : @controller.send(:render, :action => @controller.action_name)
         end
diff --git a/actionpack/lib/action_controller/new_base/rack_convenience.rb b/actionpack/lib/action_controller/base/rack_convenience.rb
index 5dfa7d12f3..805157b0e3 100644
--- a/actionpack/lib/action_controller/new_base/rack_convenience.rb
+++ b/actionpack/lib/action_controller/base/rack_convenience.rb
@@ -3,7 +3,7 @@ module ActionController
     extend ActiveSupport::Concern
 
     included do
-      delegate :headers, :status=, :location=,
+      delegate :headers, :status=, :location=, :content_type=,
                :status, :location, :content_type, :to => "@_response"
       attr_internal :request, :response
     end
diff --git a/actionpack/lib/action_controller/base/redirect.rb b/actionpack/lib/action_controller/base/redirect.rb
deleted file mode 100644
index 7e10f614e2..0000000000
--- a/actionpack/lib/action_controller/base/redirect.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-module ActionController
-  class RedirectBackError < ActionControllerError #:nodoc:
-    DEFAULT_MESSAGE = 'No HTTP_REFERER was set in the request to this action, so redirect_to :back could not be called successfully. If this is a test, make sure to specify request.env["HTTP_REFERER"].'
-
-    def initialize(message = nil)
-      super(message || DEFAULT_MESSAGE)
-    end
-  end
-  
-  module Redirector
-
-    # 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?
-
-      if options.is_a?(Hash) && options[:status]
-        status = options.delete(:status)
-      elsif response_status[:status]
-        status = response_status[:status]
-      else
-        status = 302
-      end
-
-      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+.-]*:.*}
-          redirect_to_full_url(options, status)
-        when String
-          redirect_to_full_url(request.protocol + request.host_with_port + options, status)
-        when :back
-          if referer = request.headers["Referer"]
-            redirect_to(referer, :status=>status)
-          else
-            raise RedirectBackError
-          end
-        else
-          redirect_to_full_url(url_for(options), status)
-      end
-    end
-
-    def redirect_to_full_url(url, status)
-      raise DoubleRenderError if performed?
-      logger.info("Redirected to #{url}") if logger && logger.info?
-      response.status = interpret_status(status)
-      response.location = url.gsub(/[\r\n]/, '')
-      response.body = "<html><body>You are being <a href=\"#{CGI.escapeHTML(url)}\">redirected</a>.</body></html>"      
-      @performed_redirect = true
-    end
-    
-    # Clears the redirected results from the headers, resets the status to 200 and returns
-    # the URL that was used to redirect or nil if there was no redirected URL
-    # Note that +redirect_to+ will change the body of the response to indicate a redirection.
-    # The response body is not reset here, see +erase_render_results+
-    def erase_redirect_results #:nodoc:
-      @performed_redirect = false
-      response.status = DEFAULT_RENDER_STATUS_CODE
-      response.headers.delete('Location')
-    end
-  end
-end
\ No newline at end of file
diff --git a/actionpack/lib/action_controller/new_base/redirector.rb b/actionpack/lib/action_controller/base/redirector.rb
index 20060b001f..20060b001f 100644
--- a/actionpack/lib/action_controller/new_base/redirector.rb
+++ b/actionpack/lib/action_controller/base/redirector.rb
diff --git a/actionpack/lib/action_controller/base/render.rb b/actionpack/lib/action_controller/base/render.rb
deleted file mode 100644
index cc0d878e01..0000000000
--- a/actionpack/lib/action_controller/base/render.rb
+++ /dev/null
@@ -1,403 +0,0 @@
-require 'action_controller/abstract/renderer'
-
-module ActionController
-  DEFAULT_RENDER_STATUS_CODE = "200 OK"
-  
-  class DoubleRenderError < ActionControllerError #:nodoc:
-    DEFAULT_MESSAGE = "Render and/or redirect were called multiple times in this action. Please note that you may only call render OR redirect, and at most once per action. Also note that neither redirect nor render terminate execution of the action, so if you want to exit an action after redirecting, you need to do something like \"redirect_to(...) and return\"."
-
-    def initialize(message = nil)
-      super(message || DEFAULT_MESSAGE)
-    end
-  end
-  
-  module Renderer
-    
-    protected
-    # Renders the content that will be returned to the browser as the response body.
-    #
-    # === Rendering an action
-    #
-    # Action rendering is the most common form and the type used automatically by Action Controller when nothing else is
-    # specified. By default, actions are rendered within the current layout (if one exists).
-    #
-    #   # Renders the template for the action "goal" within the current controller
-    #   render :action => "goal"
-    #
-    #   # Renders the template for the action "short_goal" within the current controller,
-    #   # but without the current active layout
-    #   render :action => "short_goal", :layout => false
-    #
-    #   # Renders the template for the action "long_goal" within the current controller,
-    #   # but with a custom layout
-    #   render :action => "long_goal", :layout => "spectacular"
-    #
-    # === Rendering partials
-    #
-    # Partial rendering in a controller is most commonly used together with Ajax calls that only update one or a few elements on a page
-    # without reloading. Rendering of partials from the controller makes it possible to use the same partial template in
-    # both the full-page rendering (by calling it from within the template) and when sub-page updates happen (from the
-    # controller action responding to Ajax calls). By default, the current layout is not used.
-    #
-    #   # Renders the same partial with a local variable.
-    #   render :partial => "person", :locals => { :name => "david" }
-    #
-    #   # Renders the partial, making @new_person available through
-    #   # the local variable 'person'
-    #   render :partial => "person", :object => @new_person
-    #
-    #   # Renders a collection of the same partial by making each element
-    #   # of @winners available through the local variable "person" as it
-    #   # builds the complete response.
-    #   render :partial => "person", :collection => @winners
-    #
-    #   # Renders a collection of partials but with a custom local variable name
-    #   render :partial => "admin_person", :collection => @winners, :as => :person
-    #
-    #   # Renders the same collection of partials, but also renders the
-    #   # person_divider partial between each person partial.
-    #   render :partial => "person", :collection => @winners, :spacer_template => "person_divider"
-    #
-    #   # Renders a collection of partials located in a view subfolder
-    #   # outside of our current controller.  In this example we will be
-    #   # rendering app/views/shared/_note.r(html|xml)  Inside the partial
-    #   # each element of @new_notes is available as the local var "note".
-    #   render :partial => "shared/note", :collection => @new_notes
-    #
-    #   # Renders the partial with a status code of 500 (internal error).
-    #   render :partial => "broken", :status => 500
-    #
-    # Note that the partial filename must also be a valid Ruby variable name,
-    # so e.g. 2005 and register-user are invalid.
-    #
-    #
-    # == Automatic etagging
-    #
-    # Rendering will automatically insert the etag header on 200 OK responses. The etag is calculated using MD5 of the
-    # response body. If a request comes in that has a matching etag, the response will be changed to a 304 Not Modified
-    # and the response body will be set to an empty string. No etag header will be inserted if it's already set.
-    #
-    # === Rendering a template
-    #
-    # Template rendering works just like action rendering except that it takes a path relative to the template root.
-    # The current layout is automatically applied.
-    #
-    #   # Renders the template located in [TEMPLATE_ROOT]/weblog/show.r(html|xml) (in Rails, app/views/weblog/show.erb)
-    #   render :template => "weblog/show"
-    #
-    #   # Renders the template with a local variable
-    #   render :template => "weblog/show", :locals => {:customer => Customer.new}
-    #
-    # === Rendering a file
-    #
-    # File rendering works just like action rendering except that it takes a filesystem path. By default, the path
-    # is assumed to be absolute, and the current layout is not applied.
-    #
-    #   # Renders the template located at the absolute filesystem path
-    #   render :file => "/path/to/some/template.erb"
-    #   render :file => "c:/path/to/some/template.erb"
-    #
-    #   # Renders a template within the current layout, and with a 404 status code
-    #   render :file => "/path/to/some/template.erb", :layout => true, :status => 404
-    #   render :file => "c:/path/to/some/template.erb", :layout => true, :status => 404
-    #
-    # === Rendering text
-    #
-    # Rendering of text is usually used for tests or for rendering prepared content, such as a cache. By default, text
-    # rendering is not done within the active layout.
-    #
-    #   # Renders the clear text "hello world" with status code 200
-    #   render :text => "hello world!"
-    #
-    #   # Renders the clear text "Explosion!"  with status code 500
-    #   render :text => "Explosion!", :status => 500
-    #
-    #   # Renders the clear text "Hi there!" within the current active layout (if one exists)
-    #   render :text => "Hi there!", :layout => true
-    #
-    #   # Renders the clear text "Hi there!" within the layout
-    #   # placed in "app/views/layouts/special.r(html|xml)"
-    #   render :text => "Hi there!", :layout => "special"
-    #
-    # The <tt>:text</tt> option can also accept a Proc object, which can be used to manually control the page generation. This should
-    # generally be avoided, as it violates the separation between code and content, and because almost everything that can be
-    # done with this method can also be done more cleanly using one of the other rendering methods, most notably templates.
-    #
-    #   # Renders "Hello from code!"
-    #   render :text => proc { |response, output| output.write("Hello from code!") }
-    #
-    # === Rendering XML
-    #
-    # Rendering XML sets the content type to application/xml.
-    #
-    #   # Renders '<name>David</name>'
-    #   render :xml => {:name => "David"}.to_xml
-    #
-    # It's not necessary to call <tt>to_xml</tt> on the object you want to render, since <tt>render</tt> will
-    # automatically do that for you:
-    #
-    #   # Also renders '<name>David</name>'
-    #   render :xml => {:name => "David"}
-    #
-    # === Rendering JSON
-    #
-    # Rendering JSON sets the content type to application/json and optionally wraps the JSON in a callback. It is expected
-    # that the response will be parsed (or eval'd) for use as a data structure.
-    #
-    #   # Renders '{"name": "David"}'
-    #   render :json => {:name => "David"}.to_json
-    #
-    # It's not necessary to call <tt>to_json</tt> on the object you want to render, since <tt>render</tt> will
-    # automatically do that for you:
-    #
-    #   # Also renders '{"name": "David"}'
-    #   render :json => {:name => "David"}
-    #
-    # Sometimes the result isn't handled directly by a script (such as when the request comes from a SCRIPT tag),
-    # so the <tt>:callback</tt> option is provided for these cases.
-    #
-    #   # Renders 'show({"name": "David"})'
-    #   render :json => {:name => "David"}.to_json, :callback => 'show'
-    #
-    # === Rendering an inline template
-    #
-    # Rendering of an inline template works as a cross between text and action rendering where the source for the template
-    # is supplied inline, like text, but its interpreted with ERb or Builder, like action. By default, ERb is used for rendering
-    # and the current layout is not used.
-    #
-    #   # Renders "hello, hello, hello, again"
-    #   render :inline => "<%= 'hello, ' * 3 + 'again' %>"
-    #
-    #   # Renders "<p>Good seeing you!</p>" using Builder
-    #   render :inline => "xml.p { 'Good seeing you!' }", :type => :builder
-    #
-    #   # Renders "hello david"
-    #   render :inline => "<%= 'hello ' + name %>", :locals => { :name => "david" }
-    #
-    # === Rendering inline JavaScriptGenerator page updates
-    #
-    # In addition to rendering JavaScriptGenerator page updates with Ajax in RJS templates (see ActionView::Base for details),
-    # you can also pass the <tt>:update</tt> parameter to +render+, along with a block, to render page updates inline.
-    #
-    #   render :update do |page|
-    #     page.replace_html  'user_list', :partial => 'user', :collection => @users
-    #     page.visual_effect :highlight, 'user_list'
-    #   end
-    #
-    # === Rendering vanilla JavaScript
-    #
-    # In addition to using RJS with render :update, you can also just render vanilla JavaScript with :js.
-    #
-    #   # Renders "alert('hello')" and sets the mime type to text/javascript
-    #   render :js => "alert('hello')"
-    #
-    # === Rendering with status and location headers
-    # All renders take the <tt>:status</tt> and <tt>:location</tt> options and turn them into headers. They can even be used together:
-    #
-    #   render :xml => post.to_xml, :status => :created, :location => post_url(post)
-    def render(options = nil, extra_options = {}, &block) #:doc:
-      raise DoubleRenderError, "Can only render or redirect once per action" if performed?
-
-      options = { :layout => true } if options.nil?
-
-      # This handles render "string", render :symbol, and render object
-      # render string and symbol are handled by render_for_name
-      # render object becomes render :partial => object
-      unless options.is_a?(Hash)
-        if options.is_a?(String) || options.is_a?(Symbol)
-          original, options = options, extra_options
-        else
-          extra_options[:partial], options = options, extra_options
-        end
-      end
-      
-      layout_name = options.delete(:layout)
-
-      _process_options(options)
-      
-      if block_given?
-        @template.send(:_evaluate_assigns_and_ivars)
-
-        generator = ActionView::Helpers::PrototypeHelper::JavaScriptGenerator.new(@template, &block)
-        response.content_type = Mime::JS
-        return render_for_text(generator.to_s)
-      end
-      
-      if original
-        return render_for_name(original, layout_name, options) unless block_given?
-      end
-      
-      if options.key?(:text)
-        return render_for_text(@template._render_text(options[:text], 
-          _pick_layout(layout_name), options))
-      end
-
-      file, template = options.values_at(:file, :template)
-      if file || template
-        file = template.sub(/^\//, '') if template
-        return render_for_file(file, [layout_name, !!template], options)
-      end
-      
-      if action_option = options[:action]
-        return render_for_action(action_option, [layout_name, true], options)
-      end
-      
-      if inline = options[:inline]
-        render_for_text(@template._render_inline(inline, _pick_layout(layout_name), options))
-
-      elsif xml = options[:xml]
-        response.content_type ||= Mime::XML
-        render_for_text(xml.respond_to?(:to_xml) ? xml.to_xml : xml)
-
-      elsif js = options[:js]
-        response.content_type ||= Mime::JS
-        render_for_text(js)
-
-      elsif options.include?(:json)
-        json = options[:json]
-        json = ActiveSupport::JSON.encode(json) unless json.respond_to?(:to_str)
-        json = "#{options[:callback]}(#{json})" unless options[:callback].blank?
-        response.content_type ||= Mime::JSON
-        render_for_text(json)
-
-      elsif partial = options[:partial]
-        if partial == true
-          parts = [action_name_base, formats, controller_name, true]
-        elsif partial.is_a?(String)
-          parts = partial_parts(partial, options)
-        else
-          return render_for_text(@template._render_partial(options))
-        end
-        
-        render_for_parts(parts, layout_name, options)
-        
-      elsif options[:nothing]
-        render_for_text(nil)
-
-      else
-        render_for_parts([action_name, formats, controller_path], layout_name, options)
-      end
-    end
-
-    def partial_parts(name, options)
-      segments = name.split("/")
-      parts = segments.pop.split(".")
-
-      case parts.size
-      when 1
-        parts
-      when 2, 3
-        extension = parts.delete_at(1).to_sym
-        if formats.include?(extension)
-          self.formats.replace [extension]
-        end
-        parts.pop if parts.size == 2
-      end
-
-      path = parts.join(".")
-      prefix = segments[0..-1].join("/")
-      prefix = prefix.blank? ? controller_path : prefix
-      parts = [path, formats, prefix]
-      parts.push options[:object] || true
-    end
-
-    def formats
-      @_request.formats.map {|f| f.symbol }.compact
-    end
-
-    def action_name_base(name = action_name)
-      (name.is_a?(String) ? name.sub(/^#{controller_path}\//, '') : name).to_s
-    end
-
-    # Same rules as <tt>render</tt>, but returns a Rack-compatible body
-    # instead of sending the response.
-    def render_to_body(options = nil, &block) #:doc:
-      render(options, &block)
-      response.body
-    ensure
-      response.content_type = nil
-      erase_render_results
-      reset_variables_added_to_assigns
-    end
-
-    def render_to_string(options = {})
-      AbstractController::Renderer.body_to_s(render_to_body(options))
-    end
-
-    # Clears the rendered results, allowing for another render to be performed.
-    def erase_render_results #:nodoc:
-      response.body = []
-      @performed_render = false
-    end
-
-    # Erase both render and redirect results
-    def erase_results #:nodoc:
-      erase_render_results
-      erase_redirect_results
-    end
-    
-    # Return a response that has no content (merely headers). The options
-    # argument is interpreted to be a hash of header names and values.
-    # This allows you to easily return a response that consists only of
-    # significant headers:
-    #
-    #   head :created, :location => person_path(@person)
-    #
-    # It can also be used to return exceptional conditions:
-    #
-    #   return head(:method_not_allowed) unless request.post?
-    #   return head(:bad_request) unless valid_request?
-    #   render
-    def head(*args)
-      if args.length > 2
-        raise ArgumentError, "too many arguments to head"
-      elsif args.empty?
-        raise ArgumentError, "too few arguments to head"
-      end
-      options = args.extract_options!
-      status = interpret_status(args.shift || options.delete(:status) || :ok)
-
-      options.each do |key, value|
-        headers[key.to_s.dasherize.split(/-/).map { |v| v.capitalize }.join("-")] = value.to_s
-      end
-
-      render :nothing => true, :status => status
-    end
-    
-    private
-    def render_for_name(name, layout, options)
-      case name.to_s.index('/')
-      when 0
-        render_for_file(name, layout, options)
-      when nil
-        render_for_action(name, layout, options)
-      else
-        render_for_file(name.sub(/^\//, ''), [layout, true], options)
-      end
-    end
-
-    # ==== Arguments
-    # parts<Array[String, Array[Symbol*], String, Boolean]>::
-    #     Example: ["show", [:html, :xml], "users", false]
-    def render_for_parts(parts, layout_details, options = {})
-      parts[1] = {:formats => parts[1], :locales => [I18n.locale]}
-      
-      tmp = view_paths.find_by_parts(*parts)
-      
-      layout = _pick_layout(*layout_details) unless 
-        self.class.exempt_from_layout.include?(tmp.handler)
-      
-      render_for_text(
-        @template._render_template_with_layout(tmp, layout, options, parts[3]))
-    end
-
-    def render_for_file(file, layout, options)
-      render_for_parts([file, [request.format.to_sym]], layout, options)
-    end
-    
-    def render_for_action(name, layout, options)
-      parts = [action_name_base(name), formats, controller_name]
-      render_for_parts(parts, layout, options)
-    end
-  end
-end
diff --git a/actionpack/lib/action_controller/new_base/render_options.rb b/actionpack/lib/action_controller/base/render_options.rb
index fc9a02626f..fc9a02626f 100644
--- a/actionpack/lib/action_controller/new_base/render_options.rb
+++ b/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
index 2fab501302..2fab501302 100644
--- a/actionpack/lib/action_controller/new_base/renderer.rb
+++ b/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
index 029e643d93..029e643d93 100644
--- a/actionpack/lib/action_controller/new_base/rescuable.rb
+++ b/actionpack/lib/action_controller/base/rescuable.rb
diff --git a/actionpack/lib/action_controller/base/rescue.rb b/actionpack/lib/action_controller/base/rescue.rb
deleted file mode 100644
index 2717a06a37..0000000000
--- a/actionpack/lib/action_controller/base/rescue.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-module ActionController #:nodoc:
-  # Actions that fail to perform as expected throw exceptions. These
-  # exceptions can either be rescued for the public view (with a nice
-  # user-friendly explanation) or for the developers view (with tons of
-  # debugging information). The developers view is already implemented by
-  # the Action Controller, but the public view should be tailored to your
-  # specific application.
-  #
-  # The default behavior for public exceptions is to render a static html
-  # file with the name of the error code thrown.  If no such file exists, an
-  # empty response is sent with the correct status code.
-  #
-  # You can override what constitutes a local request by overriding the
-  # <tt>local_request?</tt> method in your own controller. Custom rescue
-  # behavior is achieved by overriding the <tt>rescue_action_in_public</tt>
-  # and <tt>rescue_action_locally</tt> methods.
-  module Rescue
-    def self.included(base) #:nodoc:
-      base.send :include, ActiveSupport::Rescuable
-      base.extend(ClassMethods)
-
-      base.class_eval do
-        alias_method_chain :perform_action, :rescue
-      end
-    end
-
-    module ClassMethods
-      def rescue_action(env)
-        exception = env.delete('action_dispatch.rescue.exception')
-        request   = ActionDispatch::Request.new(env)
-        response  = ActionDispatch::Response.new
-        new.process(request, response, :rescue_action, exception).to_a
-      end
-    end
-
-    protected
-      # Exception handler called when the performance of an action raises
-      # an exception.
-      def rescue_action(exception)
-        rescue_with_handler(exception) || raise(exception)
-      end
-
-    private
-      def perform_action_with_rescue
-        perform_action_without_rescue
-      rescue Exception => exception
-        rescue_action(exception)
-      end
-  end
-end
diff --git a/actionpack/lib/action_controller/base/responder.rb b/actionpack/lib/action_controller/base/responder.rb
deleted file mode 100644
index 1aee980da6..0000000000
--- a/actionpack/lib/action_controller/base/responder.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-module ActionController
-  module Responder
-    def self.included(klass)
-      klass.extend ClassMethods
-    end
-    
-    private
-    def render_for_text(text) #:nodoc:
-      @performed_render = true
-
-      case text
-      when Proc
-        response.body = text
-      when nil
-        # Safari 2 doesn't pass response headers if the response is zero-length
-        if response.body_parts.empty?
-          response.body_parts << ' '
-        end
-      else
-        response.body_parts << text
-      end
-    end
-    
-    # Returns a set of the methods defined as actions in your controller
-    def action_methods
-      self.class.action_methods
-    end
-    
-    module ClassMethods
-      def action_methods
-        @action_methods ||=
-          # All public instance methods of this class, including ancestors
-          public_instance_methods(true).map { |m| m.to_s }.to_set -
-          # Except for public instance methods of Base and its ancestors
-          Base.public_instance_methods(true).map { |m| m.to_s } +
-          # Be sure to include shadowed public instance methods of this class
-          public_instance_methods(false).map { |m| m.to_s } -
-          # And always exclude explicitly hidden actions
-          hidden_actions
-      end
-    end
-  end
-end
diff --git a/actionpack/lib/action_controller/new_base/session.rb b/actionpack/lib/action_controller/base/session.rb
index bcedd6e1c7..bcedd6e1c7 100644
--- a/actionpack/lib/action_controller/new_base/session.rb
+++ b/actionpack/lib/action_controller/base/session.rb
diff --git a/actionpack/lib/action_controller/base/streaming.rb b/actionpack/lib/action_controller/base/streaming.rb
index 73d4bde6c1..5c72fc9ad9 100644
--- a/actionpack/lib/action_controller/base/streaming.rb
+++ b/actionpack/lib/action_controller/base/streaming.rb
@@ -162,15 +162,16 @@ module ActionController #:nodoc:
         disposition <<= %(; filename="#{options[:filename]}") if options[:filename]
 
         content_type = options[:type]
+
         if content_type.is_a?(Symbol)
-          raise ArgumentError, "Unknown MIME type #{options[:type]}" unless Mime::EXTENSION_LOOKUP.has_key?(content_type.to_s)
-          content_type = Mime::Type.lookup_by_extension(content_type.to_s)
+          raise ArgumentError, "Unknown MIME type #{options[:type]}" unless Mime::EXTENSION_LOOKUP.key?(content_type.to_s)
+          self.content_type = Mime::Type.lookup_by_extension(content_type.to_s)
+        else
+          self.content_type = content_type
         end
-        content_type = content_type.to_s.strip # fixes a problem with extra '\r' with some browsers
 
         headers.merge!(
           'Content-Length'            => options[:length],
-          'Content-Type'              => content_type,
           'Content-Disposition'       => disposition,
           'Content-Transfer-Encoding' => 'binary'
         )
diff --git a/actionpack/lib/action_controller/new_base/testing.rb b/actionpack/lib/action_controller/base/testing.rb
index a4a1116d9e..a4a1116d9e 100644
--- a/actionpack/lib/action_controller/new_base/testing.rb
+++ b/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
index 7119c14cd3..7119c14cd3 100644
--- a/actionpack/lib/action_controller/new_base/url_for.rb
+++ b/actionpack/lib/action_controller/base/url_for.rb
diff --git a/actionpack/lib/action_controller/base/layout.rb b/actionpack/lib/action_controller/legacy/layout.rb
index cf5f46a32b..3046e082d9 100644
--- a/actionpack/lib/action_controller/base/layout.rb
+++ b/actionpack/lib/action_controller/legacy/layout.rb
@@ -1,8 +1,16 @@
 require 'active_support/core_ext/enumerable'
+require 'active_support/core_ext/class'
 require 'active_support/core_ext/class/delegating_attributes'
 require 'active_support/core_ext/class/inheritable_attributes'
 
 module ActionController #:nodoc:
+  # MegasuperultraHAX
+  # plz refactor ActionMailer
+  class Base
+    @@exempt_from_layout = [ActionView::TemplateHandlers::RJS]
+    cattr_accessor :exempt_from_layout
+  end
+
   module Layout #:nodoc:
     def self.included(base)
       base.extend(ClassMethods)
diff --git a/actionpack/lib/action_controller/new_base.rb b/actionpack/lib/action_controller/new_base.rb
deleted file mode 100644
index df256985ac..0000000000
--- 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 e8fc153578..0000000000
--- 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 2fa5ea6519..0000000000
--- 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 0000000000..dd22bfd617
--- /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/routing/routing_ext.rb b/actionpack/lib/action_controller/routing/routing_ext.rb
index 4a82b2af5f..5e5b22b6c2 100644
--- a/actionpack/lib/action_controller/routing/routing_ext.rb
+++ b/actionpack/lib/action_controller/routing/routing_ext.rb
@@ -1,49 +1,4 @@
-class Object
-  def to_param
-    to_s
-  end
-end
-
-class TrueClass
-  def to_param
-    self
-  end
-end
-
-class FalseClass
-  def to_param
-    self
-  end
-end
-
-class NilClass
-  def to_param
-    self
-  end
-end
-
-class Regexp #:nodoc:
-  def number_of_captures
-    Regexp.new("|#{source}").match('').captures.length
-  end
-
-  def multiline?
-    options & MULTILINE == MULTILINE
-  end
-
-  class << self
-    def optionalize(pattern)
-      case unoptionalize(pattern)
-        when /\A(.|\(.*\))\Z/ then "#{pattern}?"
-        else "(?:#{pattern})?"
-      end
-    end
-
-    def unoptionalize(pattern)
-      [/\A\(\?:(.*)\)\?\Z/, /\A(.|\(.*\))\?\Z/].each do |regexp|
-        return $1 if regexp =~ pattern
-      end
-      return pattern
-    end
-  end
-end
+require 'active_support/core_ext/object/conversions'
+require 'active_support/core_ext/boolean/conversions'
+require 'active_support/core_ext/nil/conversions'
+require 'active_support/core_ext/regexp'
diff --git a/actionpack/lib/action_controller/testing/integration.rb b/actionpack/lib/action_controller/testing/integration.rb
index af4ccb7837..5cb0f48f82 100644
--- a/actionpack/lib/action_controller/testing/integration.rb
+++ b/actionpack/lib/action_controller/testing/integration.rb
@@ -1,6 +1,7 @@
 require 'stringio'
 require 'uri'
 require 'active_support/test_case'
+require 'active_support/core_ext/object/metaclass'
 
 require 'rack/mock_session'
 require 'rack/test/cookie_jar'
@@ -191,7 +192,7 @@ module ActionController
 
         unless defined? @named_routes_configured
           # install the named routes in this session instance.
-          klass = class << self; self; end
+          klass = metaclass
           Routing::Routes.install_helpers(klass)
 
           # the helpers are made protected by default--we make them public for
@@ -244,7 +245,7 @@ module ActionController
             path = location.query ? "#{location.path}?#{location.query}" : location.path
           end
 
-          [ControllerCapture, ActionController::ProcessWithTest].each do |mod|
+          [ControllerCapture, ActionController::Testing].each do |mod|
             unless ActionController::Base < mod
               ActionController::Base.class_eval { include mod }
             end
diff --git a/actionpack/lib/action_controller/testing/process.rb b/actionpack/lib/action_controller/testing/process.rb
index 9647f8ce45..7634290ea1 100644
--- a/actionpack/lib/action_controller/testing/process.rb
+++ b/actionpack/lib/action_controller/testing/process.rb
@@ -56,6 +56,8 @@ module ActionController #:nodoc:
       @block = nil
       @length = 0
       @body = []
+      @charset = nil
+      @content_type = nil
 
       @request = @template = nil
     end
@@ -122,30 +124,24 @@ module ActionController #:nodoc:
 
       @request.recycle!
       @response.recycle!
+      @controller.response_body = nil
+      @controller.formats = nil
+      @controller.params = nil
 
       @html_document = nil
-      @request.request_method = http_method
+      @request.env['REQUEST_METHOD'] = http_method
 
       parameters ||= {}
       @request.assign_parameters(@controller.class.controller_path, action.to_s, parameters)
 
       @request.session = ActionController::TestSession.new(session) unless session.nil?
       @request.session["flash"] = ActionController::Flash::FlashHash.new.update(flash) if flash
-      build_request_uri(action, parameters)
-
-      Base.class_eval { include ProcessWithTest } unless Base < ProcessWithTest
-
-      env = @request.env
-      app = @controller
-
-      # TODO: Enable Lint
-      # app = Rack::Lint.new(app)
 
-      status, headers, body = app.action(action, env)
-      response = Rack::MockResponse.new(status, headers, body)
-
-      @response.request, @response.template = @request, @controller.template
-      @response.status, @response.headers, @response.body = response.status, response.headers, response.body
+      @controller.request = @request
+      @controller.params.merge!(parameters)
+      build_request_uri(action, parameters)
+      Base.class_eval { include Testing }
+      @controller.process_with_new_base_test(@request, @response)
       @response
     end
 
@@ -165,7 +161,7 @@ module ActionController #:nodoc:
         next if ActionController::Base.protected_instance_variables.include?(ivar)
         assigns[ivar[1..-1]] = @controller.instance_variable_get(ivar)
       end
-      
+
       key.nil? ? assigns : assigns[key.to_s]
     end
 
@@ -261,27 +257,4 @@ module ActionController #:nodoc:
       ActionController::Routing.const_set(:Routes, real_routes) if real_routes
     end
   end
-
-  module ProcessWithTest #:nodoc:
-    def self.included(base)
-      base.class_eval {
-        attr_reader :assigns
-        alias_method_chain :process, :test
-      }
-    end
-
-    def process_with_test(*args)
-      process_without_test(*args).tap { set_test_assigns }
-    end
-
-    private
-      def set_test_assigns
-        @assigns = {}
-        (instance_variable_names - self.class.protected_instance_variables).each do |var|
-          name, value = var[1..-1], instance_variable_get(var)
-          @assigns[name] = value
-          @template.assigns[name] = value if response
-        end
-      end
-  end
-end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_controller/testing/process2.rb b/actionpack/lib/action_controller/testing/process2.rb
deleted file mode 100644
index 1c6fd2d80a..0000000000
--- a/actionpack/lib/action_controller/testing/process2.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-require "action_controller/testing/process"
-
-module ActionController
-  module TestProcess
-    
-    # Executes a request simulating GET HTTP method and set/volley the response
-    def get(action, parameters = nil, session = nil, flash = nil)
-      process(action, parameters, session, flash, "GET")
-    end
-
-    # Executes a request simulating POST HTTP method and set/volley the response
-    def post(action, parameters = nil, session = nil, flash = nil)
-      process(action, parameters, session, flash, "POST")
-    end
-
-    # Executes a request simulating PUT HTTP method and set/volley the response
-    def put(action, parameters = nil, session = nil, flash = nil)
-      process(action, parameters, session, flash, "PUT")
-    end
-
-    # Executes a request simulating DELETE HTTP method and set/volley the response
-    def delete(action, parameters = nil, session = nil, flash = nil)
-      process(action, parameters, session, flash, "DELETE")
-    end
-
-    # Executes a request simulating HEAD HTTP method and set/volley the response
-    def head(action, parameters = nil, session = nil, flash = nil)
-      process(action, parameters, session, flash, "HEAD")
-    end
-
-    def process(action, parameters = nil, session = nil, flash = nil, http_method = 'GET')
-      # Sanity check for required instance variables so we can give an
-      # understandable error message.
-      %w(@controller @request @response).each do |iv_name|
-        if !(instance_variable_names.include?(iv_name) || instance_variable_names.include?(iv_name.to_sym)) || instance_variable_get(iv_name).nil?
-          raise "#{iv_name} is nil: make sure you set it in your test's setup method."
-        end
-      end
-
-      @request.recycle!
-      @response.recycle!
-      @controller.response_body = nil
-      @controller.formats = nil
-      @controller.params = nil
-
-      @html_document = nil
-      @request.env['REQUEST_METHOD'] = http_method
-
-      parameters ||= {}
-      @request.assign_parameters(@controller.class.controller_path, action.to_s, parameters)
-
-      @request.session = ActionController::TestSession.new(session) unless session.nil?
-      @request.session["flash"] = ActionController::Flash::FlashHash.new.update(flash) if flash
-
-      @controller.request = @request
-      @controller.params.merge!(parameters)
-      build_request_uri(action, parameters)
-      # Base.class_eval { include ProcessWithTest } unless Base < ProcessWithTest
-      @controller.process_with_new_base_test(@request, @response)
-      @response
-    end
-    
-    def build_request_uri(action, parameters)
-      unless @request.env['REQUEST_URI']
-        options = @controller.__send__(:rewrite_options, parameters)
-        options.update(:only_path => true, :action => action)
-
-        url = ActionController::UrlRewriter.new(@request, parameters)
-        @request.request_uri = url.rewrite(options)
-      end
-    end      
-      
-  end
-end
\ No newline at end of file