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

193 files changed, 2910 insertions, 2800 deletions

diff --git a/Gemfile b/Gemfile
index fb0ca6493d..a51c560232 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,7 @@
 path File.dirname(__FILE__)
 source 'http://rubygems.org'
 
+gem "arel", :git => "git://github.com/rails/arel.git"
 gem "rails", "3.0.0.beta1"
 
 gem "rake",  ">= 0.8.7"
diff --git a/RAILS_VERSION b/RAILS_VERSION
new file mode 100644
index 0000000000..efcd59e268
--- /dev/null
+++ b/RAILS_VERSION
@@ -0,0 +1 @@
+3.0.0.beta1
diff --git a/Rakefile b/Rakefile
index 50700fdeac..4437b48d9a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -3,15 +3,6 @@ require 'rake/rdoctask'
 require 'rake/gempackagetask'
 
 PROJECTS = %w(activesupport activemodel actionpack actionmailer activeresource activerecord railties)
-PROJECTS.each { |project| $:.unshift "#{project}/lib" }
-
-require "active_support/version"
-require "active_model/version"
-require "action_pack/version"
-require "action_mailer/version"
-require "active_resource/version"
-require "active_record/version"
-require "rails/version"
 
 desc 'Run all tests by default'
 task :default => %w(test test:isolated)
@@ -58,6 +49,7 @@ end
 
 desc "Install gems for all projects."
 task :install => :gem do
+  require File.expand_path("../actionpack/lib/action_pack/version", __FILE__)
   (PROJECTS - ["railties"]).each do |project|
     puts "INSTALLING #{project}"
     system("gem install #{project}/pkg/#{project}-#{ActionPack::VERSION::STRING}.gem --no-ri --no-rdoc")
@@ -130,6 +122,12 @@ task :pdoc => :rdoc do
 end
 
 task :update_versions do
+  require File.dirname(__FILE__) + "/version"
+
+  File.open("RAILS_VERSION", "w") do |f|
+    f.write Rails::VERSION::STRING + "\n"
+  end
+
   constants = {
     "activesupport"   => "ActiveSupport",
     "activemodel"     => "ActiveModel",
diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec
index fc7f3f1e5f..a7a2599105 100644
--- a/actionmailer/actionmailer.gemspec
+++ b/actionmailer/actionmailer.gemspec
@@ -1,10 +1,9 @@
-$:.unshift "lib"
-require "action_mailer/version"
+version = File.read(File.expand_path("../../RAILS_VERSION", __FILE__)).strip
 
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'actionmailer'
-  s.version     = ActionMailer::VERSION::STRING
+  s.version     = version
   s.summary     = 'Email composition, delivery, and receiving framework (part of Rails).'
   s.description = 'Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.'
   s.required_ruby_version = '>= 1.8.7'
@@ -20,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.has_rdoc = true
 
-  s.add_dependency('actionpack',  "= #{ActionMailer::VERSION::STRING}")
+  s.add_dependency('actionpack',  version)
   s.add_dependency('mail',        '~> 2.1.3')
   s.add_dependency('text-format', '~> 1.0.0')
 end
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index 7f5bcad922..43d73e71b9 100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -34,6 +34,7 @@ require 'active_support/core_ext/array/uniq_by'
 require 'active_support/core_ext/module/attr_internal'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/string/inflections'
+require 'active_support/lazy_load_hooks'
 
 module ActionMailer
   extend ::ActiveSupport::Autoload
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 48d6bbc8d9..ef3820ad67 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -267,11 +267,9 @@ module ActionMailer #:nodoc:
 
     include AbstractController::Logger
     include AbstractController::Rendering
-    include AbstractController::DetailsCache
     include AbstractController::Layouts
     include AbstractController::Helpers
     include AbstractController::Translation
-    include AbstractController::Compatibility
 
     helper  ActionMailer::MailHelper
 
@@ -291,6 +289,8 @@ module ActionMailer #:nodoc:
       :parts_order  => [ "text/plain", "text/enriched", "text/html" ]
     }.freeze
 
+    ActionMailer.run_base_hooks(self)
+
     class << self
 
       def mailer_name
@@ -616,14 +616,12 @@ module ActionMailer #:nodoc:
 
     def each_template(paths, name, &block) #:nodoc:
       Array(paths).each do |path|
-        self.class.view_paths.each do |load_paths|
-          templates = load_paths.find_all(name, {}, path)
-          templates = templates.uniq_by { |t| t.details[:formats] }
-
-          unless templates.empty?
-            templates.each(&block)
-            return
-          end
+        templates = lookup_context.find_all(name, path)
+        templates = templates.uniq_by { |t| t.formats }
+
+        unless templates.empty?
+          templates.each(&block)
+          return
         end
       end
     end
diff --git a/actionmailer/lib/action_mailer/old_api.rb b/actionmailer/lib/action_mailer/old_api.rb
index 941261a5b4..aeb653c5db 100644
--- a/actionmailer/lib/action_mailer/old_api.rb
+++ b/actionmailer/lib/action_mailer/old_api.rb
@@ -206,7 +206,7 @@ module ActionMailer
       if String === @body
         @parts.unshift create_inline_part(@body)
       elsif @parts.empty? || @parts.all? { |p| p.content_disposition =~ /^attachment/ }
-        self.class.view_paths.first.find_all(@template, {}, @mailer_name).each do |template|
+        lookup_context.find_all(@template, @mailer_name).each do |template|
           @parts << create_inline_part(render(:_template => template), template.mime_type)
         end
 
diff --git a/actionmailer/lib/action_mailer/quoting.rb b/actionmailer/lib/action_mailer/quoting.rb
index 70f636bf69..2b55c0f0ab 100644
--- a/actionmailer/lib/action_mailer/quoting.rb
+++ b/actionmailer/lib/action_mailer/quoting.rb
@@ -22,7 +22,7 @@ module ActionMailer
     # A quick-and-dirty regexp for determining whether a string contains any
     # characters that need escaping.
     if !defined?(CHARS_NEEDING_QUOTING)
-      CHARS_NEEDING_QUOTING = /[\000-\011\013\014\016-\037\177-\377]/
+      CHARS_NEEDING_QUOTING = Regexp.new('[\000-\011\013\014\016-\037\177-\377]', nil, 'n')
     end
 
     # Quote the given text if it contains any "illegal" characters
diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
index c5f18c7911..0182e48425 100644
--- a/actionmailer/lib/action_mailer/railtie.rb
+++ b/actionmailer/lib/action_mailer/railtie.rb
@@ -6,19 +6,21 @@ module ActionMailer
     railtie_name :action_mailer
 
     initializer "action_mailer.url_for", :before => :load_environment_config do |app|
-      ActionMailer::Base.send(:include, app.routes.url_helpers)
+      ActionMailer.base_hook { include app.routes.url_helpers }
     end
 
     require "action_mailer/railties/log_subscriber"
     log_subscriber ActionMailer::Railties::LogSubscriber.new
 
     initializer "action_mailer.logger" do
-      ActionMailer::Base.logger ||= Rails.logger
+      ActionMailer.base_hook { self.logger ||= Rails.logger }
     end
 
     initializer "action_mailer.set_configs" do |app|
-      app.config.action_mailer.each do |k,v|
-        ActionMailer::Base.send "#{k}=", v
+      ActionMailer.base_hook do
+        app.config.action_mailer.each do |k,v|
+          send "#{k}=", v
+        end
       end
     end
   end
diff --git a/actionmailer/test/log_subscriber_test.rb b/actionmailer/test/log_subscriber_test.rb
index edd7c84d29..c08c34b4a2 100644
--- a/actionmailer/test/log_subscriber_test.rb
+++ b/actionmailer/test/log_subscriber_test.rb
@@ -4,7 +4,11 @@ require "action_mailer/railties/log_subscriber"
 
 class AMLogSubscriberTest < ActionMailer::TestCase
   include Rails::LogSubscriber::TestHelper
-  Rails::LogSubscriber.add(:action_mailer, ActionMailer::Railties::LogSubscriber.new)
+
+  def setup
+    super
+    Rails::LogSubscriber.add(:action_mailer, ActionMailer::Railties::LogSubscriber.new)
+  end
 
   class TestMailer < ActionMailer::Base
     def basic
diff --git a/actionmailer/test/old_base/asset_host_test.rb b/actionmailer/test/old_base/asset_host_test.rb
index aa9cfd88dd..0ec0242f55 100644
--- a/actionmailer/test/old_base/asset_host_test.rb
+++ b/actionmailer/test/old_base/asset_host_test.rb
@@ -14,6 +14,10 @@ class AssetHostTest < Test::Unit::TestCase
     set_delivery_method :test
     ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.deliveries.clear
+    AssetHostMailer.configure do |c|
+      c.asset_host = "http://www.example.com"
+      c.assets_dir = ''
+    end
   end
 
   def teardown
@@ -21,13 +25,12 @@ class AssetHostTest < Test::Unit::TestCase
   end
 
   def test_asset_host_as_string
-    ActionController::Base.asset_host = "http://www.example.com"
     mail = AssetHostMailer.email_with_asset
     assert_equal "<img alt=\"Somelogo\" src=\"http://www.example.com/images/somelogo.png\" />", mail.body.to_s.strip
   end
 
   def test_asset_host_as_one_arguement_proc
-    ActionController::Base.asset_host = Proc.new { |source|
+    AssetHostMailer.config.asset_host = Proc.new { |source|
       if source.starts_with?('/images')
         "http://images.example.com"
       else
@@ -39,7 +42,7 @@ class AssetHostTest < Test::Unit::TestCase
   end
 
   def test_asset_host_as_two_arguement_proc
-    ActionController::Base.asset_host = Proc.new {|source,request|
+    ActionController::Base.config.asset_host = Proc.new {|source,request|
       if request && request.ssl?
         "https://www.example.com"
       else
diff --git a/actionmailer/test/old_base/url_test.rb b/actionmailer/test/old_base/url_test.rb
index a719248599..60740d6b0b 100644
--- a/actionmailer/test/old_base/url_test.rb
+++ b/actionmailer/test/old_base/url_test.rb
@@ -13,6 +13,10 @@ end
 class TestMailer < ActionMailer::Base
   default_url_options[:host] = 'www.basecamphq.com'
 
+  configure do |c|
+    c.assets_dir = '' # To get the tests to pass
+  end
+
   def signed_up_with_url(recipient)
     @recipients   = recipient
     @subject      = "[Signed up] Welcome #{recipient}"
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index a281df8642..ed5b7e1e93 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -1,10 +1,9 @@
-$:.unshift "lib"
-require "action_pack/version"
+version = File.read(File.expand_path("../../RAILS_VERSION", __FILE__)).strip
 
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'actionpack'
-  s.version     = ActionPack::VERSION::STRING
+  s.version     = version
   s.summary     = 'Web-flow and rendering framework putting the VC in MVC (part of Rails).'
   s.description = 'Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.'
   s.required_ruby_version = '>= 1.8.7'
@@ -20,10 +19,10 @@ Gem::Specification.new do |s|
 
   s.has_rdoc = true
 
-  s.add_dependency('activesupport', "= #{ActionPack::VERSION::STRING}")
-  s.add_dependency('activemodel',   "= #{ActionPack::VERSION::STRING}")
+  s.add_dependency('activesupport', version)
+  s.add_dependency('activemodel',   version)
   s.add_dependency('rack',          '~> 1.1.0')
   s.add_dependency('rack-test',     '~> 0.5.0')
-  s.add_dependency('rack-mount',    '~> 0.5.1')
+  s.add_dependency('rack-mount',    '~> 0.6.0')
   s.add_dependency('erubis',        '~> 2.6.5')
 end
diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index c1b035306b..2da4dc052c 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -7,6 +7,7 @@ require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/module/attr_internal'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/module/anonymous'
+require 'active_support/i18n'
 
 module AbstractController
   extend ActiveSupport::Autoload
@@ -14,11 +15,10 @@ module AbstractController
   autoload :Base
   autoload :Callbacks
   autoload :Collector
-  autoload :Compatibility
-  autoload :DetailsCache
   autoload :Helpers
   autoload :Layouts
   autoload :Logger
   autoload :Rendering
   autoload :Translation
+  autoload :ViewPaths
 end
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb
index e14818e464..c12b584144 100644
--- a/actionpack/lib/abstract_controller/base.rb
+++ b/actionpack/lib/abstract_controller/base.rb
@@ -1,3 +1,5 @@
+require 'active_support/ordered_options'
+
 module AbstractController
   class Error < StandardError; end
   class ActionNotFound < StandardError; end
@@ -5,7 +7,6 @@ module AbstractController
   class Base
     attr_internal :response_body
     attr_internal :action_name
-    attr_internal :formats
 
     class << self
       attr_reader :abstract
@@ -28,6 +29,14 @@ module AbstractController
         @descendants ||= []
       end
 
+      def config
+        @config ||= ActiveSupport::InheritableOptions.new(superclass < Base ? superclass.config : {})
+      end
+
+      def configure
+        yield config
+      end
+
       # A list of all internal methods for a controller. This finds the first
       # abstract superclass of a controller, and gets a list of all public
       # instance methods on that abstract class. Public instance methods of
@@ -90,9 +99,8 @@ module AbstractController
 
     abstract!
 
-    # Initialize controller with nil formats.
-    def initialize #:nodoc:
-      @_formats = nil
+    def config
+      @config ||= ActiveSupport::InheritableOptions.new(self.class.config)
     end
 
     # Calls the action going through the entire action dispatch stack.
diff --git a/actionpack/lib/abstract_controller/compatibility.rb b/actionpack/lib/abstract_controller/compatibility.rb
deleted file mode 100644
index 7fb93a0eb5..0000000000
--- a/actionpack/lib/abstract_controller/compatibility.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-module AbstractController
-  module Compatibility
-    extend ActiveSupport::Concern
-
-    def _find_layout(name, details)
-      details[:prefix] = nil if name =~ /\blayouts/
-      super
-    end
-
-    # Move this into a "don't run in production" module
-    def _default_layout(details, require_layout = false)
-      super
-    rescue ActionView::MissingTemplate
-      _find_layout(_layout({}), {})
-      nil
-    end
-  end
-end
diff --git a/actionpack/lib/abstract_controller/details_cache.rb b/actionpack/lib/abstract_controller/details_cache.rb
deleted file mode 100644
index be1a1c0f34..0000000000
--- a/actionpack/lib/abstract_controller/details_cache.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-module AbstractController
-  class HashKey
-    @hash_keys = Hash.new {|h,k| h[k] = {} }
-
-    def self.get(klass, details)
-      @hash_keys[klass][details] ||= new(klass, details)
-    end
-
-    attr_reader :hash
-    alias_method :eql?, :equal?
-
-    def initialize(klass, details)
-      @details, @hash = details, details.hash
-    end
-
-    def inspect
-      "#<HashKey -- details: #{@details.inspect}>"
-    end
-  end
-
-  module DetailsCache
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      def clear_template_caches!
-        ActionView::Partials::PartialRenderer::TEMPLATES.clear
-        template_cache.clear
-        super
-      end
-
-      def template_cache
-        @template_cache ||= Hash.new {|h,k| h[k] = {} }
-      end
-    end
-
-    def render_to_body(*args)
-      Thread.current[:format_locale_key] = HashKey.get(self.class, details_for_render)
-      super
-    end
-
-    private
-
-      def with_template_cache(name, details)
-        self.class.template_cache[HashKey.get(self.class, details)][name] ||= super
-      end
-
-  end
-end
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index beda4e633e..2f9616124a 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -170,27 +170,7 @@ module AbstractController
     module ClassMethods
       def inherited(klass)
         super
-        klass.class_eval do
-          _write_layout_method
-          @found_layouts = {}
-        end
-      end
-
-      def clear_template_caches!
-        @found_layouts.clear if defined? @found_layouts
-        super
-      end
-
-      def cache_layout(details)
-        layout = @found_layouts
-        key = Thread.current[:format_locale_key]
-
-        # Cache nil
-        if layout.key?(key)
-          return layout[key]
-        else
-          layout[key] = yield
-        end
+        klass._write_layout_method
       end
 
       # This module is mixed in if layout conditions are provided. This means
@@ -259,10 +239,10 @@ module AbstractController
       def _write_layout_method
         case defined?(@_layout) ? @_layout : nil
         when String
-          self.class_eval %{def _layout(details) #{@_layout.inspect} end}
+          self.class_eval %{def _layout; #{@_layout.inspect} end}
         when Symbol
           self.class_eval <<-ruby_eval, __FILE__, __LINE__ + 1
-            def _layout(details)
+            def _layout
               #{@_layout}.tap do |layout|
                 unless layout.is_a?(String) || !layout
                   raise ArgumentError, "Your layout method :#{@_layout} returned \#{layout}. It " \
@@ -273,21 +253,21 @@ module AbstractController
           ruby_eval
         when Proc
           define_method :_layout_from_proc, &@_layout
-          self.class_eval %{def _layout(details) _layout_from_proc(self) end}
+          self.class_eval %{def _layout; _layout_from_proc(self) end}
         when false
-          self.class_eval %{def _layout(details) end}
+          self.class_eval %{def _layout; end}
         when true
           raise ArgumentError, "Layouts must be specified as a String, Symbol, false, or nil"
         when nil
           if name
+            _prefix = "layouts" unless _implied_layout_name =~ /\blayouts/
+
             self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-              def _layout(details)
-                self.class.cache_layout(details) do
-                  if template_exists?("#{_implied_layout_name}", details, :_prefix => "layouts")
-                    "#{_implied_layout_name}"
-                  else
-                    super
-                  end
+              def _layout
+                if template_exists?("#{_implied_layout_name}", #{_prefix.inspect})
+                  "#{_implied_layout_name}"
+                else
+                  super
                 end
               end
             RUBY
@@ -297,42 +277,20 @@ module AbstractController
       end
     end
 
-    def render_to_body(options = {})
-      # In the case of a partial with a layout, handle the layout
-      # here, and make sure the view does not try to handle it
-      layout = options.delete(:layout) if options.key?(:partial)
-
-      response = super
+    def _normalize_options(options)
+      super
 
-      # This is a little bit messy. We need to explicitly handle partial
-      # layouts here since the core lookup logic is in the view, but
-      # we need to determine the layout based on the controller
-      #
-      # TODO: An easier way to handle this would probably be to override
-      # render_template
-      if layout
-        layout = _layout_for_option(layout, options[:_template].details)
-        response = layout.render(view_context, options[:locals] || {}) { response }
+      if _include_layout?(options)
+        layout = options.key?(:layout) ? options.delete(:layout) : :default
+        value = _layout_for_option(layout)
+        options[:layout] = (value =~ /\blayouts/ ? value : "layouts/#{value}") if value
       end
-
-      response
     end
 
   private
 
     # This will be overwritten by _write_layout_method
-    def _layout(details) end
-
-    # Determine the layout for a given name and details.
-    #
-    # ==== Parameters
-    # name<String>:: The name of the template
-    # details<Hash{Symbol => Object}>:: A list of details to restrict
-    #   the lookup to. By default, layout lookup is limited to the
-    #   formats specified for the current request.
-    def _layout_for_name(name, details)
-      name && _find_layout(name, details)
-    end
+    def _layout; end
 
     # Determine the layout for a given name and details, taking into account
     # the name type.
@@ -342,11 +300,11 @@ module AbstractController
     # details<Hash{Symbol => Object}>:: A list of details to restrict
     #   the lookup to. By default, layout lookup is limited to the
     #   formats specified for the current request.
-    def _layout_for_option(name, details)
+    def _layout_for_option(name)
       case name
-      when String     then _layout_for_name(name, details)
-      when true       then _default_layout(details, true)
-      when :default   then _default_layout(details, false)
+      when String     then name
+      when true       then _default_layout(true)
+      when :default   then _default_layout(false)
       when false, nil then nil
       else
         raise ArgumentError,
@@ -354,29 +312,6 @@ module AbstractController
       end
     end
 
-    def _determine_template(options)
-      super
-
-      return unless (options.keys & [:text, :inline, :partial]).empty? || options.key?(:layout)
-      layout = options.key?(:layout) ? options[:layout] : :default
-      options[:_layout] = _layout_for_option(layout, options[:_template].details)
-    end
-
-    # Take in the name and details and find a Template.
-    #
-    # ==== Parameters
-    # name<String>:: The name of the template to retrieve
-    # details<Hash>:: A list of details to restrict the search by. This
-    #   might include details like the format or locale of the template.
-    #
-    # ==== Returns
-    # Template:: A template object matching the name and details
-    def _find_layout(name, details)
-      # TODO: Make prefix actually part of details in ViewPath#find_by_parts
-      prefix = details.key?(:prefix) ? details.delete(:prefix) : "layouts"
-      find_template(name, details, :_prefix => prefix)
-    end
-
     # Returns the default layout for this controller and a given set of details.
     # Optionally raises an exception if the layout could not be found.
     #
@@ -389,18 +324,24 @@ module AbstractController
     #
     # ==== Returns
     # Template:: The template object for the default layout (or nil)
-    def _default_layout(details, require_layout = false)
-      if require_layout && _action_has_layout? && !_layout(details)
-        raise ArgumentError,
-          "There was no default layout for #{self.class} in #{view_paths.inspect}"
-      end
-
+    def _default_layout(require_layout = false)
       begin
-        _layout_for_name(_layout(details), details) if _action_has_layout?
+        layout_name = _layout if _action_has_layout?
       rescue NameError => e
         raise NoMethodError,
           "You specified #{@_layout.inspect} as the layout, but no such method was found"
       end
+
+      if require_layout && _action_has_layout? && !layout_name
+        raise ArgumentError,
+          "There was no default layout for #{self.class} in #{view_paths.inspect}"
+      end
+
+      layout_name
+    end
+
+    def _include_layout?(options)
+      (options.keys & [:text, :inline, :partial]).empty? || options.key?(:layout)
     end
 
     def _action_has_layout?
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 2ea4f02871..42f4939108 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -1,5 +1,4 @@
 require "abstract_controller/base"
-require "active_support/core_ext/array/wrap"
 
 module AbstractController
   class DoubleRenderError < Error
@@ -10,30 +9,45 @@ module AbstractController
     end
   end
 
+  # This is a class to fix I18n global state. Whenever you provide I18n.locale during a request,
+  # it will trigger the lookup_context and consequently expire the cache.
+  # TODO Add some deprecation warnings to remove I18n.locale from controllers
+  class I18nProxy < ::I18n::Config #:nodoc:
+    attr_reader :i18n_config, :lookup_context
+
+    def initialize(i18n_config, lookup_context)
+      @i18n_config, @lookup_context = i18n_config, lookup_context
+    end
+
+    def locale
+      @i18n_config.locale
+    end
+
+    def locale=(value)
+      @i18n_config.locale = value
+      @lookup_context.update_details(:locale => @i18n_config.locale)
+    end
+  end
+
   module Rendering
     extend ActiveSupport::Concern
+    include AbstractController::ViewPaths
 
-    included do
-      class_attribute :_view_paths
-      delegate :_view_paths, :to => :'self.class'
-      self._view_paths = ActionView::PathSet.new
+    # Overwrite process to setup I18n proxy.
+    def process(*) #:nodoc:
+      old_config, I18n.config = I18n.config, I18nProxy.new(I18n.config, lookup_context)
+      super
+    ensure
+      I18n.config = old_config
     end
 
     # An instance of a view class. The default view class is ActionView::Base
     #
     # The view class must have the following methods:
-    # View.for_controller[controller] Create a new ActionView instance for a
-    #   controller
-    # View#render_partial[options]
-    #   - responsible for setting options[:_template]
-    #   - Returns String with the rendered partial
-    #   options<Hash>:: see _render_partial in ActionView::Base
-    # View#render_template[template, layout, options, partial]
-    #   - Returns String with the rendered template
-    #   template<ActionView::Template>:: The template to render
-    #   layout<ActionView::Template>:: The layout to render around the template
-    #   options<Hash>:: See _render_template_with_layout in ActionView::Base
-    #   partial<Boolean>:: Whether or not the template to render is a partial
+    # View.for_controller[controller]
+    #   Create a new ActionView instance for a controller
+    # View#render_template[options]
+    #   Returns String with the rendered template
     #
     # Override this method in a module to change the default behavior.
     def view_context
@@ -43,57 +57,29 @@ module AbstractController
     # Mostly abstracts the fact that calling render twice is a DoubleRenderError.
     # Delegates render_to_body and sticks the result in self.response_body.
     def render(*args, &block)
-      options = _normalize_options(*args, &block)
+      options = _normalize_args(*args, &block)
+      _normalize_options(options)
       self.response_body = render_to_body(options)
     end
 
     # Raw rendering of a template to a Rack-compatible body.
-    #
-    # ==== Options
-    # _partial_object<Object>:: The object that is being rendered. If this
-    #   exists, we are in the special case of rendering an object as a partial.
-    #
     # :api: plugin
     def render_to_body(options = {})
-      # TODO: Refactor so we can just use the normal template logic for this
-      if options.key?(:partial)
-        _render_partial(options)
-      else
-        _determine_template(options)
-        _render_template(options)
-      end
+      _process_options(options)
+      _render_template(options)
     end
 
     # Raw rendering of a template to a string. Just convert the results of
     # render_to_body into a String.
-    #
     # :api: plugin
-    def render_to_string(*args)
-      options = _normalize_options(*args)
+    def render_to_string(options={})
+      _normalize_options(options)
       AbstractController::Rendering.body_to_s(render_to_body(options))
     end
 
-    # Renders the template from an object.
-    #
-    # ==== Options
-    # _template<ActionView::Template>:: The template to render
-    # _layout<ActionView::Template>:: The layout to wrap the template in (optional)
+    # Find and renders a template based on the options given.
     def _render_template(options)
-      view_context.render_template(options)
-    end
-
-    # Renders the given partial.
-    #
-    # ==== Options
-    # partial<String|Object>:: The partial name or the object to be rendered
-    def _render_partial(options)
-      view_context.render_partial(options)
-    end
-
-    # The list of view paths for this controller. See ActionView::ViewPathSet for
-    # more details about writing custom view paths.
-    def view_paths
-      _view_paths
+      view_context.render_template(options) { |template| _with_template_hook(template) }
     end
 
     # The prefix used in render "foo" shortcuts.
@@ -115,126 +101,42 @@ module AbstractController
 
   private
 
-    # Normalize options, by converting render "foo" to render :template => "prefix/foo"
-    # and render "/foo" to render :file => "/foo".
-    def _normalize_options(action=nil, options={})
+    # Normalize options by converting render "foo" to render :action => "foo" and
+    # render "foo/bar" to render :file => "foo/bar".
+    def _normalize_args(action=nil, options={})
       case action
+      when NilClass
       when Hash
         options, action = action, nil
       when String, Symbol
         action = action.to_s
-        case action.index("/")
-        when NilClass
-          options[:_prefix] = _prefix
-          options[:_template_name] = action
-        when 0
-          options[:file] = action
-        else
-          options[:template] = action
-        end
+        key = action.include?(?/) ? :file : :action
+        options[key] = action
+      else
+        options.merge!(:partial => action)
       end
 
       options
     end
 
-    # Take in a set of options and determine the template to render
-    #
-    # ==== Options
-    # _template<ActionView::Template>:: If this is provided, the search is over
-    # _template_name<#to_s>:: The name of the template to look up. Otherwise,
-    #   use the current action name.
-    # _prefix<String>:: The prefix to look inside of. In a file system, this corresponds
-    #   to a directory.
-    # _partial<TrueClass, FalseClass>:: Whether or not the file to look up is a partial
-    def _determine_template(options)
-      if options.key?(:text)
-        options[:_template] = ActionView::Template::Text.new(options[:text], format_for_text)
-      elsif options.key?(:inline)
-        handler  = ActionView::Template.handler_class_for_extension(options[:type] || "erb")
-        template = ActionView::Template.new(options[:inline], "inline template", handler, {})
-        options[:_template] = template
-      elsif options.key?(:template)
-        options[:_template_name] = options[:template]
-      elsif options.key?(:file)
-        options[:_template_name] = options[:file]
+    def _normalize_options(options)
+      if options[:partial] == true
+        options[:partial] = action_name
       end
-      name = (options[:_template_name] || options[:action] || action_name).to_s
-      options[:_prefix] ||= _prefix if (options.keys & [:partial, :file, :template]).empty?
 
-      details = _normalize_details(options)
-
-      options[:_template] ||= with_template_cache(name, details) do
-        find_template(name, details, options)
+      if (options.keys & [:partial, :file, :template]).empty?
+        options[:prefix] ||= _prefix
       end
-    end
-
-    def details_for_render
-      { :formats => formats, :locale => [I18n.locale] }
-    end
-
-    def _normalize_details(options)
-      details = details_for_render
-      details[:formats] = Array(options[:format]) if options[:format]
-      details[:locale]  = Array(options[:locale]) if options[:locale]
-      details
-    end
-
-    def find_template(name, details, options)
-      view_paths.find(name, details, options[:_prefix], options[:_partial])
-    end
-
-    def template_exists?(name, details, options)
-      view_paths.exists?(name, details, options[:_prefix], options[:_partial])
-    end
 
-    def with_template_cache(name, details)
-      yield
+      options[:template] ||= (options[:action] || action_name).to_s
+      options
     end
 
-    def format_for_text
-      Mime[:text]
+    def _process_options(options)
     end
 
-    module ClassMethods
-      def clear_template_caches!
-      end
-
-      # Append a path to the list of view paths for this controller.
-      #
-      # ==== Parameters
-      # path<String, ViewPath>:: If a String is provided, it gets converted into
-      # the default view path. You may also provide a custom view path
-      # (see ActionView::ViewPathSet for more information)
-      def append_view_path(path)
-        self.view_paths = view_paths.dup + Array.wrap(path)
-      end
-
-      # Prepend a path to the list of view paths for this controller.
-      #
-      # ==== Parameters
-      # path<String, ViewPath>:: If a String is provided, it gets converted into
-      # the default view path. You may also provide a custom view path
-      # (see ActionView::ViewPathSet for more information)
-      def prepend_view_path(path)
-        clear_template_caches!
-        self.view_paths = Array.wrap(path) + view_paths.dup
-      end
-
-      # A list of all of the default view paths for this controller.
-      def view_paths
-        _view_paths
-      end
-
-      # Set the view paths.
-      #
-      # ==== Parameters
-      # paths<ViewPathSet, Object>:: If a ViewPathSet is provided, use that;
-      #   otherwise, process the parameter into a ViewPathSet.
-      def view_paths=(paths)
-        clear_template_caches!
-        self._view_paths = paths.is_a?(ActionView::PathSet) ? paths : ActionView::Base.process_view_paths(paths)
-        _view_paths.freeze
-      end
+    def _with_template_hook(template)
+      self.formats = template.formats
     end
   end
 end
diff --git a/actionpack/lib/abstract_controller/view_paths.rb b/actionpack/lib/abstract_controller/view_paths.rb
new file mode 100644
index 0000000000..c2a9f6336d
--- /dev/null
+++ b/actionpack/lib/abstract_controller/view_paths.rb
@@ -0,0 +1,73 @@
+module AbstractController
+  module ViewPaths
+    extend ActiveSupport::Concern
+
+    included do
+      class_attribute :_view_paths
+      self._view_paths = ActionView::PathSet.new
+    end
+
+    delegate :template_exists?, :view_paths, :formats, :formats=,
+             :locale, :locale=, :to => :lookup_context
+
+    # LookupContext is the object responsible to hold all information required to lookup
+    # templates, i.e. view paths and details. Check ActionView::LookupContext for more
+    # information.
+    def lookup_context
+      @lookup_context ||= ActionView::LookupContext.new(self.class._view_paths, details_for_lookup)
+    end
+
+    def details_for_lookup
+      { }
+    end
+
+    def append_view_path(path)
+      lookup_context.view_paths.push(*path)
+    end
+
+    def prepend_view_path(path)
+      lookup_context.view_paths.unshift(*path)
+    end
+
+    def template_exists?(*args)
+      lookup_context.exists?(*args)
+    end
+
+    module ClassMethods
+      # Append a path to the list of view paths for this controller.
+      #
+      # ==== Parameters
+      # path<String, ViewPath>:: If a String is provided, it gets converted into
+      # the default view path. You may also provide a custom view path
+      # (see ActionView::ViewPathSet for more information)
+      def append_view_path(path)
+        self.view_paths = view_paths.dup + Array(path)
+      end
+
+      # Prepend a path to the list of view paths for this controller.
+      #
+      # ==== Parameters
+      # path<String, ViewPath>:: If a String is provided, it gets converted into
+      # the default view path. You may also provide a custom view path
+      # (see ActionView::ViewPathSet for more information)
+      def prepend_view_path(path)
+        self.view_paths = Array(path) + view_paths.dup
+      end
+
+      # A list of all of the default view paths for this controller.
+      def view_paths
+        _view_paths
+      end
+
+      # Set the view paths.
+      #
+      # ==== Parameters
+      # paths<ViewPathSet, Object>:: If a ViewPathSet is provided, use that;
+      #   otherwise, process the parameter into a ViewPathSet.
+      def view_paths=(paths)
+        self._view_paths = paths.is_a?(ActionView::PathSet) ? paths : ActionView::Base.process_view_paths(paths)
+        self._view_paths.freeze
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 759e52b135..536154fc6b 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -13,13 +13,13 @@ module ActionController
   autoload_under "metal" do
     autoload :Compatibility
     autoload :ConditionalGet
-    autoload :Configuration
     autoload :Cookies
     autoload :Flash
     autoload :Head
     autoload :Helpers
     autoload :HideActions
     autoload :HttpAuthentication
+    autoload :ImplicitRender
     autoload :Instrumentation
     autoload :MimeResponds
     autoload :RackDelegation
@@ -46,7 +46,6 @@ module ActionController
 
   eager_autoload do
     autoload :RecordIdentifier
-    autoload :UrlRewriter
 
     # TODO: Don't autoload exceptions, setup explicit
     # requires for files that need them
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 13139358c7..fcd3cb9bd3 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -15,7 +15,6 @@ module ActionController
     include ActionController::Renderers::All
     include ActionController::ConditionalGet
     include ActionController::RackDelegation
-    include ActionController::Configuration
 
     # Legacy modules
     include SessionManagement
@@ -30,35 +29,13 @@ module ActionController
     include ActionController::Verification
     include ActionController::RequestForgeryProtection
     include ActionController::Streaming
+    include ActionController::RecordIdentifier
     include ActionController::HttpAuthentication::Basic::ControllerMethods
     include ActionController::HttpAuthentication::Digest::ControllerMethods
 
     # Add instrumentations hooks at the bottom, to ensure they instrument
     # all the methods properly.
     include ActionController::Instrumentation
-
-    # 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 response_body
-        ret
-      end
-
-      def default_render
-        render
-      end
-
-      def method_for_action(action_name)
-        super || begin
-          if view_paths.exists?(action_name.to_s, details_for_render, controller_path)
-            "default_render"
-          end
-        end
-      end
-    end
-
     include ImplicitRender
 
     include ActionController::Rescue
@@ -82,5 +59,9 @@ module ActionController
       filter
     end
 
+    ActionController.run_base_hooks(self)
+
   end
 end
+
+require "action_controller/deprecated/base"
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index d784138ebe..b3fa129929 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -40,28 +40,34 @@ module ActionController #:nodoc:
       autoload :Sweeping, 'action_controller/caching/sweeping'
     end
 
-    included do
-      @@cache_store = nil
-      cattr_reader :cache_store
-
-      # Defines the storage option for cached fragments
-      def self.cache_store=(store_option)
-        @@cache_store = ActiveSupport::Cache.lookup_store(store_option)
+    module ConfigMethods
+      def cache_store
+        config.cache_store
       end
 
-      include Pages, Actions, Fragments
-      include Sweeping if defined?(ActiveRecord)
+      def cache_store=(store)
+        config.cache_store = ActiveSupport::Cache.lookup_store(store)
+      end
 
-      @@perform_caching = true
-      cattr_accessor :perform_caching
-    end
+    private
 
-    module ClassMethods
       def cache_configured?
         perform_caching && cache_store
       end
     end
 
+    include ConfigMethods
+    include Pages, Actions, Fragments
+    include Sweeping if defined?(ActiveRecord)
+
+    included do
+      extend ConfigMethods
+
+      @@perform_caching = true
+      cattr_accessor :perform_caching
+    end
+
+
     def caching_allowed?
       request.get? && response.status == 200
     end
@@ -75,10 +81,5 @@ module ActionController #:nodoc:
         yield
       end
     end
-
-  private
-    def cache_configured?
-      self.class.cache_configured?
-    end
   end
 end
diff --git a/actionpack/lib/action_controller/caching/pages.rb b/actionpack/lib/action_controller/caching/pages.rb
index 5797eeebd6..fe95f0e0d7 100644
--- a/actionpack/lib/action_controller/caching/pages.rb
+++ b/actionpack/lib/action_controller/caching/pages.rb
@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'uri'
+require 'active_support/core_ext/class/attribute_accessors'
 
 module ActionController #:nodoc:
   module Caching
@@ -34,27 +35,26 @@ module ActionController #:nodoc:
     # Additionally, you can expire caches using Sweepers that act on changes in the model to determine when a cache is supposed to be
     # expired.
     module Pages
-      def self.included(base) #:nodoc:
-        base.extend(ClassMethods)
-        base.class_eval do
-          @@page_cache_directory = defined?(Rails.public_path) ? Rails.public_path : ""
-          ##
-          # :singleton-method:
-          # The cache directory should be the document root for the web server and is set using <tt>Base.page_cache_directory = "/document/root"</tt>.
-          # For Rails, this directory has already been set to Rails.public_path (which is usually set to <tt>RAILS_ROOT + "/public"</tt>). Changing
-          # this setting can be useful to avoid naming conflicts with files in <tt>public/</tt>, but doing so will likely require configuring your
-          # web server to look in the new location for cached files.
-          cattr_accessor :page_cache_directory
-
-          @@page_cache_extension = '.html'
-          ##
-          # :singleton-method:
-          # Most Rails requests do not have an extension, such as <tt>/weblog/new</tt>. In these cases, the page caching mechanism will add one in
-          # order to make it easy for the cached files to be picked up properly by the web server. By default, this cache extension is <tt>.html</tt>.
-          # If you want something else, like <tt>.php</tt> or <tt>.shtml</tt>, just set Base.page_cache_extension. In cases where a request already has an
-          # extension, such as <tt>.xml</tt> or <tt>.rss</tt>, page caching will not add an extension. This allows it to work well with RESTful apps.
-          cattr_accessor :page_cache_extension
-        end
+      extend ActiveSupport::Concern
+
+      included do
+        @@page_cache_directory = defined?(Rails.public_path) ? Rails.public_path : ""
+        ##
+        # :singleton-method:
+        # The cache directory should be the document root for the web server and is set using <tt>Base.page_cache_directory = "/document/root"</tt>.
+        # For Rails, this directory has already been set to Rails.public_path (which is usually set to <tt>RAILS_ROOT + "/public"</tt>). Changing
+        # this setting can be useful to avoid naming conflicts with files in <tt>public/</tt>, but doing so will likely require configuring your
+        # web server to look in the new location for cached files.
+        cattr_accessor :page_cache_directory
+
+        @@page_cache_extension = '.html'
+        ##
+        # :singleton-method:
+        # Most Rails requests do not have an extension, such as <tt>/weblog/new</tt>. In these cases, the page caching mechanism will add one in
+        # order to make it easy for the cached files to be picked up properly by the web server. By default, this cache extension is <tt>.html</tt>.
+        # If you want something else, like <tt>.php</tt> or <tt>.shtml</tt>, just set Base.page_cache_extension. In cases where a request already has an
+        # extension, such as <tt>.xml</tt> or <tt>.rss</tt>, page caching will not add an extension. This allows it to work well with RESTful apps.
+        cattr_accessor :page_cache_extension
       end
 
       module ClassMethods
@@ -121,10 +121,10 @@ module ActionController #:nodoc:
         if options.is_a?(Hash)
           if options[:action].is_a?(Array)
             options[:action].dup.each do |action|
-              self.class.expire_page(url_for(options.merge(:only_path => true, :skip_relative_url_root => true, :action => action)))
+              self.class.expire_page(url_for(options.merge(:only_path => true, :action => action)))
             end
           else
-            self.class.expire_page(url_for(options.merge(:only_path => true, :skip_relative_url_root => true)))
+            self.class.expire_page(url_for(options.merge(:only_path => true)))
           end
         else
           self.class.expire_page(options)
@@ -139,7 +139,7 @@ module ActionController #:nodoc:
 
         path = case options
           when Hash
-            url_for(options.merge(:only_path => true, :skip_relative_url_root => true, :format => params[:format]))
+            url_for(options.merge(:only_path => true, :format => params[:format]))
           when String
             options
           else
diff --git a/actionpack/lib/action_controller/caching/sweeping.rb b/actionpack/lib/action_controller/caching/sweeping.rb
index 871f41bfdd..cf16417e84 100644
--- a/actionpack/lib/action_controller/caching/sweeping.rb
+++ b/actionpack/lib/action_controller/caching/sweeping.rb
@@ -30,9 +30,7 @@ module ActionController #:nodoc:
     #     cache_sweeper OpenBar::Sweeper, :only => [ :edit, :destroy, :share ]
     #   end
     module Sweeping
-      def self.included(base) #:nodoc:
-        base.extend(ClassMethods)
-      end
+      extend ActiveSupport::Concern
 
       module ClassMethods #:nodoc:
         def cache_sweeper(*sweepers)
diff --git a/actionpack/lib/action_controller/deprecated/base.rb b/actionpack/lib/action_controller/deprecated/base.rb
new file mode 100644
index 0000000000..1d05b3fbd6
--- /dev/null
+++ b/actionpack/lib/action_controller/deprecated/base.rb
@@ -0,0 +1,131 @@
+module ActionController
+  class Base
+    class << self
+      def deprecated_config_accessor(option, message = nil)
+        deprecated_config_reader(option, message)
+        deprecated_config_writer(option, message)
+      end
+
+      def deprecated_config_reader(option, message = nil)
+        message ||= "Reading #{option} directly from ActionController::Base is deprecated. " \
+                    "Please read it from config.#{option}"
+
+        self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{option}
+            ActiveSupport::Deprecation.warn #{message.inspect}, caller
+            config.#{option}
+          end
+        RUBY
+      end
+
+      def deprecated_config_writer(option, message = nil)
+        message ||= "Setting #{option} directly on ActionController::Base is deprecated. " \
+                    "Please set it on config.action_controller.#{option}"
+
+        self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{option}=(val)
+            ActiveSupport::Deprecation.warn #{message.inspect}, caller
+            config.#{option} = val
+          end
+        RUBY
+      end
+
+      def consider_all_requests_local
+        ActiveSupport::Deprecation.warn "ActionController::Base.consider_all_requests_local is deprecated, " <<
+          "use Rails.application.config.consider_all_requests_local instead", caller
+        Rails.application.config.consider_all_requests_local
+      end
+
+      def consider_all_requests_local=(value)
+        ActiveSupport::Deprecation.warn "ActionController::Base.consider_all_requests_local= is deprecated. " <<
+          "Please configure it on your application with config.consider_all_requests_local=", caller
+        Rails.application.config.consider_all_requests_local = value
+      end
+
+      def allow_concurrency
+        ActiveSupport::Deprecation.warn "ActionController::Base.allow_concurrency is deprecated, " <<
+          "use Rails.application.config.allow_concurrency instead", caller
+        Rails.application.config.allow_concurrency
+      end
+
+      def allow_concurrency=(value)
+        ActiveSupport::Deprecation.warn "ActionController::Base.allow_concurrency= is deprecated. " <<
+          "Please configure it on your application with config.allow_concurrency=", caller
+        Rails.application.config.allow_concurrency = value
+      end
+
+      def ip_spoofing_check=(value)
+        ActiveSupport::Deprecation.warn "ActionController::Base.ip_spoofing_check= is deprecated. " <<
+          "Please configure it on your application with config.action_dispatch.ip_spoofing_check=", caller
+        Rails.application.config.action_dispatch.ip_spoofing_check = value
+      end
+
+      def ip_spoofing_check
+        ActiveSupport::Deprecation.warn "ActionController::Base.ip_spoofing_check is deprecated. " <<
+          "Configuring ip_spoofing_check on the application configures a middleware.", caller
+        Rails.application.config.action_disaptch.ip_spoofing_check
+      end
+
+      def trusted_proxies=(value)
+        ActiveSupport::Deprecation.warn "ActionController::Base.trusted_proxies= is deprecated. " <<
+          "Please configure it on your application with config.action_dispatch.trusted_proxies=", caller
+        Rails.application.config.action_dispatch.ip_spoofing_check = value
+      end
+
+      def trusted_proxies
+        ActiveSupport::Deprecation.warn "ActionController::Base.trusted_proxies is deprecated. " <<
+          "Configuring trusted_proxies on the application configures a middleware.", caller
+        Rails.application.config.action_dispatch.ip_spoofing_check = value
+      end
+
+      def session(*args)
+        ActiveSupport::Deprecation.warn(
+          "Disabling sessions for a single controller has been deprecated. " +
+          "Sessions are now lazy loaded. So if you don't access them, " +
+          "consider them off. You can still modify the session cookie " +
+          "options with request.session_options.", caller)
+      end
+
+      def session=(value)
+        ActiveSupport::Deprecation.warn "ActionController::Base.session= is deprecated. " <<
+          "Please configure it on your application with config.session_store :cookie_store, :key => '....'", caller
+        if value.delete(:disabled)
+          Rails.application.config.session_store :disabled
+        else
+          store = Rails.application.config.session_store
+          Rails.application.config.session_store store, value
+        end
+      end
+
+      # Controls the resource action separator
+      def resource_action_separator
+        @resource_action_separator ||= "/"
+      end
+
+      def resource_action_separator=(val)
+        ActiveSupport::Deprecation.warn "ActionController::Base.resource_action_separator is deprecated and only " \
+                                        "works with the deprecated router DSL."
+        @resource_action_separator = val
+      end
+
+      def use_accept_header
+        ActiveSupport::Deprecation.warn "ActionController::Base.use_accept_header doesn't do anything anymore. " \
+                                        "The accept header is always taken into account."
+      end
+
+      def use_accept_header=(val)
+        use_accept_header
+      end
+    end
+
+    deprecated_config_writer :session_store
+    deprecated_config_writer :session_options
+    deprecated_config_accessor :relative_url_root, "relative_url_root is ineffective. Please stop using it"
+    deprecated_config_accessor :assets_dir
+    deprecated_config_accessor :javascripts_dir
+    deprecated_config_accessor :stylesheets_dir
+
+    delegate :consider_all_requests_local, :consider_all_requests_local=,
+             :allow_concurrency, :allow_concurrency=, :to => :"self.class"
+  end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index 4fd37e7f31..eebd2c943a 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -34,7 +34,8 @@ module ActionController
     # and response object available. You might wish to control the
     # environment and response manually for performance reasons.
 
-    attr_internal :status, :headers, :content_type, :response
+    attr_internal :status, :headers, :content_type, :response, :request
+    delegate :session, :to => "@_request"
 
     def initialize(*)
       @_headers = {}
@@ -66,8 +67,9 @@ module ActionController
     end
 
     # :api: private
-    def dispatch(name, env)
-      @_env = env
+    def dispatch(name, request)
+      @_request = request
+      @_env = request.env
       @_env['action_controller.instance'] = self
       process(name)
       to_a
@@ -78,31 +80,12 @@ module ActionController
       response ? response.to_a : [status, headers, response_body]
     end
 
-    class ActionEndpoint
-      @@endpoints = Hash.new {|h,k| h[k] = Hash.new {|sh,sk| sh[sk] = {} } }
-
-      def self.for(controller, action, stack)
-        @@endpoints[controller][action][stack] ||= begin
-          endpoint = new(controller, action)
-          stack.build(endpoint)
-        end
-      end
-
-      def initialize(controller, action)
-        @controller, @action = controller, action
-        @_formats = [Mime::HTML]
-      end
-
-      def call(env)
-        @controller.new.dispatch(@action, env)
-      end
-    end
-
     class_attribute :middleware_stack
     self.middleware_stack = ActionDispatch::MiddlewareStack.new
 
     def self.inherited(base)
       self.middleware_stack = base.middleware_stack.dup
+      super
     end
 
     def self.use(*args)
@@ -126,8 +109,10 @@ module ActionController
     #
     # ==== Returns
     # Proc:: A rack application
-    def self.action(name)
-      ActionEndpoint.for(self, name, middleware_stack)
+    def self.action(name, klass = ActionDispatch::Request)
+      middleware_stack.build do |env|
+        new.dispatch(name, klass.new(env))
+      end
     end
   end
 end
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index 2b1ada1426..ab8d87b2c4 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -2,21 +2,20 @@ module ActionController
   module Compatibility
     extend ActiveSupport::Concern
 
-    include AbstractController::Compatibility
-
     class ::ActionController::ActionControllerError < StandardError #:nodoc:
     end
 
+    module ClassMethods
+    end
+
     # Temporary hax
     included do
       ::ActionController::UnknownAction = ::AbstractController::ActionNotFound
       ::ActionController::DoubleRenderError = ::AbstractController::DoubleRenderError
 
-      cattr_accessor :session_options
-      self.session_options = {}
-
-      cattr_accessor :relative_url_root
-      self.relative_url_root = ENV['RAILS_RELATIVE_URL_ROOT']
+      # ROUTES TODO: This should be handled by a middleware and route generation
+      # should be able to handle SCRIPT_NAME
+      self.config.relative_url_root = ENV['RAILS_RELATIVE_URL_ROOT']
 
       class << self
         delegate :default_charset=, :to => "ActionDispatch::Response"
@@ -30,31 +29,17 @@ module ActionController
                                              @before_filter_chain_aborted @_headers @_params
                                              @_response)
 
-      # Controls the resource action separator
-      cattr_accessor :resource_action_separator
-      self.resource_action_separator = "/"
-
-      cattr_accessor :use_accept_header
-      self.use_accept_header = true
+      def rescue_action(env)
+        raise env["action_dispatch.rescue.exception"]
+      end
 
       self.page_cache_directory = defined?(Rails.public_path) ? Rails.public_path : ""
-
-      # 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
-
-      cattr_accessor :ip_spoofing_check
-      self.ip_spoofing_check = true
-
-      cattr_accessor :trusted_proxies
     end
 
     # For old tests
     def initialize_template_class(*) end
     def assign_shortcuts(*) end
 
-    # TODO: Remove this after we flip
     def template
       @template ||= view_context
     end
@@ -64,52 +49,20 @@ module ActionController
       super
     end
 
-    module ClassMethods
-      def consider_all_requests_local
-        ActiveSupport::Deprecation.warn "ActionController::Base.consider_all_requests_local is deprecated, " <<
-          "use Rails.application.config.consider_all_requests_local instead"
-        Rails.application.config.consider_all_requests_local
-      end
-
-      def consider_all_requests_local=(value)
-        ActiveSupport::Deprecation.warn "ActionController::Base.consider_all_requests_local= is no longer effective. " <<
-          "Please configure it on your application with config.consider_all_requests_local="
-        Rails.application.config.consider_all_requests_local = value
-      end
-
-      def allow_concurrency
-        ActiveSupport::Deprecation.warn "ActionController::Base.allow_concurrency is deprecated, " <<
-          "use Rails.application.config.allow_concurrency instead"
-        Rails.application.config.allow_concurrency
-      end
-
-      def allow_concurrency=(value)
-        ActiveSupport::Deprecation.warn "ActionController::Base.allow_concurrency= is no longer effective. " <<
-          "Please configure it on your application with config.allow_concurrency="
-        Rails.application.config.allow_concurrency = value
-      end
-
-      def rescue_action(env)
-        raise env["action_dispatch.rescue.exception"]
-      end
-
-      # Defines the storage option for cached fragments
-      def cache_store=(store_option)
-        @@cache_store = ActiveSupport::Cache.lookup_store(store_option)
-      end
-    end
-
-    delegate :consider_all_requests_local, :consider_all_requests_local=,
-             :allow_concurrency, :allow_concurrency=, :to => :"self.class"
-
-    def render_to_body(options)
-      if options.is_a?(Hash) && options.key?(:template)
-        options[:template].sub!(/^\//, '')
+    def _normalize_options(options)
+      if options[:action] && options[:action].to_s.include?(?/)
+        ActiveSupport::Deprecation.warn "Giving a path to render :action is deprecated. " <<
+          "Please use render :template instead", caller
+        options[:template] = options.delete(:action)
       end
 
       options[:text] = nil if options.delete(:nothing) == true
       options[:text] = " " if options.key?(:text) && options[:text].nil?
+      super
+    end
 
+    def render_to_body(options)
+      options[:template].sub!(/^\//, '') if options.key?(:template)
       super || " "
     end
 
@@ -124,18 +77,5 @@ module ActionController
     def performed?
       response_body
     end
-
-    # ==== Request only view path switching ====
-    def append_view_path(path)
-      view_paths.push(*path)
-    end
-
-    def prepend_view_path(path)
-      view_paths.unshift(*path)
-    end
-
-    def view_paths
-      view_context.view_paths
-    end
   end
 end
diff --git a/actionpack/lib/action_controller/metal/configuration.rb b/actionpack/lib/action_controller/metal/configuration.rb
deleted file mode 100644
index 5c829853b7..0000000000
--- a/actionpack/lib/action_controller/metal/configuration.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-module ActionController
-  module Configuration
-    extend ActiveSupport::Concern
-    
-    def config
-      @config ||= self.class.config
-    end
-    
-    def config=(config)
-      @config = config
-    end
-    
-    module ClassMethods
-      def default_config
-        @default_config ||= {}
-      end
-      
-      def config
-        self.config ||= default_config
-      end
-      
-      def config=(config)
-        @config = ActiveSupport::OrderedHash.new
-        @config.merge!(config)
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb
index 0f35a7c040..6ec788f302 100644
--- a/actionpack/lib/action_controller/metal/http_authentication.rb
+++ b/actionpack/lib/action_controller/metal/http_authentication.rb
@@ -124,7 +124,7 @@ module ActionController
       end
 
       def authenticate(request, &login_procedure)
-        unless authorization(request).blank?
+        unless request.authorization.blank?
           login_procedure.call(*user_name_and_password(request))
         end
       end
@@ -133,15 +133,8 @@ module ActionController
         decode_credentials(request).split(/:/, 2)
       end
 
-      def authorization(request)
-        request.env['HTTP_AUTHORIZATION']   ||
-        request.env['X-HTTP_AUTHORIZATION'] ||
-        request.env['X_HTTP_AUTHORIZATION'] ||
-        request.env['REDIRECT_X_HTTP_AUTHORIZATION']
-      end
-
       def decode_credentials(request)
-        ActiveSupport::Base64.decode64(authorization(request).split(' ', 2).last || '')
+        ActiveSupport::Base64.decode64(request.authorization.split(' ', 2).last || '')
       end
 
       def encode_credentials(user_name, password)
@@ -165,7 +158,7 @@ module ActionController
 
         # Authenticate with HTTP Digest, returns true or false
         def authenticate_with_http_digest(realm = "Application", &password_procedure)
-          HttpAuthentication::Digest.authenticate(request, realm, &password_procedure)
+          HttpAuthentication::Digest.authenticate(config.secret, request, realm, &password_procedure)
         end
 
         # Render output including the HTTP Digest authentication header
@@ -175,30 +168,23 @@ module ActionController
       end
 
       # Returns false on a valid response, true otherwise
-      def authenticate(request, realm, &password_procedure)
-        authorization(request) && validate_digest_response(request, realm, &password_procedure)
-      end
-
-      def authorization(request)
-        request.env['HTTP_AUTHORIZATION']   ||
-        request.env['X-HTTP_AUTHORIZATION'] ||
-        request.env['X_HTTP_AUTHORIZATION'] ||
-        request.env['REDIRECT_X_HTTP_AUTHORIZATION']
+      def authenticate(secret_key, request, realm, &password_procedure)
+        request.authorization && validate_digest_response(secret_key, request, realm, &password_procedure)
       end
 
       # Returns false unless the request credentials response value matches the expected value.
       # First try the password as a ha1 digest password. If this fails, then try it as a plain
       # text password.
-      def validate_digest_response(request, realm, &password_procedure)
+      def validate_digest_response(secret_key, request, realm, &password_procedure)
         credentials = decode_credentials_header(request)
-        valid_nonce = validate_nonce(request, credentials[:nonce])
+        valid_nonce = validate_nonce(secret_key, request, credentials[:nonce])
 
-        if valid_nonce && realm == credentials[:realm] && opaque == credentials[:opaque]
+        if valid_nonce && realm == credentials[:realm] && opaque(secret_key) == credentials[:opaque]
           password = password_procedure.call(credentials[:username])
           return false unless password
 
           method = request.env['rack.methodoverride.original_method'] || request.env['REQUEST_METHOD']
-          uri    = credentials[:uri][0,1] == '/' ? request.request_uri : request.url
+          uri    = credentials[:uri][0,1] == '/' ? request.fullpath : request.url
 
          [true, false].any? do |password_is_ha1|
            expected = expected_response(method, uri, credentials, password, password_is_ha1)
@@ -226,7 +212,7 @@ module ActionController
       end
 
       def decode_credentials_header(request)
-        decode_credentials(authorization(request))
+        decode_credentials(request.authorization)
       end
 
       def decode_credentials(header)
@@ -238,6 +224,9 @@ module ActionController
       end
 
       def authentication_header(controller, realm)
+        secret_key = controller.config.secret
+        nonce = self.nonce(secret_key)
+        opaque = opaque(secret_key)
         controller.headers["WWW-Authenticate"] = %(Digest realm="#{realm}", qop="auth", algorithm=MD5, nonce="#{nonce}", opaque="#{opaque}")
       end
 
@@ -280,7 +269,7 @@ module ActionController
       # The nonce is opaque to the client. Composed of Time, and hash of Time with secret
       # key from the Rails session secret generated upon creation of project. Ensures
       # the time cannot be modified by client.
-      def nonce(time = Time.now)
+      def nonce(secret_key, time = Time.now)
         t = time.to_i
         hashed = [t, secret_key]
         digest = ::Digest::MD5.hexdigest(hashed.join(":"))
@@ -292,21 +281,16 @@ module ActionController
       # Can be much shorter if the Stale directive is implemented. This would
       # allow a user to use new nonce without prompting user again for their
       # username and password.
-      def validate_nonce(request, value, seconds_to_timeout=5*60)
+      def validate_nonce(secret_key, request, value, seconds_to_timeout=5*60)
         t = ActiveSupport::Base64.decode64(value).split(":").first.to_i
-        nonce(t) == value && (t - Time.now.to_i).abs <= seconds_to_timeout
+        nonce(secret_key, t) == value && (t - Time.now.to_i).abs <= seconds_to_timeout
       end
 
       # Opaque based on random generation - but changing each request?
-      def opaque()
+      def opaque(secret_key)
         ::Digest::MD5.hexdigest(secret_key)
       end
 
-      # Set in /initializers/session_store.rb, and loaded even if sessions are not in use.
-      def secret_key
-        ActionController::Base.session_options[:secret]
-      end
-
     end
   end
 end
diff --git a/actionpack/lib/action_controller/metal/implicit_render.rb b/actionpack/lib/action_controller/metal/implicit_render.rb
new file mode 100644
index 0000000000..282dcf66b3
--- /dev/null
+++ b/actionpack/lib/action_controller/metal/implicit_render.rb
@@ -0,0 +1,21 @@
+module ActionController
+  module ImplicitRender
+    def send_action(*)
+      ret = super
+      default_render unless response_body
+      ret
+    end
+
+    def default_render
+      render
+    end
+
+    def method_for_action(action_name)
+      super || begin
+        if template_exists?(action_name.to_s, _prefix)
+          "default_render"
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_controller/metal/instrumentation.rb b/actionpack/lib/action_controller/metal/instrumentation.rb
index 85035dc09c..d69de65f28 100644
--- a/actionpack/lib/action_controller/metal/instrumentation.rb
+++ b/actionpack/lib/action_controller/metal/instrumentation.rb
@@ -20,7 +20,7 @@ module ActionController
         :params     => request.filtered_parameters,
         :formats    => request.formats.map(&:to_sym),
         :method     => request.method,
-        :path       => (request.request_uri rescue "unknown")
+        :path       => (request.fullpath rescue "unknown")
       }
 
       ActiveSupport::Notifications.instrument("action_controller.start_processing", raw_payload.dup)
diff --git a/actionpack/lib/action_controller/metal/rack_delegation.rb b/actionpack/lib/action_controller/metal/rack_delegation.rb
index bb55383631..37106733cb 100644
--- a/actionpack/lib/action_controller/metal/rack_delegation.rb
+++ b/actionpack/lib/action_controller/metal/rack_delegation.rb
@@ -6,14 +6,11 @@ module ActionController
     extend ActiveSupport::Concern
 
     included do
-      delegate :session, :to => "@_request"
       delegate :headers, :status=, :location=, :content_type=,
                :status, :location, :content_type, :to => "@_response"
-      attr_internal :request
     end
 
-    def dispatch(action, env)
-      @_request = ActionDispatch::Request.new(env)
+    def dispatch(action, request)
       @_response = ActionDispatch::Response.new
       @_response.request = request
       super
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index 00a09309bf..f892bd9b91 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -4,44 +4,27 @@ module ActionController
 
     include ActionController::RackDelegation
     include AbstractController::Rendering
-    include AbstractController::DetailsCache
 
-    def process_action(*)
-      self.formats = request.formats.map {|x| x.to_sym }
+    def process(*)
+      self.formats = request.formats.map { |x| x.to_sym }
       super
     end
 
     def render(*args)
       raise ::AbstractController::DoubleRenderError if response_body
-      args << {} unless args.last.is_a?(Hash)
-      super(*args)
-      self.content_type ||= args.last[:_template].mime_type.to_s
+      super
       response_body
     end
 
     private
 
-      def _render_partial(options)
-        options[:partial] = action_name if options[:partial] == true
-        options[:_details] = details_for_render
-        super
-      end
-
-      def format_for_text
-        formats.first
+      def _normalize_args(action=nil, options={}, &blk)
+        options = super
+        options[:update] = blk if block_given?
+        options
       end
 
-      def _normalize_options(action=nil, options={}, &blk)
-        case action
-        when NilClass
-        when Hash
-          options = super(action.delete(:action), action)
-        when String, Symbol
-          options = super
-        else
-          options.merge! :partial => action
-        end
-
+      def _normalize_options(options)
         if options.key?(:text) && options[:text].respond_to?(:to_text)
           options[:text] = options[:text].to_text
         end
@@ -50,17 +33,23 @@ module ActionController
           options[:status] = Rack::Utils.status_code(options[:status])
         end
 
-        options[:update] = blk if block_given?
-
-        _process_options(options)
-        options
+        super
       end
 
       def _process_options(options)
         status, content_type, location = options.values_at(:status, :content_type, :location)
+
         self.status = status if status
         self.content_type = content_type if content_type
         self.headers["Location"] = url_for(location) if location
+
+        super
       end
+
+      def _with_template_hook(template)
+        super
+        self.content_type ||= template.mime_type.to_s
+      end
+
   end
 end
diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
index 276c703307..6765314df2 100644
--- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb
+++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
@@ -12,11 +12,10 @@ module ActionController #:nodoc:
     included do
       # 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
+      config.request_forgery_protection_token ||= true
 
       # Controls whether request forgergy protection is turned on or not. Turned off by default only in test mode.
-      class_attribute :allow_forgery_protection
-      self.allow_forgery_protection = true
+      config.allow_forgery_protection ||= true
 
       helper_method :form_authenticity_token
       helper_method :protect_against_forgery?
@@ -80,9 +79,47 @@ module ActionController #:nodoc:
         self.request_forgery_protection_token ||= :authenticity_token
         before_filter :verify_authenticity_token, options
       end
+
+      def request_forgery_protection_token
+        config.request_forgery_protection_token
+      end
+
+      def request_forgery_protection_token=(val)
+        config.request_forgery_protection_token = val
+      end
+
+      def allow_forgery_protection
+        config.allow_forgery_protection
+      end
+
+      def allow_forgery_protection=(val)
+        config.allow_forgery_protection = val
+      end
     end
 
     protected
+
+      def protect_from_forgery(options = {})
+        self.request_forgery_protection_token ||= :authenticity_token
+        before_filter :verify_authenticity_token, options
+      end
+
+      def request_forgery_protection_token
+        config.request_forgery_protection_token
+      end
+
+      def request_forgery_protection_token=(val)
+        config.request_forgery_protection_token = val
+      end
+
+      def allow_forgery_protection
+        config.allow_forgery_protection
+      end
+
+      def allow_forgery_protection=(val)
+        config.allow_forgery_protection = val
+      end
+
       # The actual before_filter that is used.  Modify this to change how you handle unverified requests.
       def verify_authenticity_token
         verified_request? || raise(ActionController::InvalidAuthenticityToken)
@@ -109,7 +146,7 @@ module ActionController #:nodoc:
       end
 
       def protect_against_forgery?
-        self.class.allow_forgery_protection
+        config.allow_forgery_protection
       end
   end
 end
diff --git a/actionpack/lib/action_controller/metal/session_management.rb b/actionpack/lib/action_controller/metal/session_management.rb
index d70f40ce7a..91d89ff9a4 100644
--- a/actionpack/lib/action_controller/metal/session_management.rb
+++ b/actionpack/lib/action_controller/metal/session_management.rb
@@ -2,44 +2,8 @@ module ActionController #:nodoc:
   module SessionManagement #:nodoc:
     extend ActiveSupport::Concern
 
-    include ActionController::Configuration
-
     module ClassMethods
-      # Set the session store to be used for keeping the session data between requests.
-      # By default, sessions are stored in browser cookies (<tt>:cookie_store</tt>),
-      # but you can also specify one of the other included stores (<tt>:active_record_store</tt>,
-      # <tt>:mem_cache_store</tt>, or your own custom class.
-      def session_store=(store)
-        if store == :active_record_store
-          self.session_store = ActiveRecord::SessionStore
-        else
-          @@session_store = store.is_a?(Symbol) ?
-            ActionDispatch::Session.const_get(store.to_s.camelize) :
-            store
-        end
-      end
-
-      # Returns the session store class currently used.
-      def session_store
-        if defined? @@session_store
-          @@session_store
-        else
-          ActionDispatch::Session::CookieStore
-        end
-      end
-
-      def session=(options = {})
-        self.session_store = nil if options.delete(:disabled)
-        session_options.merge!(options)
-      end
 
-      def session(*args)
-        ActiveSupport::Deprecation.warn(
-          "Disabling sessions for a single controller has been deprecated. " +
-          "Sessions are now lazy loaded. So if you don't access them, " +
-          "consider them off. You can still modify the session cookie " +
-          "options with request.session_options.", caller)
-      end
     end
   end
 end
diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb
index 8a06f34d23..10c7ca9021 100644
--- a/actionpack/lib/action_controller/metal/url_for.rb
+++ b/actionpack/lib/action_controller/metal/url_for.rb
@@ -3,14 +3,13 @@ module ActionController
     extend ActiveSupport::Concern
 
     include ActionDispatch::Routing::UrlFor
-    include ActionController::RackDelegation
 
     def url_options
       super.reverse_merge(
         :host => request.host_with_port,
         :protocol => request.protocol,
         :_path_segments => request.symbolized_path_parameters
-      )
+      ).merge(:script_name => request.script_name)
     end
 
     def _router
diff --git a/actionpack/lib/action_controller/middleware.rb b/actionpack/lib/action_controller/middleware.rb
index 17275793b7..2115b07b3e 100644
--- a/actionpack/lib/action_controller/middleware.rb
+++ b/actionpack/lib/action_controller/middleware.rb
@@ -6,7 +6,8 @@ module ActionController
       end
 
       def call(env)
-        @controller.build(@app).dispatch(:index, env)
+        request = ActionDispatch::Request.new(env)
+        @controller.build(@app).dispatch(:index, request)
       end
     end
 
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index 07c6b8f2b6..6a3afbb157 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -3,6 +3,7 @@ require "action_controller"
 require "action_view/railtie"
 require "active_support/core_ext/class/subclasses"
 require "active_support/deprecation/proxy_wrappers"
+require "active_support/deprecation"
 
 module ActionController
   class Railtie < Rails::Railtie
@@ -11,28 +12,63 @@ module ActionController
     require "action_controller/railties/log_subscriber"
     require "action_controller/railties/url_helpers"
 
+    ad = config.action_dispatch
+    config.action_controller.singleton_class.send(:define_method, :session) do
+      ActiveSupport::Deprecation.warn "config.action_controller.session has been " \
+        "renamed to config.action_dispatch.session.", caller
+      ad.session
+    end
+
+    config.action_controller.singleton_class.send(:define_method, :session=) do |val|
+      ActiveSupport::Deprecation.warn "config.action_controller.session has been " \
+        "renamed to config.action_dispatch.session.", caller
+      ad.session = val
+    end
+
+    config.action_controller.singleton_class.send(:define_method, :session_store) do
+      ActiveSupport::Deprecation.warn "config.action_controller.session_store has been " \
+        "renamed to config.action_dispatch.session_store.", caller
+      ad.session_store
+    end
+
+    config.action_controller.singleton_class.send(:define_method, :session_store=) do |val|
+      ActiveSupport::Deprecation.warn "config.action_controller.session_store has been " \
+        "renamed to config.action_dispatch.session_store.", caller
+      ad.session_store = val
+    end
+
     log_subscriber ActionController::Railties::LogSubscriber.new
 
     initializer "action_controller.logger" do
-      ActionController::Base.logger ||= Rails.logger
+      ActionController.base_hook { self.logger ||= Rails.logger }
     end
 
     initializer "action_controller.set_configs" do |app|
-      app.config.action_controller.each do |k,v|
-        ActionController::Base.send "#{k}=", v
-      end
+      paths = app.config.paths
+      ac = app.config.action_controller
+
+      ac.assets_dir      = paths.public.to_a.first
+      ac.javascripts_dir = paths.public.javascripts.to_a.first
+      ac.stylesheets_dir = paths.public.stylesheets.to_a.first
+      ac.secret          = app.config.cookie_secret
+
+      ActionController.base_hook { self.config.replace(ac) }
     end
 
     initializer "action_controller.initialize_framework_caches" do
-      ActionController::Base.cache_store ||= RAILS_CACHE
+      ActionController.base_hook { self.cache_store ||= RAILS_CACHE }
     end
 
     initializer "action_controller.set_helpers_path" do |app|
-      ActionController::Base.helpers_path = app.config.paths.app.helpers.to_a
+      ActionController.base_hook do
+        self.helpers_path = app.config.paths.app.helpers.to_a
+      end
     end
 
     initializer "action_controller.url_helpers" do |app|
-      ActionController::Base.extend ::ActionController::Railtie::UrlHelpers.with(app.routes)
+      ActionController.base_hook do
+        extend ::ActionController::Railtie::UrlHelpers.with(app.routes)
+      end
 
       message = "ActionController::Routing::Routes is deprecated. " \
                 "Instead, use Rails.application.routes"
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 64d9bdab2a..cdb5db32aa 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -322,6 +322,8 @@ module ActionController
         @controller ||= klass.new rescue nil
       end
 
+      @request.env.delete('PATH_INFO')
+
       if @controller
         @controller.request = @request
         @controller.params = {}
@@ -335,13 +337,20 @@ module ActionController
 
     private
       def build_request_uri(action, parameters)
-        unless @request.env['REQUEST_URI']
+        unless @request.env["PATH_INFO"]
           options = @controller.__send__(:url_options).merge(parameters)
-          options.update(:only_path => true, :action => action)
+          options.update(
+            :only_path => true,
+            :action => action,
+            :relative_url_root => nil,
+            :_path_segments => @request.symbolized_path_parameters)
+
+          url, query_string = @router.url_for(options).split("?", 2)
 
-          url = ActionController::UrlRewriter.new(@request, parameters)
-          @request.request_uri = url.rewrite(@router, options)
+          @request.env["SCRIPT_NAME"] = @controller.config.relative_url_root
+          @request.env["PATH_INFO"] = url
+          @request.env["QUERY_STRING"] = query_string || ""
         end
       end
-  end
+    end
 end
diff --git a/actionpack/lib/action_controller/url_rewriter.rb b/actionpack/lib/action_controller/url_rewriter.rb
deleted file mode 100644
index 807b21cd0e..0000000000
--- a/actionpack/lib/action_controller/url_rewriter.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-require 'active_support/core_ext/hash/except'
-
-module ActionController
-  # Rewrites URLs for Base.redirect_to and Base.url_for in the controller.
-  class UrlRewriter #:nodoc:
-    RESERVED_OPTIONS = [:anchor, :params, :only_path, :host, :protocol, :port, :trailing_slash, :skip_relative_url_root]
-
-    def initialize(request, parameters)
-      @request, @parameters = request, parameters
-    end
-
-    def rewrite(router, options = {})
-      options[:host]     ||= @request.host_with_port
-      options[:protocol] ||= @request.protocol
-
-      self.class.rewrite(router, options, @request.symbolized_path_parameters) do |options|
-        process_path_options(options)
-      end
-    end
-
-    def to_str
-      "#{@request.protocol}, #{@request.host_with_port}, #{@request.path}, #{@parameters[:controller]}, #{@parameters[:action]}, #{@request.parameters.inspect}"
-    end
-
-    alias_method :to_s, :to_str
-
-    # ROUTES TODO: Class method code smell
-    def self.rewrite(router, options, path_segments=nil)
-      handle_positional_args(options)
-
-      rewritten_url = ""
-
-      # ROUTES TODO: Fix the tests
-      segments = options.delete(:_path_segments)
-      path_segments = path_segments ? path_segments.merge(segments || {}) : segments
-
-      unless options[:only_path]
-        rewritten_url << (options[:protocol] || "http")
-        rewritten_url << "://" unless rewritten_url.match("://")
-        rewritten_url << rewrite_authentication(options)
-
-        raise "Missing host to link to! Please provide :host parameter or set default_url_options[:host]" unless options[:host]
-
-        rewritten_url << options[:host]
-        rewritten_url << ":#{options.delete(:port)}" if options.key?(:port)
-      end
-
-      path_options = options.except(*RESERVED_OPTIONS)
-      path_options = yield(path_options) if block_given?
-      path = router.generate(path_options, path_segments || {})
-
-      rewritten_url << ActionController::Base.relative_url_root.to_s unless options[:skip_relative_url_root]
-      rewritten_url << (options[:trailing_slash] ? path.sub(/\?|\z/) { "/" + $& } : path)
-      rewritten_url << "##{Rack::Utils.escape(options[:anchor].to_param.to_s)}" if options[:anchor]
-
-      rewritten_url
-    end
-
-  protected
-
-    def self.handle_positional_args(options)
-      return unless args = options.delete(:_positional_args)
-
-      keys = options.delete(:_positional_keys)
-      keys -= options.keys if args.size < keys.size - 1 # take format into account
-
-      args = args.zip(keys).inject({}) do |h, (v, k)|
-        h[k] = v
-        h
-      end
-
-      # Tell url_for to skip default_url_options
-      options.merge!(args)
-    end
-
-    def self.rewrite_authentication(options)
-      if options[:user] && options[:password]
-        "#{Rack::Utils.escape(options.delete(:user))}:#{Rack::Utils.escape(options.delete(:password))}@"
-      else
-        ""
-      end
-    end
-
-    # Given a Hash of options, generates a route
-    def process_path_options(options)
-      options = options.symbolize_keys
-      options.update(options[:params].symbolize_keys) if options[:params]
-
-      if (overwrite = options.delete(:overwrite_params))
-        options.update(@parameters.symbolize_keys)
-        options.update(overwrite.symbolize_keys)
-      end
-
-      options
-    end
-
-  end
-end
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index 479ea959e6..dfb8919561 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -48,6 +48,7 @@ module ActionDispatch
     autoload :Flash
     autoload :Head
     autoload :ParamsParser
+    autoload :RemoteIp
     autoload :Rescue
     autoload :ShowExceptions
     autoload :Static
diff --git a/actionpack/lib/action_dispatch/http/mime_negotiation.rb b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
index 40617e239a..fec250e928 100644
--- a/actionpack/lib/action_dispatch/http/mime_negotiation.rb
+++ b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
@@ -67,21 +67,6 @@ module ActionDispatch
         @env["action_dispatch.request.formats"] = [Mime::Type.lookup_by_extension(parameters[:format])]
       end
 
-      # Returns a symbolized version of the <tt>:format</tt> parameter of the request.
-      # If no \format is given it returns <tt>:js</tt>for Ajax requests and <tt>:html</tt>
-      # otherwise.
-      def template_format
-        parameter_format = parameters[:format]
-
-        if parameter_format
-          parameter_format
-        elsif xhr?
-          :js
-        else
-          :html
-        end
-      end
-
       # Receives an array of mimes and return the first user sent mime that
       # matches the order array.
       #
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 7a17023ed2..ea9f0f99c2 100755
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -30,6 +30,14 @@ module ActionDispatch
       METHOD
     end
 
+    def self.new(env)
+      if request = env["action_dispatch.request"] && request.instance_of?(self)
+        return request
+      end
+
+      super
+    end
+
     def key?(key)
       @env.key?(key)
     end
@@ -119,36 +127,7 @@ module ActionDispatch
     # delimited list in the case of multiple chained proxies; the last
     # address which is not trusted is the originating IP.
     def remote_ip
-      remote_addr_list = @env['REMOTE_ADDR'] && @env['REMOTE_ADDR'].scan(/[^,\s]+/)
-
-      unless remote_addr_list.blank?
-        not_trusted_addrs = remote_addr_list.reject {|addr| addr =~ TRUSTED_PROXIES || addr =~ ActionController::Base.trusted_proxies}
-        return not_trusted_addrs.first unless not_trusted_addrs.empty?
-      end
-      remote_ips = @env['HTTP_X_FORWARDED_FOR'] && @env['HTTP_X_FORWARDED_FOR'].split(',')
-
-      if @env.include? 'HTTP_CLIENT_IP'
-        if ActionController::Base.ip_spoofing_check && remote_ips && !remote_ips.include?(@env['HTTP_CLIENT_IP'])
-          # We don't know which came from the proxy, and which from the user
-          raise ActionController::ActionControllerError.new <<EOM
-IP spoofing attack?!
-HTTP_CLIENT_IP=#{@env['HTTP_CLIENT_IP'].inspect}
-HTTP_X_FORWARDED_FOR=#{@env['HTTP_X_FORWARDED_FOR'].inspect}
-EOM
-        end
-
-        return @env['HTTP_CLIENT_IP']
-      end
-
-      if remote_ips
-        while remote_ips.size > 1 && (TRUSTED_PROXIES =~ remote_ips.last.strip || ActionController::Base.trusted_proxies =~ remote_ips.last.strip)
-          remote_ips.pop
-        end
-
-        return remote_ips.last.strip
-      end
-
-      @env['REMOTE_ADDR']
+      (@env["action_dispatch.remote_ip"] || ip).to_s
     end
 
     # Returns the lowercase name of the HTTP server software.
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb
index 42ad19044d..b64a83c62e 100644
--- a/actionpack/lib/action_dispatch/http/url.rb
+++ b/actionpack/lib/action_dispatch/http/url.rb
@@ -3,7 +3,7 @@ module ActionDispatch
     module URL
       # Returns the complete URL used for this request.
       def url
-        protocol + host_with_port + request_uri
+        protocol + host_with_port + fullpath
       end
 
       # Returns 'https://' if this is an SSL request and 'http://' otherwise.
@@ -85,42 +85,11 @@ module ActionDispatch
         subdomains(tld_length).join('.')
       end
 
-      # Returns the query string, accounting for server idiosyncrasies.
-      def query_string
-        @env['QUERY_STRING'].present? ? @env['QUERY_STRING'] : (@env['REQUEST_URI'].to_s.split('?', 2)[1] || '')
-      end
-
       # Returns the request URI, accounting for server idiosyncrasies.
       # WEBrick includes the full URL. IIS leaves REQUEST_URI blank.
       def request_uri
-        if uri = @env['REQUEST_URI']
-          # Remove domain, which webrick puts into the request_uri.
-          (%r{^\w+\://[^/]+(/.*|$)$} =~ uri) ? $1 : uri
-        else
-          # Construct IIS missing REQUEST_URI from SCRIPT_NAME and PATH_INFO.
-          uri = @env['PATH_INFO'].to_s
-
-          if script_filename = @env['SCRIPT_NAME'].to_s.match(%r{[^/]+$})
-            uri = uri.sub(/#{script_filename}\//, '')
-          end
-
-          env_qs = @env['QUERY_STRING'].to_s
-          uri += "?#{env_qs}" unless env_qs.empty?
-
-          if uri.blank?
-            @env.delete('REQUEST_URI')
-          else
-            @env['REQUEST_URI'] = uri
-          end
-        end
-      end
-
-      # Returns the interpreted \path to requested resource after all the installation
-      # directory of this application was taken into account.
-      def path
-        path = request_uri.to_s[/\A[^\?]*/]
-        path.sub!(/\A#{ActionController::Base.relative_url_root}/, '')
-        path
+        ActiveSupport::Deprecation.warn "Using #request_uri is deprecated. Use fullpath instead.", caller
+        fullpath
       end
 
     private
diff --git a/actionpack/lib/action_dispatch/middleware/params_parser.rb b/actionpack/lib/action_dispatch/middleware/params_parser.rb
index 522982e202..f4c4324fb0 100644
--- a/actionpack/lib/action_dispatch/middleware/params_parser.rb
+++ b/actionpack/lib/action_dispatch/middleware/params_parser.rb
@@ -1,4 +1,3 @@
-require 'active_support/json'
 require 'action_dispatch/http/request'
 
 module ActionDispatch
diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
new file mode 100644
index 0000000000..c7d710b98e
--- /dev/null
+++ b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
@@ -0,0 +1,51 @@
+module ActionDispatch
+  class RemoteIp
+    class IpSpoofAttackError < StandardError ; end
+
+    class RemoteIpGetter
+      def initialize(env, check_ip_spoofing, trusted_proxies)
+        @env = env
+        @check_ip_spoofing = check_ip_spoofing
+        @trusted_proxies = trusted_proxies
+      end
+
+      def remote_addrs
+        @remote_addrs ||= begin
+          list = @env['REMOTE_ADDR'] ? @env['REMOTE_ADDR'].split(/[,\s]+/) : []
+          list.reject { |addr| addr =~ @trusted_proxies }
+        end
+      end
+
+      def to_s
+        return remote_addrs.first if remote_addrs.any?
+
+        forwarded_ips = @env['HTTP_X_FORWARDED_FOR'] ? @env['HTTP_X_FORWARDED_FOR'].strip.split(/[,\s]+/) : []
+
+        if client_ip = @env['HTTP_CLIENT_IP']
+          if @check_ip_spoofing && !forwarded_ips.include?(client_ip)
+            # We don't know which came from the proxy, and which from the user
+            raise IpSpoofAttackError, "IP spoofing attack?!" \
+              "HTTP_CLIENT_IP=#{@env['HTTP_CLIENT_IP'].inspect}" \
+              "HTTP_X_FORWARDED_FOR=#{@env['HTTP_X_FORWARDED_FOR'].inspect}"
+          end
+          return client_ip
+        end
+
+        return forwarded_ips.reject { |ip| ip =~ @trusted_proxies }.last || @env["REMOTE_ADDR"]
+      end
+    end
+
+    def initialize(app, check_ip_spoofing = true, trusted_proxies = nil)
+      @app = app
+      @check_ip_spoofing = check_ip_spoofing
+      regex = '(^127\.0\.0\.1$|^(10|172\.(1[6-9]|2[0-9]|30|31)|192\.168)\.)'
+      regex << "|(#{trusted_proxies})" if trusted_proxies
+      @trusted_proxies = Regexp.new(regex, "i")
+    end
+
+    def call(env)
+      env["action_dispatch.remote_ip"] = RemoteIpGetter.new(env, @check_ip_spoofing, @trusted_proxies)
+      @app.call(env)
+    end
+  end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
index 04a101dbb2..22da82479e 100644
--- a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
@@ -1,5 +1,4 @@
 require 'active_support/core_ext/hash/keys'
-require 'rack/request'
 
 module ActionDispatch
   module Session
@@ -177,9 +176,8 @@ module ActionDispatch
           if key.blank?
             raise ArgumentError, 'A key is required to write a ' +
               'cookie containing the session data. Use ' +
-              'config.action_controller.session = { :key => ' +
-              '"_myapp_session", :secret => "some secret phrase" } in ' +
-              'config/application.rb'
+              'config.action_controller.session_store :cookie_store, { :key => ' +
+              '"_myapp_session" } in config/application.rb'
           end
         end
 
@@ -193,10 +191,9 @@ module ActionDispatch
           if secret.blank?
             raise ArgumentError, "A secret is required to generate an " +
               "integrity hash for cookie session data. Use " +
-              "config.action_controller.session = { :key => " +
-              "\"_myapp_session\", :secret => \"some secret phrase of at " +
-              "least #{SECRET_MIN_LENGTH} characters\" } " +
-              "in config/environment.rb"
+              "config.cookie_secret = \"some secret phrase of at " +
+              "least #{SECRET_MIN_LENGTH} characters\"" +
+              "in config/application.rb"
           end
 
           if secret.length < SECRET_MIN_LENGTH
diff --git a/actionpack/lib/action_dispatch/middleware/stack.rb b/actionpack/lib/action_dispatch/middleware/stack.rb
index 18a2922fa7..5c5362ce4a 100644
--- a/actionpack/lib/action_dispatch/middleware/stack.rb
+++ b/actionpack/lib/action_dispatch/middleware/stack.rb
@@ -58,7 +58,7 @@ module ActionDispatch
           if lazy_compare?(@klass) && lazy_compare?(middleware)
             normalize(@klass) == normalize(middleware)
           else
-            klass == ActiveSupport::Inflector.constantize(middleware.to_s)
+            klass.name == middleware.to_s
           end
         end
       end
@@ -122,7 +122,11 @@ module ActionDispatch
       find_all { |middleware| middleware.active? }
     end
 
-    def build(app)
+    def build(app = nil, &blk)
+      app ||= blk
+
+      raise "MiddlewareStack#build requires an app" unless app
+
       active.reverse.inject(app) { |a, e| e.build(a) }
     end
   end
diff --git a/actionpack/lib/action_dispatch/railtie.rb b/actionpack/lib/action_dispatch/railtie.rb
index 79e9464337..e486bd4079 100644
--- a/actionpack/lib/action_dispatch/railtie.rb
+++ b/actionpack/lib/action_dispatch/railtie.rb
@@ -6,6 +6,7 @@ module ActionDispatch
     railtie_name :action_dispatch
 
     config.action_dispatch.x_sendfile_header = "X-Sendfile"
+    config.action_dispatch.ip_spoofing_check = true
 
     # Prepare dispatcher callbacks and run 'prepare' callbacks
     initializer "action_dispatch.prepare_dispatcher" do |app|
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 52e7b0e77d..0b7b09ee7a 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/hash/except'
+
 module ActionDispatch
   module Routing
     class Mapper
@@ -36,7 +38,7 @@ module ActionDispatch
         end
 
         def to_route
-          [ app, conditions, requirements, defaults, @options[:as] ]
+          [ app, conditions, requirements, defaults, @options[:as], @options[:anchor] ]
         end
 
         private
@@ -64,7 +66,7 @@ module ActionDispatch
 
           # match "account/overview"
           def using_match_shorthand?(args, options)
-            args.present? && options.except(:via).empty? && !args.first.include?(':')
+            args.present? && options.except(:via, :anchor).empty? && !args.first.include?(':')
           end
 
           def normalize_path(path)
@@ -85,7 +87,7 @@ module ActionDispatch
           end
 
           def requirements
-            @requirements ||= returning(@options[:constraints] || {}) do |requirements|
+            @requirements ||= (@options[:constraints] || {}).tap do |requirements|
               requirements.reverse_merge!(@scope[:constraints]) if @scope[:constraints]
               @options.each { |k, v| requirements[k] = v if v.is_a?(Regexp) }
             end
@@ -174,9 +176,15 @@ module ActionDispatch
         end
 
         def match(*args)
-          @set.add_route(*Mapping.new(@set, @scope, args).to_route)
+          mapping = Mapping.new(@set, @scope, args).to_route
+          @set.add_route(*mapping)
           self
         end
+
+        def default_url_options=(options)
+          @set.default_url_options = options
+        end
+        alias_method :default_url_options, :default_url_options=
       end
 
       module HttpHelpers
@@ -293,6 +301,7 @@ module ActionDispatch
           options = args.extract_options!
 
           options = (@scope[:options] || {}).merge(options)
+          options[:anchor] = true unless options.key?(:anchor)
 
           if @scope[:name_prefix] && !options[:as].blank?
             options[:as] = "#{@scope[:name_prefix]}_#{options[:as]}"
@@ -450,7 +459,10 @@ module ActionDispatch
 
           scope(:path => resource.name.to_s, :controller => resource.controller) do
             with_scope_level(:resource, resource) do
-              yield if block_given?
+
+              scope(:name_prefix => resource.name.to_s) do
+                yield if block_given?
+              end
 
               get    :show if resource.actions.include?(:show)
               post   :create if resource.actions.include?(:create)
@@ -533,6 +545,21 @@ module ActionDispatch
           end
         end
 
+        def mount(app, options = nil)
+          if options
+            path = options.delete(:at)
+          else
+            options = app
+            app, path = options.find { |k, v| k.respond_to?(:call) }
+            options.delete(app) if app
+          end
+
+          raise "A rack application must be specified" unless path
+
+          match(path, options.merge(:to => app, :anchor => false))
+          self
+        end
+
         def match(*args)
           options = args.extract_options!
 
diff --git a/actionpack/lib/action_dispatch/routing/route.rb b/actionpack/lib/action_dispatch/routing/route.rb
index e6e44d3546..6f37eadd6b 100644
--- a/actionpack/lib/action_dispatch/routing/route.rb
+++ b/actionpack/lib/action_dispatch/routing/route.rb
@@ -4,7 +4,7 @@ module ActionDispatch
       attr_reader :app, :conditions, :defaults, :name
       attr_reader :path, :requirements
 
-      def initialize(app, conditions = {}, requirements = {}, defaults = {}, name = nil)
+      def initialize(app, conditions, requirements, defaults, name, anchor)
         @app = app
         @defaults = defaults
         @name = name
@@ -17,7 +17,7 @@ module ActionDispatch
 
         if path = conditions[:path_info]
           @path = path
-          conditions[:path_info] = ::Rack::Mount::Strexp.compile(path, requirements, SEPARATORS)
+          conditions[:path_info] = ::Rack::Mount::Strexp.compile(path, requirements, SEPARATORS, anchor)
         end
 
         @conditions = conditions.inject({}) { |h, (k, v)|
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 99436e3cb0..722be432c7 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -168,31 +168,6 @@ module ActionDispatch
             selector = url_helper_name(name, kind)
             hash_access_method = hash_access_name(name, kind)
 
-            # We use module_eval to avoid leaks.
-            #
-            # def users_url(*args)
-            #   if args.empty? || Hash === args.first
-            #     options = hash_for_users_url(args.first || {})
-            #   else
-            #     options = hash_for_users_url(args.extract_options!)
-            #     default = default_url_options(options) if self.respond_to?(:default_url_options, true)
-            #     options = (default ||= {}).merge(options)
-            #
-            #     keys = []
-            #     keys -= options.keys if args.size < keys.size - 1
-            #
-            #     args = args.zip(keys).inject({}) do |h, (v, k)|
-            #       h[k] = v
-            #       h
-            #     end
-            #
-            #     # Tell url_for to skip default_url_options
-            #     options[:use_defaults] = false
-            #     options.merge!(args)
-            #   end
-            #
-            #   url_for(options)
-            # end
             @module.module_eval <<-END_EVAL, __FILE__, __LINE__ + 1
               def #{selector}(*args)
                 options =  #{hash_access_method}(args.extract_options!)
@@ -211,6 +186,7 @@ module ActionDispatch
 
       attr_accessor :routes, :named_routes
       attr_accessor :disable_clear_and_finalize, :resources_path_names
+      attr_accessor :default_url_options
 
       def self.default_resources_path_names
         { :new => 'new', :edit => 'edit' }
@@ -221,8 +197,10 @@ module ActionDispatch
         self.named_routes = NamedRouteCollection.new
         self.resources_path_names = self.class.default_resources_path_names.dup
         self.controller_namespaces = Set.new
+        self.default_url_options = {}
 
         @disable_clear_and_finalize = false
+        clear!
       end
 
       def draw(&block)
@@ -259,31 +237,22 @@ module ActionDispatch
         named_routes.install(destinations, regenerate_code)
       end
 
-      def url_for
-        @url_for ||= begin
-          router = self
-          Module.new do
-            extend ActiveSupport::Concern
-            include UrlFor
-
-            define_method(:_router) { router }
-          end
-        end
-      end
-
       def url_helpers
         @url_helpers ||= begin
           router = self
 
           Module.new do
             extend ActiveSupport::Concern
-            include router.url_for
+            include UrlFor
 
             # ROUTES TODO: install_helpers isn't great... can we make a module with the stuff that
             # we can include?
+            # Yes plz - JP
             included do
               router.install_helpers(self)
             end
+
+            define_method(:_router) { router }
           end
         end
       end
@@ -292,36 +261,131 @@ module ActionDispatch
         routes.empty?
       end
 
-      def add_route(app, conditions = {}, requirements = {}, defaults = {}, name = nil)
-        route = Route.new(app, conditions, requirements, defaults, name)
+      def add_route(app, conditions = {}, requirements = {}, defaults = {}, name = nil, anchor = true)
+        route = Route.new(app, conditions, requirements, defaults, name, anchor)
         @set.add_route(*route)
         named_routes[name] = route if name
         routes << route
         route
       end
 
-      def options_as_params(options)
-        # If an explicit :controller was given, always make :action explicit
-        # too, so that action expiry works as expected for things like
-        #
-        #   generate({:controller => 'content'}, {:controller => 'content', :action => 'show'})
-        #
-        # (the above is from the unit tests). In the above case, because the
-        # controller was explicitly given, but no action, the action is implied to
-        # be "index", not the recalled action of "show".
-        #
-        # great fun, eh?
-
-        options_as_params = options.clone
-        options_as_params[:action] ||= 'index' if options[:controller]
-        options_as_params[:action] = options_as_params[:action].to_s if options_as_params[:action]
-        options_as_params
-      end
+      class Generator
+        attr_reader :options, :recall, :set, :script_name, :named_route
+
+        def initialize(options, recall, set, extras = false)
+          @script_name = options.delete(:script_name)
+          @named_route = options.delete(:use_route)
+          @options     = options.dup
+          @recall      = recall.dup
+          @set         = set
+          @extras      = extras
+
+          normalize_options!
+          normalize_controller_action_id!
+          use_relative_controller!
+          controller.sub!(%r{^/}, '') if controller
+          handle_nil_action!
+        end
+
+        def controller
+          @controller ||= @options[:controller]
+        end
+
+        def current_controller
+          @recall[:controller]
+        end
+
+        def use_recall_for(key)
+          if @recall[key] && (!@options.key?(key) || @options[key] == @recall[key])
+            @options[key] = @recall.delete(key)
+          end
+        end
+
+        def normalize_options!
+          # If an explicit :controller was given, always make :action explicit
+          # too, so that action expiry works as expected for things like
+          #
+          #   generate({:controller => 'content'}, {:controller => 'content', :action => 'show'})
+          #
+          # (the above is from the unit tests). In the above case, because the
+          # controller was explicitly given, but no action, the action is implied to
+          # be "index", not the recalled action of "show".
+
+          if options[:controller]
+            options[:action]     ||= 'index'
+            options[:controller]   = options[:controller].to_s
+          end
+
+          if options[:action]
+            options[:action] = options[:action].to_s
+          end
+        end
+
+        # This pulls :controller, :action, and :id out of the recall.
+        # The recall key is only used if there is no key in the options
+        # or if the key in the options is identical. If any of
+        # :controller, :action or :id is not found, don't pull any
+        # more keys from the recall.
+        def normalize_controller_action_id!
+          @recall[:action] ||= 'index' if current_controller
+
+          use_recall_for(:controller) or return
+          use_recall_for(:action) or return
+          use_recall_for(:id)
+        end
+
+        # if the current controller is "foo/bar/baz" and :controller => "baz/bat"
+        # is specified, the controller becomes "foo/baz/bat"
+        def use_relative_controller!
+          if !named_route && different_controller?
+            old_parts = current_controller.split('/')
+            size = controller.count("/") + 1
+            parts = old_parts[0...-size] << controller
+            @controller = @options[:controller] = parts.join("/")
+          end
+        end
+
+        # This handles the case of :action => nil being explicitly passed.
+        # It is identical to :action => "index"
+        def handle_nil_action!
+          if options.has_key?(:action) && options[:action].nil?
+            options[:action] = 'index'
+          end
+          recall[:action] = options.delete(:action) if options[:action] == 'index'
+        end
+
+        def generate
+          error = ActionController::RoutingError.new("No route matches #{options.inspect}")
+          path, params = @set.generate(:path_info, named_route, options, recall, opts)
+
+          raise error unless path
+
+          params.reject! {|k,v| !v }
+
+          return [path, params.keys] if @extras
 
-      def build_expiry(options, recall)
-        recall.inject({}) do |expiry, (key, recalled_value)|
-          expiry[key] = (options.key?(key) && options[key].to_param != recalled_value.to_param)
-          expiry
+          path << "?#{params.to_query}" if params.any?
+          "#{script_name}#{path}"
+        rescue Rack::Mount::RoutingError
+          raise error
+        end
+
+        def opts
+          parameterize = lambda do |name, value|
+            if name == :controller
+              value
+            elsif value.is_a?(Array)
+              value.map { |v| Rack::Mount::Utils.escape_uri(v.to_param) }.join('/')
+            else
+              Rack::Mount::Utils.escape_uri(value.to_param)
+            end
+          end
+          {:parameterize => parameterize}
+        end
+
+        def different_controller?
+          return false unless current_controller
+          controller.to_param != current_controller.to_param
         end
       end
 
@@ -332,82 +396,44 @@ module ActionDispatch
       end
 
       def generate_extras(options, recall={})
-        generate(options, recall, :generate_extras)
+        generate(options, recall, true)
       end
 
-      def generate(options, recall = {}, method = :generate)
-        options, recall = options.dup, recall.dup
-        named_route = options.delete(:use_route)
+      def generate(options, recall = {}, extras = false)
+        Generator.new(options, recall, @set, extras).generate
+      end
 
-        options = options_as_params(options)
-        expire_on = build_expiry(options, recall)
+      RESERVED_OPTIONS = [:anchor, :params, :only_path, :host, :protocol, :port, :trailing_slash]
 
-        recall[:action] ||= 'index' if options[:controller] || recall[:controller]
+      def url_for(options)
+        options = default_url_options.merge(options || {})
 
-        if recall[:controller] && (!options.has_key?(:controller) || options[:controller] == recall[:controller])
-          options[:controller] = recall.delete(:controller)
+        handle_positional_args(options)
 
-          if recall[:action] && (!options.has_key?(:action) || options[:action] == recall[:action])
-            options[:action] = recall.delete(:action)
+        rewritten_url = ""
 
-            if recall[:id] && (!options.has_key?(:id) || options[:id] == recall[:id])
-              options[:id] = recall.delete(:id)
-            end
-          end
-        end
-
-        options[:controller] = options[:controller].to_s if options[:controller]
+        path_segments = options.delete(:_path_segments)
 
-        if !named_route && expire_on[:controller] && options[:controller] && options[:controller][0] != ?/
-          old_parts = recall[:controller].split('/')
-          new_parts = options[:controller].split('/')
-          parts = old_parts[0..-(new_parts.length + 1)] + new_parts
-          options[:controller] = parts.join('/')
-        end
+        unless options[:only_path]
+          rewritten_url << (options[:protocol] || "http")
+          rewritten_url << "://" unless rewritten_url.match("://")
+          rewritten_url << rewrite_authentication(options)
 
-        options[:controller] = options[:controller][1..-1] if options[:controller] && options[:controller][0] == ?/
+          raise "Missing host to link to! Please provide :host parameter or set default_url_options[:host]" unless options[:host]
 
-        merged = options.merge(recall)
-        if options.has_key?(:action) && options[:action].nil?
-          options.delete(:action)
-          recall[:action] = 'index'
+          rewritten_url << options[:host]
+          rewritten_url << ":#{options.delete(:port)}" if options.key?(:port)
         end
-        recall[:action] = options.delete(:action) if options[:action] == 'index'
-
-        opts = {}
-        opts[:parameterize] = lambda { |name, value|
-          if name == :controller
-            value
-          elsif value.is_a?(Array)
-            value.map { |v| Rack::Mount::Utils.escape_uri(v.to_param) }.join('/')
-          else
-            Rack::Mount::Utils.escape_uri(value.to_param)
-          end
-        }
 
-        unless result = @set.generate(:path_info, named_route, options, recall, opts)
-          raise ActionController::RoutingError, "No route matches #{options.inspect}"
-        end
+        path_options = options.except(*RESERVED_OPTIONS)
+        path_options = yield(path_options) if block_given?
+        path = generate(path_options, path_segments || {})
 
-        path, params = result
-        params.each do |k, v|
-          if v
-            params[k] = v
-          else
-            params.delete(k)
-          end
-        end
+        # ROUTES TODO: This can be called directly, so script_name should probably be set in the router
+        rewritten_url << (options[:trailing_slash] ? path.sub(/\?|\z/) { "/" + $& } : path)
+        rewritten_url << "##{Rack::Utils.escape(options[:anchor].to_param.to_s)}" if options[:anchor]
 
-        if path && method == :generate_extras
-          [path, params.keys]
-        elsif path
-          path << "?#{params.to_query}" if params.any?
-          path
-        else
-          raise ActionController::RoutingError, "No route matches #{options.inspect}"
-        end
-      rescue Rack::Mount::RoutingError
-        raise ActionController::RoutingError, "No route matches #{options.inspect}"
+        rewritten_url
       end
 
       def call(env)
@@ -435,6 +461,30 @@ module ActionDispatch
 
         raise ActionController::RoutingError, "No route matches #{path.inspect}"
       end
+
+      private
+        def handle_positional_args(options)
+          return unless args = options.delete(:_positional_args)
+
+          keys = options.delete(:_positional_keys)
+          keys -= options.keys if args.size < keys.size - 1 # take format into account
+
+          args = args.zip(keys).inject({}) do |h, (v, k)|
+            h[k] = v
+            h
+          end
+
+          # Tell url_for to skip default_url_options
+          options.merge!(args)
+        end
+
+        def rewrite_authentication(options)
+          if options[:user] && options[:password]
+            "#{Rack::Utils.escape(options.delete(:user))}:#{Rack::Utils.escape(options.delete(:password))}@"
+          else
+            ""
+          end
+        end
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb
index 7f2c9a5c12..ec78f53fa6 100644
--- a/actionpack/lib/action_dispatch/routing/url_for.rb
+++ b/actionpack/lib/action_dispatch/routing/url_for.rb
@@ -85,37 +85,24 @@ module ActionDispatch
       extend ActiveSupport::Concern
 
       included do
-        # Including in a class uses an inheritable hash. Modules get a plain hash.
-        if respond_to?(:class_attribute)
-          class_attribute :default_url_options
-        else
-          mattr_accessor :default_url_options
-          remove_method :default_url_options
-        end
+        # TODO: with_routing extends @controller with url_helpers, trickling down to including this module which overrides its default_url_options
+        unless method_defined?(:default_url_options)
+          # Including in a class uses an inheritable hash. Modules get a plain hash.
+          if respond_to?(:class_attribute)
+            class_attribute :default_url_options
+          else
+            mattr_accessor :default_url_options
+            remove_method :default_url_options
+          end
 
-        self.default_url_options = {}
+          self.default_url_options = {}
+        end
       end
 
-      # def default_url_options(options = nil)
-      #   self.class.default_url_options
-      # end
-
       def url_options
-        self.class.default_url_options.merge(@url_options || {})
+        default_url_options
       end
 
-      def url_options=(options)
-        @url_options = options
-      end
-
-      # def merge_options(options) #:nodoc:
-      #   if respond_to?(:default_url_options) && (defaults = default_url_options(options))
-      #     defaults.merge(options)
-      #   else
-      #     options
-      #   end
-      # end
-
       # Generate a url based on the options provided, default_url_options and the
       # routes defined in routes.rb.  The following options are supported:
       #
@@ -126,8 +113,6 @@ module ActionDispatch
       #   provided either explicitly, or via +default_url_options+.
       # * <tt>:port</tt> - Optionally specify the port to connect to.
       # * <tt>:anchor</tt> - An anchor name to be appended to the path.
-      # * <tt>:skip_relative_url_root</tt> - If true, the url is not constructed using the
-      #   +relative_url_root+ set in ActionController::Base.relative_url_root.
       # * <tt>:trailing_slash</tt> - If true, adds a trailing slash, as in "/archive/2009/"
       #
       # Any other key (<tt>:controller</tt>, <tt>:action</tt>, etc.) given to
@@ -139,25 +124,16 @@ module ActionDispatch
       #    url_for :controller => 'tasks', :action => 'testing', :host=>'somehost.org', :anchor => 'ok', :only_path => true    # => '/tasks/testing#ok'
       #    url_for :controller => 'tasks', :action => 'testing', :trailing_slash=>true  # => 'http://somehost.org/tasks/testing/'
       #    url_for :controller => 'tasks', :action => 'testing', :host=>'somehost.org', :number => '33'  # => 'http://somehost.org/tasks/testing?number=33'
-      def url_for(options = {})
-        options ||= {}
+      def url_for(options = nil)
         case options
-          when String
-            options
-          when Hash
-            # Handle the deprecated instance level default_url_options
-            if respond_to?(:default_url_options, true)
-              ActiveSupport::Deprecation.warn "Overwriting #default_url_options is deprecated. Please set url options with self.url_options = { ... }"
-              if defaults = default_url_options(options)
-                options = defaults.merge(options)
-              end
-            end
-
-            ActionController::UrlRewriter.rewrite(_router, url_options.merge(options))
-          else
-            polymorphic_url(options)
+        when String
+          options
+        when nil, Hash
+          _router.url_for(url_options.merge(options || {}))
+        else
+          polymorphic_url(options)
         end
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index f5035fe45a..afe6386105 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -37,15 +37,18 @@ module ActionView
     autoload :Helpers
 
     autoload_under "render" do
+      autoload :Layouts
       autoload :Partials
       autoload :Rendering
     end
 
-    autoload :MissingTemplate,   'action_view/base'
-    autoload :Resolver,          'action_view/template/resolver'
-    autoload :PathResolver,      'action_view/template/resolver'
-    autoload :PathSet,           'action_view/paths'
-    autoload :FileSystemResolverWithFallback, 'action_view/template/resolver'
+    autoload :Base
+    autoload :LookupContext
+    autoload :MissingTemplate,    'action_view/base'
+    autoload :Resolver,           'action_view/template/resolver'
+    autoload :PathResolver,       'action_view/template/resolver'
+    autoload :FileSystemResolver, 'action_view/template/resolver'
+    autoload :PathSet,            'action_view/paths'
 
     autoload :TemplateError,     'action_view/template/error'
     autoload :TemplateHandler,   'action_view/template'
@@ -55,7 +58,7 @@ module ActionView
   autoload :TestCase, 'action_view/test_case'
 end
 
+require 'active_support/i18n'
 require 'active_support/core_ext/string/output_safety'
-require 'action_view/base'
 
 I18n.load_path << "#{File.dirname(__FILE__)}/action_view/locale/en.yml"
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 2d2b53a6ce..ffe3060404 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -173,102 +173,43 @@ module ActionView #:nodoc:
     module Subclasses
     end
 
-    include Helpers, Rendering, Partials, ::ERB::Util
+    include Helpers, Rendering, Partials, Layouts, ::ERB::Util, Context
+    extend  ActiveSupport::Memoizable
 
-    def config
-      self.config = DEFAULT_CONFIG unless @config
-      @config
-    end
-
-    def config=(config)
-      @config = ActiveSupport::OrderedOptions.new.merge(config)
-    end
-
-    extend ActiveSupport::Memoizable
-
-    attr_accessor :base_path, :assigns, :template_extension
-    attr_internal :captures
-
-    def reset_formats(formats)
-      old_formats, self.formats = self.formats, formats
-      reset_hash_key
-      yield if block_given?
-    ensure
-      if block_given?
-        self.formats = old_formats
-        reset_hash_key
-      end
-    end
-
-    def reset_hash_key
-      if defined?(AbstractController::HashKey)
-        # This is expensive, but we need to reset this when the format is updated,
-        # which currently only happens
-        Thread.current[:format_locale_key] =
-          AbstractController::HashKey.get(self.class, :formats => formats, :locale => [I18n.locale])
-      end
-    end
-
-    def formats
-      controller ? controller.formats : @formats
-    end
-
-    def formats=(val)
-      if controller
-        controller.formats = val
-      else
-        @formats = val
-      end
-    end
-
-    class << self
-      delegate :erb_trim_mode=, :to => 'ActionView::Template::Handlers::ERB'
-      delegate :logger, :to => 'ActionController::Base', :allow_nil => true
-    end
+    ActionView.run_base_hooks(self)
 
-    @@debug_rjs = false
-    ##
-    # :singleton-method:
     # Specify whether RJS responses should be wrapped in a try/catch block
     # that alert()s the caught exception (and then re-raises it).
     cattr_accessor :debug_rjs
+    @@debug_rjs = false
 
-    # Specify whether templates should be cached. Otherwise the file we be read everytime it is accessed.
-    # Automatically reloading templates are not thread safe and should only be used in development mode.
-    @@cache_template_loading = nil
-    cattr_accessor :cache_template_loading
+    class_attribute :helpers
+    attr_reader :helpers
 
-    # :nodoc:
-    def self.xss_safe?
-      true
+    class << self
+      delegate :erb_trim_mode=, :to => 'ActionView::Template::Handlers::ERB'
+      delegate :logger, :to => 'ActionController::Base', :allow_nil => true
     end
 
-    def self.cache_template_loading?
-      ActionController::Base.allow_concurrency || (cache_template_loading.nil? ? !ActiveSupport::Dependencies.load? : cache_template_loading)
-    end
+    attr_accessor :base_path, :assigns, :template_extension, :lookup_context
+    attr_internal :captures, :request, :layout, :controller, :template, :config
 
-    attr_internal :request, :layout
-
-    def controller_path
-      @controller_path ||= controller && controller.controller_path
-    end
+    delegate :find, :exists?, :formats, :formats=, :locale, :locale=,
+             :view_paths, :view_paths=, :with_fallbacks, :update_details, :to => :lookup_context
 
     delegate :request_forgery_protection_token, :template, :params, :session, :cookies, :response, :headers,
              :flash, :action_name, :controller_name, :to => :controller
 
     delegate :logger, :to => :controller, :allow_nil => true
 
-    delegate :find, :to => :view_paths
-
-    include Context
+    def self.xss_safe? #:nodoc:
+      true
+    end
 
     def self.process_view_paths(value)
       ActionView::PathSet.new(Array(value))
     end
 
-    class_attribute :helpers
-    attr_reader :helpers
-
     def self.for_controller(controller)
       @views ||= {}
 
@@ -296,26 +237,26 @@ module ActionView #:nodoc:
         klass = self
       end
 
-      klass.new(controller.class.view_paths, {}, controller)
+      klass.new(controller.lookup_context, {}, controller)
     end
 
-    def initialize(view_paths = [], assigns_for_first_render = {}, controller = nil, formats = nil)#:nodoc:
+    def initialize(lookup_context = nil, assigns_for_first_render = {}, controller = nil, formats = nil) #:nodoc:
       @config = nil
-      @formats = formats
       @assigns = assigns_for_first_render.each { |key, value| instance_variable_set("@#{key}", value) }
       @helpers = self.class.helpers || Module.new
 
       @_controller   = controller
-      @_content_for  = Hash.new {|h,k| h[k] = ActiveSupport::SafeBuffer.new }
+      @_config       = ActiveSupport::InheritableOptions.new(controller.config) if controller
+      @_content_for  = Hash.new { |h,k| h[k] = ActiveSupport::SafeBuffer.new }
       @_virtual_path = nil
-      self.view_paths = view_paths
-    end
 
-    attr_internal :controller, :template
-    attr_reader :view_paths
+      @lookup_context = lookup_context.is_a?(ActionView::LookupContext) ?
+        lookup_context : ActionView::LookupContext.new(lookup_context)
+      @lookup_context.formats = formats if formats
+    end
 
-    def view_paths=(paths)
-      @view_paths = self.class.process_view_paths(paths)
+    def controller_path
+      @controller_path ||= controller && controller.controller_path
     end
 
     def punctuate_body!(part)
diff --git a/actionpack/lib/action_view/helpers.rb b/actionpack/lib/action_view/helpers.rb
index b4f649385a..e359b0bdac 100644
--- a/actionpack/lib/action_view/helpers.rb
+++ b/actionpack/lib/action_view/helpers.rb
@@ -10,6 +10,7 @@ module ActionView #:nodoc:
     autoload :CsrfHelper, 'action_view/helpers/csrf_helper'
     autoload :DateHelper, 'action_view/helpers/date_helper'
     autoload :DebugHelper, 'action_view/helpers/debug_helper'
+    autoload :DeprecatedBlockHelpers, 'action_view/helpers/deprecated_block_helpers'
     autoload :FormHelper, 'action_view/helpers/form_helper'
     autoload :FormOptionsHelper, 'action_view/helpers/form_options_helper'
     autoload :FormTagHelper, 'action_view/helpers/form_tag_helper'
diff --git a/actionpack/lib/action_view/helpers/active_model_helper.rb b/actionpack/lib/action_view/helpers/active_model_helper.rb
index ed83b8a8b2..4e12cdab54 100644
--- a/actionpack/lib/action_view/helpers/active_model_helper.rb
+++ b/actionpack/lib/action_view/helpers/active_model_helper.rb
@@ -5,9 +5,11 @@ require 'active_support/core_ext/enumerable'
 require 'active_support/core_ext/kernel/reporting'
 
 module ActionView
-  class Base
-    @@field_error_proc = Proc.new{ |html_tag, instance| "<div class=\"fieldWithErrors\">#{html_tag}</div>".html_safe }
-    cattr_accessor :field_error_proc
+  ActionView.base_hook do
+    class ActionView::Base
+      @@field_error_proc = Proc.new{ |html_tag, instance| "<div class=\"fieldWithErrors\">#{html_tag}</div>".html_safe }
+      cattr_accessor :field_error_proc
+    end
   end
 
   module Helpers
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 96976ce45f..de3d61ebbe 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -133,13 +133,6 @@ module ActionView
     # change. You can use something like Live HTTP Headers for Firefox to verify
     # that the cache is indeed working.
     module AssetTagHelper
-      assets_dir = defined?(Rails.public_path) ? Rails.public_path : "public"
-      ActionView::DEFAULT_CONFIG = {
-        :assets_dir => assets_dir,
-        :javascripts_dir => "#{assets_dir}/javascripts",
-        :stylesheets_dir => "#{assets_dir}/stylesheets",
-      }
-
       JAVASCRIPT_DEFAULT_SOURCES = ['prototype', 'effects', 'dragdrop', 'controls', 'rails'].freeze unless const_defined?(:JAVASCRIPT_DEFAULT_SOURCES)
 
       # Returns a link tag that browsers and news readers can use to auto-detect
@@ -648,8 +641,8 @@ module ActionView
             source = rewrite_asset_path(source)
 
             if has_request && include_host
-              unless source =~ %r{^#{ActionController::Base.relative_url_root}/}
-                source = "#{ActionController::Base.relative_url_root}#{source}"
+              unless source =~ %r{^#{controller.config.relative_url_root}/}
+                source = "#{controller.config.relative_url_root}#{source}"
               end
             end
           end
@@ -677,7 +670,7 @@ module ActionView
         # or the value returned from invoking the proc if it's a proc or the value from
         # invoking call if it's an object responding to call.
         def compute_asset_host(source)
-          if host = ActionController::Base.asset_host
+          if host = config.asset_host
             if host.is_a?(Proc) || host.respond_to?(:call)
               case host.is_a?(Proc) ? host.arity : host.method(:call).arity
               when 2
diff --git a/actionpack/lib/action_view/helpers/atom_feed_helper.rb b/actionpack/lib/action_view/helpers/atom_feed_helper.rb
index a26a8c9b4b..58c3a8752e 100644
--- a/actionpack/lib/action_view/helpers/atom_feed_helper.rb
+++ b/actionpack/lib/action_view/helpers/atom_feed_helper.rb
@@ -114,7 +114,7 @@ module ActionView
         feed_opts.merge!(options).reject!{|k,v| !k.to_s.match(/^xml/)}
 
         xml.feed(feed_opts) do
-          xml.id(options[:id] || "tag:#{request.host},#{options[:schema_date]}:#{request.request_uri.split(".")[0]}")
+          xml.id(options[:id] || "tag:#{request.host},#{options[:schema_date]}:#{request.fullpath.split(".")[0]}")
           xml.link(:rel => 'alternate', :type => 'text/html', :href => options[:root_url] || (request.protocol + request.host_with_port))
           xml.link(:rel => 'self', :type => 'application/atom+xml', :href => options[:url] || request.url)
 
diff --git a/actionpack/lib/action_view/helpers/capture_helper.rb b/actionpack/lib/action_view/helpers/capture_helper.rb
index 8c48300ed3..75fc2fddeb 100644
--- a/actionpack/lib/action_view/helpers/capture_helper.rb
+++ b/actionpack/lib/action_view/helpers/capture_helper.rb
@@ -30,14 +30,10 @@ module ActionView
       #   <b><%= @greeting %></b>
       #   </body></html>
       #
-      def capture(*args, &block)
-        # Return captured buffer in erb.
-        if block_called_from_erb?(block)
-          with_output_buffer { block.call(*args) }
-        else
-          # Return block result otherwise, but protect buffer also.
-          with_output_buffer { return block.call(*args) }
-        end
+      def capture(*args)
+        value = nil
+        buffer = with_output_buffer { value = yield *args }
+        buffer.presence || value
       end
 
       # Calling content_for stores a block of markup in an identifier for later use.
@@ -143,7 +139,7 @@ module ActionView
       # Defaults to a new empty string.
       def with_output_buffer(buf = nil) #:nodoc:
         unless buf
-          buf = ActiveSupport::SafeBuffer.new
+          buf = ActionView::OutputBuffer.new
           buf.force_encoding(output_buffer.encoding) if buf.respond_to?(:force_encoding)
         end
         self.output_buffer, old_buffer = buf, output_buffer
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 89ac682c18..42018ee261 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -1,5 +1,6 @@
 require "date"
 require 'action_view/helpers/tag_helper'
+require 'active_support/core_ext/hash/slice'
 
 module ActionView
   module Helpers
@@ -865,7 +866,7 @@ module ActionView
             :id => input_id_from_type(type),
             :name => input_name_from_type(type),
             :value => value
-          }) + "\n").html_safe
+          }.merge(@html_options.slice(:disabled))) + "\n").html_safe
         end
 
         # Returns the name attribute for the input tag
diff --git a/actionpack/lib/action_view/helpers/deprecated_block_helpers.rb b/actionpack/lib/action_view/helpers/deprecated_block_helpers.rb
new file mode 100644
index 0000000000..3d0657e873
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/deprecated_block_helpers.rb
@@ -0,0 +1,52 @@
+module ActionView
+  module Helpers
+    module DeprecatedBlockHelpers
+      extend ActiveSupport::Concern
+
+      include ActionView::Helpers::TagHelper
+      include ActionView::Helpers::TextHelper
+      include ActionView::Helpers::JavaScriptHelper
+      include ActionView::Helpers::FormHelper
+
+      def content_tag(*, &block)
+        block_called_from_erb?(block) ? safe_concat(super) : super
+      end
+
+      def javascript_tag(*, &block)
+        block_called_from_erb?(block) ? safe_concat(super) : super
+      end
+
+      def form_for(*, &block)
+        block_called_from_erb?(block) ? safe_concat(super) : super
+      end
+
+      def form_tag(*, &block)
+        block_called_from_erb?(block) ? safe_concat(super) : super
+      end
+
+      def fields_for(*, &block)
+        block_called_from_erb?(block) ? safe_concat(super) : super
+      end
+
+      def field_set_tag(*, &block)
+        block_called_from_erb?(block) ? safe_concat(super) : super
+      end
+
+      BLOCK_CALLED_FROM_ERB = 'defined? __in_erb_template'
+
+      if RUBY_VERSION < '1.9.0'
+        # Check whether we're called from an erb template.
+        # We'd return a string in any other case, but erb <%= ... %>
+        # can't take an <% end %> later on, so we have to use <% ... %>
+        # and implicitly concat.
+        def block_called_from_erb?(block)
+          block && eval(BLOCK_CALLED_FROM_ERB, block)
+        end
+      else
+        def block_called_from_erb?(block)
+          block && eval(BLOCK_CALLED_FROM_ERB, block.binding)
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index ace3bcfde3..48df26efaa 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -92,6 +92,10 @@ module ActionView
     # link:classes/ActionView/Helpers/DateHelper.html, and
     # link:classes/ActionView/Helpers/ActiveRecordHelper.html
     module FormHelper
+      extend ActiveSupport::Concern
+
+      include FormTagHelper
+
       # Creates a form and a scope around a specific model object that is used
       # as a base for questioning about values for the fields.
       #
@@ -309,9 +313,9 @@ module ActionView
 
         options[:html][:remote] = true if options.delete(:remote)
 
-        safe_concat(form_tag(options.delete(:url) || {}, options.delete(:html) || {}))
-        fields_for(object_name, *(args << options), &proc)
-        safe_concat('</form>')
+        output = form_tag(options.delete(:url) || {}, options.delete(:html) || {})
+        output << fields_for(object_name, *(args << options), &proc)
+        output.safe_concat('</form>')
       end
 
       def apply_form_for_options!(object_or_array, options) #:nodoc:
@@ -528,7 +532,10 @@ module ActionView
         end
 
         builder = options[:builder] || ActionView::Base.default_form_builder
-        yield builder.new(object_name, object, self, options, block)
+
+        with_output_buffer do
+          yield builder.new(object_name, object, self, options, block)
+        end
       end
 
       # Returns a label tag tailored for labelling an input field for a specified attribute (identified by +method+) on an object
@@ -1183,9 +1190,11 @@ module ActionView
 
           if association.is_a?(Array)
             explicit_child_index = options[:child_index]
-            association.map do |child|
-              fields_for_nested_model("#{name}[#{explicit_child_index || nested_child_index(name)}]", child, options, block)
-            end.join
+            output = ActiveSupport::SafeBuffer.new
+            association.each do |child|
+              output << fields_for_nested_model("#{name}[#{explicit_child_index || nested_child_index(name)}]", child, options, block)
+            end
+            output
           elsif association
             fields_for_nested_model(name, association, options, block)
           end
@@ -1211,8 +1220,10 @@ module ActionView
     end
   end
 
-  class Base
-    cattr_accessor :default_form_builder
-    @@default_form_builder = ::ActionView::Helpers::FormBuilder
+  ActionView.base_hook do
+    class ActionView::Base
+      cattr_accessor :default_form_builder
+      @@default_form_builder = ::ActionView::Helpers::FormBuilder
+    end
   end
 end
diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
index 7f74be27cb..7039ecd233 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -97,7 +97,9 @@ module ActionView
     #   </select>
     #
     module FormOptionsHelper
+      # ERB::Util can mask some helpers like textilize. Make sure to include them.
       include ERB::Util
+      include TextHelper
 
       # Create a select tag and a series of contained option tags for the provided object and method.
       # The option currently held by the object will be selected, provided that the object is available.
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index 7dcaee7e34..573733ffea 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -10,6 +10,11 @@ module ActionView
     # NOTE: The HTML options <tt>disabled</tt>, <tt>readonly</tt>, and <tt>multiple</tt> can all be treated as booleans. So specifying
     # <tt>:disabled => true</tt> will give <tt>disabled="disabled"</tt>.
     module FormTagHelper
+      extend ActiveSupport::Concern
+
+      include UrlHelper
+      include TextHelper
+
       # Starts a form tag that points the action to an url configured with <tt>url_for_options</tt> just like
       # ActionController::Base#url_for. The method for the form defaults to POST.
       #
@@ -441,10 +446,10 @@ module ActionView
       #   # => <fieldset class="format"><p><input id="name" name="name" type="text" /></p></fieldset>
       def field_set_tag(legend = nil, options = nil, &block)
         content = capture(&block)
-        safe_concat(tag(:fieldset, options, true))
-        safe_concat(content_tag(:legend, legend)) unless legend.blank?
-        concat(content)
-        safe_concat("</fieldset>")
+        output = tag(:fieldset, options, true)
+        output.safe_concat(content_tag(:legend, legend)) unless legend.blank?
+        output.concat(content)
+        output.safe_concat("</fieldset>")
       end
 
       private
@@ -477,9 +482,10 @@ module ActionView
 
         def form_tag_in_block(html_options, &block)
           content = capture(&block)
-          safe_concat(form_tag_html(html_options))
-          concat(content)
-          safe_concat("</form>")
+          output = ActiveSupport::SafeBuffer.new
+          output.safe_concat(form_tag_html(html_options))
+          output << content
+          output.safe_concat("</form>")
         end
 
         def token_tag
diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb
index 2c73ff88f7..8dab3094dd 100644
--- a/actionpack/lib/action_view/helpers/javascript_helper.rb
+++ b/actionpack/lib/action_view/helpers/javascript_helper.rb
@@ -83,13 +83,7 @@ module ActionView
             content_or_options_with_block
           end
 
-        tag = content_tag(:script, javascript_cdata_section(content), html_options.merge(:type => Mime::JS))
-
-        if block_called_from_erb?(block)
-          safe_concat(tag)
-        else
-          tag
-        end
+        content_tag(:script, javascript_cdata_section(content), html_options.merge(:type => Mime::JS))
       end
 
       def javascript_cdata_section(content) #:nodoc:
diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb
index 3d3502a08b..46e41bc406 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -28,27 +28,25 @@ module ActionView
       #  number_to_phone(1235551234, :country_code => 1, :extension => 1343, :delimiter => ".")
       #  => +1.123.555.1234 x 1343
       def number_to_phone(number, options = {})
-        number       = number.to_s.strip unless number.nil?
+        return nil if number.nil?
+
+        number       = number.to_s.strip
         options      = options.symbolize_keys
         area_code    = options[:area_code] || nil
         delimiter    = options[:delimiter] || "-"
         extension    = options[:extension].to_s.strip || nil
         country_code = options[:country_code] || nil
 
-        begin
-          str = ""
-          str << "+#{country_code}#{delimiter}" unless country_code.blank?
-          str << if area_code
-            number.gsub!(/([0-9]{1,3})([0-9]{3})([0-9]{4}$)/,"(\\1) \\2#{delimiter}\\3")
-          else
-            number.gsub!(/([0-9]{0,3})([0-9]{3})([0-9]{4})$/,"\\1#{delimiter}\\2#{delimiter}\\3")
-            number.starts_with?('-') ? number.slice!(1..-1) : number
-          end
-          str << " x #{extension}" unless extension.blank?
-          str
-        rescue
-          number
+        str = ""
+        str << "+#{country_code}#{delimiter}" unless country_code.blank?
+        str << if area_code
+          number.gsub!(/([0-9]{1,3})([0-9]{3})([0-9]{4}$)/,"(\\1) \\2#{delimiter}\\3")
+        else
+          number.gsub!(/([0-9]{0,3})([0-9]{3})([0-9]{4})$/,"\\1#{delimiter}\\2#{delimiter}\\3")
+          number.starts_with?('-') ? number.slice!(1..-1) : number
         end
+        str << " x #{extension}" unless extension.blank?
+        str
       end
 
       # Formats a +number+ into a currency string (e.g., $13.65). You can customize the format
@@ -87,13 +85,14 @@ module ActionView
         format    = options[:format]    || defaults[:format]
         separator = '' if precision == 0
 
-        begin
-          format.gsub(/%n/, number_with_precision(number,
-            :precision => precision,
-            :delimiter => delimiter,
-            :separator => separator)
-          ).gsub(/%u/, unit).html_safe
-        rescue
+        value = number_with_precision(number,
+          :precision => precision,
+          :delimiter => delimiter,
+          :separator => separator)
+
+        if value
+          format.gsub(/%n/, value).gsub(/%u/, unit).html_safe
+        else
           number
         end
       end
@@ -122,14 +121,11 @@ module ActionView
         separator = options[:separator] || defaults[:separator]
         delimiter = options[:delimiter] || defaults[:delimiter]
 
-        begin
-          number_with_precision(number,
-            :precision => precision,
-            :separator => separator,
-            :delimiter => delimiter) + "%"
-        rescue
-          number
-        end
+        value = number_with_precision(number,
+          :precision => precision,
+          :separator => separator,
+          :delimiter => delimiter)
+        value ? value + "%" : number
       end
 
       # Formats a +number+ with grouped thousands using +delimiter+ (e.g., 12,324). You can
@@ -168,11 +164,11 @@ module ActionView
         delimiter ||= (options[:delimiter] || defaults[:delimiter])
         separator ||= (options[:separator] || defaults[:separator])
 
-        begin
-          parts = number.to_s.split('.')
+        parts = number.to_s.split('.')
+        if parts[0]
           parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{delimiter}")
           parts.join(separator)
-        rescue
+        else
           number
         end
       end
@@ -216,11 +212,17 @@ module ActionView
         delimiter ||= (options[:delimiter] || defaults[:delimiter])
 
         begin
+          value = Float(number)
+        rescue ArgumentError, TypeError
+          value = nil
+        end
+
+        if value
           rounded_number = BigDecimal.new((Float(number) * (10 ** precision)).to_s).round.to_f / 10 ** precision
           number_with_delimiter("%01.#{precision}f" % rounded_number,
             :separator => separator,
             :delimiter => delimiter)
-        rescue
+        else
           number
         end
       end
@@ -293,17 +295,13 @@ module ActionView
           unit_key = STORAGE_UNITS[exponent]
           unit = I18n.translate(:"number.human.storage_units.units.#{unit_key}", :locale => options[:locale], :count => number, :raise => true)
 
-          begin
-            escaped_separator = Regexp.escape(separator)
-            formatted_number = number_with_precision(number,
-              :precision => precision,
-              :separator => separator,
-              :delimiter => delimiter
-            ).sub(/(#{escaped_separator})(\d*[1-9])?0+\z/, '\1\2').sub(/#{escaped_separator}\z/, '')
-            storage_units_format.gsub(/%n/, formatted_number).gsub(/%u/, unit)
-          rescue
-            number
-          end
+          escaped_separator = Regexp.escape(separator)
+          formatted_number = number_with_precision(number,
+            :precision => precision,
+            :separator => separator,
+            :delimiter => delimiter
+          ).sub(/(#{escaped_separator})(\d*[1-9])?0+\z/, '\1\2').sub(/#{escaped_separator}\z/, '')
+          storage_units_format.gsub(/%n/, formatted_number).gsub(/%u/, unit)
         end
       end
     end
diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb
index 67a7586699..be49b5cc28 100644
--- a/actionpack/lib/action_view/helpers/prototype_helper.rb
+++ b/actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -182,7 +182,7 @@ module ActionView
         def initialize(context, &block) #:nodoc:
           context._evaluate_assigns_and_ivars
           @context, @lines = context, []
-          @context.reset_formats([:js, :html]) do
+          @context.update_details(:formats => [:js, :html]) do
             include_helpers_from_context
             @context.with_output_buffer(@lines) do
               @context.instance_exec(self, &block)
@@ -583,7 +583,7 @@ module ActionView
             end
 
             def with_formats(*args)
-              @context ? @context.reset_formats(args) { yield } : yield
+              @context ? @context.update_details(:formats => args) { yield } : yield
             end
 
             def javascript_object_for(object)
diff --git a/actionpack/lib/action_view/helpers/tag_helper.rb b/actionpack/lib/action_view/helpers/tag_helper.rb
index 513d72880c..d9d2588a2a 100644
--- a/actionpack/lib/action_view/helpers/tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/tag_helper.rb
@@ -7,6 +7,9 @@ module ActionView
     module TagHelper
       include ERB::Util
 
+      extend ActiveSupport::Concern
+      include CaptureHelper
+
       BOOLEAN_ATTRIBUTES = %w(disabled readonly multiple checked autobuffer
                            autoplay controls loop selected hidden scoped async
                            defer reversed ismap seemless muted required
@@ -69,13 +72,7 @@ module ActionView
       def content_tag(name, content_or_options_with_block = nil, options = nil, escape = true, &block)
         if block_given?
           options = content_or_options_with_block if content_or_options_with_block.is_a?(Hash)
-          content_tag = content_tag_string(name, capture(&block), options, escape)
-
-          if block_called_from_erb?(block)
-            safe_concat(content_tag)
-          else
-            content_tag
-          end
+          content_tag_string(name, capture(&block), options, escape)
         else
           content_tag_string(name, content_or_options_with_block, options, escape)
         end
@@ -109,21 +106,6 @@ module ActionView
       end
 
       private
-        BLOCK_CALLED_FROM_ERB = 'defined? __in_erb_template'
-
-        if RUBY_VERSION < '1.9.0'
-          # Check whether we're called from an erb template.
-          # We'd return a string in any other case, but erb <%= ... %>
-          # can't take an <% end %> later on, so we have to use <% ... %>
-          # and implicitly concat.
-          def block_called_from_erb?(block)
-            block && eval(BLOCK_CALLED_FROM_ERB, block)
-          end
-        else
-          def block_called_from_erb?(block)
-            block && eval(BLOCK_CALLED_FROM_ERB, block.binding)
-          end
-        end
 
         def content_tag_string(name, content, options, escape = true)
           tag_options = tag_options(options, escape) if options
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index d9607c0095..148f2868e9 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -544,10 +544,11 @@ module ActionView
         # submitted url doesn't have any either.  This lets the function
         # work with things like ?order=asc
         if url_string.index("?")
-          request_uri = request.request_uri
+          request_uri = request.fullpath
         else
-          request_uri = request.request_uri.split('?').first
+          request_uri = request.path
         end
+
         if url_string =~ /^\w+:\/\//
           url_string == "#{request.protocol}#{request.host_with_port}#{request_uri}"
         else
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
new file mode 100644
index 0000000000..91885c7370
--- /dev/null
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -0,0 +1,151 @@
+require 'active_support/core_ext/object/try'
+require 'active_support/core_ext/object/blank'
+
+module ActionView
+  # LookupContext is the object responsible to hold all information required to lookup
+  # templates, i.e. view paths and details. The LookupContext is also responsible to
+  # generate a key, given to view paths, used in the resolver cache lookup. Since
+  # this key is generated just once during the request, it speeds up all cache accesses.
+  class LookupContext #:nodoc:
+    mattr_accessor :fallbacks
+    @@fallbacks = [FileSystemResolver.new(""), FileSystemResolver.new("/")]
+
+    mattr_accessor :registered_details
+    self.registered_details = {}
+
+    def self.register_detail(name, options = {})
+      registered_details[name] = lambda do |value|
+        value = Array(value.presence || yield)
+        value |= [nil] unless options[:allow_nil] == false
+        value
+      end
+    end
+
+    register_detail(:formats) { Mime::SET.symbols }
+    register_detail(:locale)  { [I18n.locale] }
+
+    class DetailsKey #:nodoc:
+      attr_reader :details
+      alias :eql? :equal?
+
+      @details_keys = Hash.new
+
+      def self.get(details)
+        @details_keys[details] ||= new(details)
+      end
+
+      def initialize(details)
+        @details, @hash = details, details.hash
+      end
+    end
+
+    def initialize(view_paths, details = {})
+      @details_key = nil
+      self.view_paths = view_paths
+      self.details = details
+    end
+
+    module ViewPaths
+      attr_reader :view_paths
+
+      # Whenever setting view paths, makes a copy so we can manipulate then in
+      # instance objects as we wish.
+      def view_paths=(paths)
+        @view_paths = ActionView::Base.process_view_paths(paths)
+      end
+
+      def find(name, prefix = nil, partial = false)
+        @view_paths.find(name, prefix, partial || false, details, details_key)
+      end
+
+      def find_all(name, prefix = nil, partial = false)
+        @view_paths.find_all(name, prefix, partial || false, details, details_key)
+      end
+
+      def exists?(name, prefix = nil, partial = false)
+        @view_paths.exists?(name, prefix, partial || false, details, details_key)
+      end
+
+      # Add fallbacks to the view paths. Useful in cases you are rendering a file.
+      def with_fallbacks
+        added_resolvers = 0
+        self.class.fallbacks.each do |resolver|
+          next if view_paths.include?(resolver)
+          view_paths.push(resolver)
+          added_resolvers += 1
+        end
+        yield
+      ensure
+        added_resolvers.times { view_paths.pop }
+      end
+    end
+
+    module Details
+      attr_reader :details
+
+      def details=(details)
+        @details = normalize_details(details)
+        @details_key = nil if @details_key && @details_key.details != @details
+      end
+
+      def details_key
+        @details_key ||= DetailsKey.get(@details)
+      end
+
+      # Shortcut to read formats from details.
+      def formats
+        @details[:formats].compact
+      end
+
+      # Shortcut to set formats in details.
+      def formats=(value)
+        self.details = @details.merge(:formats => value)
+      end
+
+      # Shortcut to read locale.
+      def locale
+        I18n.locale
+      end
+
+      # Shortcut to set locale in details and I18n.
+      def locale=(value)
+        I18n.locale = value
+
+        unless I18n.config.respond_to?(:lookup_context)
+          self.details = @details.merge(:locale => value)
+        end
+      end
+
+      # Update the details keys by merging the given hash into the current
+      # details hash. If a block is given, the details are modified just during
+      # the execution of the block and reverted to the previous value after.
+      def update_details(new_details)
+        old_details  = @details
+        self.details = old_details.merge(new_details)
+
+        if block_given?
+          begin
+            yield
+          ensure
+            self.details = old_details
+          end
+        end
+      end
+
+    protected
+
+      def normalize_details(details)
+        details = details.dup
+        # TODO: Refactor this concern out of the resolver
+        details.delete(:formats) if details[:formats] == [:"*/*"]
+        self.class.registered_details.each do |k, v|
+          details[k] = v.call(details[k])
+        end
+        details.freeze
+      end
+    end
+
+    include Details
+    include ViewPaths
+  end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_view/paths.rb b/actionpack/lib/action_view/paths.rb
index 6e55d69d00..35927d09d1 100644
--- a/actionpack/lib/action_view/paths.rb
+++ b/actionpack/lib/action_view/paths.rb
@@ -1,80 +1,39 @@
 module ActionView #:nodoc:
   class PathSet < Array #:nodoc:
-    def self.type_cast(obj, cache = nil)
-      # TODO: Clean this up
-      if obj.is_a?(String)
-        if cache.nil?
-          cache = !defined?(Rails.application) || Rails.application.config.cache_classes
+    %w(initialize << concat insert push unshift).each do |method|
+      class_eval <<-METHOD, __FILE__, __LINE__ + 1
+        def #{method}(*args)
+          super
+          typecast!
         end
-        FileSystemResolverWithFallback.new(obj, :cache => cache)
-      else
-        obj
-      end
-    end
-
-    def initialize(*args)
-      super(*args).map! { |obj| self.class.type_cast(obj) }
-    end
-
-    def <<(obj)
-      super(self.class.type_cast(obj))
-    end
-
-    def concat(array)
-      super(array.map! { |obj| self.class.type_cast(obj) })
-    end
-
-    def insert(index, obj)
-      super(index, self.class.type_cast(obj))
-    end
-
-    def push(*objs)
-      super(*objs.map { |obj| self.class.type_cast(obj) })
+      METHOD
     end
 
-    def unshift(*objs)
-      super(*objs.map { |obj| self.class.type_cast(obj) })
+    def find(path, prefix = nil, partial = false, details = {}, key = nil)
+      template = find_all(path, prefix, partial, details, key).first
+      raise MissingTemplate.new(self, "#{prefix}/#{path}", details, partial) unless template
+      template
     end
 
-    def find(path, details = {}, prefix = nil, partial = false)
-      template_path = path
-
-      each do |load_path|
-        if template = load_path.find(template_path, details, prefix, partial)
-          return template
-        end
+    def find_all(*args)
+      each do |resolver|
+        templates = resolver.find_all(*args)
+        return templates unless templates.empty?
       end
-      
-      raise ActionView::MissingTemplate.new(self, "#{prefix}/#{path}", details, partial)
+      []
     end
-    
-    def exists?(path, extension = nil, prefix = nil, partial = false)
-      template_path = path.sub(/^\//, '')
 
-      each do |load_path|
-        return true if template = load_path.find(template_path, extension, prefix, partial)
-      end      
-      false
+    def exists?(*args)
+      find_all(*args).any?
     end
 
-    def find_template(original_template_path, format = nil, html_fallback = true)
-      return original_template_path if original_template_path.respond_to?(:render)
-      template_path = original_template_path.sub(/^\//, '')
+  protected
 
-      each do |load_path|
-        if template = load_path.find(template_path, format)
-          return template
-        # Try to find html version if the format is javascript
-        elsif format == :js && html_fallback && template = load_path["#{template_path}.#{I18n.locale}.html"]
-          return template
-        elsif format == :js && html_fallback && template = load_path["#{template_path}.html"]
-          return template
-        end
+    def typecast!
+      each_with_index do |path, i|
+        next unless path.is_a?(String)
+        self[i] = FileSystemResolver.new(path)
       end
-
-      return Template.new(original_template_path, original_template_path.to_s =~ /\A\// ? "" : ".") if File.file?(original_template_path)
-
-      raise MissingTemplate.new(self, original_template_path, format)
     end
   end
 end
diff --git a/actionpack/lib/action_view/railtie.rb b/actionpack/lib/action_view/railtie.rb
index 03f18ac172..2e5d115630 100644
--- a/actionpack/lib/action_view/railtie.rb
+++ b/actionpack/lib/action_view/railtie.rb
@@ -10,7 +10,9 @@ module ActionView
 
     initializer "action_view.cache_asset_timestamps" do |app|
       unless app.config.cache_classes
-        ActionView::Helpers::AssetTagHelper.cache_asset_timestamps = false
+        ActionView.base_hook do
+          ActionView::Helpers::AssetTagHelper.cache_asset_timestamps = false
+        end
       end
     end
   end
diff --git a/actionpack/lib/action_view/render/layouts.rb b/actionpack/lib/action_view/render/layouts.rb
new file mode 100644
index 0000000000..8688de3d18
--- /dev/null
+++ b/actionpack/lib/action_view/render/layouts.rb
@@ -0,0 +1,65 @@
+require 'active_support/core_ext/object/try'
+
+module ActionView
+  module Layouts
+
+    # You can think of a layout as a method that is called with a block. _layout_for
+    # returns the contents that are yielded to the layout. If the user calls yield
+    # :some_name, the block, by default, returns content_for(:some_name). If the user
+    # calls yield, the default block returns content_for(:layout).
+    #
+    # The user can override this default by passing a block to the layout.
+    #
+    # ==== Example
+    #
+    #   # The template
+    #   <% render :layout => "my_layout" do %>Content<% end %>
+    #
+    #   # The layout
+    #   <html><% yield %></html>
+    #
+    # In this case, instead of the default block, which would return content_for(:layout),
+    # this method returns the block that was passed in to render layout, and the response
+    # would be <html>Content</html>.
+    #
+    # Finally, the block can take block arguments, which can be passed in by yield.
+    #
+    # ==== Example
+    #
+    #   # The template
+    #   <% render :layout => "my_layout" do |customer| %>Hello <%= customer.name %><% end %>
+    #
+    #   # The layout
+    #   <html><% yield Struct.new(:name).new("David") %></html>
+    #
+    # In this case, the layout would receive the block passed into <tt>render :layout</tt>,
+    # and the Struct specified in the layout would be passed into the block. The result
+    # would be <html>Hello David</html>.
+    def _layout_for(name = nil, &block) #:nodoc:
+      if !block || name
+        @_content_for[name || :layout]
+      else
+        capture(&block)
+      end
+    end
+
+    # This is the method which actually finds the layout using details in the lookup
+    # context object. If no layout is found, it checkes if at least a layout with
+    # the given name exists across all details before raising the error.
+    def _find_layout(layout) #:nodoc:
+      begin
+        layout =~ /^\// ?
+          with_fallbacks { find(layout) } : find(layout)
+      rescue ActionView::MissingTemplate => e
+        update_details(:formats => nil) do
+          raise unless exists?(layout)
+        end
+      end
+    end
+
+    # Contains the logic that actually renders the layout.
+    def _render_layout(layout, locals, &block) #:nodoc:
+      layout.render(self, locals){ |*name| _layout_for(*name, &block) }
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index 8b6dce0c1c..950c9d2cd8 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -174,17 +174,11 @@ module ActionView
 
     class PartialRenderer
       PARTIAL_NAMES = Hash.new {|h,k| h[k] = {} }
-      TEMPLATES = Hash.new {|h,k| h[k] = {} }
-
-      attr_reader :template
 
       def initialize(view_context, options, block)
         @view           = view_context
         @partial_names  = PARTIAL_NAMES[@view.controller.class]
 
-        key = Thread.current[:format_locale_key]
-        @templates      = TEMPLATES[key] if key
-
         setup(options, block)
       end
 
@@ -228,6 +222,7 @@ module ActionView
           if !@block && (layout = @options[:layout])
             content = @view._render_layout(find_template(layout), @locals){ content }
           end
+
           content
         end
       end
@@ -244,9 +239,9 @@ module ActionView
       end
 
       def collection_with_template(template = @template)
-        segments, locals, as = [], @locals, @options[:as] || template.variable_name
+        segments, locals, as, template = [], @locals, @options[:as] || @template.variable_name, @template
 
-        counter_name  = template.counter_name
+        counter_name = template.counter_name
         locals[counter_name] = -1
 
         @collection.each do |object|
@@ -256,7 +251,6 @@ module ActionView
           segments << template.render(@view, locals)
         end
 
-        @template = template
         segments
       end
 
@@ -277,7 +271,7 @@ module ActionView
       end
 
       def render_partial(object = @object)
-        locals, view = @locals, @view
+        locals, view, template = @locals, @view, @template
 
         object ||= locals[template.variable_name]
         locals[@options[:as] || template.variable_name] = object
@@ -288,6 +282,7 @@ module ActionView
       end
 
     private
+
       def collection
         if @object.respond_to?(:to_ary)
           @object
@@ -296,20 +291,10 @@ module ActionView
         end
       end
 
-      def find_template(path = @path)
-        unless @templates
-          path && _find_template(path)
-        else
-          path && @templates[path] ||= _find_template(path)
-        end
-      end
-
-      def _find_template(path)
-        if controller = @view.controller
-          prefix = controller.controller_path unless path.include?(?/)
-        end
-
-        @view.find(path, {:formats => @view.formats}, prefix, true)
+      def find_template(path=@path)
+        return path unless path.is_a?(String)
+        prefix = @view.controller_path unless path.include?(?/)
+        @view.find(path, prefix, true)
       end
 
       def partial_path(object = @object)
@@ -324,21 +309,8 @@ module ActionView
       end
     end
 
-    def render_partial(options)
-      _evaluate_assigns_and_ivars
-
-      details = options[:_details]
-
-      # Is this needed
-      self.formats = details[:formats] if details
-      renderer = PartialRenderer.new(self, options, nil)
-      text = renderer.render
-      options[:_template] = renderer.template
-      text
-    end
-
     def _render_partial(options, &block) #:nodoc:
-      if defined? @renderer
+      if defined?(@renderer)
         @renderer.setup(options, block)
       else
         @renderer = PartialRenderer.new(self, options, block)
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index 64cc0caf11..47ea70f5ad 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -15,27 +15,11 @@ module ActionView
     def render(options = {}, locals = {}, &block) #:nodoc:
       case options
       when Hash
-        layout = options[:layout]
-        options[:locals] ||= {}
-
         if block_given?
-          return safe_concat(_render_partial(options.merge(:partial => layout), &block))
-        elsif options.key?(:partial)
-          return _render_partial(options)
-        end
-
-        template = if options[:file]
-          find(options[:file], details_for_render)
-        elsif options[:inline]
-          handler = Template.handler_class_for_extension(options[:type] || "erb")
-          Template.new(options[:inline], "inline template", handler, {})
-        elsif options[:text]
-          Template::Text.new(options[:text])
-        end
-
-        if template
-          layout = find(layout, details_for_render) if layout
-          _render_template(template, layout, :locals => options[:locals])
+          content = _render_partial(options.merge(:partial => options[:layout]), &block)
+          safe_concat(content)
+        else
+          _render(options)
         end
       when :update
         update_page(&block)
@@ -44,65 +28,57 @@ module ActionView
       end
     end
 
-    def details_for_render
-      controller.try(:details_for_render) || {:formats => formats}
+    # This is the API to render a ViewContext's template from a controller.
+    def render_template(options, &block)
+      _evaluate_assigns_and_ivars
+
+      # TODO Layout for partials should be handled here, because inside the
+      # partial renderer it looks for the layout as a partial.
+      if options.key?(:partial) && options[:layout]
+        options[:layout] = _find_layout(options[:layout])
+      end
+
+      _render(options, &block)
     end
 
-    # You can think of a layout as a method that is called with a block. _layout_for
-    # returns the contents that are yielded to the layout. If the user calls yield
-    # :some_name, the block, by default, returns content_for(:some_name). If the user
-    # calls yield, the default block returns content_for(:layout).
-    #
-    # The user can override this default by passing a block to the layout.
-    #
-    # ==== Example
-    #
-    #   # The template
-    #   <% render :layout => "my_layout" do %>Content<% end %>
-    #
-    #   # The layout
-    #   <html><% yield %></html>
-    #
-    # In this case, instead of the default block, which would return content_for(:layout),
-    # this method returns the block that was passed in to render layout, and the response
-    # would be <html>Content</html>.
-    #
-    # Finally, the block can take block arguments, which can be passed in by yield.
-    #
-    # ==== Example
-    #
-    #   # The template
-    #   <% render :layout => "my_layout" do |customer| %>Hello <%= customer.name %><% end %>
-    #
-    #   # The layout
-    #   <html><% yield Struct.new(:name).new("David") %></html>
-    #
-    # In this case, the layout would receive the block passed into <tt>render :layout</tt>,
-    # and the Struct specified in the layout would be passed into the block. The result
-    # would be <html>Hello David</html>.
-    def _layout_for(name = nil, &block)
-      return @_content_for[name || :layout] if !block_given? || name
-      capture(&block)
+    # This method holds the common render logic for both controllers and
+    # views rendering stacks.
+    def _render(options) #:nodoc:
+      if options.key?(:partial)
+        _render_partial(options)
+      else
+        template = _determine_template(options)
+        yield template if block_given?
+        _render_template(template, options[:layout], options)
+      end
     end
 
-    # This is the API to render a ViewContext's template from a controller.
-    #
-    # Internal Options:
-    # _template:: The Template object to render
-    # _layout::   The layout, if any, to wrap the Template in
-    def render_template(options)
-      _evaluate_assigns_and_ivars
-      template, layout = options.values_at(:_template, :_layout)
-      _render_template(template, layout, options)
+    # Determine the template to be rendered using the given options.
+    def _determine_template(options) #:nodoc:
+      if options.key?(:inline)
+        handler = Template.handler_class_for_extension(options[:type] || "erb")
+        Template.new(options[:inline], "inline template", handler, {})
+      elsif options.key?(:text)
+        Template::Text.new(options[:text], self.formats.try(:first))
+      elsif options.key?(:_template)
+        options[:_template]
+      elsif options.key?(:file)
+        with_fallbacks { find(options[:file], options[:prefix]) }
+      elsif options.key?(:template)
+        find(options[:template], options[:prefix])
+      end
     end
 
-    def _render_template(template, layout = nil, options = {})
+    # Renders the given template. An string representing the layout can be
+    # supplied as well.
+    def _render_template(template, layout = nil, options = {}) #:nodoc:
       locals = options[:locals] || {}
+      layout = _find_layout(layout) if layout
 
       ActiveSupport::Notifications.instrument("action_view.render_template",
         :identifier => template.identifier, :layout => layout.try(:identifier)) do
 
-        content = template.render(self, locals)
+        content = template.render(self, locals) { |*name| _layout_for(*name) }
         @_content_for[:layout] = content
 
         if layout
@@ -114,8 +90,5 @@ module ActionView
       end
     end
 
-    def _render_layout(layout, locals, &block)
-      layout.render(self, locals){ |*name| _layout_for(*name, &block) }
-    end
   end
 end
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index cd6b1930a1..b4fdb49d3b 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -16,23 +16,22 @@ module ActionView
     end
 
     extend Template::Handlers
-    attr_reader :source, :identifier, :handler, :mime_type, :formats, :details
+
+    attr_reader :source, :identifier, :handler, :virtual_path, :formats
 
     def initialize(source, identifier, handler, details)
       @source     = source
       @identifier = identifier
       @handler    = handler
-      @details    = details
+
+      @partial      = details[:partial]
+      @virtual_path = details[:virtual_path]
       @method_names = {}
 
-      format = details.delete(:format) || begin
-        # TODO: Clean this up
-        handler.respond_to?(:default_format) ? handler.default_format.to_sym.to_s : "html"
-      end
-      @mime_type = Mime::Type.lookup_by_extension(format.to_s)
-      @formats = [format.to_sym]
-      @formats << :html if format == :js
-      @details[:formats] = Array.wrap(format.to_sym)
+      format    = details[:format]
+      format  ||= handler.default_format.to_sym if handler.respond_to?(:default_format)
+      format  ||= :html
+      @formats  = [format.to_sym]
     end
 
     def render(view, locals, &block)
@@ -47,19 +46,20 @@ module ActionView
       end
     end
 
-    # TODO: Figure out how to abstract this
+    def mime_type
+      @mime_type ||= Mime::Type.lookup_by_extension(@formats.first.to_s) if @formats.first
+    end
+
     def variable_name
-      @variable_name ||= identifier[%r'_?(\w+)(\.\w+)*$', 1].to_sym
+      @variable_name ||= @virtual_path[%r'_?(\w+)(\.\w+)*$', 1].to_sym
     end
 
-    # TODO: Figure out how to abstract this
     def counter_name
       @counter_name ||= "#{variable_name}_counter".to_sym
     end
 
-    # TODO: kill hax
     def partial?
-      @details[:partial]
+      @partial
     end
 
     def inspect
@@ -87,7 +87,7 @@ module ActionView
 
         source = <<-end_src
           def #{method_name}(local_assigns)
-            _old_virtual_path, @_virtual_path = @_virtual_path, #{@details[:virtual_path].inspect};_old_output_buffer = output_buffer;#{locals_code};#{code}
+            _old_virtual_path, @_virtual_path = @_virtual_path, #{@virtual_path.inspect};_old_output_buffer = output_buffer;#{locals_code};#{code}
           ensure
             @_virtual_path, self.output_buffer = _old_virtual_path, _old_output_buffer
           end
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index 4b7cec50f3..937694ce8e 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -3,10 +3,54 @@ require 'active_support/core_ext/string/output_safety'
 require 'erubis'
 
 module ActionView
+  class OutputBuffer
+    def initialize
+      @buffer = ActiveSupport::SafeBuffer.new
+    end
+
+    def safe_concat(value)
+      @buffer.safe_concat(value)
+    end
+
+    def <<(value)
+      @buffer << value.to_s
+    end
+
+    def length
+      @buffer.length
+    end
+
+    def [](*args)
+      @buffer[*args]
+    end
+
+    def to_s
+      @buffer.to_s
+    end
+
+    def to_str
+      @buffer.to_str
+    end
+
+    def empty?
+      @buffer.empty?
+    end
+
+    def html_safe?
+      @buffer.html_safe?
+    end
+
+    if "".respond_to?(:force_encoding)
+      def force_encoding(encoding)
+        @buffer.force_encoding(encoding)
+      end
+    end
+  end
+
   module Template::Handlers
     class Erubis < ::Erubis::Eruby
       def add_preamble(src)
-        src << "@output_buffer = ActiveSupport::SafeBuffer.new;"
+        src << "@output_buffer = ActionView::OutputBuffer.new;"
       end
 
       def add_text(src, text)
@@ -15,10 +59,10 @@ module ActionView
       end
 
       def add_expr_literal(src, code)
-        if code =~ /\s*raw\s+(.*)/
-          src << "@output_buffer.safe_concat((" << $1 << ").to_s);"
+        if code =~ /(do|\{)(\s*\|[^|]*\|)?\s*\Z/
+          src << '@output_buffer << ' << code
         else
-          src << '@output_buffer << ((' << code << ').to_s);'
+          src << '@output_buffer << (' << code << ');'
         end
       end
 
@@ -42,7 +86,7 @@ module ActionView
       self.erb_trim_mode = '-'
 
       self.default_format = Mime::HTML
-      
+
       cattr_accessor :erb_implementation
       self.erb_implementation = Erubis
 
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index 20402f9d6d..a43597e728 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -4,64 +4,47 @@ require "active_support/core_ext/array/wrap"
 require "action_view/template"
 
 module ActionView
-  # Abstract superclass
   class Resolver
-
-    class_inheritable_accessor(:registered_details)
-    self.registered_details = {}
-
-    def self.register_detail(name, options = {})
-      registered_details[name] = lambda do |val|
-        val = Array.wrap(val || yield)
-        val |= [nil] unless options[:allow_nil] == false
-        val
-      end
-    end
-
-    register_detail(:locale)  { [I18n.locale] }
-    register_detail(:formats) { Mime::SET.symbols }
-    register_detail(:handlers) do
-      Template::Handlers.extensions
+    def initialize
+      @cached = Hash.new { |h1,k1| h1[k1] =
+        Hash.new { |h2,k2| h2[k2] = Hash.new { |h3, k3| h3[k3] = {} } } }
     end
 
-    def initialize(options = {})
-      @cache  = options[:cache]
-      @cached = {}
+    def clear_cache
+      @cached.clear
     end
 
-    # Normalizes the arguments and passes it on to find_template
     def find(*args)
       find_all(*args).first
     end
 
-    def find_all(name, details = {}, prefix = nil, partial = nil)
-      details = normalize_details(details)
+    # Normalizes the arguments and passes it on to find_template.
+    def find_all(name, prefix=nil, partial=false, details={}, key=nil)
       name, prefix = normalize_name(name, prefix)
+      details = details.merge(:handlers => default_handlers)
 
-      cached([name, details, prefix, partial]) do
-        find_templates(name, details, prefix, partial)
+      cached(key, prefix, name, partial) do
+        find_templates(name, prefix, partial, details)
       end
     end
 
   private
 
+    def caching?
+      @caching ||= !defined?(Rails.application) || Rails.application.config.cache_classes
+    end
+
+    def default_handlers
+      Template::Handlers.extensions + [nil]
+    end
+
     # This is what child classes implement. No defaults are needed
     # because Resolver guarantees that the arguments are present and
     # normalized.
-    def find_templates(name, details, prefix, partial)
+    def find_templates(name, prefix, partial, details)
       raise NotImplementedError
     end
 
-    def normalize_details(details)
-      details = details.dup
-      # TODO: Refactor this concern out of the resolver
-      details.delete(:formats) if details[:formats] == [:"*/*"]
-      registered_details.each do |k, v|
-        details[k] = v.call(details[k])
-      end
-      details
-    end
-
     # Support legacy foo.erb names even though we now ignore .erb
     # as well as incorrectly putting part of the path in the template
     # name instead of the prefix.
@@ -73,92 +56,73 @@ module ActionView
       return parts.pop, [prefix, *parts].compact.join("/")
     end
 
-    def cached(key)
-      return yield unless @cache
-      return @cached[key] if @cached.key?(key)
-      @cached[key] = yield
+    def cached(key, prefix, name, partial)
+      return yield unless key && caching?
+      scope = @cached[key][prefix][name]
+      if scope.key?(partial)
+        scope[partial]
+      else
+        scope[partial] = yield
+      end
     end
   end
 
   class PathResolver < Resolver
-
     EXTENSION_ORDER = [:locale, :formats, :handlers]
 
     def to_s
       @path.to_s
     end
-    alias to_path to_s
-
-    def find_templates(name, details, prefix, partial)
-      path = build_path(name, details, prefix, partial)
-      query(path, EXTENSION_ORDER.map { |ext| details[ext] })
-    end
+    alias :to_path :to_s
 
   private
 
-    def build_path(name, details, prefix, partial)
+    def find_templates(name, prefix, partial, details)
+      path = build_path(name, prefix, partial, details)
+      query(partial, path, EXTENSION_ORDER.map { |ext| details[ext] })
+    end
+
+    def build_path(name, prefix, partial, details)
       path = ""
       path << "#{prefix}/" unless prefix.empty?
       path << (partial ? "_#{name}" : name)
       path
     end
 
-    def query(path, exts)
+    def query(partial, path, exts)
       query = File.join(@path, path)
+
       exts.each do |ext|
         query << '{' << ext.map {|e| e && ".#{e}" }.join(',') << '}'
       end
 
       Dir[query].reject { |p| File.directory?(p) }.map do |p|
-        Template.new(File.read(p), File.expand_path(p), *path_to_details(p))
+        handler, format = extract_handler_and_format(p)
+        Template.new(File.read(p), File.expand_path(p), handler,
+          :partial => partial, :virtual_path => path, :format => format)
       end
     end
 
-    # # TODO: fix me
-    # # :api: plugin
-    def path_to_details(path)
-      # [:erb, :format => :html, :locale => :en, :partial => true/false]
-      if m = path.match(%r'((^|.*/)(_)?[\w-]+)((?:\.[\w-]+)*)\.(\w+)$')
-        partial = m[3] == '_'
-        details = (m[4]||"").split('.').reject { |e| e.empty? }
-        handler = Template.handler_class_for_extension(m[5])
+    def extract_handler_and_format(path)
+      pieces = File.basename(path).split(".")
+      pieces.shift
 
-        format  = Mime[details.last] && details.pop.to_sym
-        locale  = details.last && details.pop.to_sym
-
-        virtual_path = (m[1].gsub("#{@path}/", "") << details.join("."))
-
-        return handler, :format => format, :locale => locale, :partial => partial,
-                        :virtual_path => virtual_path
-      end
+      handler = Template.handler_class_for_extension(pieces.pop)
+      format  = pieces.last && Mime[pieces.last] && pieces.pop.to_sym
+      [handler, format]
     end
   end
 
   class FileSystemResolver < PathResolver
-    def initialize(path, options = {})
+    def initialize(path)
       raise ArgumentError, "path already is a Resolver class" if path.is_a?(Resolver)
-      super(options)
+      super()
       @path = Pathname.new(path).expand_path
     end
-  end
-
-  # TODO: remove hack
-  class FileSystemResolverWithFallback < Resolver
-    def initialize(path, options = {})
-      super(options)
-      @paths = [FileSystemResolver.new(path, options), FileSystemResolver.new("", options), FileSystemResolver.new("/", options)]
-    end
 
-    def find_templates(*args)
-      @paths.each do |p|
-        template = p.find_templates(*args)
-        return template unless template.empty?
-      end
-      []
-    end
-
-    def to_s
-      @paths.first.to_s
+    def eql?(resolver)
+      self.class.equal?(resolver.class) && to_path == resolver.to_path
     end
+    alias :== :eql?
   end
 end
diff --git a/actionpack/lib/action_view/template/text.rb b/actionpack/lib/action_view/template/text.rb
index 2abb352d4e..df394b0fb0 100644
--- a/actionpack/lib/action_view/template/text.rb
+++ b/actionpack/lib/action_view/template/text.rb
@@ -1,15 +1,10 @@
 module ActionView #:nodoc:
   class Template
     class Text < String #:nodoc:
-      HTML = Mime[:html]
-
-      def initialize(string, content_type = HTML)
+      def initialize(string, content_type = nil)
         super(string.to_s)
-        @content_type = Mime[content_type] || content_type
-      end
-
-      def details
-        {:formats => [@content_type.to_sym]}
+        @content_type   = Mime[content_type] || content_type if content_type
+        @content_type ||= Mime::TEXT
       end
 
       def identifier
@@ -29,7 +24,7 @@ module ActionView #:nodoc:
       end
 
       def formats
-        [mime_type]
+        [@content_type.to_sym]
       end
 
       def partial?
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index f639700eaf..1578ac9479 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -1,4 +1,5 @@
 require 'action_controller/test_case'
+require 'action_view'
 
 module ActionView
   class Base
@@ -34,6 +35,8 @@ module ActionView
         @request = ActionController::TestRequest.new
         @response = ActionController::TestResponse.new
 
+        @request.env.delete('PATH_INFO')
+
         @params = {}
       end
     end
@@ -60,6 +63,10 @@ module ActionView
       make_test_case_available_to_view!
     end
 
+    def config
+      @controller.config
+    end
+
     def render(options = {}, local_assigns = {}, &block)
       @rendered << output = _view.render(options, local_assigns, &block)
       output
diff --git a/actionpack/test/abstract/abstract_controller_test.rb b/actionpack/test/abstract/abstract_controller_test.rb
index 4ad87d9762..f70d497481 100644
--- a/actionpack/test/abstract/abstract_controller_test.rb
+++ b/actionpack/test/abstract/abstract_controller_test.rb
@@ -59,11 +59,11 @@ module AbstractController
       end
 
       def rendering_to_body
-        self.response_body = render_to_body :_template_name => "naked_render.erb"
+        self.response_body = render_to_body :template => "naked_render.erb"
       end
 
       def rendering_to_string
-        self.response_body = render_to_string :_template_name => "naked_render.erb"
+        self.response_body = render_to_string :template => "naked_render.erb"
       end
     end
 
diff --git a/actionpack/test/abstract/details_cache_test.rb b/actionpack/test/abstract/details_cache_test.rb
deleted file mode 100644
index ee746c1bb0..0000000000
--- a/actionpack/test/abstract/details_cache_test.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-require 'abstract_unit'
-
-module AbstractController
-  module Testing
-  
-    class CachedController < AbstractController::Base
-      include AbstractController::Rendering
-      include AbstractController::DetailsCache
-
-      self.view_paths = [ActionView::FixtureResolver.new(
-        "default.erb" => "With Default",
-        "template.erb" => "With Template",
-        "some/file.erb" => "With File",
-        "template_name.erb" => "With Template Name"
-      )]
-    end
-
-    class TestLocalizedCache < ActiveSupport::TestCase
-
-      def setup
-        @controller = CachedController.new
-        CachedController.clear_template_caches!
-      end
-
-      def test_templates_are_cached
-        @controller.render :template => "default.erb"
-        assert_equal "With Default", @controller.response_body
-
-        cached = @controller.class.template_cache
-        assert_equal 1, cached.size
-        assert_kind_of ActionView::Template, cached.values.first["default.erb"]
-      end
-
-      def test_cache_is_used
-        CachedController.new.render :template => "default.erb"
-
-        @controller.expects(:find_template).never
-        @controller.render :template => "default.erb"
-
-        assert_equal 1, @controller.class.template_cache.size
-      end
-
-      def test_cache_changes_with_locale
-        CachedController.new.render :template => "default.erb"
-
-        I18n.locale = :es
-        @controller.render :template => "default.erb"
-
-        assert_equal 2, @controller.class.template_cache.size
-      ensure
-        I18n.locale = :en
-      end
-
-    end
-
-  end
-end
diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb
index b6d89ea489..65a50807fd 100644
--- a/actionpack/test/abstract/layouts_test.rb
+++ b/actionpack/test/abstract/layouts_test.rb
@@ -8,41 +8,52 @@ module AbstractControllerTests
       include AbstractController::Rendering
       include AbstractController::Layouts
 
+      def _prefix
+        "template"
+      end
+
       self.view_paths = [ActionView::FixtureResolver.new(
-        "layouts/hello.erb"                     => "With String <%= yield %>",
-        "layouts/hello_override.erb"            => "With Override <%= yield %>",
-        "layouts/abstract_controller_tests/layouts/with_string_implied_child.erb" =>
-                                                   "With Implied <%= yield %>",
-        "layouts/overwrite.erb"                  => "Overwrite <%= yield %>",
-        "layouts/with_false_layout.erb"         => "False Layout <%= yield %>"
+        "abstract_controller_tests/layouts/with_string_implied_child.erb" =>
+                                           "With Implied <%= yield %>",
+        "layouts/hello.erb"             => "With String <%= yield %>",
+        "layouts/hello_override.erb"    => "With Override <%= yield %>",
+        "layouts/overwrite.erb"         => "Overwrite <%= yield %>",
+        "layouts/with_false_layout.erb" => "False Layout <%= yield %>"
       )]
     end
     
     class Blank < Base
-      self.view_paths = []
-      
+      self.view_paths = ActionView::FixtureResolver.new("template/index.erb" => "Hello blank!")
+
       def index
-        render :_template => ActionView::Template::Text.new("Hello blank!")
+        render 
       end
     end
     
     class WithString < Base
       layout "hello"
-      
+
+      append_view_path ActionView::FixtureResolver.new(
+        "template/index.erb"             => "Hello string!",
+        "template/overwrite_default.erb" => "Hello string!",
+        "template/overwrite_false.erb"   => "Hello string!",
+        "template/overwrite_string.erb"  => "Hello string!"
+      )
+
       def index
-        render :_template => ActionView::Template::Text.new("Hello string!")
+        render
       end
 
       def overwrite_default
-        render :_template => ActionView::Template::Text.new("Hello string!"), :layout => :default
+        render :layout => :default
       end
 
       def overwrite_false
-        render :_template => ActionView::Template::Text.new("Hello string!"), :layout => false
+        render :layout => false
       end
 
       def overwrite_string
-        render :_template => ActionView::Template::Text.new("Hello string!"), :layout => "overwrite"
+        render :layout => "overwrite"
       end
 
       def overwrite_skip
@@ -70,18 +81,28 @@ module AbstractControllerTests
     class WithProc < Base
       layout proc { |c| "overwrite" }
 
+      append_view_path ActionView::FixtureResolver.new(
+        "template/index.erb" => "Hello proc!"
+      )
+
       def index
-        render :_template => ActionView::Template::Text.new("Hello proc!")
+        render
       end
     end
 
     class WithSymbol < Base
       layout :hello
-      
+
+      append_view_path ActionView::FixtureResolver.new(
+        "template/index.erb" => "Hello symbol!"
+      )
+
       def index
-        render :_template => ActionView::Template::Text.new("Hello symbol!")
+        render
       end
-    private  
+
+    private
+
       def hello
         "overwrite"
       end
@@ -89,11 +110,17 @@ module AbstractControllerTests
     
     class WithSymbolReturningString < Base
       layout :no_hello
-      
+
+      append_view_path ActionView::FixtureResolver.new(
+        "template/index.erb" => "Hello missing symbol!"
+      )
+
       def index
-        render :_template => ActionView::Template::Text.new("Hello missing symbol!")
+        render
       end
-    private  
+
+    private
+
       def no_hello
         nil
       end
@@ -101,19 +128,28 @@ module AbstractControllerTests
     
     class WithSymbolReturningNil < Base
       layout :nilz
-      
+
+      append_view_path ActionView::FixtureResolver.new(
+        "template/index.erb" => "Hello nilz!"
+      )
+
       def index
-        render :_template => ActionView::Template::Text.new("Hello nilz!")
+        render
       end
       
-      def nilz() end
+      def nilz
+      end
     end
     
     class WithSymbolReturningObj < Base
       layout :objekt
-      
+
+      append_view_path ActionView::FixtureResolver.new(
+        "template/index.erb" => "Hello object!"
+      )
+
       def index
-        render :_template => ActionView::Template::Text.new("Hello nilz!")
+        render
       end
       
       def objekt
@@ -123,33 +159,49 @@ module AbstractControllerTests
     
     class WithSymbolAndNoMethod < Base
       layout :no_method
-      
+
+      append_view_path ActionView::FixtureResolver.new(
+        "template/index.erb" => "Hello boom!"
+      )
+
       def index
-        render :_template => ActionView::Template::Text.new("Hello boom!")
+        render
       end
     end
     
     class WithMissingLayout < Base
       layout "missing"
-      
+
+      append_view_path ActionView::FixtureResolver.new(
+        "template/index.erb" => "Hello missing!"
+      )
+
       def index
-        render :_template => ActionView::Template::Text.new("Hello missing!")
+        render
       end
     end
     
     class WithFalseLayout < Base
       layout false
-      
+
+      append_view_path ActionView::FixtureResolver.new(
+        "template/index.erb" => "Hello false!"
+      )
+
       def index
-        render :_template => ActionView::Template::Text.new("Hello false!")
+        render
       end
     end
     
     class WithNilLayout < Base
       layout nil
+
+      append_view_path ActionView::FixtureResolver.new(
+        "template/index.erb" => "Hello nil!"
+      )
       
       def index
-        render :_template => ActionView::Template::Text.new("Hello nil!")
+        render
       end
     end
     
diff --git a/actionpack/test/abstract/render_test.rb b/actionpack/test/abstract/render_test.rb
index db924633ca..25dc8bd804 100644
--- a/actionpack/test/abstract/render_test.rb
+++ b/actionpack/test/abstract/render_test.rb
@@ -15,13 +15,8 @@ module AbstractController
         "renderer/default.erb" => "With Default",
         "renderer/string.erb" => "With String",
         "renderer/symbol.erb" => "With Symbol",
-        "renderer/template_name.erb" => "With Template Name",
         "string/with_path.erb" => "With String With Path",
-        "some/file.erb" => "With File",
-        "with_format.html.erb" => "With html format",
-        "with_format.xml.erb" => "With xml format",
-        "with_locale.en.erb" => "With en locale",
-        "with_locale.pl.erb" => "With pl locale"
+        "some/file.erb" => "With File"
       )]
 
       def template
@@ -55,30 +50,6 @@ module AbstractController
       def symbol
         render :symbol
       end
-
-      def template_name
-        render :_template_name => :template_name
-      end
-
-      def object
-        render :_template => ActionView::Template::Text.new("With Object")
-      end
-
-      def with_html_format
-        render :template => "with_format", :format => :html
-      end
-
-      def with_xml_format
-        render :template => "with_format", :format => :xml
-      end
-
-      def with_en_locale
-        render :template => "with_locale"
-      end
-
-      def with_pl_locale
-        render :template => "with_locale", :locale => :pl
-      end
     end
 
     class TestRenderer < ActiveSupport::TestCase
@@ -126,36 +97,6 @@ module AbstractController
         @controller.process(:string_with_path)
         assert_equal "With String With Path", @controller.response_body
       end
-
-      def test_render_template_name
-        @controller.process(:template_name)
-        assert_equal "With Template Name", @controller.response_body
-      end
-
-      def test_render_object
-        @controller.process(:object)
-        assert_equal "With Object", @controller.response_body
-      end
-
-      def test_render_with_html_format
-        @controller.process(:with_html_format)
-        assert_equal "With html format", @controller.response_body
-      end
-
-      def test_render_with_xml_format
-        @controller.process(:with_xml_format)
-        assert_equal "With xml format", @controller.response_body
-      end
-
-      def test_render_with_en_locale
-        @controller.process(:with_en_locale)
-        assert_equal "With en locale", @controller.response_body
-      end
-
-      def test_render_with_pl_locale
-        @controller.process(:with_pl_locale)
-        assert_equal "With pl locale", @controller.response_body
-      end
     end
   end
 end
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index f1e8779cfa..67aa412d3d 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -16,7 +16,6 @@ require 'test/unit'
 require 'abstract_controller'
 require 'action_controller'
 require 'action_view'
-require 'action_view/base'
 require 'action_dispatch'
 require 'fixture_template'
 require 'active_support/dependencies'
@@ -105,6 +104,21 @@ class RoutedRackApp
   end
 end
 
+class BasicController
+  attr_accessor :request
+
+  def config
+    @config ||= ActiveSupport::InheritableOptions.new(ActionController::Base.config).tap do |config|
+      # VIEW TODO: View tests should not require a controller
+      public_dir = File.expand_path("../fixtures/public", __FILE__)
+      config.assets_dir = public_dir
+      config.javascripts_dir = "#{public_dir}/javascripts"
+      config.stylesheets_dir = "#{public_dir}/stylesheets"
+      config
+    end
+  end
+end
+
 class ActionController::IntegrationTest < ActiveSupport::TestCase
   def self.build_app(routes = nil)
     RoutedRackApp.new(routes || ActionDispatch::Routing::RouteSet.new) do |middleware|
@@ -155,8 +169,7 @@ end
 # Temporary base class
 class Rack::TestCase < ActionController::IntegrationTest
   setup do
-    ActionController::Base.session_options[:key] = "abc"
-    ActionController::Base.session_options[:secret] = ("*" * 30)
+    ActionController::Base.config.secret = "abc" * 30
   end
 
   def self.testing(klass = nil)
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb
index ade9a7fcba..f047e7da30 100644
--- a/actionpack/test/controller/base_test.rb
+++ b/actionpack/test/controller/base_test.rb
@@ -76,6 +76,9 @@ class UrlOptionsController < ActionController::Base
   end
 end
 
+class RecordIdentifierController < ActionController::Base
+end
+
 class ControllerClassTests < ActiveSupport::TestCase
   def test_controller_path
     assert_equal 'empty', EmptyController.controller_path
@@ -102,6 +105,11 @@ class ControllerClassTests < ActiveSupport::TestCase
 
     assert_equal [:password], parameters
   end
+
+  def test_record_identifier
+    assert_respond_to RecordIdentifierController.new, :dom_id
+    assert_respond_to RecordIdentifierController.new, :dom_class
+  end
 end
 
 class ControllerInstanceTests < Test::Unit::TestCase
@@ -181,7 +189,7 @@ class UrlOptionsTest < ActionController::TestCase
     rescue_action_in_public!
   end
 
-  def test_default_url_options_are_used_if_set
+  def test_url_options_override
     with_routing do |set|
       set.draw do |map|
         match 'from_view', :to => 'url_options#from_view', :as => :from_view
@@ -206,20 +214,18 @@ class DefaultUrlOptionsTest < ActionController::TestCase
     rescue_action_in_public!
   end
 
-  def test_default_url_options_are_used_if_set
+  def test_default_url_options_override
     with_routing do |set|
       set.draw do |map|
         match 'from_view', :to => 'default_url_options#from_view', :as => :from_view
         match ':controller/:action'
       end
 
-      assert_deprecated do
-        get :from_view, :route => "from_view_url"
+      get :from_view, :route => "from_view_url"
 
-        assert_equal 'http://www.override.com/from_view?locale=en', @response.body
-        assert_equal 'http://www.override.com/from_view?locale=en', @controller.send(:from_view_url)
-        assert_equal 'http://www.override.com/default_url_options/new?locale=en', @controller.url_for(:controller => 'default_url_options')
-      end
+      assert_equal 'http://www.override.com/from_view?locale=en', @response.body
+      assert_equal 'http://www.override.com/from_view?locale=en', @controller.send(:from_view_url)
+      assert_equal 'http://www.override.com/default_url_options/new?locale=en', @controller.url_for(:controller => 'default_url_options')
     end
   end
 
@@ -232,21 +238,19 @@ class DefaultUrlOptionsTest < ActionController::TestCase
         match ':controller/:action'
       end
 
-      assert_deprecated do
-        get :from_view, :route => "description_path(1)"
-
-        assert_equal '/en/descriptions/1', @response.body
-        assert_equal '/en/descriptions', @controller.send(:descriptions_path)
-        assert_equal '/pl/descriptions', @controller.send(:descriptions_path, "pl")
-        assert_equal '/pl/descriptions', @controller.send(:descriptions_path, :locale => "pl")
-        assert_equal '/pl/descriptions.xml', @controller.send(:descriptions_path, "pl", "xml")
-        assert_equal '/en/descriptions.xml', @controller.send(:descriptions_path, :format => "xml")
-        assert_equal '/en/descriptions/1', @controller.send(:description_path, 1)
-        assert_equal '/pl/descriptions/1', @controller.send(:description_path, "pl", 1)
-        assert_equal '/pl/descriptions/1', @controller.send(:description_path, 1, :locale => "pl")
-        assert_equal '/pl/descriptions/1.xml', @controller.send(:description_path, "pl", 1, "xml")
-        assert_equal '/en/descriptions/1.xml', @controller.send(:description_path, 1, :format => "xml")
-      end
+      get :from_view, :route => "description_path(1)"
+
+      assert_equal '/en/descriptions/1', @response.body
+      assert_equal '/en/descriptions', @controller.send(:descriptions_path)
+      assert_equal '/pl/descriptions', @controller.send(:descriptions_path, "pl")
+      assert_equal '/pl/descriptions', @controller.send(:descriptions_path, :locale => "pl")
+      assert_equal '/pl/descriptions.xml', @controller.send(:descriptions_path, "pl", "xml")
+      assert_equal '/en/descriptions.xml', @controller.send(:descriptions_path, :format => "xml")
+      assert_equal '/en/descriptions/1', @controller.send(:description_path, 1)
+      assert_equal '/pl/descriptions/1', @controller.send(:description_path, "pl", 1)
+      assert_equal '/pl/descriptions/1', @controller.send(:description_path, 1, :locale => "pl")
+      assert_equal '/pl/descriptions/1.xml', @controller.send(:description_path, "pl", 1, "xml")
+      assert_equal '/en/descriptions/1.xml', @controller.send(:description_path, 1, :format => "xml")
     end
   end
 
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 80c968cc04..a3c8fdbb6e 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -6,12 +6,18 @@ CACHE_DIR = 'test_cache'
 # Don't change '/../temp/' cavalierly or you might hose something you don't want hosed
 FILE_STORE_PATH = File.join(File.dirname(__FILE__), '/../temp/', CACHE_DIR)
 ActionController::Base.page_cache_directory = FILE_STORE_PATH
-ActionController::Base.cache_store = :file_store, FILE_STORE_PATH
 
-class PageCachingTestController < ActionController::Base
+class CachingController < ActionController::Base
+  abstract!
+
+  self.cache_store = :file_store, FILE_STORE_PATH
+end
+
+class PageCachingTestController < CachingController
   caches_page :ok, :no_content, :if => Proc.new { |c| !c.request.format.json? }
   caches_page :found, :not_found
 
+
   def ok
     head :ok
   end
@@ -51,12 +57,13 @@ class PageCachingTest < ActionController::TestCase
 
     @request = ActionController::TestRequest.new
     @request.host = 'hostname.com'
+    @request.env.delete('PATH_INFO')
 
     @response   = ActionController::TestResponse.new
     @controller = PageCachingTestController.new
+    @controller.cache_store = :file_store, FILE_STORE_PATH
 
-    @params = {:controller => 'posts', :action => 'index', :only_path => true, :skip_relative_url_root => true}
-    @rewriter = ActionController::UrlRewriter.new(@request, @params)
+    @params = {:controller => 'posts', :action => 'index', :only_path => true}
 
     FileUtils.rm_rf(File.dirname(FILE_STORE_PATH))
     FileUtils.mkdir_p(FILE_STORE_PATH)
@@ -74,9 +81,9 @@ class PageCachingTest < ActionController::TestCase
         match '/', :to => 'posts#index', :as => :main
       end
       @params[:format] = 'rss'
-      assert_equal '/posts.rss', @rewriter.rewrite(@router, @params)
+      assert_equal '/posts.rss', @router.url_for(@params)
       @params[:format] = nil
-      assert_equal '/', @rewriter.rewrite(@router, @params)
+      assert_equal '/', @router.url_for(@params)
     end
   end
 
@@ -110,7 +117,7 @@ class PageCachingTest < ActionController::TestCase
   end
 
   def test_should_cache_ok_at_custom_path
-    @request.request_uri = "/index.html"
+    @request.env['PATH_INFO'] = '/index.html'
     get :ok
     assert_response :ok
     assert File.exist?("#{FILE_STORE_PATH}/index.html")
@@ -147,7 +154,7 @@ class PageCachingTest < ActionController::TestCase
     end
 end
 
-class ActionCachingTestController < ActionController::Base
+class ActionCachingTestController < CachingController
   rescue_from(Exception) { head 500 }
   if defined? ActiveRecord
     rescue_from(ActiveRecord::RecordNotFound) { head :not_found }
@@ -305,12 +312,9 @@ class ActionCacheTest < ActionController::TestCase
   end
 
   def test_action_cache_conditional_options
-    old_use_accept_header = ActionController::Base.use_accept_header
-    ActionController::Base.use_accept_header = true
     @request.env['HTTP_ACCEPT'] = 'application/json'
     get :index
     assert !fragment_exist?('hostname.com/action_caching_test')
-    ActionController::Base.use_accept_header = old_use_accept_header
   end
 
   def test_action_cache_with_store_options
@@ -524,7 +528,7 @@ class ActionCacheTest < ActionController::TestCase
     end
 end
 
-class FragmentCachingTestController < ActionController::Base
+class FragmentCachingTestController < CachingController
   def some_action; end;
 end
 
@@ -533,8 +537,8 @@ class FragmentCachingTest < ActionController::TestCase
     super
     ActionController::Base.perform_caching = true
     @store = ActiveSupport::Cache::MemoryStore.new
-    ActionController::Base.cache_store = @store
     @controller = FragmentCachingTestController.new
+    @controller.cache_store = @store
     @params = {:controller => 'posts', :action => 'index'}
     @request = ActionController::TestRequest.new
     @response = ActionController::TestResponse.new
@@ -632,7 +636,7 @@ class FragmentCachingTest < ActionController::TestCase
 
 end
 
-class FunctionalCachingController < ActionController::Base
+class FunctionalCachingController < CachingController
   def fragment_cached
   end
 
@@ -666,8 +670,8 @@ class FunctionalFragmentCachingTest < ActionController::TestCase
     super
     ActionController::Base.perform_caching = true
     @store = ActiveSupport::Cache::MemoryStore.new
-    ActionController::Base.cache_store = @store
     @controller = FunctionalCachingController.new
+    @controller.cache_store = @store
     @request = ActionController::TestRequest.new
     @response = ActionController::TestResponse.new
   end
diff --git a/actionpack/test/controller/content_type_test.rb b/actionpack/test/controller/content_type_test.rb
index e5ffe20ecc..967107853b 100644
--- a/actionpack/test/controller/content_type_test.rb
+++ b/actionpack/test/controller/content_type_test.rb
@@ -145,18 +145,6 @@ end
 class AcceptBasedContentTypeTest < ActionController::TestCase
   tests OldContentTypeController
 
-  def setup
-    super
-    @_old_accept_header = ActionController::Base.use_accept_header
-    ActionController::Base.use_accept_header = true
-  end
-
-  def teardown
-    super
-    ActionController::Base.use_accept_header = @_old_accept_header
-  end
-
-
   def test_render_default_content_types_for_respond_to
     @request.accept = Mime::HTML.to_s
     get :render_default_content_types_for_respond_to
diff --git a/actionpack/test/controller/cookie_test.rb b/actionpack/test/controller/cookie_test.rb
index f5ccef8aaf..908967a110 100644
--- a/actionpack/test/controller/cookie_test.rb
+++ b/actionpack/test/controller/cookie_test.rb
@@ -157,7 +157,7 @@ class CookieTest < ActionController::TestCase
     def assert_cookie_header(expected)
       header = @response.headers["Set-Cookie"]
       if header.respond_to?(:to_str)
-        assert_equal expected, header
+        assert_equal expected.split("\n").sort, header.split("\n").sort
       else
         assert_equal expected.split("\n"), header
       end
diff --git a/actionpack/test/controller/http_digest_authentication_test.rb b/actionpack/test/controller/http_digest_authentication_test.rb
index 7e9a2625f1..eb2af523a2 100644
--- a/actionpack/test/controller/http_digest_authentication_test.rb
+++ b/actionpack/test/controller/http_digest_authentication_test.rb
@@ -40,11 +40,13 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
 
   setup do
     # Used as secret in generating nonce to prevent tampering of timestamp
-    @old_secret, ActionController::Base.session_options[:secret] = ActionController::Base.session_options[:secret], "session_options_secret"
+    @secret = "session_options_secret"
+    @controller.config.secret = @secret
+    # @old_secret, ActionController::Base.config.secret[:secret] = ActionController::Base.session_options[:secret], @secret
   end
 
   teardown do
-    ActionController::Base.session_options[:secret] = @old_secret
+    # ActionController::Base.session_options[:secret] = @old_secret
   end
 
   AUTH_HEADERS.each do |header|
@@ -138,7 +140,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
 
   test "authentication request with request-uri that doesn't match credentials digest-uri" do
     @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => 'pretty', :password => 'please')
-    @request.env['REQUEST_URI'] = "/http_digest_authentication_test/dummy_digest/altered/uri"
+    @request.env['PATH_INFO'] = "/http_digest_authentication_test/dummy_digest/altered/uri"
     get :display
 
     assert_response :unauthorized
@@ -147,7 +149,8 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
 
   test "authentication request with absolute request uri (as in webrick)" do
     @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => 'pretty', :password => 'please')
-    @request.env['REQUEST_URI'] = "http://test.host/http_digest_authentication_test/dummy_digest"
+    @request.env["SERVER_NAME"] = "test.host"
+    @request.env['PATH_INFO'] = "/http_digest_authentication_test/dummy_digest"
 
     get :display
 
@@ -170,7 +173,8 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
   test "authentication request with absolute uri in both request and credentials (as in Webrick with IE)" do
     @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:url => "http://test.host/http_digest_authentication_test/dummy_digest",
                                                             :username => 'pretty', :password => 'please')
-    @request.env['REQUEST_URI'] = "http://test.host/http_digest_authentication_test/dummy_digest"
+    @request.env['SERVER_NAME'] = "test.host"
+    @request.env['PATH_INFO'] = "/http_digest_authentication_test/dummy_digest"
 
     get :display
 
@@ -202,7 +206,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
 
   test "validate_digest_response should fail with nil returning password_procedure" do
     @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => nil, :password => nil)
-    assert !ActionController::HttpAuthentication::Digest.validate_digest_response(@request, "SuperSecret"){nil}
+    assert !ActionController::HttpAuthentication::Digest.validate_digest_response(@secret, @request, "SuperSecret"){nil}
   end
 
   private
@@ -225,7 +229,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
 
     credentials = decode_credentials(@response.headers['WWW-Authenticate'])
     credentials.merge!(options)
-    credentials.merge!(:uri => @request.env['REQUEST_URI'].to_s)
+    credentials.merge!(:uri => @request.env['PATH_INFO'].to_s)
     ActionController::HttpAuthentication::Digest.encode_credentials(method, credentials, password, options[:password_is_ha1])
   end
 
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index c38348fa68..2180466ca7 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -284,18 +284,13 @@ class IntegrationProcessTest < ActionController::IntegrationTest
     end
   end
 
-  def test_cookie_monster
+  test 'response cookies are added to the cookie jar for the next request' do
     with_test_route_set do
       self.cookies['cookie_1'] = "sugar"
       self.cookies['cookie_2'] = "oatmeal"
       get '/cookie_monster'
-      assert_equal 410, status
-      assert_equal "Gone", status_message
-      assert_response 410
-      assert_response :gone
       assert_equal "cookie_1=; path=/\ncookie_3=chocolate; path=/", headers["Set-Cookie"]
       assert_equal({"cookie_1"=>"", "cookie_2"=>"oatmeal", "cookie_3"=>"chocolate"}, cookies.to_hash)
-      assert_equal "Gone", response.body
     end
   end
 
@@ -333,7 +328,7 @@ class IntegrationProcessTest < ActionController::IntegrationTest
     with_test_route_set do
       get '/get_with_params?foo=bar'
       assert_equal '/get_with_params?foo=bar', request.env["REQUEST_URI"]
-      assert_equal '/get_with_params?foo=bar', request.request_uri
+      assert_equal '/get_with_params?foo=bar', request.fullpath
       assert_equal "foo=bar", request.env["QUERY_STRING"]
       assert_equal 'foo=bar', request.query_string
       assert_equal 'bar', request.parameters['foo']
@@ -346,8 +341,8 @@ class IntegrationProcessTest < ActionController::IntegrationTest
   def test_get_with_parameters
     with_test_route_set do
       get '/get_with_params', :foo => "bar"
-      assert_equal '/get_with_params', request.env["REQUEST_URI"]
-      assert_equal '/get_with_params', request.request_uri
+      assert_equal '/get_with_params', request.env["PATH_INFO"]
+      assert_equal '/get_with_params', request.path_info
       assert_equal 'foo=bar', request.env["QUERY_STRING"]
       assert_equal 'foo=bar', request.query_string
       assert_equal 'bar', request.parameters['foo']
diff --git a/actionpack/test/controller/log_subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb
index 1f8134822c..20d3e77b6e 100644
--- a/actionpack/test/controller/log_subscriber_test.rb
+++ b/actionpack/test/controller/log_subscriber_test.rb
@@ -46,8 +46,7 @@ class ACLogSubscriberTest < ActionController::TestCase
 
     @cache_path = File.expand_path('../temp/test_cache', File.dirname(__FILE__))
     ActionController::Base.page_cache_directory = @cache_path
-    ActionController::Base.cache_store = :file_store, @cache_path
-
+    @controller.cache_store = :file_store, @cache_path
     Rails::LogSubscriber.add(:action_controller, ActionController::Railties::LogSubscriber.new)
   end
 
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index 5e34773899..5c1eaf453c 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -155,13 +155,11 @@ class RespondToControllerTest < ActionController::TestCase
 
   def setup
     super
-    ActionController::Base.use_accept_header = true
     @request.host = "www.example.com"
   end
 
   def teardown
     super
-    ActionController::Base.use_accept_header = false
   end
 
   def test_html
@@ -544,13 +542,11 @@ class RespondWithControllerTest < ActionController::TestCase
 
   def setup
     super
-    ActionController::Base.use_accept_header = true
     @request.host = "www.example.com"
   end
 
   def teardown
     super
-    ActionController::Base.use_accept_header = false
   end
 
   def test_using_resource
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index ecfe14b797..e3c4869391 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -355,7 +355,7 @@ class TestController < ActionController::Base
     @before = "i'm before the render"
     render_to_string :text => "foo"
     @after = "i'm after the render"
-    render :action => "test/hello_world"
+    render :template => "test/hello_world"
   end
 
   def render_to_string_with_exception
@@ -369,7 +369,7 @@ class TestController < ActionController::Base
     rescue
     end
     @after = "i'm after the render"
-    render :action => "test/hello_world"
+    render :template => "test/hello_world"
   end
 
   def accessing_params_in_template_with_layout
@@ -514,7 +514,7 @@ class TestController < ActionController::Base
   def render_to_string_with_partial
     @partial_only = render_to_string :partial => "partial_only"
     @partial_with_locals = render_to_string :partial => "customer", :locals => { :customer => Customer.new("david") }
-    render :action => "test/hello_world"
+    render :template => "test/hello_world"
   end
 
   def partial_with_counter
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index d716dc2661..f6ba275849 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -42,7 +42,7 @@ class TestTest < ActionController::TestCase
     end
 
     def test_uri
-      render :text => request.request_uri
+      render :text => request.fullpath
     end
 
     def test_query_string
@@ -128,6 +128,7 @@ XML
     @controller = TestController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+    @request.env['PATH_INFO'] = nil
   end
 
   def test_raw_post_handling
@@ -199,7 +200,7 @@ XML
   end
 
   def test_process_with_request_uri_with_params_with_explicit_uri
-    @request.request_uri = "/explicit/uri"
+    @request.env['PATH_INFO'] = "/explicit/uri"
     process :test_uri, :id => 7
     assert_equal "/explicit/uri", @response.body
   end
@@ -210,7 +211,8 @@ XML
   end
 
   def test_process_with_query_string_with_explicit_uri
-    @request.request_uri = "/explicit/uri?q=test?extra=question"
+    @request.env['PATH_INFO'] = '/explicit/uri'
+    @request.env['QUERY_STRING'] = 'q=test?extra=question'
     process :test_query_string
     assert_equal "q=test?extra=question", @response.body
   end
diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb
index a7b77edc6e..fc7773dffe 100644
--- a/actionpack/test/controller/url_for_test.rb
+++ b/actionpack/test/controller/url_for_test.rb
@@ -113,15 +113,13 @@ module AbstractController
       end
 
       def test_relative_url_root_is_respected
-        orig_relative_url_root = ActionController::Base.relative_url_root
-        ActionController::Base.relative_url_root = '/subdir'
+        # ROUTES TODO: Tests should not have to pass :relative_url_root directly. This
+        # should probably come from the router.
 
         add_host!
         assert_equal('https://www.basecamphq.com/subdir/c/a/i',
-          W.new.url_for(:controller => 'c', :action => 'a', :id => 'i', :protocol => 'https')
+          W.new.url_for(:controller => 'c', :action => 'a', :id => 'i', :protocol => 'https', :script_name => '/subdir')
         )
-      ensure
-        ActionController::Base.relative_url_root = orig_relative_url_root
       end
 
       def test_named_routes
@@ -146,9 +144,6 @@ module AbstractController
       end
 
       def test_relative_url_root_is_respected_for_named_routes
-        orig_relative_url_root = ActionController::Base.relative_url_root
-        ActionController::Base.relative_url_root = '/subdir'
-
         with_routing do |set|
           set.draw do |map|
             match '/home/sweet/home/:user', :to => 'home#index', :as => :home
@@ -158,10 +153,8 @@ module AbstractController
           controller = kls.new
 
           assert_equal 'http://www.basecamphq.com/subdir/home/sweet/home/again',
-            controller.send(:home_url, :host => 'www.basecamphq.com', :user => 'again')
+            controller.send(:home_url, :host => 'www.basecamphq.com', :user => 'again', :script_name => "/subdir")
         end
-      ensure
-        ActionController::Base.relative_url_root = orig_relative_url_root
       end
 
       def test_only_path
diff --git a/actionpack/test/controller/url_rewriter_test.rb b/actionpack/test/controller/url_rewriter_test.rb
index 199b824a7a..7b46a48a1d 100644
--- a/actionpack/test/controller/url_rewriter_test.rb
+++ b/actionpack/test/controller/url_rewriter_test.rb
@@ -1,13 +1,24 @@
 require 'abstract_unit'
 require 'controller/fake_controllers'
 
-ActionController::UrlRewriter
-
 class UrlRewriterTests < ActionController::TestCase
+  class Rewriter
+    def initialize(request)
+      @options = {
+        :host => request.host_with_port,
+        :protocol => request.protocol
+      }
+    end
+
+    def rewrite(router, options)
+      router.url_for(@options.merge(options))
+    end
+  end
+
   def setup
     @request = ActionController::TestRequest.new
     @params = {}
-    @rewriter = ActionController::UrlRewriter.new(@request, @params)
+    @rewriter = Rewriter.new(@request) #.new(@request, @params)
   end
 
   def test_port
@@ -61,34 +72,6 @@ class UrlRewriterTests < ActionController::TestCase
     )
   end
 
-  def test_overwrite_params
-    @params[:controller] = 'hi'
-    @params[:action] = 'bye'
-    @params[:id] = '2'
-
-    assert_equal '/hi/hi/2', @rewriter.rewrite(@router, :only_path => true, :overwrite_params => {:action => 'hi'})
-    u = @rewriter.rewrite(@router, :only_path => false, :overwrite_params => {:action => 'hi'})
-    assert_match %r(/hi/hi/2$), u
-  end
-
-  def test_overwrite_removes_original
-    @params[:controller] = 'search'
-    @params[:action] = 'list'
-    @params[:list_page] = 1
-
-    assert_equal '/search/list?list_page=2', @rewriter.rewrite(@router, :only_path => true, :overwrite_params => {"list_page" => 2})
-    u = @rewriter.rewrite(@router, :only_path => false, :overwrite_params => {:list_page => 2})
-    assert_equal 'http://test.host/search/list?list_page=2', u
-  end
-
-  def test_to_str
-    @params[:controller] = 'hi'
-    @params[:action] = 'bye'
-    @request.parameters[:id] = '2'
-
-    assert_equal 'http://, test.host, /, hi, bye, {"id"=>"2"}', @rewriter.to_str
-  end
-
   def test_trailing_slash
     options = {:controller => 'foo', :action => 'bar', :id => '3', :only_path => true}
     assert_equal '/foo/bar/3', @rewriter.rewrite(@router, options)
diff --git a/actionpack/test/controller/view_paths_test.rb b/actionpack/test/controller/view_paths_test.rb
index 56821332c5..b8972b04b6 100644
--- a/actionpack/test/controller/view_paths_test.rb
+++ b/actionpack/test/controller/view_paths_test.rb
@@ -36,9 +36,12 @@ class ViewLoadPathsTest < ActionController::TestCase
     @old_behavior = ActiveSupport::Deprecation.behavior
     @last_message = nil
     ActiveSupport::Deprecation.behavior = Proc.new { |message, callback| @last_message = message }
+
+    @paths = TestController.view_paths
   end
 
   def teardown
+    TestController.view_paths = @paths
     ActiveSupport::Deprecation.behavior = @old_behavior
   end
 
diff --git a/actionpack/test/dispatch/mount_test.rb b/actionpack/test/dispatch/mount_test.rb
new file mode 100644
index 0000000000..f89e5fda07
--- /dev/null
+++ b/actionpack/test/dispatch/mount_test.rb
@@ -0,0 +1,36 @@
+require 'abstract_unit'
+
+class TestRoutingMount < ActionDispatch::IntegrationTest
+  SprocketsApp = lambda { |env|
+    [200, {"Content-Type" => "text/html"}, ["#{env["SCRIPT_NAME"]} -- #{env["PATH_INFO"]}"]]
+  }
+
+  Router = ActionDispatch::Routing::RouteSet.new
+  Router.draw do
+    mount SprocketsApp, :at => "/sprockets"
+    mount SprocketsApp => "/shorthand"
+
+    scope "/its_a" do
+      mount SprocketsApp, :at => "/sprocket"
+    end
+  end
+
+  def app
+    Router
+  end
+
+  def test_mounting_sets_script_name
+    get "/sprockets/omg"
+    assert_equal "/sprockets -- /omg", response.body
+  end
+
+  def test_mounting_works_with_scope
+    get "/its_a/sprocket/omg"
+    assert_equal "/its_a/sprocket -- /omg", response.body
+  end
+  
+  def test_mounting_with_shorthand
+    get "/shorthand/omg"
+    assert_equal "/shorthand -- /omg", response.body
+  end
+end
\ No newline at end of file
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index cc6acead6e..badef4e92e 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -1,14 +1,6 @@
 require 'abstract_unit'
 
 class RequestTest < ActiveSupport::TestCase
-  def setup
-    ActionController::Base.relative_url_root = nil
-  end
-
-  def teardown
-    ActionController::Base.relative_url_root = nil
-  end
-
   test "remote ip" do
     request = stub_request 'REMOTE_ADDR' => '1.2.3.4'
     assert_equal '1.2.3.4', request.remote_ip
@@ -50,7 +42,7 @@ class RequestTest < ActiveSupport::TestCase
 
     request = stub_request 'HTTP_X_FORWARDED_FOR' => '1.1.1.1',
                            'HTTP_CLIENT_IP'       => '2.2.2.2'
-    e = assert_raise(ActionController::ActionControllerError) {
+    e = assert_raise(ActionDispatch::RemoteIp::IpSpoofAttackError) {
       request.remote_ip
     }
     assert_match /IP spoofing attack/, e.message
@@ -62,18 +54,17 @@ class RequestTest < ActiveSupport::TestCase
     # example is WAP.  Since the cellular network is not IP based, it's a
     # leap of faith to assume that their proxies are ever going to set the
     # HTTP_CLIENT_IP/HTTP_X_FORWARDED_FOR headers properly.
-    ActionController::Base.ip_spoofing_check = false
     request = stub_request 'HTTP_X_FORWARDED_FOR' => '1.1.1.1',
-                           'HTTP_CLIENT_IP'       => '2.2.2.2'
+                           'HTTP_CLIENT_IP'       => '2.2.2.2',
+                           :ip_spoofing_check => false
     assert_equal '2.2.2.2', request.remote_ip
-    ActionController::Base.ip_spoofing_check = true
 
     request = stub_request 'HTTP_X_FORWARDED_FOR' => '8.8.8.8, 9.9.9.9'
     assert_equal '9.9.9.9', request.remote_ip
   end
 
   test "remote ip with user specified trusted proxies" do
-    ActionController::Base.trusted_proxies = /^67\.205\.106\.73$/i
+    @trusted_proxies = /^67\.205\.106\.73$/i
 
     request = stub_request 'REMOTE_ADDR' => '67.205.106.73',
                            'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
@@ -96,8 +87,6 @@ class RequestTest < ActiveSupport::TestCase
 
     request = stub_request 'HTTP_X_FORWARDED_FOR' => '9.9.9.9, 3.4.5.6, 10.0.0.1, 67.205.106.73'
     assert_equal '3.4.5.6', request.remote_ip
-
-    ActionController::Base.trusted_proxies = nil
   end
 
   test "domains" do
@@ -151,104 +140,34 @@ class RequestTest < ActiveSupport::TestCase
     assert_equal ":8080", request.port_string
   end
 
-  test "request uri" do
-    request = stub_request 'REQUEST_URI' => "http://www.rubyonrails.org/path/of/some/uri?mapped=1"
-    assert_equal "/path/of/some/uri?mapped=1", request.request_uri
-    assert_equal "/path/of/some/uri",          request.path
-
-    request = stub_request 'REQUEST_URI' => "http://www.rubyonrails.org/path/of/some/uri"
-    assert_equal "/path/of/some/uri", request.request_uri
-    assert_equal "/path/of/some/uri", request.path
-
-    request = stub_request 'REQUEST_URI' => "/path/of/some/uri"
-    assert_equal "/path/of/some/uri", request.request_uri
-    assert_equal "/path/of/some/uri", request.path
-
-    request = stub_request 'REQUEST_URI' => "/"
-    assert_equal "/", request.request_uri
-    assert_equal "/", request.path
-
-    request = stub_request 'REQUEST_URI' => "/?m=b"
-    assert_equal "/?m=b", request.request_uri
-    assert_equal "/",     request.path
-
-    request = stub_request 'REQUEST_URI' => "/", 'SCRIPT_NAME' => '/dispatch.cgi'
-    assert_equal "/", request.request_uri
-    assert_equal "/", request.path
-
-    ActionController::Base.relative_url_root = "/hieraki"
-    request = stub_request 'REQUEST_URI' => "/hieraki/", 'SCRIPT_NAME' => "/hieraki/dispatch.cgi"
-    assert_equal "/hieraki/", request.request_uri
-    assert_equal "/",         request.path
-    ActionController::Base.relative_url_root = nil
-
-    ActionController::Base.relative_url_root = "/collaboration/hieraki"
-    request = stub_request 'REQUEST_URI' => "/collaboration/hieraki/books/edit/2",
-      'SCRIPT_NAME' => "/collaboration/hieraki/dispatch.cgi"
-    assert_equal "/collaboration/hieraki/books/edit/2", request.request_uri
-    assert_equal "/books/edit/2",                       request.path
-    ActionController::Base.relative_url_root = nil
-
-    # The following tests are for when REQUEST_URI is not supplied (as in IIS)
-    request = stub_request 'PATH_INFO'   => "/path/of/some/uri?mapped=1",
-                           'SCRIPT_NAME' => nil,
-                           'REQUEST_URI' => nil
-    assert_equal "/path/of/some/uri?mapped=1", request.request_uri
-    assert_equal "/path/of/some/uri",          request.path
-
-    ActionController::Base.relative_url_root = '/path'
-    request = stub_request 'PATH_INFO'   => "/path/of/some/uri?mapped=1",
-                           'SCRIPT_NAME' => "/path/dispatch.rb",
-                           'REQUEST_URI' => nil
-    assert_equal "/path/of/some/uri?mapped=1", request.request_uri
-    assert_equal "/of/some/uri",               request.path
-    ActionController::Base.relative_url_root = nil
-
-    request = stub_request 'PATH_INFO'   => "/path/of/some/uri",
-                           'SCRIPT_NAME' => nil,
-                           'REQUEST_URI' => nil
-    assert_equal "/path/of/some/uri", request.request_uri
-    assert_equal "/path/of/some/uri", request.path
-
-    request = stub_request 'PATH_INFO' => '/', 'REQUEST_URI' => nil
-    assert_equal "/", request.request_uri
-    assert_equal "/", request.path
-
-    request = stub_request 'PATH_INFO' => '/?m=b', 'REQUEST_URI' => nil
-    assert_equal "/?m=b", request.request_uri
-    assert_equal "/",     request.path
-
-    request = stub_request 'PATH_INFO'   => "/",
-                           'SCRIPT_NAME' => "/dispatch.cgi",
-                           'REQUEST_URI' => nil
-    assert_equal "/", request.request_uri
-    assert_equal "/", request.path
-
-    ActionController::Base.relative_url_root = '/hieraki'
-    request = stub_request 'PATH_INFO'   => "/hieraki/",
-                           'SCRIPT_NAME' => "/hieraki/dispatch.cgi",
-                           'REQUEST_URI' => nil
-    assert_equal "/hieraki/", request.request_uri
-    assert_equal "/",         request.path
-    ActionController::Base.relative_url_root = nil
-
-    request = stub_request 'REQUEST_URI' => '/hieraki/dispatch.cgi'
-    ActionController::Base.relative_url_root = '/hieraki'
-    assert_equal "/dispatch.cgi", request.path
-    ActionController::Base.relative_url_root = nil
-
-    request = stub_request 'REQUEST_URI' => '/hieraki/dispatch.cgi'
-    ActionController::Base.relative_url_root = '/foo'
-    assert_equal "/hieraki/dispatch.cgi", request.path
-    ActionController::Base.relative_url_root = nil
-
-    # This test ensures that Rails uses REQUEST_URI over PATH_INFO
-    ActionController::Base.relative_url_root = nil
-    request = stub_request 'REQUEST_URI' => "/some/path",
-                           'PATH_INFO'   => "/another/path",
-                           'SCRIPT_NAME' => "/dispatch.cgi"
-    assert_equal "/some/path", request.request_uri
-    assert_equal "/some/path", request.path
+  test "full path" do
+    request = stub_request 'SCRIPT_NAME' => '', 'PATH_INFO' => '/path/of/some/uri', 'QUERY_STRING' => 'mapped=1'
+    assert_equal "/path/of/some/uri?mapped=1", request.fullpath
+    assert_equal "/path/of/some/uri",          request.path_info
+
+    request = stub_request 'SCRIPT_NAME' => '', 'PATH_INFO' => '/path/of/some/uri'
+    assert_equal "/path/of/some/uri", request.fullpath
+    assert_equal "/path/of/some/uri", request.path_info
+
+    request = stub_request 'SCRIPT_NAME' => '', 'PATH_INFO' => '/'
+    assert_equal "/", request.fullpath
+    assert_equal "/", request.path_info
+
+    request = stub_request 'SCRIPT_NAME' => '', 'PATH_INFO' => '/', 'QUERY_STRING' => 'm=b'
+    assert_equal "/?m=b", request.fullpath
+    assert_equal "/",     request.path_info
+
+    request = stub_request 'SCRIPT_NAME' => '/hieraki', 'PATH_INFO' => '/'
+    assert_equal "/hieraki/", request.fullpath
+    assert_equal "/",         request.path_info
+
+    request = stub_request 'SCRIPT_NAME' => '/collaboration/hieraki', 'PATH_INFO' => '/books/edit/2'
+    assert_equal "/collaboration/hieraki/books/edit/2", request.fullpath
+    assert_equal "/books/edit/2",                       request.path_info
+
+    request = stub_request 'SCRIPT_NAME' => '/path', 'PATH_INFO' => '/of/some/uri', 'QUERY_STRING' => 'mapped=1'
+    assert_equal "/path/of/some/uri?mapped=1", request.fullpath
+    assert_equal "/of/some/uri",               request.path_info
   end
 
 
@@ -506,18 +425,14 @@ class RequestTest < ActiveSupport::TestCase
 
 protected
 
-  def stub_request(env={})
+  def stub_request(env = {})
+    ip_spoofing_check = env.key?(:ip_spoofing_check) ? env.delete(:ip_spoofing_check) : true
+    ip_app = ActionDispatch::RemoteIp.new(Proc.new { }, ip_spoofing_check, @trusted_proxies)
+    ip_app.call(env)
     ActionDispatch::Request.new(env)
   end
 
   def with_set(*args)
     args
   end
-
-  def with_accept_header(value)
-    ActionController::Base.use_accept_header, old = value, ActionController::Base.use_accept_header
-    yield
-  ensure
-    ActionController::Base.use_accept_header = old
-  end
 end
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 37c2f1421b..f5fcf9b0df 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -15,6 +15,8 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
   stub_controllers do |routes|
     Routes = routes
     Routes.draw do
+      default_url_options :host => "rubyonrails.org"
+
       controller :sessions do
         get  'login' => :new, :as => :login
         post 'login' => :create
@@ -24,6 +26,8 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       resource :session do
         get :create
+
+        resource :info
       end
 
       match 'account/logout' => redirect("/logout"), :as => :logout_redirect
@@ -187,6 +191,8 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       assert_equal '/login', url_for(:controller => 'sessions', :action => 'create', :only_path => true)
       assert_equal '/login', url_for(:controller => 'sessions', :action => 'new', :only_path => true)
+
+      assert_equal 'http://rubyonrails.org/login', Routes.url_for(:controller => 'sessions', :action => 'create')
     end
   end
 
@@ -234,6 +240,14 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_session_info_nested_singleton_resource
+    with_test_routes do
+      get '/session/info'
+      assert_equal 'infos#show', @response.body
+      assert_equal '/session/info', session_info_path
+    end
+  end
+
   def test_redirect_modulo
     with_test_routes do
       get '/account/modulo/name'
diff --git a/actionpack/test/dispatch/url_generation_test.rb b/actionpack/test/dispatch/url_generation_test.rb
new file mode 100644
index 0000000000..18b5b7ee00
--- /dev/null
+++ b/actionpack/test/dispatch/url_generation_test.rb
@@ -0,0 +1,38 @@
+require 'abstract_unit'
+
+module TestUrlGeneration
+  class WithMountPoint < ActionDispatch::IntegrationTest
+    Router = ActionDispatch::Routing::RouteSet.new
+    Router.draw { match "/foo", :to => "my_route_generating#index", :as => :foo }
+
+    class ::MyRouteGeneratingController < ActionController::Base
+      include Router.url_helpers
+      def index
+        render :text => foo_path
+      end
+    end
+
+    include Router.url_helpers
+
+    def _router
+      Router
+    end
+
+    def app
+      Router
+    end
+
+    test "generating URLS normally" do
+      assert_equal "/foo", foo_path
+    end
+
+    test "accepting a :script_name option" do
+      assert_equal "/bar/foo", foo_path(:script_name => "/bar")
+    end
+
+    test "the request's SCRIPT_NAME takes precedence over the router's" do
+      get "/foo", {}, 'SCRIPT_NAME' => "/new"
+      assert_equal "/new/foo", response.body
+    end
+  end
+end
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/layout_render_file.erb b/actionpack/test/fixtures/test/layout_render_file.erb
new file mode 100644
index 0000000000..2f8e921c5f
--- /dev/null
+++ b/actionpack/test/fixtures/test/layout_render_file.erb
@@ -0,0 +1,2 @@
+<% content_for :title do %>title<% end -%>
+<%= render :file => 'layouts/yield' -%>
\ No newline at end of file
diff --git a/actionpack/test/lib/fixture_template.rb b/actionpack/test/lib/fixture_template.rb
index 6b9e7c5270..d287fae470 100644
--- a/actionpack/test/lib/fixture_template.rb
+++ b/actionpack/test/lib/fixture_template.rb
@@ -1,13 +1,13 @@
 module ActionView #:nodoc:
   class FixtureResolver < PathResolver
-    def initialize(hash = {}, options = {})
-      super(options)
+    def initialize(hash = {})
+      super()
       @hash = hash
     end
 
   private
 
-    def query(path, exts)
+    def query(partial, path, exts)
       query = Regexp.escape(path)
       exts.each do |ext|
         query << '(?:' << ext.map {|e| e && Regexp.escape(".#{e}") }.join('|') << ')'
@@ -15,9 +15,11 @@ module ActionView #:nodoc:
 
       templates = []
       @hash.select { |k,v| k =~ /^#{query}$/ }.each do |path, source|
-        templates << Template.new(source, path, *path_to_details(path))
+        handler, format = extract_handler_and_format(path)
+        templates << Template.new(source, path, handler,
+          :partial => partial, :virtual_path => path, :format => format)
       end
-      templates.sort_by {|t| -t.details.values.compact.size }
+      templates.sort_by {|t| -t.formats.size }
     end
 
   end
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 586de66714..50c3ab0b60 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -1,14 +1,16 @@
 require 'abstract_unit'
+require 'active_support/ordered_options'
 
-class AssetTagHelperTest < ActionView::TestCase
-  tests ActionView::Helpers::AssetTagHelper
+class FakeController
+  attr_accessor :request
 
-  DEFAULT_CONFIG = ActionView::DEFAULT_CONFIG.merge(
-    :assets_dir => File.dirname(__FILE__) + "/../fixtures/public",
-    :javascripts_dir => File.dirname(__FILE__) + "/../fixtures/public/javascripts",
-    :stylesheets_dir => File.dirname(__FILE__) + "/../fixtures/public/stylesheets")
+  def config
+    @config ||= ActiveSupport::InheritableOptions.new(ActionController::Base.config)
+  end
+end
 
-  include ActiveSupport::Configurable
+class AssetTagHelperTest < ActionView::TestCase
+  tests ActionView::Helpers::AssetTagHelper
 
   def setup
     super
@@ -32,8 +34,7 @@ class AssetTagHelperTest < ActionView::TestCase
       )
     end
 
-    @controller = Class.new do
-      attr_accessor :request
+    @controller = Class.new(BasicController) do
       def url_for(*args) "http://www.example.com" end
     end.new
 
@@ -50,7 +51,6 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def teardown
     ActionController::Base.perform_caching = false
-    ActionController::Base.asset_host = nil
     ENV.delete('RAILS_ASSET_ID')
   end
 
@@ -372,11 +372,9 @@ class AssetTagHelperTest < ActionView::TestCase
   end
 
   def test_timebased_asset_id_with_relative_url_root
-      ActionController::Base.relative_url_root = "/collaboration/hieraki"
-      expected_time = File.stat(File.expand_path(File.dirname(__FILE__) + "/../fixtures/public/images/rails.png")).mtime.to_i.to_s
-      assert_equal %(<img alt="Rails" src="#{ActionController::Base.relative_url_root}/images/rails.png?#{expected_time}" />), image_tag("rails.png")
-    ensure
-      ActionController::Base.relative_url_root = ""
+    @controller.config.relative_url_root = "/collaboration/hieraki"
+    expected_time = File.stat(File.expand_path(File.dirname(__FILE__) + "/../fixtures/public/images/rails.png")).mtime.to_i.to_s
+    assert_equal %(<img alt="Rails" src="#{@controller.config.relative_url_root}/images/rails.png?#{expected_time}" />), image_tag("rails.png")
   end
 
   def test_should_skip_asset_id_on_complete_url
@@ -402,7 +400,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_image_path_with_caching_and_proc_asset_host_using_request
     ENV['RAILS_ASSET_ID'] = ''
-    ActionController::Base.asset_host = Proc.new do |source, request|
+    @controller.config.asset_host = Proc.new do |source, request|
       if request.ssl?
         "#{request.protocol}#{request.host_with_port}"
       else
@@ -410,8 +408,6 @@ class AssetTagHelperTest < ActionView::TestCase
       end
     end
 
-    ActionController::Base.perform_caching = true
-
 
     @controller.request.stubs(:ssl?).returns(false)
     assert_equal "http://assets15.example.com/images/xml.png", image_path("xml.png")
@@ -422,7 +418,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_javascript_include_tag_when_caching_on
     ENV["RAILS_ASSET_ID"] = ""
-    ActionController::Base.asset_host = 'http://a0.example.com'
+    @controller.config.asset_host = 'http://a0.example.com'
     ActionController::Base.perform_caching = true
 
     assert_dom_equal(
@@ -454,7 +450,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_javascript_include_tag_when_caching_on_with_proc_asset_host
     ENV['RAILS_ASSET_ID'] = ''
-    ActionController::Base.asset_host = Proc.new { |source| "http://a#{source.length}.example.com" }
+    @controller.config.asset_host = Proc.new { |source| "http://a#{source.length}.example.com" }
     ActionController::Base.perform_caching = true
 
     assert_equal '/javascripts/scripts.js'.length, 23
@@ -471,7 +467,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_javascript_include_tag_when_caching_on_with_2_argument_proc_asset_host
     ENV['RAILS_ASSET_ID'] = ''
-    ActionController::Base.asset_host = Proc.new { |source, request|
+    @controller.config.asset_host = Proc.new { |source, request|
       if request.ssl?
         "#{request.protocol}#{request.host_with_port}"
       else
@@ -508,7 +504,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_javascript_include_tag_when_caching_on_with_2_argument_object_asset_host
     ENV['RAILS_ASSET_ID'] = ''
-    ActionController::Base.asset_host = Class.new do
+    @controller.config.asset_host = Class.new do
       def call(source, request)
         if request.ssl?
           "#{request.protocol}#{request.host_with_port}"
@@ -548,7 +544,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_javascript_include_tag_when_caching_on_and_using_subdirectory
     ENV["RAILS_ASSET_ID"] = ""
-    ActionController::Base.asset_host = 'http://a%d.example.com'
+    @controller.config.asset_host = 'http://a%d.example.com'
     ActionController::Base.perform_caching = true
 
     hash = '/javascripts/cache/money.js'.hash % 4
@@ -564,7 +560,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_javascript_include_tag_with_all_and_recursive_puts_defaults_at_the_start_of_the_file
     ENV["RAILS_ASSET_ID"] = ""
-    ActionController::Base.asset_host = 'http://a0.example.com'
+    @controller.config.asset_host = 'http://a0.example.com'
     ActionController::Base.perform_caching = true
 
     assert_dom_equal(
@@ -585,7 +581,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_javascript_include_tag_with_all_puts_defaults_at_the_start_of_the_file
     ENV["RAILS_ASSET_ID"] = ""
-    ActionController::Base.asset_host = 'http://a0.example.com'
+    @controller.config.asset_host = 'http://a0.example.com'
     ActionController::Base.perform_caching = true
 
     assert_dom_equal(
@@ -606,7 +602,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_javascript_include_tag_with_relative_url_root
     ENV["RAILS_ASSET_ID"] = ""
-    ActionController::Base.relative_url_root = "/collaboration/hieraki"
+    @controller.config.relative_url_root = "/collaboration/hieraki"
     ActionController::Base.perform_caching = true
 
     assert_dom_equal(
@@ -624,7 +620,6 @@ class AssetTagHelperTest < ActionView::TestCase
     assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'money.js'))
 
   ensure
-    ActionController::Base.relative_url_root = nil
     FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'all.js'))
     FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'money.js'))
   end
@@ -694,7 +689,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_stylesheet_link_tag_when_caching_on
     ENV["RAILS_ASSET_ID"] = ""
-    ActionController::Base.asset_host = 'http://a0.example.com'
+    @controller.config.asset_host = 'http://a0.example.com'
     ActionController::Base.perform_caching = true
 
     assert_dom_equal(
@@ -804,7 +799,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_stylesheet_link_tag_when_caching_on_with_proc_asset_host
     ENV["RAILS_ASSET_ID"] = ""
-    ActionController::Base.asset_host = Proc.new { |source| "http://a#{source.length}.example.com" }
+    @controller.config.asset_host = Proc.new { |source| "http://a#{source.length}.example.com" }
     ActionController::Base.perform_caching = true
 
     assert_equal '/stylesheets/styles.css'.length, 23
@@ -821,7 +816,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_stylesheet_link_tag_with_relative_url_root
     ENV["RAILS_ASSET_ID"] = ""
-    ActionController::Base.relative_url_root = "/collaboration/hieraki"
+    @controller.config.relative_url_root = "/collaboration/hieraki"
     ActionController::Base.perform_caching = true
 
     assert_dom_equal(
@@ -841,7 +836,6 @@ class AssetTagHelperTest < ActionView::TestCase
 
     assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
   ensure
-    ActionController::Base.relative_url_root = nil
     FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
     FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
   end
@@ -879,21 +873,16 @@ end
 class AssetTagHelperNonVhostTest < ActionView::TestCase
   tests ActionView::Helpers::AssetTagHelper
 
-  DEFAULT_CONFIG = ActionView::DEFAULT_CONFIG
-  include ActiveSupport::Configurable
-
   def setup
     super
-    ActionController::Base.relative_url_root = "/collaboration/hieraki"
-
-    @controller = Class.new do
-      attr_accessor :request
-
+    @controller = Class.new(BasicController) do
       def url_for(options)
         "http://www.example.com/collaboration/hieraki"
       end
     end.new
 
+    @controller.config.relative_url_root = "/collaboration/hieraki"
+
     @request = Class.new do
       def protocol
         'gopher://'
@@ -905,10 +894,6 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase
     ActionView::Helpers::AssetTagHelper::reset_javascript_include_default
   end
 
-  def teardown
-    ActionController::Base.relative_url_root = nil
-  end
-
   def test_should_compute_proper_path
     assert_dom_equal(%(<link href="http://www.example.com/collaboration/hieraki" rel="alternate" title="RSS" type="application/rss+xml" />), auto_discovery_link_tag)
     assert_dom_equal(%(/collaboration/hieraki/javascripts/xmlhr.js), javascript_path("xmlhr"))
@@ -923,43 +908,33 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase
   end
 
   def test_should_compute_proper_path_with_asset_host
-    ActionController::Base.asset_host = "http://assets.example.com"
+    @controller.config.asset_host = "http://assets.example.com"
     assert_dom_equal(%(<link href="http://www.example.com/collaboration/hieraki" rel="alternate" title="RSS" type="application/rss+xml" />), auto_discovery_link_tag)
     assert_dom_equal(%(http://assets.example.com/collaboration/hieraki/javascripts/xmlhr.js), javascript_path("xmlhr"))
     assert_dom_equal(%(http://assets.example.com/collaboration/hieraki/stylesheets/style.css), stylesheet_path("style"))
     assert_dom_equal(%(http://assets.example.com/collaboration/hieraki/images/xml.png), image_path("xml.png"))
     assert_dom_equal(%(<img alt="Mouse" onmouseover="this.src='http://assets.example.com/collaboration/hieraki/images/mouse_over.png'" onmouseout="this.src='http://assets.example.com/collaboration/hieraki/images/mouse.png'" src="http://assets.example.com/collaboration/hieraki/images/mouse.png" />), image_tag("mouse.png", :mouseover => "/images/mouse_over.png"))
     assert_dom_equal(%(<img alt="Mouse2" onmouseover="this.src='http://assets.example.com/collaboration/hieraki/images/mouse_over2.png'" onmouseout="this.src='http://assets.example.com/collaboration/hieraki/images/mouse2.png'" src="http://assets.example.com/collaboration/hieraki/images/mouse2.png" />), image_tag("mouse2.png", :mouseover => image_path("mouse_over2.png")))
-  ensure
-    ActionController::Base.asset_host = ""
   end
 
   def test_should_ignore_asset_host_on_complete_url
-    ActionController::Base.asset_host = "http://assets.example.com"
+    @controller.config.asset_host = "http://assets.example.com"
     assert_dom_equal(%(<link href="http://bar.example.com/stylesheets/style.css" media="screen" rel="stylesheet" type="text/css" />), stylesheet_link_tag("http://bar.example.com/stylesheets/style.css"))
-  ensure
-    ActionController::Base.asset_host = ""
   end
 
   def test_should_wildcard_asset_host_between_zero_and_four
-    ActionController::Base.asset_host = 'http://a%d.example.com'
+    @controller.config.asset_host = 'http://a%d.example.com'
     assert_match %r(http://a[0123].example.com/collaboration/hieraki/images/xml.png), image_path('xml.png')
-  ensure
-    ActionController::Base.asset_host = nil
   end
 
   def test_asset_host_without_protocol_should_use_request_protocol
-    ActionController::Base.asset_host = 'a.example.com'
+    @controller.config.asset_host = 'a.example.com'
     assert_equal 'gopher://a.example.com/collaboration/hieraki/images/xml.png', image_path('xml.png')
-  ensure
-    ActionController::Base.asset_host = nil
   end
 
   def test_asset_host_without_protocol_should_use_request_protocol_even_if_path_present
-    ActionController::Base.asset_host = 'a.example.com/files/go/here'
+    @controller.config.asset_host = 'a.example.com/files/go/here'
     assert_equal 'gopher://a.example.com/files/go/here/collaboration/hieraki/images/xml.png', image_path('xml.png')
-  ensure
-    ActionController::Base.asset_host = nil
   end
 
   def test_assert_css_and_js_of_the_same_name_return_correct_extension
diff --git a/actionpack/test/template/compiled_templates_test.rb b/actionpack/test/template/compiled_templates_test.rb
index 632988bb2e..2c719757e4 100644
--- a/actionpack/test/template/compiled_templates_test.rb
+++ b/actionpack/test/template/compiled_templates_test.rb
@@ -14,9 +14,6 @@ class CompiledTemplatesTest < Test::Unit::TestCase
     assert_equal "two", render(:file => "test/render_file_with_locals_and_default.erb", :locals => { :secret => "two" })
   end
 
-  # This is broken in 1.8.6 (not supported in Rails 3.0) because the cache uses a Hash
-  # key. Since Ruby 1.8.6 implements Hash#hash using the hash's object_id, it will never
-  # successfully get a cache hit here.
   def test_template_changes_are_not_reflected_with_cached_templates
     assert_equal "Hello world!", render(:file => "test/hello_world.erb")
     modify_template "test/hello_world.erb", "Goodbye world!" do
@@ -44,7 +41,7 @@ class CompiledTemplatesTest < Test::Unit::TestCase
     end
 
     def render_without_cache(*args)
-      path = ActionView::FileSystemResolverWithFallback.new(FIXTURE_LOAD_PATH)
+      path = ActionView::FileSystemResolver.new(FIXTURE_LOAD_PATH)
       view_paths = ActionView::Base.process_view_paths(path)
       ActionView::Base.new(view_paths, {}).render(*args)
     end
diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb
index 7d3075d232..da2477b6f8 100644
--- a/actionpack/test/template/date_helper_test.rb
+++ b/actionpack/test/template/date_helper_test.rb
@@ -1229,11 +1229,28 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, date_select("post", "written_on", :order => [ :month, :year ])
   end
 
+  def test_date_select_without_day_and_with_disabled_html_option
+    @post = Post.new
+    @post.written_on = Date.new(2004, 6, 15)
+
+    expected = "<input type=\"hidden\" id=\"post_written_on_3i\" disabled=\"disabled\" name=\"post[written_on(3i)]\" value=\"1\" />\n"
+
+    expected <<  %{<select id="post_written_on_2i" disabled="disabled" name="post[written_on(2i)]">\n}
+    expected << %{<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n}
+    expected << "</select>\n"
+
+    expected << %{<select id="post_written_on_1i" disabled="disabled" name="post[written_on(1i)]">\n}
+    expected << %{<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n}
+    expected << "</select>\n"
+
+    assert_dom_equal expected, date_select("post", "written_on", { :order => [ :month, :year ] }, :disabled => true)
+  end
+
   def test_date_select_within_fields_for
     @post = Post.new
     @post.written_on = Date.new(2004, 6, 15)
 
-    fields_for :post, @post do |f|
+    output_buffer = fields_for :post, @post do |f|
       concat f.date_select(:written_on)
     end
 
@@ -1249,7 +1266,7 @@ class DateHelperTest < ActionView::TestCase
     @post.written_on = Date.new(2004, 6, 15)
     id = 27
 
-    fields_for :post, @post, :index => id do |f|
+    output_buffer = fields_for :post, @post, :index => id do |f|
       concat f.date_select(:written_on)
     end
 
@@ -1265,7 +1282,7 @@ class DateHelperTest < ActionView::TestCase
     @post.written_on = Date.new(2004, 6, 15)
     id = nil
 
-    fields_for :post, @post, :index => id do |f|
+    output_buffer = fields_for :post, @post, :index => id do |f|
       concat f.date_select(:written_on)
     end
 
@@ -1461,7 +1478,7 @@ class DateHelperTest < ActionView::TestCase
     @post = Post.new
     @post.written_on = Date.new(2004, 6, 15)
 
-    fields_for :post, @post do |f|
+    output_buffer = fields_for :post, @post do |f|
       concat f.date_select(:written_on, {}, :class => 'selector')
     end
 
@@ -1625,7 +1642,7 @@ class DateHelperTest < ActionView::TestCase
     @post = Post.new
     @post.written_on = Time.local(2004, 6, 15, 15, 16, 35)
 
-    fields_for :post, @post do |f|
+    output_buffer = fields_for :post, @post do |f|
       concat f.time_select(:written_on, {}, :class => 'selector')
     end
 
@@ -1713,6 +1730,25 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, time_select("post", "written_on", :prompt => {:hour => 'Choose hour', :minute => 'Choose minute'})
   end
 
+  def test_time_select_with_disabled_html_option
+    @post = Post.new
+    @post.written_on = Time.local(2004, 6, 15, 15, 16, 35)
+
+    expected = %{<input type="hidden" id="post_written_on_1i" disabled="disabled" name="post[written_on(1i)]" value="2004" />\n}
+    expected << %{<input type="hidden" id="post_written_on_2i" disabled="disabled" name="post[written_on(2i)]" value="6" />\n}
+    expected << %{<input type="hidden" id="post_written_on_3i" disabled="disabled" name="post[written_on(3i)]" value="15" />\n}
+
+    expected << %(<select id="post_written_on_4i" disabled="disabled" name="post[written_on(4i)]">\n)
+    0.upto(23) { |i| expected << %(<option value="#{sprintf("%02d", i)}"#{' selected="selected"' if i == 15}>#{sprintf("%02d", i)}</option>\n) }
+    expected << "</select>\n"
+    expected << " : "
+    expected << %(<select id="post_written_on_5i" disabled="disabled" name="post[written_on(5i)]">\n)
+    0.upto(59) { |i| expected << %(<option value="#{sprintf("%02d", i)}"#{' selected="selected"' if i == 16}>#{sprintf("%02d", i)}</option>\n) }
+    expected << "</select>\n"
+
+    assert_dom_equal expected, time_select("post", "written_on", {}, :disabled => true)
+  end
+
   def test_datetime_select
     @post = Post.new
     @post.updated_at = Time.local(2004, 6, 15, 16, 35)
@@ -1780,7 +1816,7 @@ class DateHelperTest < ActionView::TestCase
     @post = Post.new
     @post.updated_at = Time.local(2004, 6, 15, 16, 35)
 
-    fields_for :post, @post do |f|
+    output_buffer = fields_for :post, @post do |f|
       concat f.datetime_select(:updated_at, {}, :class => 'selector')
     end
 
@@ -2016,7 +2052,7 @@ class DateHelperTest < ActionView::TestCase
     @post.updated_at = Time.local(2004, 6, 15, 16, 35)
     id = 456
 
-    fields_for :post, @post, :index => id do |f|
+    output_buffer = fields_for :post, @post, :index => id do |f|
       concat f.datetime_select(:updated_at)
     end
 
@@ -2173,6 +2209,25 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, datetime_select("post", "updated_at", :discard_year => true, :discard_month => true)
   end
 
+  def test_datetime_select_discard_year_and_month_with_disabled_html_option
+    @post = Post.new
+    @post.updated_at = Time.local(2004, 6, 15, 15, 16, 35)
+
+    expected = %{<input type="hidden" id="post_updated_at_1i" disabled="disabled" name="post[updated_at(1i)]" value="2004" />\n}
+    expected << %{<input type="hidden" id="post_updated_at_2i" disabled="disabled" name="post[updated_at(2i)]" value="6" />\n}
+    expected << %{<input type="hidden" id="post_updated_at_3i" disabled="disabled" name="post[updated_at(3i)]" value="15" />\n}
+
+    expected << %{<select id="post_updated_at_4i" disabled="disabled" name="post[updated_at(4i)]">\n}
+    0.upto(23) { |i| expected << %(<option value="#{sprintf("%02d", i)}"#{' selected="selected"' if i == 15}>#{sprintf("%02d", i)}</option>\n) }
+    expected << "</select>\n"
+    expected << " : "
+    expected << %{<select id="post_updated_at_5i" disabled="disabled" name="post[updated_at(5i)]">\n}
+    0.upto(59) { |i| expected << %(<option value="#{sprintf("%02d", i)}"#{' selected="selected"' if i == 16}>#{sprintf("%02d", i)}</option>\n) }
+    expected << "</select>\n"
+
+    assert_dom_equal expected, datetime_select("post", "updated_at", { :discard_year => true, :discard_month => true }, :disabled => true)
+  end
+
   def test_datetime_select_discard_hour
     @post = Post.new
     @post.updated_at = Time.local(2004, 6, 15, 15, 16, 35)
diff --git a/actionpack/test/template/erb/tag_helper_test.rb b/actionpack/test/template/erb/tag_helper_test.rb
new file mode 100644
index 0000000000..b91539ef0b
--- /dev/null
+++ b/actionpack/test/template/erb/tag_helper_test.rb
@@ -0,0 +1,82 @@
+require "abstract_unit"
+
+module ERBTest
+  class ViewContext
+    mock_controller = Class.new do
+      include SharedTestRoutes.url_helpers
+    end
+
+    include ActionView::Helpers::TagHelper
+    include ActionView::Helpers::JavaScriptHelper
+    include ActionView::Helpers::FormHelper
+
+    attr_accessor :output_buffer
+
+    def protect_against_forgery?() false end
+
+    define_method(:controller) do
+      mock_controller.new
+    end
+  end
+
+  class DeprecatedViewContext < ViewContext
+    include ActionView::Helpers::DeprecatedBlockHelpers
+  end
+
+  module SharedTagHelpers
+    extend ActiveSupport::Testing::Declarative
+
+    def render_content(start, inside)
+      template = block_helper(start, inside)
+      ActionView::Template::Handlers::Erubis.new(template).evaluate(context.new)
+    end
+
+    test "percent equals works for content_tag" do
+      assert_equal "<div>Hello world</div>", render_content("content_tag(:div)", "Hello world")
+    end
+
+    test "percent equals works for javascript_tag" do
+      expected_output = "<script type=\"text/javascript\">\n//<![CDATA[\nalert('Hello')\n//]]>\n</script>"
+      assert_equal expected_output, render_content("javascript_tag", "alert('Hello')")
+    end
+
+    test "percent equals works for javascript_tag with options" do
+      expected_output = "<script id=\"the_js_tag\" type=\"text/javascript\">\n//<![CDATA[\nalert('Hello')\n//]]>\n</script>"
+      assert_equal expected_output, render_content("javascript_tag(:id => 'the_js_tag')", "alert('Hello')")
+    end
+
+    test "percent equals works with form tags" do
+      expected_output = "<form action=\"foo\" method=\"post\">hello</form>"
+      assert_equal expected_output, render_content("form_tag('foo')", "<%= 'hello' %>")
+    end
+
+    test "percent equals works with fieldset tags" do
+      expected_output = "<fieldset><legend>foo</legend>hello</fieldset>"
+      assert_equal expected_output, render_content("field_set_tag('foo')", "<%= 'hello' %>")
+    end
+  end
+
+  class TagHelperTest < ActiveSupport::TestCase
+    def context
+      ViewContext
+    end
+
+    def block_helper(str, rest)
+      "<%= #{str} do %>#{rest}<% end %>"
+    end
+
+    include SharedTagHelpers
+  end
+
+  class DeprecatedTagHelperTest < ActiveSupport::TestCase
+    def context
+      DeprecatedViewContext
+    end
+
+    def block_helper(str, rest)
+      "<% __in_erb_template=true %><% #{str} do %>#{rest}<% end %>"
+    end
+
+    include SharedTagHelpers
+  end
+end
\ No newline at end of file
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index d143c39c9c..7c5ccfd6ed 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -4,6 +4,10 @@ require 'controller/fake_models'
 class FormHelperTest < ActionView::TestCase
   tests ActionView::Helpers::FormHelper
 
+  def form_for(*)
+    @output_buffer = super
+  end
+
   def setup
     super
 
@@ -590,9 +594,9 @@ class FormHelperTest < ActionView::TestCase
 
   def test_nested_fields_for
     form_for(:post, @post) do |f|
-      f.fields_for(:comment, @post) do |c|
+      concat f.fields_for(:comment, @post) { |c|
         concat c.text_field(:title)
-      end
+      }
     end
 
     expected = "<form action='http://www.example.com' method='post'>" +
@@ -605,9 +609,9 @@ class FormHelperTest < ActionView::TestCase
   def test_nested_fields_for_with_nested_collections
     form_for('post[]', @post) do |f|
       concat f.text_field(:title)
-      f.fields_for('comment[]', @comment) do |c|
+      concat f.fields_for('comment[]', @comment) { |c|
         concat c.text_field(:name)
-      end
+      }
     end
 
     expected = "<form action='http://www.example.com' method='post'>" +
@@ -621,9 +625,9 @@ class FormHelperTest < ActionView::TestCase
   def test_nested_fields_for_with_index_and_parent_fields
     form_for('post', @post, :index => 1) do |c|
       concat c.text_field(:title)
-      c.fields_for('comment', @comment, :index => 1) do |r|
+      concat c.fields_for('comment', @comment, :index => 1) { |r|
         concat r.text_field(:name)
-      end
+      }
     end
 
     expected = "<form action='http://www.example.com' method='post'>" +
@@ -635,10 +639,10 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_index_and_nested_fields_for
-    form_for(:post, @post, :index => 1) do |f|
-      f.fields_for(:comment, @post) do |c|
+    output_buffer = form_for(:post, @post, :index => 1) do |f|
+      concat f.fields_for(:comment, @post) { |c|
         concat c.text_field(:title)
-      end
+      }
     end
 
     expected = "<form action='http://www.example.com' method='post'>" +
@@ -650,9 +654,9 @@ class FormHelperTest < ActionView::TestCase
 
   def test_nested_fields_for_with_index_on_both
     form_for(:post, @post, :index => 1) do |f|
-      f.fields_for(:comment, @post, :index => 5) do |c|
+      concat f.fields_for(:comment, @post, :index => 5) { |c|
         concat c.text_field(:title)
-      end
+      }
     end
 
     expected = "<form action='http://www.example.com' method='post'>" +
@@ -664,9 +668,9 @@ class FormHelperTest < ActionView::TestCase
 
   def test_nested_fields_for_with_auto_index
     form_for("post[]", @post) do |f|
-      f.fields_for(:comment, @post) do |c|
+      concat f.fields_for(:comment, @post) { |c|
         concat c.text_field(:title)
-      end
+      }
     end
 
     expected = "<form action='http://www.example.com' method='post'>" +
@@ -678,9 +682,9 @@ class FormHelperTest < ActionView::TestCase
 
   def test_nested_fields_for_with_index_radio_button
     form_for(:post, @post) do |f|
-      f.fields_for(:comment, @post, :index => 5) do |c|
+      concat f.fields_for(:comment, @post, :index => 5) { |c|
         concat c.radio_button(:title, "hello")
-      end
+      }
     end
 
     expected = "<form action='http://www.example.com' method='post'>" +
@@ -692,9 +696,9 @@ class FormHelperTest < ActionView::TestCase
 
   def test_nested_fields_for_with_auto_index_on_both
     form_for("post[]", @post) do |f|
-      f.fields_for("comment[]", @post) do |c|
+      concat f.fields_for("comment[]", @post) { |c|
         concat c.text_field(:title)
-      end
+      }
     end
 
     expected = "<form action='http://www.example.com' method='post'>" +
@@ -705,16 +709,16 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_nested_fields_for_with_index_and_auto_index
-    form_for("post[]", @post) do |f|
-      f.fields_for(:comment, @post, :index => 5) do |c|
+    output_buffer = form_for("post[]", @post) do |f|
+      concat f.fields_for(:comment, @post, :index => 5) { |c|
         concat c.text_field(:title)
-      end
+      }
     end
 
-    form_for(:post, @post, :index => 1) do |f|
-      f.fields_for("comment[]", @post) do |c|
+    output_buffer << form_for(:post, @post, :index => 1) do |f|
+      concat f.fields_for("comment[]", @post) { |c|
         concat c.text_field(:title)
-      end
+      }
     end
 
     expected = "<form action='http://www.example.com' method='post'>" +
@@ -732,9 +736,9 @@ class FormHelperTest < ActionView::TestCase
 
     form_for(:post, @post) do |f|
       concat f.text_field(:title)
-      f.fields_for(:author) do |af|
+      concat f.fields_for(:author) { |af|
         concat af.text_field(:name)
-      end
+      }
     end
 
     expected = '<form action="http://www.example.com" method="post">' +
@@ -759,9 +763,9 @@ class FormHelperTest < ActionView::TestCase
 
     form_for(:post, @post) do |f|
       concat f.text_field(:title)
-      f.fields_for(:author) do |af|
+      concat f.fields_for(:author) { |af|
         concat af.text_field(:name)
-      end
+      }
     end
 
     expected = '<form action="http://www.example.com" method="post">' +
@@ -778,10 +782,10 @@ class FormHelperTest < ActionView::TestCase
 
     form_for(:post, @post) do |f|
       concat f.text_field(:title)
-      f.fields_for(:author) do |af|
+      concat f.fields_for(:author) { |af|
         concat af.hidden_field(:id)
         concat af.text_field(:name)
-      end
+      }
     end
 
     expected = '<form action="http://www.example.com" method="post">' +
@@ -799,9 +803,9 @@ class FormHelperTest < ActionView::TestCase
     form_for(:post, @post) do |f|
       concat f.text_field(:title)
       @post.comments.each do |comment|
-        f.fields_for(:comments, comment) do |cf|
+        concat f.fields_for(:comments, comment) { |cf|
           concat cf.text_field(:name)
-        end
+        }
       end
     end
 
@@ -822,10 +826,10 @@ class FormHelperTest < ActionView::TestCase
     form_for(:post, @post) do |f|
       concat f.text_field(:title)
       @post.comments.each do |comment|
-        f.fields_for(:comments, comment) do |cf|
+        concat f.fields_for(:comments, comment) { |cf|
           concat cf.hidden_field(:id)
           concat cf.text_field(:name)
-        end
+        }
       end
     end
 
@@ -846,9 +850,9 @@ class FormHelperTest < ActionView::TestCase
     form_for(:post, @post) do |f|
       concat f.text_field(:title)
       @post.comments.each do |comment|
-        f.fields_for(:comments, comment) do |cf|
+        concat f.fields_for(:comments, comment) { |cf|
           concat cf.text_field(:name)
-        end
+        }
       end
     end
 
@@ -867,9 +871,9 @@ class FormHelperTest < ActionView::TestCase
     form_for(:post, @post) do |f|
       concat f.text_field(:title)
       @post.comments.each do |comment|
-        f.fields_for(:comments, comment) do |cf|
+        concat f.fields_for(:comments, comment) { |cf|
           concat cf.text_field(:name)
-        end
+        }
       end
     end
 
@@ -903,9 +907,9 @@ class FormHelperTest < ActionView::TestCase
 
     form_for(:post, @post) do |f|
       concat f.text_field(:title)
-      f.fields_for(:comments, @post.comments) do |cf|
+      concat f.fields_for(:comments, @post.comments) { |cf|
         concat cf.text_field(:name)
-      end
+      }
     end
 
     expected = '<form action="http://www.example.com" method="post">' +
@@ -925,9 +929,9 @@ class FormHelperTest < ActionView::TestCase
 
     form_for(:post, @post) do |f|
       concat f.text_field(:title)
-      f.fields_for(:comments, comments) do |cf|
+      concat f.fields_for(:comments, comments) { |cf|
         concat cf.text_field(:name)
-      end
+      }
     end
 
     expected = '<form action="http://www.example.com" method="post">' +
@@ -947,10 +951,10 @@ class FormHelperTest < ActionView::TestCase
 
     form_for(:post, @post) do |f|
       concat f.text_field(:title)
-      f.fields_for(:comments) do |cf|
+      concat f.fields_for(:comments) { |cf|
         concat cf.text_field(:name)
         yielded_comments << cf.object
-      end
+      }
     end
 
     expected = '<form action="http://www.example.com" method="post">' +
@@ -968,9 +972,9 @@ class FormHelperTest < ActionView::TestCase
     @post.comments = []
 
     form_for(:post, @post) do |f|
-      f.fields_for(:comments, Comment.new(321), :child_index => 'abc') do |cf|
+      concat f.fields_for(:comments, Comment.new(321), :child_index => 'abc') { |cf|
         concat cf.text_field(:name)
-      end
+      }
     end
 
     expected = '<form action="http://www.example.com" method="post">' +
@@ -988,24 +992,24 @@ class FormHelperTest < ActionView::TestCase
     @post.tags[0].relevances = []
     @post.tags[1].relevances = []
     form_for(:post, @post) do |f|
-      f.fields_for(:comments, @post.comments[0]) do |cf|
+      concat f.fields_for(:comments, @post.comments[0]) { |cf|
         concat cf.text_field(:name)
-        cf.fields_for(:relevances, CommentRelevance.new(314)) do |crf|
+        concat cf.fields_for(:relevances, CommentRelevance.new(314)) { |crf|
           concat crf.text_field(:value)
-        end
-      end
-      f.fields_for(:tags, @post.tags[0]) do |tf|
+        }
+      }
+      concat f.fields_for(:tags, @post.tags[0]) { |tf|
         concat tf.text_field(:value)
-        tf.fields_for(:relevances, TagRelevance.new(3141)) do |trf|
+        concat tf.fields_for(:relevances, TagRelevance.new(3141)) { |trf|
           concat trf.text_field(:value)
-        end
-      end
-      f.fields_for('tags', @post.tags[1]) do |tf|
+        }
+      }
+      concat f.fields_for('tags', @post.tags[1]) { |tf|
         concat tf.text_field(:value)
-        tf.fields_for(:relevances, TagRelevance.new(31415)) do |trf|
+        concat tf.fields_for(:relevances, TagRelevance.new(31415)) { |trf|
           concat trf.text_field(:value)
-        end
-      end
+        }
+      }
     end
 
     expected = '<form action="http://www.example.com" method="post">' +
@@ -1027,7 +1031,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_fields_for
-    fields_for(:post, @post) do |f|
+    output_buffer = fields_for(:post, @post) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
@@ -1043,7 +1047,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_fields_for_with_index
-    fields_for("post[]", @post) do |f|
+    output_buffer = fields_for("post[]", @post) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
@@ -1059,7 +1063,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_fields_for_with_nil_index_option_override
-    fields_for("post[]", @post, :index => nil) do |f|
+    output_buffer = fields_for("post[]", @post, :index => nil) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
@@ -1075,7 +1079,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_fields_for_with_index_option_override
-    fields_for("post[]", @post, :index => "abc") do |f|
+    output_buffer = fields_for("post[]", @post, :index => "abc") do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
@@ -1091,7 +1095,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_fields_for_without_object
-    fields_for(:post) do |f|
+    output_buffer = fields_for(:post) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
@@ -1107,7 +1111,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_fields_for_with_only_object
-    fields_for(@post) do |f|
+    output_buffer = fields_for(@post) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
@@ -1123,7 +1127,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_fields_for_object_with_bracketed_name
-    fields_for("author[post]", @post) do |f|
+    output_buffer = fields_for("author[post]", @post) do |f|
       concat f.label(:title)
       concat f.text_field(:title)
     end
@@ -1134,7 +1138,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_fields_for_object_with_bracketed_name_and_index
-    fields_for("author[post]", @post, :index => 1) do |f|
+    output_buffer = fields_for("author[post]", @post, :index => 1) do |f|
       concat f.label(:title)
       concat f.text_field(:title)
     end
@@ -1153,9 +1157,9 @@ class FormHelperTest < ActionView::TestCase
       concat post_form.text_field(:title)
       concat post_form.text_area(:body)
 
-      fields_for(:parent_post, @post) do |parent_fields|
+      concat fields_for(:parent_post, @post) { |parent_fields|
         concat parent_fields.check_box(:secret)
-      end
+      }
     end
 
     expected =
@@ -1174,9 +1178,9 @@ class FormHelperTest < ActionView::TestCase
       concat post_form.text_field(:title)
       concat post_form.text_area(:body)
 
-      post_form.fields_for(@comment) do |comment_fields|
+      concat post_form.fields_for(@comment) { |comment_fields|
         concat comment_fields.text_field(:name)
-      end
+      }
     end
 
     expected =
@@ -1273,7 +1277,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_fields_for_with_labelled_builder
-    fields_for(:post, @post, :builder => LabelledFormBuilder) do |f|
+    output_buffer = fields_for(:post, @post, :builder => LabelledFormBuilder) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb
index aa40e46aa8..5799e3db53 100644
--- a/actionpack/test/template/form_options_helper_test.rb
+++ b/actionpack/test/template/form_options_helper_test.rb
@@ -293,7 +293,7 @@ class FormOptionsHelperTest < ActionView::TestCase
     @post = Post.new
     @post.category = "<mus>"
 
-    fields_for :post, @post do |f|
+    output_buffer = fields_for :post, @post do |f|
       concat f.select(:category, %w( abe <mus> hest))
     end
   
@@ -307,7 +307,7 @@ class FormOptionsHelperTest < ActionView::TestCase
     @post = Post.new
     @post.category = "<mus>"
 
-    fields_for :post, @post, :index => 108 do |f|
+    output_buffer = fields_for :post, @post, :index => 108 do |f|
       concat f.select(:category, %w( abe <mus> hest))
     end
 
@@ -322,7 +322,7 @@ class FormOptionsHelperTest < ActionView::TestCase
     @post.category = "<mus>"
     def @post.to_param; 108; end
 
-    fields_for "post[]", @post do |f|
+    output_buffer = fields_for "post[]", @post do |f|
       concat f.select(:category, %w( abe <mus> hest))
     end
 
@@ -336,7 +336,7 @@ class FormOptionsHelperTest < ActionView::TestCase
     @post = Post.new
     options = "<option value=\"abe\">abe</option><option value=\"mus\">mus</option><option value=\"hest\">hest</option>"
 
-    fields_for :post, @post do |f|
+    output_buffer = fields_for :post, @post do |f|
       concat f.select(:category, options, :prompt => 'The prompt')
     end
 
@@ -462,7 +462,7 @@ class FormOptionsHelperTest < ActionView::TestCase
     @post = Post.new
     @post.author_name = "Babe"
 
-    fields_for :post, @post do |f|
+    output_buffer = fields_for :post, @post do |f|
       concat f.collection_select(:author_name, dummy_posts, :author_name, :author_name)
     end
   
@@ -476,7 +476,7 @@ class FormOptionsHelperTest < ActionView::TestCase
     @post = Post.new
     @post.author_name = "Babe"
 
-    fields_for :post, @post, :index => 815 do |f|
+    output_buffer = fields_for :post, @post, :index => 815 do |f|
       concat f.collection_select(:author_name, dummy_posts, :author_name, :author_name)
     end
 
@@ -491,7 +491,7 @@ class FormOptionsHelperTest < ActionView::TestCase
     @post.author_name = "Babe"
     def @post.to_param; 815; end
 
-    fields_for "post[]", @post do |f|
+    output_buffer = fields_for "post[]", @post do |f|
       concat f.collection_select(:author_name, dummy_posts, :author_name, :author_name)
     end
 
@@ -570,7 +570,7 @@ class FormOptionsHelperTest < ActionView::TestCase
   def test_time_zone_select_under_fields_for
     @firm = Firm.new("D")
 
-    fields_for :firm, @firm do |f|
+    output_buffer = fields_for :firm, @firm do |f|
       concat f.time_zone_select(:time_zone)
     end
   
@@ -589,7 +589,7 @@ class FormOptionsHelperTest < ActionView::TestCase
   def test_time_zone_select_under_fields_for_with_index
     @firm = Firm.new("D")
 
-    fields_for :firm, @firm, :index => 305 do |f|
+    output_buffer = fields_for :firm, @firm, :index => 305 do |f|
       concat f.time_zone_select(:time_zone)
     end
 
@@ -609,7 +609,7 @@ class FormOptionsHelperTest < ActionView::TestCase
     @firm = Firm.new("D")
     def @firm.to_param; 305; end
 
-    fields_for "firm[]", @firm do |f|
+    output_buffer = fields_for "firm[]", @firm do |f|
       concat f.time_zone_select(:time_zone)
     end
 
@@ -787,7 +787,7 @@ class FormOptionsHelperTest < ActionView::TestCase
     @post = Post.new
     @post.origin = 'dk'
 
-    fields_for :post, @post do |f|
+    output_buffer = fields_for :post, @post do |f|
       concat f.grouped_collection_select("origin", @continents, :countries, :continent_name, :country_id, :country_name)
     end
 
diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb
index 0ceec1afbf..868a35c476 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -3,17 +3,16 @@ require 'abstract_unit'
 class FormTagHelperTest < ActionView::TestCase
   tests ActionView::Helpers::FormTagHelper
 
-  include ActiveSupport::Configurable
-  DEFAULT_CONFIG = ActionView::DEFAULT_CONFIG
+  # include ActiveSupport::Configurable
+  # DEFAULT_CONFIG = ActionView::DEFAULT_CONFIG
 
   def setup
     super
-    @controller = Class.new do
+    @controller = Class.new(BasicController) do
       def url_for(options)
         "http://www.example.com"
       end
-    end
-    @controller = @controller.new
+    end.new
   end
 
   VALID_HTML_ID = /^[A-Za-z][-_:.A-Za-z0-9]*$/ # see http://www.w3.org/TR/html4/types.html#type-name
@@ -60,16 +59,14 @@ class FormTagHelperTest < ActionView::TestCase
   end
 
   def test_form_tag_with_block_in_erb
-    __in_erb_template = ''
-    form_tag("http://example.com") { concat "Hello world!" }
+    output_buffer = form_tag("http://example.com") { concat "Hello world!" }
 
     expected = %(<form action="http://example.com" method="post">Hello world!</form>)
     assert_dom_equal expected, output_buffer
   end
 
   def test_form_tag_with_block_and_method_in_erb
-    __in_erb_template = ''
-    form_tag("http://example.com", :method => :put) { concat "Hello world!" }
+    output_buffer = form_tag("http://example.com", :method => :put) { concat "Hello world!" }
 
     expected = %(<form action="http://example.com" method="post"><div style='margin:0;padding:0;display:inline'><input type="hidden" name="_method" value="put" /></div>Hello world!</form>)
     assert_dom_equal expected, output_buffer
@@ -333,26 +330,22 @@ class FormTagHelperTest < ActionView::TestCase
   end
 
   def test_field_set_tag_in_erb
-    __in_erb_template = ''
-    field_set_tag("Your details") { concat "Hello world!" }
+    output_buffer = field_set_tag("Your details") { concat "Hello world!" }
 
     expected = %(<fieldset><legend>Your details</legend>Hello world!</fieldset>)
     assert_dom_equal expected, output_buffer
 
-    self.output_buffer = ''.html_safe
-    field_set_tag { concat "Hello world!" }
+    output_buffer = field_set_tag { concat "Hello world!" }
 
     expected = %(<fieldset>Hello world!</fieldset>)
     assert_dom_equal expected, output_buffer
 
-    self.output_buffer = ''.html_safe
-    field_set_tag('') { concat "Hello world!" }
+    output_buffer = field_set_tag('') { concat "Hello world!" }
 
     expected = %(<fieldset>Hello world!</fieldset>)
     assert_dom_equal expected, output_buffer
 
-    self.output_buffer = ''.html_safe
-    field_set_tag('', :class => 'format') { concat "Hello world!" }
+    output_buffer = field_set_tag('', :class => 'format') { concat "Hello world!" }
 
     expected = %(<fieldset class="format">Hello world!</fieldset>)
     assert_dom_equal expected, output_buffer
diff --git a/actionpack/test/template/javascript_helper_test.rb b/actionpack/test/template/javascript_helper_test.rb
index 368a9c2514..f49b763881 100644
--- a/actionpack/test/template/javascript_helper_test.rb
+++ b/actionpack/test/template/javascript_helper_test.rb
@@ -7,8 +7,8 @@ class JavaScriptHelperTest < ActionView::TestCase
 
   attr_accessor :formats, :output_buffer
 
-  def reset_formats(format)
-    @format = format
+  def update_details(details)
+    @details = details
     yield if block_given?
   end
 
@@ -74,18 +74,6 @@ class JavaScriptHelperTest < ActionView::TestCase
       javascript_tag("alert('hello')", :id => "the_js_tag")
   end
 
-  def test_javascript_tag_with_block_in_erb
-    __in_erb_template = ''
-    javascript_tag { concat "alert('hello')" }
-    assert_dom_equal "<script type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>", output_buffer
-  end
-
-  def test_javascript_tag_with_block_and_options_in_erb
-    __in_erb_template = ''
-    javascript_tag(:id => "the_js_tag") { concat "alert('hello')" }
-    assert_dom_equal "<script id=\"the_js_tag\" type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>", output_buffer
-  end
-
   def test_javascript_cdata_section
     assert_dom_equal "\n//<![CDATA[\nalert('hello')\n//]]>\n", javascript_cdata_section("alert('hello')")
   end
diff --git a/actionpack/test/template/prototype_helper_test.rb b/actionpack/test/template/prototype_helper_test.rb
index 6811d3aaf3..619293dc43 100644
--- a/actionpack/test/template/prototype_helper_test.rb
+++ b/actionpack/test/template/prototype_helper_test.rb
@@ -39,8 +39,8 @@ class Author::Nested < Author; end
 class PrototypeHelperBaseTest < ActionView::TestCase
   attr_accessor :formats, :output_buffer
 
-  def reset_formats(format)
-    @format = format
+  def update_details(details)
+    @details = details
     yield if block_given?
   end
 
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index 338ada8b0e..cea8ab1bce 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -33,17 +33,17 @@ module RenderTestCases
   end
 
   def test_render_file_with_localization
-    old_locale, I18n.locale = I18n.locale, :da
+    old_locale, @view.locale = @view.locale, :da
     assert_equal "Hey verden", @view.render(:file => "test/hello_world")
   ensure
-    I18n.locale = old_locale
+    @view.locale = old_locale
   end
 
   def test_render_file_with_dashed_locale
-    old_locale, I18n.locale = I18n.locale, :"pt-BR"
+    old_locale, @view.locale = @view.locale, :"pt-BR"
     assert_equal "Ola mundo", @view.render(:file => "test/hello_world")
   ensure
-    I18n.locale = old_locale
+    @view.locale = old_locale
   end
 
   def test_render_file_at_top_level
@@ -233,6 +233,11 @@ module RenderTestCases
       @view.render(:file => "test/nested_layout.erb", :layout => "layouts/yield")
   end
 
+  def test_render_with_file_in_layout
+    assert_equal %(\n<title>title</title>\n\n),
+      @view.render(:file => "test/layout_render_file.erb")
+  end
+ 
   if '1.9'.respond_to?(:force_encoding)
     def test_render_utf8_template_with_magic_comment
       with_external_encoding Encoding::ASCII_8BIT do
@@ -265,7 +270,7 @@ class CachedViewRenderTest < ActiveSupport::TestCase
   # Ensure view path cache is primed
   def setup
     view_paths = ActionController::Base.view_paths
-    assert_equal ActionView::FileSystemResolverWithFallback, view_paths.first.class
+    assert_equal ActionView::FileSystemResolver, view_paths.first.class
     setup_view(view_paths)
   end
 end
@@ -276,9 +281,9 @@ class LazyViewRenderTest < ActiveSupport::TestCase
   # Test the same thing as above, but make sure the view path
   # is not eager loaded
   def setup
-    path = ActionView::FileSystemResolverWithFallback.new(FIXTURE_LOAD_PATH)
+    path = ActionView::FileSystemResolver.new(FIXTURE_LOAD_PATH)
     view_paths = ActionView::Base.process_view_paths(path)
-    assert_equal ActionView::FileSystemResolverWithFallback, view_paths.first.class
+    assert_equal ActionView::FileSystemResolver.new(FIXTURE_LOAD_PATH), view_paths.first
     setup_view(view_paths)
   end
 end
diff --git a/actionpack/test/template/tag_helper_test.rb b/actionpack/test/template/tag_helper_test.rb
index 3858ffde40..256d9bdcde 100644
--- a/actionpack/test/template/tag_helper_test.rb
+++ b/actionpack/test/template/tag_helper_test.rb
@@ -42,15 +42,13 @@ class TagHelperTest < ActionView::TestCase
   end
 
   def test_content_tag_with_block_in_erb
-    __in_erb_template = ''
-    content_tag(:div) { concat "Hello world!" }
-    assert_dom_equal "<div>Hello world!</div>", output_buffer
+    buffer = content_tag(:div) { concat "Hello world!" }
+    assert_dom_equal "<div>Hello world!</div>", buffer
   end
 
   def test_content_tag_with_block_and_options_in_erb
-    __in_erb_template = ''
-    content_tag(:div, :class => "green") { concat "Hello world!" }
-    assert_dom_equal %(<div class="green">Hello world!</div>), output_buffer
+    buffer = content_tag(:div, :class => "green") { concat "Hello world!" }
+    assert_dom_equal %(<div class="green">Hello world!</div>), buffer
   end
 
   def test_content_tag_with_block_and_options_out_of_erb
@@ -68,10 +66,10 @@ class TagHelperTest < ActionView::TestCase
                  output_buffer
   end
 
+  # TAG TODO: Move this into a real template
   def test_content_tag_nested_in_content_tag_in_erb
-    __in_erb_template = true
-    content_tag("p") { concat content_tag("b", "Hello") }
-    assert_equal '<p><b>Hello</b></p>', output_buffer
+    buffer = content_tag("p") { concat content_tag("b", "Hello") }
+    assert_equal '<p><b>Hello</b></p>', buffer
   end
 
   def test_content_tag_with_escaped_array_class
diff --git a/actionpack/test/template/test_case_test.rb b/actionpack/test/template/test_case_test.rb
index 12807baaa7..195a6ea3ae 100644
--- a/actionpack/test/template/test_case_test.rb
+++ b/actionpack/test/template/test_case_test.rb
@@ -89,16 +89,23 @@ module ActionView
       end
 
       test "helper class that is being tested is always included in view instance" do
-        self.class.helper_class.module_eval do
-          def render_from_helper
-            render :partial => 'customer', :collection => @customers
+        # This ensure is a hidious hack to deal with these tests bleeding
+        # methods between eachother
+        begin
+          self.class.helper_class.module_eval do
+            def render_from_helper
+              render :partial => 'customer', :collection => @customers
+            end
           end
-        end
 
-        TestController.stubs(:controller_path).returns('test')
+          TestController.stubs(:controller_path).returns('test')
 
-        @customers = [stub(:name => 'Eloy'), stub(:name => 'Manfred')]
-        assert_match /Hello: EloyHello: Manfred/, render(:partial => 'test/from_helper')
+          @customers = [stub(:name => 'Eloy'), stub(:name => 'Manfred')]
+          assert_match /Hello: EloyHello: Manfred/, render(:partial => 'test/from_helper')
+
+        ensure
+          self.class.helper_class.send(:remove_method, :render_from_helper)
+        end
       end
 
       test "no additional helpers should shared across test cases" do
@@ -147,10 +154,16 @@ module ActionView
       end
 
       test "is able to make methods available to the view" do
-        _helpers.module_eval do
-          def render_from_helper; from_test_case end
+        # This ensure is a hidious hack to deal with these tests bleeding
+        # methods between eachother
+        begin
+          _helpers.module_eval do
+            def render_from_helper; from_test_case end
+          end
+          assert_equal 'Word!', render(:partial => 'test/from_helper')
+        ensure
+          _helpers.send(:remove_method, :render_from_helper)
         end
-        assert_equal 'Word!', render(:partial => 'test/from_helper')
       end
 
       def from_test_case; 'Word!'; end
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index b047466aaf..165cb655da 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -1,22 +1,21 @@
 # encoding: utf-8
 require 'abstract_unit'
+require 'active_support/ordered_options'
 require 'controller/fake_controllers'
 
-RequestMock = Struct.new("Request", :request_uri, :protocol, :host_with_port, :env)
-
 class UrlHelperTest < ActionView::TestCase
-  include ActiveSupport::Configurable
-  DEFAULT_CONFIG = ActionView::DEFAULT_CONFIG
 
   def setup
     super
-    @controller = Class.new do
-      attr_accessor :url, :request
+    @controller = Class.new(BasicController) do
+      attr_accessor :url
       def url_for(options)
         url
       end
     end
+
     @controller = @controller.new
+    @request = @controller.request = ActionDispatch::TestRequest.new
     @controller.url = "http://www.example.com"
   end
 
@@ -38,12 +37,13 @@ class UrlHelperTest < ActionView::TestCase
   end
 
   def test_url_for_with_back
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show", nil, nil, {'HTTP_REFERER' => 'http://www.example.com/referer'})
+    @request.env['HTTP_REFERER'] = 'http://www.example.com/referer'
     assert_equal 'http://www.example.com/referer', url_for(:back)
   end
 
   def test_url_for_with_back_and_no_referer
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show", nil, nil, {})
+    @request.env['HOST_NAME'] = 'www.example.com'
+    @request.env['PATH_INFO'] = '/weblog/show'
     assert_equal 'javascript:history.back()', url_for(:back)
   end
 
@@ -122,7 +122,6 @@ class UrlHelperTest < ActionView::TestCase
     url = {:controller => 'weblog', :action => 'show'}
     @controller = ActionController::Base.new
     @controller.request = ActionController::TestRequest.new
-    @controller.url = ActionController::UrlRewriter.new(@controller.request, url)
     assert_dom_equal(%q{<a href="/weblog/show">Test Link</a>}, link_to('Test Link', url))
   end
 
@@ -131,7 +130,6 @@ class UrlHelperTest < ActionView::TestCase
     url = {:controller => 'weblog', :action => 'show', :host => 'www.example.com'}
     @controller = ActionController::Base.new
     @controller.request = ActionController::TestRequest.new
-    @controller.url = ActionController::UrlRewriter.new(@controller.request, url)
     assert_dom_equal(%q{<a href="http://www.example.com/weblog/show">Test Link</a>}, link_to('Test Link', url))
   end
 
@@ -144,22 +142,28 @@ class UrlHelperTest < ActionView::TestCase
   end
 
   def test_link_tag_with_back
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show", nil, nil, {'HTTP_REFERER' => 'http://www.example.com/referer'})
+    @request.env['HOST_NAME'] = 'www.example.com'
+    @request.env['PATH_INFO'] = '/weblog/show'
+    @request.env['HTTP_REFERER'] = 'http://www.example.com/referer'
     assert_dom_equal "<a href=\"http://www.example.com/referer\">go back</a>", link_to('go back', :back)
   end
 
   def test_link_tag_with_back_and_no_referer
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show", nil, nil, {})
+    @request.env['HOST_NAME'] = 'www.example.com'
+    @request.env['PATH_INFO'] = '/weblog/show'
     assert_dom_equal "<a href=\"javascript:history.back()\">go back</a>", link_to('go back', :back)
   end
 
   def test_link_tag_with_back
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show", nil, nil, {'HTTP_REFERER' => 'http://www.example.com/referer'})
+    @request.env['HOST_NAME'] = 'www.example.com'
+    @request.env['PATH_INFO'] = '/weblog/show'
+    @request.env['HTTP_REFERER'] = 'http://www.example.com/referer'
     assert_dom_equal "<a href=\"http://www.example.com/referer\">go back</a>", link_to('go back', :back)
   end
 
   def test_link_tag_with_back_and_no_referer
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show", nil, nil, {})
+    @request.env['HOST_NAME'] = 'www.example.com'
+    @request.env['PATH_INFO'] = '/weblog/show'
     assert_dom_equal "<a href=\"javascript:history.back()\">go back</a>", link_to('go back', :back)
   end
 
@@ -263,55 +267,60 @@ class UrlHelperTest < ActionView::TestCase
   end
 
   def test_current_page_with_simple_url
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show")
+    @request.env['HTTP_HOST'] = 'www.example.com'
+    @request.env['PATH_INFO'] = '/weblog/show'
     @controller.url = "http://www.example.com/weblog/show"
     assert current_page?({ :action => "show", :controller => "weblog" })
     assert current_page?("http://www.example.com/weblog/show")
   end
 
   def test_current_page_ignoring_params
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc&page=1")
+    @request.env['HTTP_HOST'] = 'www.example.com'
+    @request.env['PATH_INFO'] = '/weblog/show'
+    @request.env['QUERY_STRING'] = 'order=desc&page=1'
     @controller.url = "http://www.example.com/weblog/show?order=desc&page=1"
     assert current_page?({ :action => "show", :controller => "weblog" })
     assert current_page?("http://www.example.com/weblog/show")
   end
 
   def test_current_page_with_params_that_match
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc&page=1")
+    @request.env['HTTP_HOST'] = 'www.example.com'
+    @request.env['PATH_INFO'] = '/weblog/show'
+    @request.env['QUERY_STRING'] = 'order=desc&page=1'
     @controller.url = "http://www.example.com/weblog/show?order=desc&page=1"
     assert current_page?({ :action => "show", :controller => "weblog", :order => "desc", :page => "1" })
     assert current_page?("http://www.example.com/weblog/show?order=desc&amp;page=1")
   end
 
   def test_link_unless_current
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show")
+    @request.env['HTTP_HOST'] = 'www.example.com'
+    @request.env['PATH_INFO'] = '/weblog/show'
     @controller.url = "http://www.example.com/weblog/show"
     assert_equal "Showing", link_to_unless_current("Showing", { :action => "show", :controller => "weblog" })
     assert_equal "Showing", link_to_unless_current("Showing", "http://www.example.com/weblog/show")
 
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc")
+    @request.env['QUERY_STRING'] = 'order=desc'
     @controller.url = "http://www.example.com/weblog/show"
     assert_equal "Showing", link_to_unless_current("Showing", { :action => "show", :controller => "weblog" })
     assert_equal "Showing", link_to_unless_current("Showing", "http://www.example.com/weblog/show")
 
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc&page=1")
+    @request.env['QUERY_STRING'] = 'order=desc&page=1'
     @controller.url = "http://www.example.com/weblog/show?order=desc&page=1"
     assert_equal "Showing", link_to_unless_current("Showing", { :action => "show", :controller => "weblog", :order=>'desc', :page=>'1' })
     assert_equal "Showing", link_to_unless_current("Showing", "http://www.example.com/weblog/show?order=desc&page=1")
     assert_equal "Showing", link_to_unless_current("Showing", "http://www.example.com/weblog/show?order=desc&page=1")
 
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc")
+    @request.env['QUERY_STRING'] = 'order=desc'
     @controller.url = "http://www.example.com/weblog/show?order=asc"
     assert_equal "<a href=\"http://www.example.com/weblog/show?order=asc\">Showing</a>", link_to_unless_current("Showing", { :action => "show", :controller => "weblog" })
     assert_equal "<a href=\"http://www.example.com/weblog/show?order=asc\">Showing</a>", link_to_unless_current("Showing", "http://www.example.com/weblog/show?order=asc")
 
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc&page=1")
+    @request.env['QUERY_STRING'] = 'order=desc&page=1'
     @controller.url = "http://www.example.com/weblog/show?order=desc&page=2"
     assert_equal "<a href=\"http://www.example.com/weblog/show?order=desc&page=2\">Showing</a>", link_to_unless_current("Showing", { :action => "show", :controller => "weblog" })
     assert_equal "<a href=\"http://www.example.com/weblog/show?order=desc&amp;page=2\">Showing</a>", link_to_unless_current("Showing", "http://www.example.com/weblog/show?order=desc&page=2")
 
-
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show")
+    @request.env['QUERY_STRING'] = ''
     @controller.url = "http://www.example.com/weblog/list"
     assert_equal "<a href=\"http://www.example.com/weblog/list\">Listing</a>",
       link_to_unless_current("Listing", :action => "list", :controller => "weblog")
@@ -426,7 +435,7 @@ class UrlHelperControllerTest < ActionController::TestCase
     end
 
     with_url_helper_routing do
-      assert_deprecated { get :show_named_route, :kind => 'url' }
+      get :show_named_route, :kind => 'url'
       assert_equal 'http://testtwo.host/url_helper_controller_test/url_helper/show_named_route', @response.body
     end
   end
@@ -464,8 +473,6 @@ end
 class LinkToUnlessCurrentWithControllerTest < ActionController::TestCase
   def setup
     super
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
     @controller = TasksController.new
   end
 
@@ -565,7 +572,6 @@ end
 class PolymorphicControllerTest < ActionController::TestCase
   def setup
     super
-    @request  = ActionController::TestRequest.new
     @response = ActionController::TestResponse.new
   end
 
diff --git a/activemodel/activemodel.gemspec b/activemodel/activemodel.gemspec
index 9183558c7c..eb9ef7b7c0 100644
--- a/activemodel/activemodel.gemspec
+++ b/activemodel/activemodel.gemspec
@@ -1,10 +1,9 @@
-$:.unshift "lib"
-require "active_model/version"
+version = File.read(File.expand_path("../../RAILS_VERSION", __FILE__)).strip
 
 Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.name = 'activemodel'
-  s.version = ActiveModel::VERSION::STRING
+  s.version = version
   s.summary = 'A toolkit for building modeling frameworks (part of Rails).'
   s.description = 'A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.'
   s.required_ruby_version = '>= 1.8.7'
@@ -16,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.has_rdoc = true
 
-  s.add_dependency('activesupport', "= #{ActiveModel::VERSION::STRING}")
+  s.add_dependency('activesupport', version)
 
   s.require_path = 'lib'
   s.files = Dir["CHANGELOG", "MIT-LICENSE", "README", "lib/**/*"]
diff --git a/activerecord/activerecord.gemspec b/activerecord/activerecord.gemspec
index 5d76333950..8b1ea8596a 100644
--- a/activerecord/activerecord.gemspec
+++ b/activerecord/activerecord.gemspec
@@ -1,10 +1,9 @@
-$:.unshift "lib"
-require "active_record/version"
+version = File.read(File.expand_path("../../RAILS_VERSION", __FILE__)).strip
 
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'activerecord'
-  s.version     = ActiveRecord::VERSION::STRING
+  s.version     = version
   s.summary     = 'Object-relational mapper framework (part of Rails).'
   s.description = 'Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.'
   s.required_ruby_version = '>= 1.8.7'
@@ -21,7 +20,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w( README )
   s.rdoc_options.concat ['--main',  'README']
 
-  s.add_dependency('activesupport', "= #{ActiveRecord::VERSION::STRING}")
-  s.add_dependency('activemodel',   "= #{ActiveRecord::VERSION::STRING}")
-  s.add_dependency('arel',          '~> 0.2.1')
+  s.add_dependency('activesupport', version)
+  s.add_dependency('activemodel',   version)
+  s.add_dependency('arel',          '~> 0.3.1')
 end
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index b79da4565d..5942640c85 100644
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -30,7 +30,6 @@ $:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include
 
 require 'active_support'
 require 'active_model'
-require 'arel'
 
 module ActiveRecord
   extend ActiveSupport::Autoload
@@ -38,8 +37,8 @@ module ActiveRecord
   eager_autoload do
     autoload :VERSION
 
-    autoload :ActiveRecordError, 'active_record/base'
-    autoload :ConnectionNotEstablished, 'active_record/base'
+    autoload :ActiveRecordError, 'active_record/errors'
+    autoload :ConnectionNotEstablished, 'active_record/errors'
 
     autoload :Aggregations
     autoload :AssociationPreload
@@ -106,12 +105,16 @@ module ActiveRecord
 
     eager_autoload do
       autoload :AbstractAdapter
+      autoload :ConnectionManagement, "active_record/connection_adapters/abstract/connection_pool"
     end
   end
 
   autoload :TestCase
   autoload :TestFixtures, 'active_record/fixtures'
+
+  base_hook do
+    Arel::Table.engine = Arel::Sql::Engine.new(self)
+  end
 end
 
-Arel::Table.engine = Arel::Sql::Engine.new(ActiveRecord::Base)
-I18n.load_path << File.dirname(__FILE__) + '/active_record/locale/en.yml'
+I18n.load_path << File.dirname(__FILE__) + '/active_record/locale/en.yml'
\ No newline at end of file
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 57785b4c93..b69577f8dd 100755
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -1537,58 +1537,42 @@ module ActiveRecord
         # has_one associated objects, according to the defined :dependent rule.
         def configure_dependency_for_has_one(reflection)
           if reflection.options.include?(:dependent)
-            case reflection.options[:dependent]
-              when :destroy
-                method_name = "has_one_dependent_destroy_for_#{reflection.name}".to_sym
-                define_method(method_name) do
-                  association = send(reflection.name)
-                  association.destroy unless association.nil?
-                end
-                before_destroy method_name
-              when :delete
-                method_name = "has_one_dependent_delete_for_#{reflection.name}".to_sym
+            name = reflection.options[:dependent]
+            method_name = :"has_one_dependent_#{name}_for_#{reflection.name}"
+
+            case name
+              when :destroy, :delete
                 define_method(method_name) do
-                  # Retrieve the associated object and delete it. The retrieval
-                  # is necessary because there may be multiple associated objects
-                  # with foreign keys pointing to this object, and we only want
-                  # to delete the correct one, not all of them.
                   association = send(reflection.name)
-                  association.delete unless association.nil?
+                  association.send(name) if association
                 end
-                before_destroy method_name
               when :nullify
-                method_name = "has_one_dependent_nullify_for_#{reflection.name}".to_sym
                 define_method(method_name) do
                   association = send(reflection.name)
-                  association.update_attribute(reflection.primary_key_name, nil) unless association.nil?
+                  association.update_attribute(reflection.primary_key_name, nil) if association
                 end
-                before_destroy method_name
               else
                 raise ArgumentError, "The :dependent option expects either :destroy, :delete or :nullify (#{reflection.options[:dependent].inspect})"
             end
+
+            before_destroy method_name
           end
         end
 
         def configure_dependency_for_belongs_to(reflection)
           if reflection.options.include?(:dependent)
-            case reflection.options[:dependent]
-              when :destroy
-                method_name = "belongs_to_dependent_destroy_for_#{reflection.name}".to_sym
-                define_method(method_name) do
-                  association = send(reflection.name)
-                  association.destroy unless association.nil?
-                end
-                after_destroy method_name
-              when :delete
-                method_name = "belongs_to_dependent_delete_for_#{reflection.name}".to_sym
-                define_method(method_name) do
-                  association = send(reflection.name)
-                  association.delete unless association.nil?
-                end
-                after_destroy method_name
-              else
-                raise ArgumentError, "The :dependent option expects either :destroy or :delete (#{reflection.options[:dependent].inspect})"
+            name = reflection.options[:dependent]
+
+            unless [:destroy, :delete].include?(name)
+              raise ArgumentError, "The :dependent option expects either :destroy or :delete (#{reflection.options[:dependent].inspect})"
+            end
+
+            method_name = :"belongs_to_dependent_#{name}_for_#{reflection.name}"
+            define_method(method_name) do
+              association = send(reflection.name)
+              association.send(name) if association
             end
+            after_destroy method_name
           end
         end
 
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index cd67490573..52587ef251 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -13,172 +13,10 @@ require 'active_support/core_ext/hash/slice'
 require 'active_support/core_ext/string/behavior'
 require 'active_support/core_ext/object/singleton_class'
 require 'active_support/core_ext/module/delegation'
+require 'arel'
+require 'active_record/errors'
 
 module ActiveRecord #:nodoc:
-  # Generic Active Record exception class.
-  class ActiveRecordError < StandardError
-  end
-
-  # Raised when the single-table inheritance mechanism fails to locate the subclass
-  # (for example due to improper usage of column that +inheritance_column+ points to).
-  class SubclassNotFound < ActiveRecordError #:nodoc:
-  end
-
-  # Raised when an object assigned to an association has an incorrect type.
-  #
-  #   class Ticket < ActiveRecord::Base
-  #     has_many :patches
-  #   end
-  #
-  #   class Patch < ActiveRecord::Base
-  #     belongs_to :ticket
-  #   end
-  #
-  #   # Comments are not patches, this assignment raises AssociationTypeMismatch.
-  #   @ticket.patches << Comment.new(:content => "Please attach tests to your patch.")
-  class AssociationTypeMismatch < ActiveRecordError
-  end
-
-  # Raised when unserialized object's type mismatches one specified for serializable field.
-  class SerializationTypeMismatch < ActiveRecordError
-  end
-
-  # Raised when adapter not specified on connection (or configuration file <tt>config/database.yml</tt> misses adapter field).
-  class AdapterNotSpecified < ActiveRecordError
-  end
-
-  # Raised when Active Record cannot find database adapter specified in <tt>config/database.yml</tt> or programmatically.
-  class AdapterNotFound < ActiveRecordError
-  end
-
-  # Raised when connection to the database could not been established (for example when <tt>connection=</tt> is given a nil object).
-  class ConnectionNotEstablished < ActiveRecordError
-  end
-
-  # Raised when Active Record cannot find record by given id or set of ids.
-  class RecordNotFound < ActiveRecordError
-  end
-
-  # Raised by ActiveRecord::Base.save! and ActiveRecord::Base.create! methods when record cannot be
-  # saved because record is invalid.
-  class RecordNotSaved < ActiveRecordError
-  end
-
-  # Raised when SQL statement cannot be executed by the database (for example, it's often the case for MySQL when Ruby driver used is too old).
-  class StatementInvalid < ActiveRecordError
-  end
-
-  # Raised when SQL statement is invalid and the application gets a blank result.
-  class ThrowResult < ActiveRecordError
-  end
-
-  # Parent class for all specific exceptions which wrap database driver exceptions
-  # provides access to the original exception also.
-  class WrappedDatabaseException < StatementInvalid
-    attr_reader :original_exception
-
-    def initialize(message, original_exception)
-      super(message)
-      @original_exception = original_exception
-    end
-  end
-
-  # Raised when a record cannot be inserted because it would violate a uniqueness constraint.
-  class RecordNotUnique < WrappedDatabaseException
-  end
-
-  # Raised when a record cannot be inserted or updated because it references a non-existent record.
-  class InvalidForeignKey < WrappedDatabaseException
-  end
-
-  # Raised when number of bind variables in statement given to <tt>:condition</tt> key (for example, when using +find+ method)
-  # does not match number of expected variables.
-  #
-  # For example, in
-  #
-  #   Location.find :all, :conditions => ["lat = ? AND lng = ?", 53.7362]
-  #
-  # two placeholders are given but only one variable to fill them.
-  class PreparedStatementInvalid < ActiveRecordError
-  end
-
-  # Raised on attempt to save stale record. Record is stale when it's being saved in another query after
-  # instantiation, for example, when two users edit the same wiki page and one starts editing and saves
-  # the page before the other.
-  #
-  # Read more about optimistic locking in ActiveRecord::Locking module RDoc.
-  class StaleObjectError < ActiveRecordError
-  end
-
-  # Raised when association is being configured improperly or
-  # user tries to use offset and limit together with has_many or has_and_belongs_to_many associations.
-  class ConfigurationError < ActiveRecordError
-  end
-
-  # Raised on attempt to update record that is instantiated as read only.
-  class ReadOnlyRecord < ActiveRecordError
-  end
-
-  # ActiveRecord::Transactions::ClassMethods.transaction uses this exception
-  # to distinguish a deliberate rollback from other exceptional situations.
-  # Normally, raising an exception will cause the +transaction+ method to rollback
-  # the database transaction *and* pass on the exception. But if you raise an
-  # ActiveRecord::Rollback exception, then the database transaction will be rolled back,
-  # without passing on the exception.
-  #
-  # For example, you could do this in your controller to rollback a transaction:
-  #
-  #   class BooksController < ActionController::Base
-  #     def create
-  #       Book.transaction do
-  #         book = Book.new(params[:book])
-  #         book.save!
-  #         if today_is_friday?
-  #           # The system must fail on Friday so that our support department
-  #           # won't be out of job. We silently rollback this transaction
-  #           # without telling the user.
-  #           raise ActiveRecord::Rollback, "Call tech support!"
-  #         end
-  #       end
-  #       # ActiveRecord::Rollback is the only exception that won't be passed on
-  #       # by ActiveRecord::Base.transaction, so this line will still be reached
-  #       # even on Friday.
-  #       redirect_to root_url
-  #     end
-  #   end
-  class Rollback < ActiveRecordError
-  end
-
-  # Raised when attribute has a name reserved by Active Record (when attribute has name of one of Active Record instance methods).
-  class DangerousAttributeError < ActiveRecordError
-  end
-
-  # Raised when unknown attributes are supplied via mass assignment.
-  class UnknownAttributeError < NoMethodError
-  end
-
-  # Raised when an error occurred while doing a mass assignment to an attribute through the
-  # <tt>attributes=</tt> method. The exception has an +attribute+ property that is the name of the
-  # offending attribute.
-  class AttributeAssignmentError < ActiveRecordError
-    attr_reader :exception, :attribute
-    def initialize(message, exception, attribute)
-      @exception = exception
-      @attribute = attribute
-      @message = message
-    end
-  end
-
-  # Raised when there are multiple errors while doing a mass assignment through the +attributes+
-  # method. The exception has an +errors+ property that contains an array of AttributeAssignmentError
-  # objects, each corresponding to the error while assigning to an attribute.
-  class MultiparameterAssignmentErrors < ActiveRecordError
-    attr_reader :errors
-    def initialize(errors)
-      @errors = errors
-    end
-  end
-
   # Active Record objects don't specify their attributes directly, but rather infer them from the table definition with
   # which they're linked. Adding, removing, and changing attributes and their type is done directly in the database. Any change
   # is instantly reflected in the Active Record objects. The mapping that binds a given Active Record class to a certain
@@ -551,7 +389,7 @@ module ActiveRecord #:nodoc:
     class << self # Class methods
       def colorize_logging(*args)
         ActiveSupport::Deprecation.warn "ActiveRecord::Base.colorize_logging and " <<
-          "config.active_record.colorize_logging are deprecated. Please use " << 
+          "config.active_record.colorize_logging are deprecated. Please use " <<
           "Rails::LogSubscriber.colorize_logging or config.colorize_logging instead", caller
       end
       alias :colorize_logging= :colorize_logging
@@ -2001,10 +1839,9 @@ module ActiveRecord #:nodoc:
 
       # Returns a hash of all the attributes with their names as keys and the values of the attributes as values.
       def attributes
-        self.attribute_names.inject({}) do |attrs, name|
-          attrs[name] = read_attribute(name)
-          attrs
-        end
+        attrs = {}
+        attribute_names.each { |name| attrs[name] = read_attribute(name) }
+        attrs
       end
 
       # Returns an <tt>#inspect</tt>-like string for the value of the
@@ -2348,7 +2185,7 @@ module ActiveRecord #:nodoc:
 
       # Returns a comma-separated pair list, like "key1 = val1, key2 = val2".
       def comma_pair_list(hash)
-        hash.inject([]) { |list, pair| list << "#{pair.first} = #{pair.last}" }.join(", ")
+        hash.map { |k,v| "#{k} = #{v}" }.join(", ")
       end
 
       def quote_columns(quoter, hash)
@@ -2402,8 +2239,10 @@ module ActiveRecord #:nodoc:
 
     include Aggregations, Transactions, Reflection, Serialization
 
+    NilClass.add_whiner(self) if NilClass.respond_to?(:add_whiner)
   end
 end
 
 # TODO: Remove this and make it work with LAZY flag
 require 'active_record/connection_adapters/abstract_adapter'
+ActiveRecord.run_base_hooks(ActiveRecord::Base)
\ No newline at end of file
diff --git a/activerecord/lib/active_record/errors.rb b/activerecord/lib/active_record/errors.rb
new file mode 100644
index 0000000000..cf5ddca2ba
--- /dev/null
+++ b/activerecord/lib/active_record/errors.rb
@@ -0,0 +1,165 @@
+module ActiveRecord
+  # Generic Active Record exception class.
+  class ActiveRecordError < StandardError
+  end
+
+  # Raised when the single-table inheritance mechanism fails to locate the subclass
+  # (for example due to improper usage of column that +inheritance_column+ points to).
+  class SubclassNotFound < ActiveRecordError #:nodoc:
+  end
+
+  # Raised when an object assigned to an association has an incorrect type.
+  #
+  #   class Ticket < ActiveRecord::Base
+  #     has_many :patches
+  #   end
+  #
+  #   class Patch < ActiveRecord::Base
+  #     belongs_to :ticket
+  #   end
+  #
+  #   # Comments are not patches, this assignment raises AssociationTypeMismatch.
+  #   @ticket.patches << Comment.new(:content => "Please attach tests to your patch.")
+  class AssociationTypeMismatch < ActiveRecordError
+  end
+
+  # Raised when unserialized object's type mismatches one specified for serializable field.
+  class SerializationTypeMismatch < ActiveRecordError
+  end
+
+  # Raised when adapter not specified on connection (or configuration file <tt>config/database.yml</tt> misses adapter field).
+  class AdapterNotSpecified < ActiveRecordError
+  end
+
+  # Raised when Active Record cannot find database adapter specified in <tt>config/database.yml</tt> or programmatically.
+  class AdapterNotFound < ActiveRecordError
+  end
+
+  # Raised when connection to the database could not been established (for example when <tt>connection=</tt> is given a nil object).
+  class ConnectionNotEstablished < ActiveRecordError
+  end
+
+  # Raised when Active Record cannot find record by given id or set of ids.
+  class RecordNotFound < ActiveRecordError
+  end
+
+  # Raised by ActiveRecord::Base.save! and ActiveRecord::Base.create! methods when record cannot be
+  # saved because record is invalid.
+  class RecordNotSaved < ActiveRecordError
+  end
+
+  # Raised when SQL statement cannot be executed by the database (for example, it's often the case for MySQL when Ruby driver used is too old).
+  class StatementInvalid < ActiveRecordError
+  end
+
+  # Raised when SQL statement is invalid and the application gets a blank result.
+  class ThrowResult < ActiveRecordError
+  end
+
+  # Parent class for all specific exceptions which wrap database driver exceptions
+  # provides access to the original exception also.
+  class WrappedDatabaseException < StatementInvalid
+    attr_reader :original_exception
+
+    def initialize(message, original_exception)
+      super(message)
+      @original_exception = original_exception
+    end
+  end
+
+  # Raised when a record cannot be inserted because it would violate a uniqueness constraint.
+  class RecordNotUnique < WrappedDatabaseException
+  end
+
+  # Raised when a record cannot be inserted or updated because it references a non-existent record.
+  class InvalidForeignKey < WrappedDatabaseException
+  end
+
+  # Raised when number of bind variables in statement given to <tt>:condition</tt> key (for example, when using +find+ method)
+  # does not match number of expected variables.
+  #
+  # For example, in
+  #
+  #   Location.find :all, :conditions => ["lat = ? AND lng = ?", 53.7362]
+  #
+  # two placeholders are given but only one variable to fill them.
+  class PreparedStatementInvalid < ActiveRecordError
+  end
+
+  # Raised on attempt to save stale record. Record is stale when it's being saved in another query after
+  # instantiation, for example, when two users edit the same wiki page and one starts editing and saves
+  # the page before the other.
+  #
+  # Read more about optimistic locking in ActiveRecord::Locking module RDoc.
+  class StaleObjectError < ActiveRecordError
+  end
+
+  # Raised when association is being configured improperly or
+  # user tries to use offset and limit together with has_many or has_and_belongs_to_many associations.
+  class ConfigurationError < ActiveRecordError
+  end
+
+  # Raised on attempt to update record that is instantiated as read only.
+  class ReadOnlyRecord < ActiveRecordError
+  end
+
+  # ActiveRecord::Transactions::ClassMethods.transaction uses this exception
+  # to distinguish a deliberate rollback from other exceptional situations.
+  # Normally, raising an exception will cause the +transaction+ method to rollback
+  # the database transaction *and* pass on the exception. But if you raise an
+  # ActiveRecord::Rollback exception, then the database transaction will be rolled back,
+  # without passing on the exception.
+  #
+  # For example, you could do this in your controller to rollback a transaction:
+  #
+  #   class BooksController < ActionController::Base
+  #     def create
+  #       Book.transaction do
+  #         book = Book.new(params[:book])
+  #         book.save!
+  #         if today_is_friday?
+  #           # The system must fail on Friday so that our support department
+  #           # won't be out of job. We silently rollback this transaction
+  #           # without telling the user.
+  #           raise ActiveRecord::Rollback, "Call tech support!"
+  #         end
+  #       end
+  #       # ActiveRecord::Rollback is the only exception that won't be passed on
+  #       # by ActiveRecord::Base.transaction, so this line will still be reached
+  #       # even on Friday.
+  #       redirect_to root_url
+  #     end
+  #   end
+  class Rollback < ActiveRecordError
+  end
+
+  # Raised when attribute has a name reserved by Active Record (when attribute has name of one of Active Record instance methods).
+  class DangerousAttributeError < ActiveRecordError
+  end
+
+  # Raised when unknown attributes are supplied via mass assignment.
+  class UnknownAttributeError < NoMethodError
+  end
+
+  # Raised when an error occurred while doing a mass assignment to an attribute through the
+  # <tt>attributes=</tt> method. The exception has an +attribute+ property that is the name of the
+  # offending attribute.
+  class AttributeAssignmentError < ActiveRecordError
+    attr_reader :exception, :attribute
+    def initialize(message, exception, attribute)
+      @exception = exception
+      @attribute = attribute
+      @message = message
+    end
+  end
+
+  # Raised when there are multiple errors while doing a mass assignment through the +attributes+
+  # method. The exception has an +errors+ property that contains an array of AttributeAssignmentError
+  # objects, each corresponding to the error while assigning to an attribute.
+  class MultiparameterAssignmentErrors < ActiveRecordError
+    attr_reader :errors
+    def initialize(errors)
+      @errors = errors
+    end
+  end
+end
\ No newline at end of file
diff --git a/activerecord/lib/active_record/named_scope.rb b/activerecord/lib/active_record/named_scope.rb
index f1f56850ae..394e1587e1 100644
--- a/activerecord/lib/active_record/named_scope.rb
+++ b/activerecord/lib/active_record/named_scope.rb
@@ -26,7 +26,7 @@ module ActiveRecord
         if options.present?
           Scope.init(self, options, &block)
         else
-          current_scoped_methods ? unscoped.merge(current_scoped_methods) : unscoped.spawn
+          current_scoped_methods ? unscoped.merge(current_scoped_methods) : unscoped.clone
         end
       end
 
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index b38bd9a644..60addd46c6 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -24,31 +24,39 @@ module ActiveRecord
     log_subscriber ActiveRecord::Railties::LogSubscriber.new
 
     initializer "active_record.initialize_timezone" do
-      ActiveRecord::Base.time_zone_aware_attributes = true
-      ActiveRecord::Base.default_timezone = :utc
+      ActiveRecord.base_hook do
+        self.time_zone_aware_attributes = true
+        self.default_timezone = :utc
+      end
     end
 
     initializer "active_record.logger" do
-      ActiveRecord::Base.logger ||= ::Rails.logger
+      ActiveRecord.base_hook { self.logger ||= ::Rails.logger }
     end
 
     initializer "active_record.set_configs" do |app|
-      app.config.active_record.each do |k,v|
-        ActiveRecord::Base.send "#{k}=", v
+      ActiveRecord.base_hook do
+        app.config.active_record.each do |k,v|
+          send "#{k}=", v
+        end
       end
     end
 
     # This sets the database configuration from Configuration#database_configuration
     # and then establishes the connection.
     initializer "active_record.initialize_database" do |app|
-      ActiveRecord::Base.configurations = app.config.database_configuration
-      ActiveRecord::Base.establish_connection
+      ActiveRecord.base_hook do
+        self.configurations = app.config.database_configuration
+        establish_connection
+      end
     end
 
     # Expose database runtime to controller for logging.
     initializer "active_record.log_runtime" do |app|
       require "active_record/railties/controller_runtime"
-      ActionController::Base.send :include, ActiveRecord::Railties::ControllerRuntime
+      ActionController.base_hook do
+        include ActiveRecord::Railties::ControllerRuntime
+      end
     end
 
     # Setup database middleware after initializers have run
@@ -64,18 +72,22 @@ module ActiveRecord
     end
 
     initializer "active_record.load_observers" do
-      ActiveRecord::Base.instantiate_observers
+      ActiveRecord.base_hook { instantiate_observers }
 
-      ActionDispatch::Callbacks.to_prepare(:activerecord_instantiate_observers) do
-        ActiveRecord::Base.instantiate_observers
+      ActiveRecord.base_hook do
+        ActionDispatch::Callbacks.to_prepare(:activerecord_instantiate_observers) do
+          ActiveRecord::Base.instantiate_observers
+        end
       end
     end
 
     initializer "active_record.set_dispatch_hooks", :before => :set_clear_dependencies_hook do |app|
-      unless app.config.cache_classes
-        ActionDispatch::Callbacks.after do
-          ActiveRecord::Base.reset_subclasses
-          ActiveRecord::Base.clear_reloadable_connections!
+      ActiveRecord.base_hook do
+        unless app.config.cache_classes
+          ActionDispatch::Callbacks.after do
+            ActiveRecord::Base.reset_subclasses
+            ActiveRecord::Base.clear_reloadable_connections!
+          end
         end
       end
     end
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 7bc3d3bf33..aca4629dd8 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -21,6 +21,10 @@ module ActiveRecord
       with_create_scope { @klass.new(*args, &block) }
     end
 
+    def initialize_copy(other)
+      reset
+    end
+
     alias build new
 
     def create(*args, &block)
diff --git a/activerecord/lib/active_record/relation/predicate_builder.rb b/activerecord/lib/active_record/relation/predicate_builder.rb
index 65e5c0495c..7e83eccbb5 100644
--- a/activerecord/lib/active_record/relation/predicate_builder.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder.rb
@@ -20,7 +20,7 @@ module ActiveRecord
             table = Arel::Table.new(table_name, :engine => @engine)
           end
 
-          attribute = table[column] || Arel::Attribute.new(table, column.to_sym)
+          attribute = table[column]
 
           case value
           when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::NamedScope::Scope
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 25ffa7860e..e00d9cdf27 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -8,7 +8,7 @@ module ActiveRecord
 
         class_eval <<-CEVAL
           def #{query_method}(*args)
-            new_relation = spawn
+            new_relation = clone
             value = Array.wrap(args.flatten).reject {|x| x.blank? }
             new_relation.#{query_method}_values += value if value.present?
             new_relation
@@ -19,7 +19,7 @@ module ActiveRecord
       [:where, :having].each do |query_method|
         class_eval <<-CEVAL
           def #{query_method}(*args)
-            new_relation = spawn
+            new_relation = clone
             value = build_where(*args)
             new_relation.#{query_method}_values += [*value] if value.present?
             new_relation
@@ -32,7 +32,7 @@ module ActiveRecord
 
         class_eval <<-CEVAL
           def #{query_method}(value = true)
-            new_relation = spawn
+            new_relation = clone
             new_relation.#{query_method}_value = value
             new_relation
           end
@@ -41,12 +41,12 @@ module ActiveRecord
     end
 
     def lock(locks = true)
-      relation = spawn
+      relation = clone
       case locks
       when String, TrueClass, NilClass
-        spawn.tap {|new_relation| new_relation.lock_value = locks || true }
+        clone.tap {|new_relation| new_relation.lock_value = locks || true }
       else
-        spawn.tap {|new_relation| new_relation.lock_value = false }
+        clone.tap {|new_relation| new_relation.lock_value = false }
       end
     end
 
@@ -184,16 +184,16 @@ module ActiveRecord
 
       builder = PredicateBuilder.new(table.engine)
 
-      conditions = if [String, Array].include?(args.first.class)
-        @klass.send(:sanitize_sql, args.size > 1 ? args : args.first)
-      elsif args.first.is_a?(Hash)
-        attributes = @klass.send(:expand_hash_conditions_for_aggregates, args.first)
+      opts = args.first
+      case opts
+      when String, Array
+        @klass.send(:sanitize_sql, args.size > 1 ? args : opts)
+      when Hash
+        attributes = @klass.send(:expand_hash_conditions_for_aggregates, opts)
         builder.build_from_hash(attributes, table)
       else
-        args.first
+        opts
       end
-
-      conditions
     end
 
     private
diff --git a/activerecord/lib/active_record/relation/spawn_methods.rb b/activerecord/lib/active_record/relation/spawn_methods.rb
index cccf413e67..a18380f01c 100644
--- a/activerecord/lib/active_record/relation/spawn_methods.rb
+++ b/activerecord/lib/active_record/relation/spawn_methods.rb
@@ -1,11 +1,7 @@
 module ActiveRecord
   module SpawnMethods
-    def spawn
-      clone.reset
-    end
-
     def merge(r)
-      merged_relation = spawn
+      merged_relation = clone
       return merged_relation unless r
 
       merged_relation = merged_relation.eager_load(r.eager_load_values).preload(r.preload_values).includes(r.includes_values)
@@ -83,7 +79,7 @@ module ActiveRecord
                            :order, :select, :readonly, :group, :having, :from, :lock ]
 
     def apply_finder_options(options)
-      relation = spawn
+      relation = clone
       return relation unless options
 
       options.assert_valid_keys(VALID_FIND_OPTIONS)
diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb
index 2a77eed1b5..41a23d7f61 100644
--- a/activerecord/test/cases/associations/belongs_to_associations_test.rb
+++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb
@@ -18,7 +18,8 @@ require 'models/essay'
 
 class BelongsToAssociationsTest < ActiveRecord::TestCase
   fixtures :accounts, :companies, :developers, :projects, :topics,
-           :developers_projects, :computers, :authors, :posts, :tags, :taggings, :comments
+           :developers_projects, :computers, :authors, :author_addresses,
+           :posts, :tags, :taggings, :comments
 
   def test_belongs_to
     Client.find(3).firm.name
@@ -346,14 +347,14 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
     assert_raise(ActiveRecord::ReadOnlyRecord) { companies(:first_client).readonly_firm.save! }
     assert companies(:first_client).readonly_firm.readonly?
   end
-  
+
   def test_polymorphic_assignment_foreign_type_field_updating
     # should update when assigning a saved record
     sponsor = Sponsor.new
     member = Member.create
     sponsor.sponsorable = member
     assert_equal "Member", sponsor.sponsorable_type
-    
+
     # should update when assigning a new record
     sponsor = Sponsor.new
     member = Member.new
@@ -374,15 +375,15 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
     essay.writer = writer
     assert_equal "Author", essay.writer_type
   end
-  
+
   def test_polymorphic_assignment_updates_foreign_id_field_for_new_and_saved_records
     sponsor = Sponsor.new
     saved_member = Member.create
     new_member = Member.new
-    
+
     sponsor.sponsorable = saved_member
     assert_equal saved_member.id, sponsor.sponsorable_id
-    
+
     sponsor.sponsorable = new_member
     assert_equal nil, sponsor.sponsorable_id
   end
@@ -424,4 +425,23 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
       Account.find(@account.id, :include => :firm).save!
     end
   end
+
+  def test_dependent_delete_and_destroy_with_belongs_to
+    author_address = author_addresses(:david_address)
+    author_address_extra = author_addresses(:david_address_extra)
+    assert_equal [], AuthorAddress.destroyed_author_address_ids
+
+    assert_difference "AuthorAddress.count", -2 do
+      authors(:david).destroy
+    end
+
+    assert_equal [], AuthorAddress.find_all_by_id([author_address.id, author_address_extra.id])
+    assert_equal [author_address.id], AuthorAddress.destroyed_author_address_ids
+  end
+
+  def test_invalid_belongs_to_dependent_option_raises_exception
+    assert_raise ArgumentError do
+      Author.belongs_to :special_author_address, :dependent => :nullify
+    end
+  end
 end
diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index ce7eedbb54..54624e79ce 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -14,7 +14,7 @@ require 'models/tagging'
 
 class HasManyAssociationsTest < ActiveRecord::TestCase
   fixtures :accounts, :categories, :companies, :developers, :projects,
-           :developers_projects, :topics, :authors, :comments, :author_addresses,
+           :developers_projects, :topics, :authors, :comments,
            :people, :posts, :readers, :taggings
 
   def setup
@@ -684,24 +684,6 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal  'Microsoft', another_ms_client.name
   end
 
-  def test_dependent_delete_and_destroy_with_belongs_to
-    author_address = author_addresses(:david_address)
-    assert_equal [], AuthorAddress.destroyed_author_address_ids[authors(:david).id]
-
-    assert_difference "AuthorAddress.count", -2 do
-      authors(:david).destroy
-    end
-
-    assert_equal nil, AuthorAddress.find_by_id(authors(:david).author_address_id)
-    assert_equal nil, AuthorAddress.find_by_id(authors(:david).author_address_extra_id)
-  end
-
-  def test_invalid_belongs_to_dependent_option_raises_exception
-    assert_raise ArgumentError do
-      Author.belongs_to :special_author_address, :dependent => :nullify
-    end
-  end
-
   def test_clearing_without_initial_access
     firm = companies(:first_firm)
 
diff --git a/activerecord/test/cases/associations/has_one_associations_test.rb b/activerecord/test/cases/associations/has_one_associations_test.rb
index d359ad48c5..d5dbb88886 100644
--- a/activerecord/test/cases/associations/has_one_associations_test.rb
+++ b/activerecord/test/cases/associations/has_one_associations_test.rb
@@ -14,7 +14,7 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
     assert_equal companies(:first_firm).account, Account.find(1)
     assert_equal Account.find(1).credit_limit, companies(:first_firm).account.credit_limit
   end
-  
+
   def test_has_one_cache_nils
     firm = companies(:another_firm)
     assert_queries(1) { assert_nil firm.account }
@@ -96,7 +96,7 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
     assert_nil Account.find(old_account_id).firm_id
   end
 
-  def test_association_changecalls_delete
+  def test_association_change_calls_delete
     companies(:first_firm).deletable_account = Account.new
     assert_equal [], Account.destroyed_account_ids[companies(:first_firm).id]
   end
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index e6d56a7193..28a1ae5feb 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -38,12 +38,12 @@ class CalculationsTest < ActiveRecord::TestCase
   end
 
   def test_should_get_maximum_of_field_with_include
-    assert_equal 50, Account.maximum(:credit_limit, :include => :firm, :conditions => "companies.name != 'Summit'")
+    assert_equal 55, Account.maximum(:credit_limit, :include => :firm, :conditions => "companies.name != 'Summit'")
   end
 
   def test_should_get_maximum_of_field_with_scoped_include
     Account.send :with_scope, :find => { :include => :firm, :conditions => "companies.name != 'Summit'" } do
-      assert_equal 50, Account.maximum(:credit_limit)
+      assert_equal 55, Account.maximum(:credit_limit)
     end
   end
 
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index f77dc801dc..e831ebf36c 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -9,6 +9,7 @@ require 'test/unit'
 require 'stringio'
 
 require 'active_record'
+require 'active_support/dependencies'
 require 'connection'
 
 begin
diff --git a/activerecord/test/cases/log_subscriber_test.rb b/activerecord/test/cases/log_subscriber_test.rb
index f0197ddf77..f3b94eb829 100644
--- a/activerecord/test/cases/log_subscriber_test.rb
+++ b/activerecord/test/cases/log_subscriber_test.rb
@@ -5,11 +5,12 @@ require "active_record/railties/log_subscriber"
 
 class LogSubscriberTest < ActiveSupport::TestCase
   include Rails::LogSubscriber::TestHelper
-  Rails::LogSubscriber.add(:active_record, ActiveRecord::Railties::LogSubscriber.new)
 
   def setup
     @old_logger = ActiveRecord::Base.logger
     super
+
+    Rails::LogSubscriber.add(:active_record, ActiveRecord::Railties::LogSubscriber.new)
   end
 
   def teardown
diff --git a/activerecord/test/models/author.rb b/activerecord/test/models/author.rb
index 7cbc6e803f..025f6207f8 100644
--- a/activerecord/test/models/author.rb
+++ b/activerecord/test/models/author.rb
@@ -35,7 +35,7 @@ class Author < ActiveRecord::Base
   has_many :ordered_uniq_comments, :through => :posts, :source => :comments, :uniq => true, :order => 'comments.id'
   has_many :ordered_uniq_comments_desc, :through => :posts, :source => :comments, :uniq => true, :order => 'comments.id DESC'
   has_many :readonly_comments, :through => :posts, :source => :comments, :readonly => true
-  
+
   has_many :special_posts
   has_many :special_post_comments, :through => :special_posts, :source => :comments
 
@@ -130,14 +130,11 @@ class AuthorAddress < ActiveRecord::Base
   has_one :author
 
   def self.destroyed_author_address_ids
-    @destroyed_author_address_ids ||= Hash.new { |h,k| h[k] = [] }
+    @destroyed_author_address_ids ||= []
   end
 
   before_destroy do |author_address|
-    if author_address.author
-      AuthorAddress.destroyed_author_address_ids[author_address.author.id] << author_address.id
-    end
-    true
+    AuthorAddress.destroyed_author_address_ids << author_address.id
   end
 end
 
diff --git a/activerecord/test/models/company.rb b/activerecord/test/models/company.rb
index df5fd10b6b..f31d5f87e5 100644
--- a/activerecord/test/models/company.rb
+++ b/activerecord/test/models/company.rb
@@ -82,7 +82,7 @@ class Firm < Company
   has_one :account_using_primary_key, :primary_key => "firm_id", :class_name => "Account", :order => "id"
   has_one :account_using_foreign_and_primary_keys, :foreign_key => "firm_name", :primary_key => "name", :class_name => "Account"
   has_one :deletable_account, :foreign_key => "firm_id", :class_name => "Account", :dependent => :delete
-  
+
   has_one :account_limit_500_with_hash_conditions, :foreign_key => "firm_id", :class_name => "Account", :conditions => { :credit_limit => 500 }
 
   has_one :unautosaved_account, :foreign_key => "firm_id", :class_name => 'Account', :autosave => false
@@ -155,7 +155,7 @@ class VerySpecialClient < SpecialClient
 end
 
 class Account < ActiveRecord::Base
-  belongs_to :firm
+  belongs_to :firm, :class_name => 'Company'
   belongs_to :unautosaved_firm, :foreign_key => "firm_id", :class_name => "Firm", :autosave => false
 
   def self.destroyed_account_ids
diff --git a/activeresource/activeresource.gemspec b/activeresource/activeresource.gemspec
index 209364a5dc..3718bb4f2e 100644
--- a/activeresource/activeresource.gemspec
+++ b/activeresource/activeresource.gemspec
@@ -1,10 +1,9 @@
-$:.unshift "lib"
-require "active_resource/version"
+version = File.read(File.expand_path("../../RAILS_VERSION", __FILE__)).strip
 
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'activeresource'
-  s.version     = ActiveResource::VERSION::STRING
+  s.version     = version
   s.summary     = 'REST modeling framework (part of Rails).'
   s.description = 'REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.'
   s.required_ruby_version = '>= 1.8.7'
@@ -21,6 +20,6 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w( README )
   s.rdoc_options.concat ['--main',  'README']
 
-  s.add_dependency('activesupport', "= #{ActiveResource::VERSION::STRING}")
-  s.add_dependency('activemodel',   "= #{ActiveResource::VERSION::STRING}")
+  s.add_dependency('activesupport', version)
+  s.add_dependency('activemodel',   version)
 end
diff --git a/activeresource/test/cases/log_subscriber_test.rb b/activeresource/test/cases/log_subscriber_test.rb
index 5df2cad599..f0330e8f51 100644
--- a/activeresource/test/cases/log_subscriber_test.rb
+++ b/activeresource/test/cases/log_subscriber_test.rb
@@ -7,15 +7,16 @@ require "active_support/core_ext/hash/conversions"
 # TODO: This test should be part of Railties
 class LogSubscriberTest < ActiveSupport::TestCase
   include Rails::LogSubscriber::TestHelper
-  Rails::LogSubscriber.add(:active_resource, ActiveResource::Railties::LogSubscriber.new)
 
   def setup
+    super
+
     @matz = { :id => 1, :name => 'Matz' }.to_xml(:root => 'person')
     ActiveResource::HttpMock.respond_to do |mock|
       mock.get "/people/1.xml", {}, @matz
     end
 
-    super
+    Rails::LogSubscriber.add(:active_resource, ActiveResource::Railties::LogSubscriber.new)
   end
 
   def set_logger(logger)
diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec
index 89e8dca278..78fb48924e 100644
--- a/activesupport/activesupport.gemspec
+++ b/activesupport/activesupport.gemspec
@@ -1,10 +1,9 @@
-$:.unshift "lib"
-require "active_support/version"
+version = File.read(File.expand_path("../../RAILS_VERSION", __FILE__)).strip
 
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'activesupport'
-  s.version     = ActiveSupport::VERSION::STRING
+  s.version     = version
   s.summary     = 'A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.'
   s.description = 'A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'
   s.required_ruby_version = '>= 1.8.7'
@@ -19,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.has_rdoc = true
 
-  s.add_dependency('i18n',            '~> 0.3.4')
+  s.add_dependency('i18n',            '~> 0.3.6.pre')
   s.add_dependency('tzinfo',          '~> 0.3.16')
   s.add_dependency('builder',         '~> 2.1.2')
   s.add_dependency('memcache-client', '~> 1.7.5')
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index ae31d191c0..e34e46b4cf 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -53,6 +53,7 @@ module ActiveSupport
     autoload :Deprecation
     autoload :Gzip
     autoload :Inflector
+    autoload :JSON
     autoload :Memoizable
     autoload :MessageEncryptor
     autoload :MessageVerifier
@@ -70,3 +71,5 @@ module ActiveSupport
   autoload :SafeBuffer, "active_support/core_ext/string/output_safety"
   autoload :TestCase
 end
+
+autoload :I18n, "active_support/i18n"
diff --git a/activesupport/lib/active_support/all.rb b/activesupport/lib/active_support/all.rb
index 64600575d9..f537818300 100644
--- a/activesupport/lib/active_support/all.rb
+++ b/activesupport/lib/active_support/all.rb
@@ -1,4 +1,3 @@
 require 'active_support'
-require 'active_support/i18n'
 require 'active_support/time'
 require 'active_support/core_ext'
diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb
index 814567a5a6..2119322bfe 100644
--- a/activesupport/lib/active_support/core_ext/array/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/array/conversions.rb
@@ -1,7 +1,6 @@
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/hash/reverse_merge'
 require 'active_support/inflector'
-require 'active_support/i18n'
 
 class Array
   # Converts the array to a comma-separated sentence where the last element is joined by the connector word. Options:
diff --git a/activesupport/lib/active_support/core_ext/class/attribute.rb b/activesupport/lib/active_support/core_ext/class/attribute.rb
index 1bd39a9349..c18905b369 100644
--- a/activesupport/lib/active_support/core_ext/class/attribute.rb
+++ b/activesupport/lib/active_support/core_ext/class/attribute.rb
@@ -24,14 +24,35 @@ class Class
   # For convenience, a query method is defined as well:
   #
   #   Subclass.setting?           # => false
+  #
+  # Instances may overwrite the class value in the same way:
+  #
+  #   Base.setting = true
+  #   object = Base.new
+  #   object.setting          # => true
+  #   object.setting = false
+  #   object.setting          # => false
+  #   Base.setting            # => true
+  #
+  # To opt out of the instance writer method, pass :instance_writer => false.
+  #
+  #   object.setting = false  # => NoMethodError
   def class_attribute(*attrs)
+    instance_writer = !attrs.last.is_a?(Hash) || attrs.pop[:instance_writer]
+
     s = singleton_class
     attrs.each do |attr|
       s.send(:define_method, attr) { }
-      s.send(:define_method, "#{attr}?") { !!send(attr) }
-      s.send(:define_method, "#{attr}=") do |value|
+      s.send(:define_method, :"#{attr}?") { !!send(attr) }
+      s.send(:define_method, :"#{attr}=") do |value|
         singleton_class.send(:define_method, attr) { value }
       end
+
+      define_method(attr) { self.class.send(attr) }
+      define_method(:"#{attr}?") { !!send(attr) }
+      define_method(:"#{attr}=") do |value|
+        singleton_class.send(:define_method, attr) { value }
+      end if instance_writer
     end
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/string/inflections.rb b/activesupport/lib/active_support/core_ext/string/inflections.rb
index ea4ed61e42..fbb7b79fc6 100644
--- a/activesupport/lib/active_support/core_ext/string/inflections.rb
+++ b/activesupport/lib/active_support/core_ext/string/inflections.rb
@@ -1,8 +1,10 @@
+require 'active_support/inflector'
+
 # String inflections define new methods on the String class to transform names for different purposes.
 # For instance, you can figure out the name of a database from the name of a class.
 #
 #   "ScaleScore".tableize # => "scale_scores"
-
+#
 class String
   # Returns the plural form of the word in the string.
   #
diff --git a/activesupport/lib/active_support/core_ext/string/interpolation.rb b/activesupport/lib/active_support/core_ext/string/interpolation.rb
index 06d3505c60..932117cc10 100644
--- a/activesupport/lib/active_support/core_ext/string/interpolation.rb
+++ b/activesupport/lib/active_support/core_ext/string/interpolation.rb
@@ -1,91 +1 @@
-=begin
-  heavily based on Masao Mutoh's gettext String interpolation extension
-  http://github.com/mutoh/gettext/blob/f6566738b981fe0952548c421042ad1e0cdfb31e/lib/gettext/core_ext/string.rb
-  Copyright (C) 2005-2010 Masao Mutoh
-  You may redistribute it and/or modify it under the same license terms as Ruby.
-=end
-
-if RUBY_VERSION < '1.9' && !"".respond_to?(:interpolate_without_ruby_19_syntax)
-
-  # KeyError is raised by String#% when the string contains a named placeholder
-  # that is not contained in the given arguments hash. Ruby 1.9 includes and
-  # raises this exception natively. We define it to mimic Ruby 1.9's behaviour
-  # in Ruby 1.8.x
-
-  class KeyError < IndexError
-    def initialize(message = nil)
-      super(message || "key not found")
-    end
-  end unless defined?(KeyError)
-
-  # Extension for String class. This feature is included in Ruby 1.9 or later but not occur TypeError.
-  #
-  # String#% method which accept "named argument". The translator can know
-  # the meaning of the msgids using "named argument" instead of %s/%d style.
-
-  class String
-    alias :interpolate_without_ruby_19_syntax :% # :nodoc:
-
-    INTERPOLATION_PATTERN = Regexp.union(
-      /%%/,
-      /%\{(\w+)\}/,                               # matches placeholders like "%{foo}"
-      /%<(\w+)>(.*?\d*\.?\d*[bBdiouxXeEfgGcps])/  # matches placeholders like "%<foo>.d"
-    )
-
-    # % uses self (i.e. the String) as a format specification and returns the
-    # result of applying it to the given arguments. In other words it interpolates
-    # the given arguments to the string according to the formats the string
-    # defines.
-    #
-    # There are three ways to use it:
-    #
-    # * Using a single argument or Array of arguments.
-    #
-    #   This is the default behaviour of the String class. See Kernel#sprintf for
-    #   more details about the format string.
-    #
-    #   Example:
-    #
-    #     "%d %s" % [1, "message"]
-    #     # => "1 message"
-    #
-    # * Using a Hash as an argument and unformatted, named placeholders.
-    #
-    #   When you pass a Hash as an argument and specify placeholders with %{foo}
-    #   it will interpret the hash values as named arguments.
-    #
-    #   Example:
-    #
-    #     "%{firstname}, %{lastname}" % {:firstname => "Masao", :lastname => "Mutoh"}
-    #     # => "Masao Mutoh"
-    #
-    # * Using a Hash as an argument and formatted, named placeholders.
-    #
-    #   When you pass a Hash as an argument and specify placeholders with %<foo>d
-    #   it will interpret the hash values as named arguments and format the value
-    #   according to the formatting instruction appended to the closing >.
-    #
-    #   Example:
-    #
-    #     "%<integer>d, %<float>.1f" % { :integer => 10, :float => 43.4 }
-    #     # => "10, 43.3"
-    def %(args)
-      if args.kind_of?(Hash)
-        dup.gsub(INTERPOLATION_PATTERN) do |match|
-          if match == '%%'
-            '%'
-          else
-            key = ($1 || $2).to_sym
-            raise KeyError unless args.has_key?(key)
-            $3 ? sprintf("%#{$3}", args[key]) : args[key]
-          end
-        end
-      elsif self =~ INTERPOLATION_PATTERN
-        raise ArgumentError.new('one hash required')
-      else
-        result = gsub(/%([{<])/, '%%\1')
-        result.send :'interpolate_without_ruby_19_syntax', args
-      end
-    end
-  end
-end
+require 'i18n/core_ext/string/interpolate'
diff --git a/activesupport/lib/active_support/dependencies/autoload.rb b/activesupport/lib/active_support/dependencies/autoload.rb
index 44edb89ad5..f669f4a77e 100644
--- a/activesupport/lib/active_support/dependencies/autoload.rb
+++ b/activesupport/lib/active_support/dependencies/autoload.rb
@@ -1,7 +1,12 @@
 require "active_support/inflector/methods"
+require "active_support/lazy_load_hooks"
 
 module ActiveSupport
   module Autoload
+    def self.extended(base)
+      base.extend(LazyLoadHooks)
+    end
+
     @@autoloads = {}
     @@under_path = nil
     @@at_path = nil
diff --git a/activesupport/lib/active_support/deprecation/reporting.rb b/activesupport/lib/active_support/deprecation/reporting.rb
index fcb05ad8d9..03c445ffbf 100644
--- a/activesupport/lib/active_support/deprecation/reporting.rb
+++ b/activesupport/lib/active_support/deprecation/reporting.rb
@@ -29,7 +29,8 @@ module ActiveSupport
       private
         def deprecation_message(callstack, message = nil)
           message ||= "You are using deprecated behavior which will be removed from the next major or minor release."
-          "DEPRECATION WARNING: #{message}. #{deprecation_caller_message(callstack)}"
+          message += '.' unless message =~ /\.$/
+          "DEPRECATION WARNING: #{message} #{deprecation_caller_message(callstack)}"
         end
 
         def deprecation_caller_message(callstack)
diff --git a/activesupport/lib/active_support/i18n.rb b/activesupport/lib/active_support/i18n.rb
index 854c60eec1..034d7d8ddc 100644
--- a/activesupport/lib/active_support/i18n.rb
+++ b/activesupport/lib/active_support/i18n.rb
@@ -1,2 +1,3 @@
 require 'i18n'
-I18n.load_path << "#{File.dirname(__FILE__)}/locale/en.yml"
\ No newline at end of file
+I18n.load_path << "#{File.dirname(__FILE__)}/locale/en.yml"
+ActiveSupport.run_base_hooks(:i18n)
\ No newline at end of file
diff --git a/activesupport/lib/active_support/inflector/transliterate.rb b/activesupport/lib/active_support/inflector/transliterate.rb
index 30a9072ee1..236f2eb628 100644
--- a/activesupport/lib/active_support/inflector/transliterate.rb
+++ b/activesupport/lib/active_support/inflector/transliterate.rb
@@ -47,7 +47,7 @@ module ActiveSupport
       # replace accented chars with their ascii equivalents
       parameterized_string = transliterate(string)
       # Turn unwanted chars into the separator
-      parameterized_string.gsub!(/[^a-z0-9\-_\+]+/i, sep)
+      parameterized_string.gsub!(/[^a-z0-9\-_]+/i, sep)
       unless sep.nil? || sep.empty?
         re_sep = Regexp.escape(sep)
         # No more than one of the separator in a row.
diff --git a/activesupport/lib/active_support/json/decoding.rb b/activesupport/lib/active_support/json/decoding.rb
index e357b6837a..04ff316a44 100644
--- a/activesupport/lib/active_support/json/decoding.rb
+++ b/activesupport/lib/active_support/json/decoding.rb
@@ -7,7 +7,7 @@ module ActiveSupport
 
   module JSON
     # Listed in order of preference.
-    DECODERS = %w(Yajl JSONGem Yaml)
+    DECODERS = %w(Yajl Yaml)
 
     class << self
       attr_reader :parse_error
diff --git a/activesupport/lib/active_support/lazy_load_hooks.rb b/activesupport/lib/active_support/lazy_load_hooks.rb
new file mode 100644
index 0000000000..36acfda524
--- /dev/null
+++ b/activesupport/lib/active_support/lazy_load_hooks.rb
@@ -0,0 +1,25 @@
+module ActiveSupport
+  module LazyLoadHooks
+    def _setup_base_hooks
+      @base_hooks ||= Hash.new {|h,k| h[k] = [] }
+      @base ||= {}
+    end
+
+    def base_hook(name = nil, &block)
+      _setup_base_hooks
+
+      if base = @base[name]
+        base.instance_eval(&block)
+      else
+        @base_hooks[name] << block
+      end
+    end
+
+    def run_base_hooks(base, name = nil)
+      _setup_base_hooks
+
+      @base_hooks[name].each { |hook| base.instance_eval(&hook) } if @base_hooks
+      @base[name] = base
+    end
+  end
+end
\ No newline at end of file
diff --git a/activesupport/lib/active_support/ordered_options.rb b/activesupport/lib/active_support/ordered_options.rb
index 596a7b757d..61ccb79211 100644
--- a/activesupport/lib/active_support/ordered_options.rb
+++ b/activesupport/lib/active_support/ordered_options.rb
@@ -18,4 +18,10 @@ module ActiveSupport #:nodoc:
       end
     end
   end
+
+  class InheritableOptions < OrderedOptions
+    def initialize(parent)
+      super() { |h,k| parent[k] }
+    end
+  end
 end
diff --git a/activesupport/lib/active_support/railtie.rb b/activesupport/lib/active_support/railtie.rb
index 58d11585ba..d2c13e030d 100644
--- a/activesupport/lib/active_support/railtie.rb
+++ b/activesupport/lib/active_support/railtie.rb
@@ -37,10 +37,12 @@ module I18n
     config.i18n.load_path = []
 
     initializer "i18n.initialize" do
-      require 'active_support/i18n'
-
-      ActionDispatch::Callbacks.to_prepare do
+      ActiveSupport.base_hook(:i18n) do
         I18n.reload!
+
+        ActionDispatch::Callbacks.to_prepare do
+          I18n.reload!
+        end
       end
     end
 
diff --git a/activesupport/lib/active_support/whiny_nil.rb b/activesupport/lib/active_support/whiny_nil.rb
index 11b05efac1..91ddef2619 100644
--- a/activesupport/lib/active_support/whiny_nil.rb
+++ b/activesupport/lib/active_support/whiny_nil.rb
@@ -25,17 +25,16 @@
 # By default it is on in development and test modes, and it is off in production
 # mode.
 class NilClass
-  WHINERS = [::Array]
-  WHINERS << ::ActiveRecord::Base if defined? ::ActiveRecord
-
   METHOD_CLASS_MAP = Hash.new
 
-  WHINERS.each do |klass|
+  def self.add_whiner(klass)
     methods = klass.public_instance_methods - public_instance_methods
     class_name = klass.name
     methods.each { |method| METHOD_CLASS_MAP[method.to_sym] = class_name }
   end
 
+  add_whiner ::Array
+
   # Raises a RuntimeError when you attempt to call +id+ on +nil+.
   def id
     raise RuntimeError, "Called id for nil, which would mistakenly be 4 -- if you really wanted the id of nil, use object_id", caller
diff --git a/activesupport/test/core_ext/class/attribute_test.rb b/activesupport/test/core_ext/class/attribute_test.rb
index ef84b9f255..06b4cf075f 100644
--- a/activesupport/test/core_ext/class/attribute_test.rb
+++ b/activesupport/test/core_ext/class/attribute_test.rb
@@ -2,13 +2,6 @@ require 'abstract_unit'
 require 'active_support/core_ext/class/attribute'
 
 class ClassAttributeTest < ActiveSupport::TestCase
-  class Base
-    class_attribute :setting
-  end
-
-  class Subclass < Base
-  end
-
   def setup
     @klass = Class.new { class_attribute :setting }
     @sub = Class.new(@klass)
@@ -40,8 +33,30 @@ class ClassAttributeTest < ActiveSupport::TestCase
     assert_equal true, @klass.setting?
   end
 
-  test 'no instance delegates' do
-    assert_raise(NoMethodError) { @klass.new.setting }
-    assert_raise(NoMethodError) { @klass.new.setting? }
+  test 'instance reader delegates to class' do
+    assert_nil @klass.new.setting
+
+    @klass.setting = 1
+    assert_equal 1, @klass.new.setting
+  end
+
+  test 'instance override' do
+    object = @klass.new
+    object.setting = 1
+    assert_nil @klass.setting
+    @klass.setting = 2
+    assert_equal 1, object.setting
+  end
+
+  test 'instance query' do
+    object = @klass.new
+    assert_equal false, object.setting?
+    object.setting = 1
+    assert_equal true, object.setting?
+  end
+
+  test 'disabling instance writer' do
+    object = Class.new { class_attribute :setting, :instance_writer => false }.new
+    assert_raise(NoMethodError) { object.setting = 'boom' }
   end
 end
diff --git a/activesupport/test/inflector_test_cases.rb b/activesupport/test/inflector_test_cases.rb
index 2fa94b8e9c..ebd26d3fc6 100644
--- a/activesupport/test/inflector_test_cases.rb
+++ b/activesupport/test/inflector_test_cases.rb
@@ -158,7 +158,8 @@ module InflectorTestCases
     "Allow_Under_Scores"                  => "allow_under_scores",
     "Trailing bad characters!@#"          => "trailing-bad-characters",
     "!@#Leading bad characters"           => "leading-bad-characters",
-    "Squeeze   separators"                => "squeeze-separators"
+    "Squeeze   separators"                => "squeeze-separators",
+    "Test with + sign"                    => "test-with-sign"
   }
 
   StringToParameterizeWithNoSeparator = {
@@ -166,7 +167,8 @@ module InflectorTestCases
     "Random text with *(bad)* characters" => "randomtextwithbadcharacters",
     "Trailing bad characters!@#"          => "trailingbadcharacters",
     "!@#Leading bad characters"           => "leadingbadcharacters",
-    "Squeeze   separators"                => "squeezeseparators"
+    "Squeeze   separators"                => "squeezeseparators",
+    "Test with + sign"                    => "testwithsign"
   }
 
   StringToParameterizeWithUnderscore = {
@@ -174,7 +176,8 @@ module InflectorTestCases
     "Random text with *(bad)* characters" => "random_text_with_bad_characters",
     "Trailing bad characters!@#"          => "trailing_bad_characters",
     "!@#Leading bad characters"           => "leading_bad_characters",
-    "Squeeze   separators"                => "squeeze_separators"
+    "Squeeze   separators"                => "squeeze_separators",
+    "Test with + sign"                    => "test_with_sign"
   }
 
   # Ruby 1.9 doesn't do Unicode normalization yet.
diff --git a/activesupport/test/whiny_nil_test.rb b/activesupport/test/whiny_nil_test.rb
index 1e4f8d854a..4b9f06dead 100644
--- a/activesupport/test/whiny_nil_test.rb
+++ b/activesupport/test/whiny_nil_test.rb
@@ -9,6 +9,8 @@ end
 require 'abstract_unit'
 require 'active_support/whiny_nil'
 
+NilClass.add_whiner ::ActiveRecord::Base
+
 class WhinyNilTest < Test::Unit::TestCase
   def test_unchanged
     nil.method_thats_not_in_whiners
diff --git a/ci/ci_build.rb b/ci/ci_build.rb
index a2df8e698d..2a7bbc376e 100755
--- a/ci/ci_build.rb
+++ b/ci/ci_build.rb
@@ -19,7 +19,7 @@ puts "[CruiseControl] Rails build"
 build_results = {}
 
 # Install required version of bundler.
-bundler_install_cmd = "sudo gem install bundler -v 0.9.8 --no-ri --no-rdoc"
+bundler_install_cmd = "sudo gem install bundler -v 0.9.10 --no-ri --no-rdoc"
 puts "Running command: #{bundler_install_cmd}"
 build_results[:install_bundler] = system bundler_install_cmd
 
diff --git a/rails.gemspec b/rails.gemspec
index 0cd4540ec3..8b9a374e25 100644
--- a/rails.gemspec
+++ b/rails.gemspec
@@ -1,13 +1,13 @@
-$:.unshift "railties/lib"
-require "rails/version"
+version = File.read(File.expand_path("../RAILS_VERSION",__FILE__)).strip
 
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'rails'
-  s.version     = Rails::VERSION::STRING
+  s.version     = version
   s.summary     = 'Full-stack web application framework.'
   s.description = 'Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'
   s.required_ruby_version = '>= 1.8.7'
+  s.required_rubygems_version = ">= 1.3.6"
 
   s.author            = 'David Heinemeier Hansson'
   s.email             = 'david@loudthinking.com'
@@ -17,11 +17,11 @@ Gem::Specification.new do |s|
   s.files = []
   s.require_path = []
 
-  s.add_dependency('activesupport',    "= #{Rails::VERSION::STRING}")
-  s.add_dependency('actionpack',       "= #{Rails::VERSION::STRING}")
-  s.add_dependency('activerecord',     "= #{Rails::VERSION::STRING}")
-  s.add_dependency('activeresource',   "= #{Rails::VERSION::STRING}")
-  s.add_dependency('actionmailer',     "= #{Rails::VERSION::STRING}")
-  s.add_dependency('railties',         "= #{Rails::VERSION::STRING}")
+  s.add_dependency('activesupport',    version)
+  s.add_dependency('actionpack',       version)
+  s.add_dependency('activerecord',     version)
+  s.add_dependency('activeresource',   version)
+  s.add_dependency('actionmailer',     version)
+  s.add_dependency('railties',         version)
   s.add_dependency('bundler',          '>= 0.9.8')
 end
diff --git a/railties/guides/source/configuring.textile b/railties/guides/source/configuring.textile
index 0e6f981168..5418ad7dd4 100644
--- a/railties/guides/source/configuring.textile
+++ b/railties/guides/source/configuring.textile
@@ -159,7 +159,7 @@ WARNING: Threadsafe operation in incompatible with the normal workings of develo
 
 * +config.action_controller.relative_url_root+ can be used to tell Rails that you are deploying to a subdirectory. The default is +ENV['RAILS_RELATIVE_URL_ROOT']+.
 
-* +config.action_controller.session_store+ sets the name of the store for session data. The default is +:cookie_store+; other valid options include +:active_record_store+, +:mem_cache_store+ or the name of your own custom class.
+* +config.action_dispatch.session_store+ sets the name of the store for session data. The default is +:cookie_store+; other valid options include +:active_record_store+, +:mem_cache_store+ or the name of your own custom class.
 
 The caching code adds two additional settings:
 
diff --git a/railties/guides/source/security.textile b/railties/guides/source/security.textile
index ecf68b56f9..b62ff8cb38 100644
--- a/railties/guides/source/security.textile
+++ b/railties/guides/source/security.textile
@@ -92,7 +92,7 @@ Rails 2 introduced a new default session storage, CookieStore. CookieStore saves
 That means the security of this storage depends on this secret (and on the digest algorithm, which defaults to SHA512, which has not been compromised, yet). So _(highlight)don't use a trivial secret, i.e. a word from a dictionary, or one which is shorter than 30 characters_. Put the secret in your environment.rb:
 
 <ruby>
-config.action_controller.session = {
+config.action_dispatch.session = {
   :key    => '_app_session',
   :secret => '0x0dkfj3927dkc7djdh36rkckdfzsg...'
 }
diff --git a/railties/lib/generators/erb/scaffold/templates/_form.html.erb b/railties/lib/generators/erb/scaffold/templates/_form.html.erb
index 9c19a09616..01ec58c615 100644
--- a/railties/lib/generators/erb/scaffold/templates/_form.html.erb
+++ b/railties/lib/generators/erb/scaffold/templates/_form.html.erb
@@ -1,4 +1,4 @@
-<%% form_for(@<%= singular_name %>) do |f| %>
+<%%= form_for(@<%= singular_name %>) do |f| %>
   <%%= f.error_messages %>
 
 <% for attribute in attributes -%>
diff --git a/railties/lib/generators/erb/scaffold/templates/layout.html.erb b/railties/lib/generators/erb/scaffold/templates/layout.html.erb
index 420d17f33c..3f64be0c45 100644
--- a/railties/lib/generators/erb/scaffold/templates/layout.html.erb
+++ b/railties/lib/generators/erb/scaffold/templates/layout.html.erb
@@ -9,6 +9,7 @@
 <body>
 
 <p class="notice"><%%= notice %></p>
+<p class="alert"><%%= alert %></p>
 
 <%%= yield %>
 
diff --git a/railties/lib/generators/rails/app/templates/Gemfile b/railties/lib/generators/rails/app/templates/Gemfile
index f4bce8646d..0dd10f3f2d 100644
--- a/railties/lib/generators/rails/app/templates/Gemfile
+++ b/railties/lib/generators/rails/app/templates/Gemfile
@@ -1,4 +1,4 @@
-source 'http://gemcutter.org'
+source 'http://rubygems.org'
 
 <%- if options.dev? -%>
 gem 'rails', :path => '<%= Rails::Generators::RAILS_DEV_PATH %>'
@@ -15,15 +15,15 @@ gem 'rails', '<%= Rails::VERSION::STRING %>'
 gem '<%= gem_for_database %>'<% if require_for_database %>, :require => '<%= require_for_database %>'<% end %>
 <% end -%>
 
-# Use mongrel as the web server
-# gem 'mongrel'
+# Use unicorn as the web server
+# gem 'unicorn'
 
 # Deploy with Capistrano
 # gem 'capistrano'
 
 # Bundle the extra gems:
 # gem 'bj'
-# gem 'hpricot', '0.6'
+# gem 'nokogiri', '1.4.1'
 # gem 'sqlite3-ruby', :require => 'sqlite3'
 # gem 'aws-s3', :require => 'aws/s3'
 
diff --git a/railties/lib/generators/rails/app/templates/config/initializers/cookie_verification_secret.rb.tt b/railties/lib/generators/rails/app/templates/config/initializers/cookie_verification_secret.rb.tt
index 451dbe1d1c..be627fbbcc 100644
--- a/railties/lib/generators/rails/app/templates/config/initializers/cookie_verification_secret.rb.tt
+++ b/railties/lib/generators/rails/app/templates/config/initializers/cookie_verification_secret.rb.tt
@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random, 
 # no regular words or you'll be exposed to dictionary attacks.
-ActionController::Base.cookie_verifier_secret = '<%= app_secret %>'
+Rails.application.config.cookie_secret = '<%= app_secret %>'
diff --git a/railties/lib/generators/rails/app/templates/config/initializers/session_store.rb.tt b/railties/lib/generators/rails/app/templates/config/initializers/session_store.rb.tt
index baff704d3e..9e32fb930e 100644
--- a/railties/lib/generators/rails/app/templates/config/initializers/session_store.rb.tt
+++ b/railties/lib/generators/rails/app/templates/config/initializers/session_store.rb.tt
@@ -1,15 +1,10 @@
 # Be sure to restart your server when you modify this file.
 
-# Your secret key for verifying cookie session data integrity.
-# If you change this key, all old sessions will become invalid!
-# Make sure the secret is at least 30 characters and all random, 
-# no regular words or you'll be exposed to dictionary attacks.
-ActionController::Base.session = {
-  :key    => '_<%= app_name %>_session',
-  :secret => '<%= app_secret %>'
+Rails.application.config.session_store :cookie_store, {
+  :key => '_<%= app_name %>_session',
 }
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information
 # (create the session table with "rake db:sessions:create")
-# ActionController::Base.session_store = :active_record_store
+# Rails.application.config.session_store :active_record_store
diff --git a/railties/lib/generators/rails/stylesheets/templates/scaffold.css b/railties/lib/generators/rails/stylesheets/templates/scaffold.css
index de6669ad9e..ea3dc9b8b5 100644
--- a/railties/lib/generators/rails/stylesheets/templates/scaffold.css
+++ b/railties/lib/generators/rails/stylesheets/templates/scaffold.css
@@ -24,6 +24,10 @@ div.field, div.actions {
   color: green;
 }
 
+.alert {
+  color: red;
+}
+
 .fieldWithErrors {
   padding: 2px;
   background-color: red;
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index a74550b302..f43e8847ac 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -15,7 +15,10 @@ module Rails
 
     class << self
       private :new
-      alias   :configure :class_eval
+
+      def configure(&block)
+        class_eval(&block)
+      end
 
       def instance
         if self == Rails::Application
@@ -55,10 +58,6 @@ module Rails
       @railties ||= Railties.new(config)
     end
 
-    def metal_loader
-      @metal_loader ||= MetalLoader.new
-    end
-
     def routes_reloader
       @routes_reloader ||= RoutesReloader.new
     end
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index a00f9c43ae..d3a0ecb243 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -21,6 +21,10 @@ module Rails
         @consider_all_requests_local = true
       end
 
+      def middleware
+        @@default_middleware_stack ||= default_middleware
+      end
+
       def paths
         @paths ||= begin
           paths = super
diff --git a/railties/lib/rails/application/routes_reloader.rb b/railties/lib/rails/application/routes_reloader.rb
index fde6211c5d..a5154f4bba 100644
--- a/railties/lib/rails/application/routes_reloader.rb
+++ b/railties/lib/rails/application/routes_reloader.rb
@@ -27,7 +27,7 @@ module Rails
 
         routes.clear!
         paths.each { |path| load(path) }
-        routes.finalize!
+        ActionController.base_hook { routes.finalize! }
 
         nil
       ensure
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index bcd98c67f8..73ae9bcb16 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -4,95 +4,6 @@ require 'rails/rack'
 
 module Rails
   module Configuration
-    module Shared
-      def middleware
-        @@default_middleware_stack ||= default_middleware
-      end
-
-      # Holds generators configuration:
-      #
-      #   config.generators do |g|
-      #     g.orm             :datamapper, :migration => true
-      #     g.template_engine :haml
-      #     g.test_framework  :rspec
-      #   end
-      #
-      # If you want to disable color in console, do:
-      #
-      #   config.generators.colorize_logging = false
-      #
-      def generators
-        @@generators ||= Rails::Configuration::Generators.new
-        if block_given?
-          yield @@generators
-        else
-          @@generators
-        end
-      end
-
-      def after_initialize_blocks
-        @@after_initialize_blocks ||= []
-      end
-
-      def after_initialize(&blk)
-        after_initialize_blocks << blk if blk
-      end
-
-      def to_prepare_blocks
-        @@to_prepare_blocks ||= []
-      end
-
-      def to_prepare(&blk)
-        to_prepare_blocks << blk if blk
-      end
-
-      def respond_to?(name)
-        super || name.to_s =~ config_key_regexp
-      end
-
-    private
-
-      def method_missing(name, *args, &blk)
-        if name.to_s =~ config_key_regexp
-          return $2 == '=' ? options[$1] = args.first : options[$1]
-        end
-        super
-      end
-
-      def config_key_regexp
-        bits = config_keys.map { |n| Regexp.escape(n.to_s) }.join('|')
-        /^(#{bits})(?:=)?$/
-      end
-
-      def config_keys
-        (Railtie.railtie_names + Engine.engine_names).map { |n| n.to_s }.uniq
-      end
-
-      def options
-        @@options ||= Hash.new { |h,k| h[k] = ActiveSupport::OrderedOptions.new }
-      end
-
-      def default_middleware
-        require 'action_dispatch'
-        ActionDispatch::MiddlewareStack.new.tap do |middleware|
-          middleware.use('::ActionDispatch::Static', lambda { Rails.public_path }, :if => lambda { Rails.application.config.serve_static_assets })
-          middleware.use('::Rack::Lock', :if => lambda { !Rails.application.config.allow_concurrency })
-          middleware.use('::Rack::Runtime')
-          middleware.use('::Rails::Rack::Logger')
-          middleware.use('::ActionDispatch::ShowExceptions', lambda { Rails.application.config.consider_all_requests_local })
-          middleware.use('::Rack::Sendfile', lambda { Rails.application.config.action_dispatch.x_sendfile_header })
-          middleware.use('::ActionDispatch::Callbacks', lambda { !Rails.application.config.cache_classes })
-          middleware.use('::ActionDispatch::Cookies')
-          middleware.use(lambda { ActionController::Base.session_store }, lambda { ActionController::Base.session_options })
-          middleware.use('::ActionDispatch::Flash', :if => lambda { ActionController::Base.session_store })
-          middleware.use(lambda { Rails.application.metal_loader.build_middleware(Rails.application.config.metals) }, :if => lambda { Rails.application.metal_loader.metals.any? })
-          middleware.use('ActionDispatch::ParamsParser')
-          middleware.use('::Rack::MethodOverride')
-          middleware.use('::ActionDispatch::Head')
-        end
-      end
-    end
-
     class Generators #:nodoc:
       attr_accessor :aliases, :options, :templates, :fallbacks, :colorize_logging
 
diff --git a/railties/lib/rails/console/app.rb b/railties/lib/rails/console/app.rb
index 4959e18e33..4a7701081b 100644
--- a/railties/lib/rails/console/app.rb
+++ b/railties/lib/rails/console/app.rb
@@ -17,8 +17,8 @@ end
 # create a new session. If a block is given, the new session will be yielded
 # to the block before being returned.
 def new_session
-  app = ActionController::Dispatcher.new
-  session = ActionController::Integration::Session.new(app)
+  app = Rails.application
+  session = ActionDispatch::Integration::Session.new(app)
   yield session if block_given?
   session
 end
diff --git a/railties/lib/rails/console/helpers.rb b/railties/lib/rails/console/helpers.rb
index 039db667c4..212fc6125a 100644
--- a/railties/lib/rails/console/helpers.rb
+++ b/railties/lib/rails/console/helpers.rb
@@ -2,4 +2,6 @@ def helper
   @helper ||= ApplicationController.helpers
 end
 
-@controller = ApplicationController.new
+def controller
+  @controller ||= ApplicationController.new
+end
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 79183480a3..85b4ff8470 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -41,7 +41,7 @@ module Rails
       end
     end
 
-    delegate :middleware, :paths, :root, :to => :config
+    delegate :middleware, :paths, :metal_loader, :root, :to => :config
 
     def load_tasks
       super
@@ -82,7 +82,7 @@ module Rails
     initializer :add_routing_namespaces do |app|
       paths.app.controllers.to_a.each do |load_path|
         load_path = File.expand_path(load_path)
-        Dir["#{load_path}/*/*_controller.rb"].collect do |path|
+        Dir["#{load_path}/*/**/*_controller.rb"].collect do |path|
           namespace = File.dirname(path).sub(/#{load_path}\/?/, '')
           app.routes.controller_namespaces << namespace unless namespace.empty?
         end
@@ -97,8 +97,8 @@ module Rails
 
     initializer :add_view_paths do
       views = paths.app.views.to_a
-      ActionController::Base.prepend_view_path(views) if defined?(ActionController::Base)
-      ActionMailer::Base.prepend_view_path(views) if defined?(ActionMailer::Base)
+      ActionController.base_hook { prepend_view_path(views) } if defined?(ActionController)
+      ActionMailer.base_hook { prepend_view_path(views) } if defined?(ActionMailer)
     end
 
     initializer :add_metals do |app|
diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb
index 93b882f874..b8f1f1009c 100644
--- a/railties/lib/rails/engine/configuration.rb
+++ b/railties/lib/rails/engine/configuration.rb
@@ -7,6 +7,7 @@ module Rails
       attr_writer :eager_load_paths, :load_once_paths, :load_paths
 
       def initialize(root=nil)
+        super()
         @root = root
       end
 
@@ -17,8 +18,9 @@ module Rails
           paths.app.controllers     "app/controllers",     :eager_load => true
           paths.app.helpers         "app/helpers",         :eager_load => true
           paths.app.models          "app/models",          :eager_load => true
-          paths.app.metals          "app/metal"
-          paths.app.views           "app/views"
+          paths.app.mailers         "app/mailers",         :eager_load => true
+          paths.app.metals          "app/metal",           :eager_load => true
+          paths.app.views           "app/views",           :eager_load => true
           paths.lib                 "lib",                 :load_path => true
           paths.lib.tasks           "lib/tasks",           :glob => "**/*.rake"
           paths.lib.templates       "lib/templates"
@@ -26,6 +28,9 @@ module Rails
           paths.config.initializers "config/initializers", :glob => "**/*.rb"
           paths.config.locales      "config/locales",      :glob => "*.{rb,yml}"
           paths.config.routes       "config/routes.rb"
+          paths.public              "public"
+          paths.public.javascripts  "public/javascripts"
+          paths.public.stylesheets  "public/stylesheets"
           paths
         end
       end
diff --git a/railties/lib/rails/log_subscriber.rb b/railties/lib/rails/log_subscriber.rb
index 0fbc19d89c..42697d2e32 100644
--- a/railties/lib/rails/log_subscriber.rb
+++ b/railties/lib/rails/log_subscriber.rb
@@ -87,6 +87,7 @@ module Rails
     %w(info debug warn error fatal unknown).each do |level|
       class_eval <<-METHOD, __FILE__, __LINE__ + 1
         def #{level}(*args, &block)
+          return unless logger
           logger.#{level}(*args, &block)
         end
       METHOD
diff --git a/railties/lib/rails/rack/logger.rb b/railties/lib/rails/rack/logger.rb
index 2efe224e94..dd8b342f59 100644
--- a/railties/lib/rails/rack/logger.rb
+++ b/railties/lib/rails/rack/logger.rb
@@ -19,7 +19,7 @@ module Rails
 
         def before_dispatch(env)
           request = ActionDispatch::Request.new(env)
-          path = request.request_uri.inspect rescue "unknown"
+          path = request.fullpath.inspect rescue "unknown"
 
           info "\n\nStarted #{request.method.to_s.upcase} #{path} " <<
                       "for #{request.remote_ip} at #{Time.now.to_s(:db)}"
diff --git a/railties/lib/rails/railtie/configuration.rb b/railties/lib/rails/railtie/configuration.rb
index bfb43f7041..828ccec3d0 100644
--- a/railties/lib/rails/railtie/configuration.rb
+++ b/railties/lib/rails/railtie/configuration.rb
@@ -3,7 +3,123 @@ require 'rails/configuration'
 module Rails
   class Railtie
     class Configuration
-      include Rails::Configuration::Shared
+      attr_accessor :cookie_secret
+
+      def initialize
+        @session_store = :cookie_store
+        @session_options = {}
+      end
+
+      # Holds generators configuration:
+      #
+      #   config.generators do |g|
+      #     g.orm             :datamapper, :migration => true
+      #     g.template_engine :haml
+      #     g.test_framework  :rspec
+      #   end
+      #
+      # If you want to disable color in console, do:
+      #
+      #   config.generators.colorize_logging = false
+      #
+      def generators
+        @@generators ||= Rails::Configuration::Generators.new
+        if block_given?
+          yield @@generators
+        else
+          @@generators
+        end
+      end
+
+      def after_initialize_blocks
+        @@after_initialize_blocks ||= []
+      end
+
+      def after_initialize(&blk)
+        after_initialize_blocks << blk if blk
+      end
+
+      def to_prepare_blocks
+        @@to_prepare_blocks ||= []
+      end
+
+      def to_prepare(&blk)
+        to_prepare_blocks << blk if blk
+      end
+
+      def respond_to?(name)
+        super || name.to_s =~ config_key_regexp
+      end
+
+      def metal_loader
+        @metal_loader ||= Rails::Application::MetalLoader.new
+      end
+
+      def session_store(*args)
+        if args.empty?
+          case @session_store
+          when :disabled
+            nil
+          when :active_record_store
+            ActiveRecord::SessionStore
+          when Symbol
+            ActionDispatch::Session.const_get(@session_store.to_s.camelize)
+          else
+            @session_store
+          end
+        else
+          @session_store = args.shift
+          @session_options = args.shift || {}
+        end
+      end
+
+    private
+
+      def method_missing(name, *args, &blk)
+        if name.to_s =~ config_key_regexp
+          return $2 == '=' ? options[$1] = args.first : options[$1]
+        end
+        super
+      end
+
+      def session_options
+        return @session_options unless @session_store == :cookie_store
+        @session_options.merge(:secret => @cookie_secret)
+      end
+
+      def config_key_regexp
+        bits = config_keys.map { |n| Regexp.escape(n.to_s) }.join('|')
+        /^(#{bits})(?:=)?$/
+      end
+
+      def config_keys
+        (Railtie.railtie_names + Engine.engine_names).map { |n| n.to_s }.uniq
+      end
+
+      def options
+        @@options ||= Hash.new { |h,k| h[k] = ActiveSupport::OrderedOptions.new }
+      end
+
+      def default_middleware
+        require 'action_dispatch'
+        ActionDispatch::MiddlewareStack.new.tap do |middleware|
+          middleware.use('::ActionDispatch::Static', lambda { Rails.public_path }, :if => lambda { serve_static_assets })
+          middleware.use('::Rack::Lock', :if => lambda { !allow_concurrency })
+          middleware.use('::Rack::Runtime')
+          middleware.use('::Rails::Rack::Logger')
+          middleware.use('::ActionDispatch::ShowExceptions', lambda { consider_all_requests_local })
+          middleware.use("::ActionDispatch::RemoteIp", lambda { action_dispatch.ip_spoofing_check }, lambda { action_dispatch.trusted_proxies })
+          middleware.use('::Rack::Sendfile', lambda { action_dispatch.x_sendfile_header })
+          middleware.use('::ActionDispatch::Callbacks', lambda { !cache_classes })
+          middleware.use('::ActionDispatch::Cookies')
+          middleware.use(lambda { session_store }, lambda { session_options })
+          middleware.use('::ActionDispatch::Flash', :if => lambda { session_store })
+          middleware.use(lambda { metal_loader.build_middleware(metals) }, :if => lambda { metal_loader.metals.any? })
+          middleware.use('ActionDispatch::ParamsParser')
+          middleware.use('::Rack::MethodOverride')
+          middleware.use('::ActionDispatch::Head')
+        end
+      end
     end
   end
 end
\ No newline at end of file
diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index 1f4067d29e..abf9b33ae5 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -11,44 +11,54 @@ namespace :doc do
     rdoc.rdoc_files.include('lib/**/*.rb')
   }
 
-  desc 'Generate documentation for the Rails framework. Specify path with PATH="/path/to/rails"'
-  Rake::RDocTask.new("rails") { |rdoc|
-    path = ENV['RAILS_PATH'] || 'vendor/gems/gems'
-    version = "-#{Rails::VERSION::STRING}" unless ENV['RAILS_PATH']
-    rdoc.rdoc_dir = 'doc/api'
-    rdoc.template = "#{ENV['template']}.rb" if ENV['template']
-    rdoc.title    = "Rails Framework Documentation"
-    rdoc.options << '--line-numbers' << '--inline-source'
-    rdoc.rdoc_files.include('README')
-
-    %w(README CHANGELOG lib/action_mailer/base.rb).each do |file|
-      rdoc.rdoc_files.include("#{path}/actionmailer#{version}/#{file}")
+  desc 'Generate documentation for the Rails framework. Specify path with RAILS_PATH="/path/to/rails"'
+  path = ENV['RAILS_PATH']
+  unless path && File.directory?(path)
+    task :rails do
+      if path
+        $stderr.puts "Skipping doc:rails, missing Rails directory at #{path}"
+      else
+        $stderr.puts "Skipping doc:rails, RAILS_PATH environment variable is not set"
+      end
     end
+  else
+    Rake::RDocTask.new("rails") { |rdoc|
+      version = "-#{Rails::VERSION::STRING}" unless ENV['RAILS_PATH']
+      rdoc.rdoc_dir = 'doc/api'
+      rdoc.template = "#{ENV['template']}.rb" if ENV['template']
+      rdoc.title    = "Rails Framework Documentation"
+      rdoc.options << '--line-numbers' << '--inline-source'
+      rdoc.rdoc_files.include('README')
+
+      %w(README CHANGELOG lib/action_mailer/base.rb).each do |file|
+        rdoc.rdoc_files.include("#{path}/actionmailer#{version}/#{file}")
+      end
 
-    %w(README CHANGELOG lib/action_controller/**/*.rb lib/action_view/**/*.rb).each do |file|
-      rdoc.rdoc_files.include("#{path}/actionpack#{version}/#{file}")
-    end
+      %w(README CHANGELOG lib/action_controller/**/*.rb lib/action_view/**/*.rb).each do |file|
+        rdoc.rdoc_files.include("#{path}/actionpack#{version}/#{file}")
+      end
 
-    %w(README CHANGELOG lib/active_model/**/*.rb).each do |file|
-      rdoc.rdoc_files.include("#{path}/activemodel#{version}/#{file}")
-    end
+      %w(README CHANGELOG lib/active_model/**/*.rb).each do |file|
+        rdoc.rdoc_files.include("#{path}/activemodel#{version}/#{file}")
+      end
 
-    %w(README CHANGELOG lib/active_record/**/*.rb).each do |file|
-      rdoc.rdoc_files.include("#{path}/activerecord#{version}/#{file}")
-    end
+      %w(README CHANGELOG lib/active_record/**/*.rb).each do |file|
+        rdoc.rdoc_files.include("#{path}/activerecord#{version}/#{file}")
+      end
 
-    %w(README CHANGELOG lib/active_resource.rb lib/active_resource/*).each do |file|
-      rdoc.rdoc_files.include("#{path}/activeresource#{version}/#{file}")
-    end
+      %w(README CHANGELOG lib/active_resource.rb lib/active_resource/*).each do |file|
+        rdoc.rdoc_files.include("#{path}/activeresource#{version}/#{file}")
+      end
 
-    %w(README CHANGELOG lib/active_support/**/*.rb).each do |file|
-      rdoc.rdoc_files.include("#{path}/activesupport#{version}/#{file}")
-    end
+      %w(README CHANGELOG lib/active_support/**/*.rb).each do |file|
+        rdoc.rdoc_files.include("#{path}/activesupport#{version}/#{file}")
+      end
 
-    %w(README CHANGELOG MIT-LICENSE lib/{*.rb,commands/*.rb,generators/*.rb}).each do |file|
-      rdoc.rdoc_files.include("#{path}/railties#{version}/#{file}")
-    end
-  }
+      %w(README CHANGELOG MIT-LICENSE lib/{*.rb,commands/*.rb,generators/*.rb}).each do |file|
+        rdoc.rdoc_files.include("#{path}/railties#{version}/#{file}")
+      end
+    }
+  end
 
   plugins = FileList['vendor/plugins/**'].collect { |plugin| File.basename(plugin) }
 
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb
index c6d67bfc19..2ed5353755 100644
--- a/railties/lib/rails/test_help.rb
+++ b/railties/lib/rails/test_help.rb
@@ -1,9 +1,6 @@
 # Make double-sure the RAILS_ENV is set to test,
 # so fixtures are loaded to the right database
-unless Rails.env.test?
-  puts "Abort testing: Your Rails environment is not running in test mode!"
-  exit
-end
+abort("Abort testing: Your Rails environment is not running in test mode!") unless Rails.env.test?
 
 require 'test/unit'
 require 'active_support/core_ext/kernel/requires'
diff --git a/railties/railties.gemspec b/railties/railties.gemspec
index 7b17642667..b9d2739539 100644
--- a/railties/railties.gemspec
+++ b/railties/railties.gemspec
@@ -1,10 +1,9 @@
-$:.unshift "lib"
-require "rails/version"
+version = File.read(File.expand_path("../../RAILS_VERSION", __FILE__)).strip
 
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'railties'
-  s.version     = Rails::VERSION::STRING
+  s.version     = version
   s.summary     = 'Tools for creating, working with, and running Rails applications.'
   s.description = 'Rails internals: application bootup, plugins, generators, and rake tasks.'
   s.required_ruby_version = '>= 1.8.7'
@@ -25,6 +24,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency('rake',          '>= 0.8.3')
   s.add_dependency('thor',          '~> 0.13.4')
-  s.add_dependency('activesupport', "= #{Rails::VERSION::STRING}")
-  s.add_dependency('actionpack',    "= #{Rails::VERSION::STRING}")
+  s.add_dependency('activesupport', version)
+  s.add_dependency('actionpack',    version)
 end
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index acf752a448..54cd751f4e 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -177,7 +177,8 @@ module ApplicationTests
       require "action_controller/railtie"
 
       class MyApp < Rails::Application
-        config.action_controller.session = { :key => "_myapp_session", :secret => "3b7cd727ee24e8444053437c36cc66c4" }
+        config.cookie_secret = "3b7cd727ee24e8444053437c36cc66c4"
+        config.session_store :cookie_store, :key => "_myapp_session"
       end
 
       MyApp.initialize!
@@ -204,7 +205,8 @@ module ApplicationTests
       require "action_controller/railtie"
 
       class MyApp < Rails::Application
-        config.action_controller.session = { :key => "_myapp_session", :secret => "3b7cd727ee24e8444053437c36cc66c4" }
+        config.cookie_secret = "3b7cd727ee24e8444053437c36cc66c4"
+        config.session_store :cookie_store, :key => "_myapp_session"
         config.action_dispatch.x_sendfile_header = 'X-Lighttpd-Send-File'
       end
 
diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb
index 91f31df2e7..8e57022e5b 100644
--- a/railties/test/application/initializers/frameworks_test.rb
+++ b/railties/test/application/initializers/frameworks_test.rb
@@ -65,7 +65,7 @@ module ApplicationTests
     test "database middleware doesn't initialize when session store is not active_record" do
       add_to_config <<-RUBY
         config.root = "#{app_path}"
-        config.action_controller.session_store = :cookie_store
+        config.session_store :cookie_store, { :key => "blahblahblah" }
       RUBY
       require "#{app_path}/config/environment"
 
@@ -73,7 +73,7 @@ module ApplicationTests
     end
 
     test "database middleware initializes when session store is active record" do
-      add_to_config "config.action_controller.session_store = :active_record_store"
+      add_to_config "config.session_store :active_record_store"
 
       require "#{app_path}/config/environment"
 
diff --git a/railties/test/application/metal_test.rb b/railties/test/application/metal_test.rb
index 225bede117..1ec62282c8 100644
--- a/railties/test/application/metal_test.rb
+++ b/railties/test/application/metal_test.rb
@@ -28,7 +28,7 @@ module ApplicationTests
         end
       RUBY
 
-      get "/"
+      get "/not/slash"
       assert_equal 200, last_response.status
       assert_equal "FooMetal", last_response.body
     end
@@ -50,7 +50,7 @@ module ApplicationTests
         end
       RUBY
 
-      get "/"
+      get "/not/slash"
       assert_equal 200, last_response.status
       assert_equal "Metal B", last_response.body
     end
diff --git a/railties/test/application/middleware_stack_defaults_test.rb b/railties/test/application/middleware_stack_defaults_test.rb
new file mode 100644
index 0000000000..284f7e2e5b
--- /dev/null
+++ b/railties/test/application/middleware_stack_defaults_test.rb
@@ -0,0 +1,54 @@
+require 'isolation/abstract_unit'
+
+class MiddlewareStackDefaultsTest < Test::Unit::TestCase
+  include ActiveSupport::Testing::Isolation
+
+  def setup
+    boot_rails
+    require "rails"
+    require "action_controller/railtie"
+
+    Object.const_set(:MyApplication, Class.new(Rails::Application))
+    MyApplication.class_eval do
+      config.cookie_secret = "3b7cd727ee24e8444053437c36cc66c4"
+      config.session_store :cookie_store, :key => "_myapp_session"
+    end
+  end
+
+  def remote_ip(env = {})
+    remote_ip = nil
+    env = Rack::MockRequest.env_for("/").merge(env).merge('action_dispatch.show_exceptions' => false)
+
+    endpoint = Proc.new do |e|
+      remote_ip = ActionDispatch::Request.new(e).remote_ip
+      [200, {}, ["Hello"]]
+    end
+
+    out = MyApplication.middleware.build(endpoint).call(env)
+    remote_ip
+  end
+
+  test "remote_ip works" do
+    assert_equal "1.1.1.1", remote_ip("REMOTE_ADDR" => "1.1.1.1")
+  end
+
+  test "checks IP spoofing by default" do
+    assert_raises(ActionDispatch::RemoteIp::IpSpoofAttackError) do
+      remote_ip("HTTP_X_FORWARDED_FOR" => "1.1.1.1", "HTTP_CLIENT_IP" => "1.1.1.2")
+    end
+  end
+
+  test "can disable IP spoofing check" do
+    MyApplication.config.action_dispatch.ip_spoofing_check = false
+
+    assert_nothing_raised(ActionDispatch::RemoteIp::IpSpoofAttackError) do
+      assert_equal "1.1.1.2", remote_ip("HTTP_X_FORWARDED_FOR" => "1.1.1.1", "HTTP_CLIENT_IP" => "1.1.1.2")
+    end
+  end
+
+  test "the user can set trusted proxies" do
+    MyApplication.config.action_dispatch.trusted_proxies = /^4\.2\.42\.42$/
+
+    assert_equal "1.1.1.1", remote_ip("REMOTE_ADDR" => "4.2.42.42,1.1.1.1")
+  end
+end
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 5e869bff1e..9a359d20b1 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -19,6 +19,7 @@ module ApplicationTests
         "Rack::Runtime",
         "Rails::Rack::Logger",
         "ActionDispatch::ShowExceptions",
+        "ActionDispatch::RemoteIp",
         "Rack::Sendfile",
         "ActionDispatch::Callbacks",
         "ActionDispatch::Cookies",
diff --git a/railties/test/application/paths_test.rb b/railties/test/application/paths_test.rb
index ac0aa27c64..511b8b629a 100644
--- a/railties/test/application/paths_test.rb
+++ b/railties/test/application/paths_test.rb
@@ -11,8 +11,8 @@ module ApplicationTests
       app_file "config/environments/development.rb", ""
       add_to_config <<-RUBY
         config.root = "#{app_path}"
-        config.after_initialize do
-          ActionController::Base.session_store = nil
+        config.after_initialize do |app|
+          app.config.session_store nil
         end
       RUBY
       use_frameworks [:action_controller, :action_view, :action_mailer, :active_record]
@@ -56,9 +56,10 @@ module ApplicationTests
     end
 
     test "booting up Rails yields a list of paths that are eager" do
-      assert @paths.app.eager_load?
-      assert @paths.app.controllers.eager_load?
-      assert @paths.app.helpers.eager_load?
+      eager_load = @paths.eager_load
+      assert eager_load.include?(root("app/controllers"))
+      assert eager_load.include?(root("app/helpers"))
+      assert eager_load.include?(root("app/models"))
     end
 
     test "environments has a glob equal to the current environment" do
diff --git a/railties/test/application/url_generation_test.rb b/railties/test/application/url_generation_test.rb
index a0d9ff7a3a..04f5454e09 100644
--- a/railties/test/application/url_generation_test.rb
+++ b/railties/test/application/url_generation_test.rb
@@ -14,7 +14,8 @@ module ApplicationTests
       require "action_controller/railtie"
 
       class MyApp < Rails::Application
-        config.action_controller.session = { :key => "_myapp_session", :secret => "3b7cd727ee24e8444053437c36cc66c4" }
+        config.cookie_secret = "3b7cd727ee24e8444053437c36cc66c4"
+        config.session_store :cookie_store, :key => "_myapp_session"
       end
 
       MyApp.initialize!
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index 364dbd8e55..8f2f15b49e 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -100,7 +100,7 @@ module TestHelpers
         end
       end
 
-      add_to_config 'config.action_controller.session = { :key => "_myapp_session", :secret => "bac838a849c1d5c4de2e6a50af826079" }'
+      add_to_config 'config.cookie_secret = "3b7cd727ee24e8444053437c36cc66c4"; config.session_store :cookie_store, :key => "_myapp_session"'
     end
 
     class Bukkit
diff --git a/railties/test/railties/shared_tests.rb b/railties/test/railties/shared_tests.rb
index 151abe21f8..83d25be5db 100644
--- a/railties/test/railties/shared_tests.rb
+++ b/railties/test/railties/shared_tests.rb
@@ -254,7 +254,7 @@ YAML
       require 'rack/test'
       extend Rack::Test::Methods
 
-      get "/"
+      get "/not/slash"
       assert_equal 200, last_response.status
       assert_equal "FooMetal", last_response.body
     end
@@ -263,13 +263,15 @@ YAML
       @plugin.write "config/routes.rb", <<-RUBY
         Rails.application.routes.draw do
           namespace :admin do
-            match "index", :to => "admin/foo#index"
+            namespace :foo do
+              match "bar", :to => "admin/foo/bar#index"
+            end
           end
         end
       RUBY
 
-      @plugin.write "app/controllers/admin/foo_controller.rb", <<-RUBY
-        class Admin::FooController < ApplicationController
+      @plugin.write "app/controllers/admin/foo/bar_controller.rb", <<-RUBY
+        class Admin::Foo::BarController < ApplicationController
           def index
             render :text => "Rendered from namespace"
           end
@@ -280,7 +282,7 @@ YAML
       require 'rack/test'
       extend Rack::Test::Methods
 
-      get "/admin/index"
+      get "/admin/foo/bar"
       assert_equal 200, last_response.status
       assert_equal "Rendered from namespace", last_response.body
     end