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

120 files changed, 3270 insertions, 1254 deletions

diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile
index 5475ffa493..ebcca0d246 100644
--- a/actionmailer/Rakefile
+++ b/actionmailer/Rakefile
@@ -60,7 +60,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "actionmailer"
   s.homepage = "http://www.rubyonrails.org"
 
-  s.add_dependency('actionpack', '= 2.3.2' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 3.0.pre' + PKG_BUILD)
 
   s.has_rdoc = true
   s.requirements << 'none'
diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb
index 08ff0d2ffb..0f2b58552b 100644
--- a/actionmailer/lib/action_mailer/version.rb
+++ b/actionmailer/lib/action_mailer/version.rb
@@ -1,8 +1,8 @@
 module ActionMailer
   module VERSION #:nodoc:
-    MAJOR = 2
-    MINOR = 3
-    TINY  = 2
+    MAJOR = 3
+    MINOR = 0
+    TINY  = "pre"
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb
index 51b375fef3..3d4d0fb995 100644
--- a/actionmailer/test/abstract_unit.rb
+++ b/actionmailer/test/abstract_unit.rb
@@ -1,9 +1,6 @@
 require 'rubygems'
 require 'test/unit'
 
-gem 'mocha', '>= 0.9.5'
-require 'mocha'
-
 $:.unshift "#{File.dirname(__FILE__)}/../lib"
 $:.unshift "#{File.dirname(__FILE__)}/../../activesupport/lib"
 $:.unshift "#{File.dirname(__FILE__)}/../../actionpack/lib"
diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 142c72ce6b..1fc5018561 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -115,7 +115,7 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.requirements << 'none'
 
-  s.add_dependency('activesupport', '= 2.3.2' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 3.0.pre' + PKG_BUILD)
 
   s.require_path = 'lib'
   s.autorequire = 'action_controller'
diff --git a/actionpack/lib/action_controller/base/filter_parameter_logging.rb b/actionpack/lib/action_controller/base/filter_parameter_logging.rb
index 26cd03f277..065e62a37f 100644
--- a/actionpack/lib/action_controller/base/filter_parameter_logging.rb
+++ b/actionpack/lib/action_controller/base/filter_parameter_logging.rb
@@ -43,6 +43,10 @@ module ActionController
               filtered_parameters[key] = '[FILTERED]'
             elsif value.is_a?(Hash)
               filtered_parameters[key] = filter_parameters(value)
+            elsif value.is_a?(Array)
+              filtered_parameters[key] = value.collect do |item|
+                filter_parameters(item)
+              end
             elsif block_given?
               key = key.dup
               value = value.dup if value
diff --git a/actionpack/lib/action_controller/base/http.rb b/actionpack/lib/action_controller/base/http.rb
index 2e73561f93..ec78bc15a8 100644
--- a/actionpack/lib/action_controller/base/http.rb
+++ b/actionpack/lib/action_controller/base/http.rb
@@ -36,7 +36,7 @@ module ActionController
     # ==== Returns
     # String
     def self.controller_path
-      @controller_path ||= self.name.sub(/Controller$/, '').underscore
+      @controller_path ||= name && name.sub(/Controller$/, '').underscore
     end
 
     # Delegates to the class' #controller_path
diff --git a/actionpack/lib/action_controller/base/streaming.rb b/actionpack/lib/action_controller/base/streaming.rb
index 70a97ccfec..9ff4f25f43 100644
--- a/actionpack/lib/action_controller/base/streaming.rb
+++ b/actionpack/lib/action_controller/base/streaming.rb
@@ -168,7 +168,7 @@ module ActionController #:nodoc:
         end
 
         headers.merge!(
-          'Content-Length'            => options[:length],
+          'Content-Length'            => options[:length].to_s,
           'Content-Disposition'       => disposition,
           'Content-Transfer-Encoding' => 'binary'
         )
diff --git a/actionpack/lib/action_controller/routing/generation/polymorphic_routes.rb b/actionpack/lib/action_controller/routing/generation/polymorphic_routes.rb
index d9b614c237..c6f7de17bd 100644
--- a/actionpack/lib/action_controller/routing/generation/polymorphic_routes.rb
+++ b/actionpack/lib/action_controller/routing/generation/polymorphic_routes.rb
@@ -112,8 +112,7 @@ module ActionController
     # Returns the path component of a URL for the given record. It uses
     # <tt>polymorphic_url</tt> with <tt>:routing_type => :path</tt>.
     def polymorphic_path(record_or_hash_or_array, options = {})
-      options[:routing_type] = :path
-      polymorphic_url(record_or_hash_or_array, options)
+      polymorphic_url(record_or_hash_or_array, options.merge(:routing_type => :path))
     end
 
     %w(edit new).each do |action|
diff --git a/actionpack/lib/action_controller/routing/route_set.rb b/actionpack/lib/action_controller/routing/route_set.rb
index 45ad8a3a3b..87b4b0571c 100644
--- a/actionpack/lib/action_controller/routing/route_set.rb
+++ b/actionpack/lib/action_controller/routing/route_set.rb
@@ -436,7 +436,7 @@ module ActionController
       def recognize(request)
         params = recognize_path(request.path, extract_request_environment(request))
         request.path_parameters = params.with_indifferent_access
-        "#{params[:controller].camelize}Controller".constantize
+        "#{params[:controller].to_s.camelize}Controller".constantize
       end
 
       def recognize_path(path, environment={})
diff --git a/actionpack/lib/action_controller/testing/performance.rb b/actionpack/lib/action_controller/testing/performance_test.rb
index d88180087d..d88180087d 100644
--- a/actionpack/lib/action_controller/testing/performance.rb
+++ b/actionpack/lib/action_controller/testing/performance_test.rb
diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb
index dda6604bdd..27f27e27fe 100644
--- a/actionpack/lib/action_dispatch/http/mime_type.rb
+++ b/actionpack/lib/action_dispatch/http/mime_type.rb
@@ -10,7 +10,7 @@ module Mime
     %w(<< concat shift unshift push pop []= clear compact! collect!
     delete delete_at delete_if flatten! map! insert reject! reverse!
     replace slice! sort! uniq!).each do |method|
-      define_method(method) { @symbols = nil; super }
+      define_method(method) {|*args| @symbols = nil; super(*args) }
     end
   end
 
diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
index e0aa2a5f2f..ed0cdf38ee 100644
--- a/actionpack/lib/action_pack/version.rb
+++ b/actionpack/lib/action_pack/version.rb
@@ -1,8 +1,8 @@
 module ActionPack #:nodoc:
   module VERSION #:nodoc:
-    MAJOR = 2
-    MINOR = 3
-    TINY  = 2
+    MAJOR = 3
+    MINOR = 0
+    TINY  = "pre"
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index b994c7b141..45184f58fb 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -230,7 +230,7 @@ module ActionView #:nodoc:
 
     def initialize(view_paths = [], assigns_for_first_render = {}, controller = nil, formats = nil)#:nodoc:
       @formats = formats || [:html]
-      @assigns = assigns_for_first_render
+      @assigns = assigns_for_first_render.each { |key, value| instance_variable_set("@#{key}", value) }
       @controller = controller
       @helpers = ProxyModule.new(self)
       @_content_for = Hash.new {|h,k| h[k] = "" }
@@ -245,6 +245,7 @@ module ActionView #:nodoc:
     end
 
     def with_template(current_template)
+      _evaluate_assigns_and_ivars
       last_template, self.template = template, current_template
       last_formats, self.formats = formats, [current_template.mime_type.to_sym] + Mime::SET.symbols
       yield
@@ -260,10 +261,7 @@ module ActionView #:nodoc:
 
     # Evaluates the local assigns and controller ivars, pushes them to the view.
     def _evaluate_assigns_and_ivars #:nodoc:
-      return if @assigns_added
-      @assigns.each { |key, value| instance_variable_set("@#{key}", value) }
-      _copy_ivars_from_controller
-      @assigns_added = true
+      @assigns_added ||= _copy_ivars_from_controller
     end
 
   private
@@ -274,6 +272,7 @@ module ActionView #:nodoc:
         variables -= @controller.protected_instance_variables if @controller.respond_to?(:protected_instance_variables)
         variables.each { |name| instance_variable_set(name, @controller.instance_variable_get(name)) }
       end
+      true
     end
 
   end
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index babb9db38a..14cdc7a025 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -1,6 +1,7 @@
 require 'cgi'
 require 'action_view/helpers/url_helper'
 require 'action_view/helpers/tag_helper'
+require 'active_support/core_ext/file'
 
 module ActionView
   module Helpers #:nodoc:
@@ -285,7 +286,7 @@ module ActionView
           end
           javascript_src_tag(joined_javascript_name, options)
         else
-          expand_javascript_sources(sources, recursive).collect { |source| javascript_src_tag(source, options) }.join("\n")
+          ensure_javascript_sources!(expand_javascript_sources(sources, recursive)).collect { |source| javascript_src_tag(source, options) }.join("\n")
         end
       end
 
@@ -434,7 +435,7 @@ module ActionView
           end
           stylesheet_tag(joined_stylesheet_name, options)
         else
-          expand_stylesheet_sources(sources, recursive).collect { |source| stylesheet_tag(source, options) }.join("\n")
+          ensure_stylesheet_sources!(expand_stylesheet_sources(sources, recursive)).collect { |source| stylesheet_tag(source, options) }.join("\n")
         end
       end
 
@@ -664,13 +665,28 @@ module ActionView
           end
         end
 
+        def ensure_stylesheet_sources!(sources)
+          sources.each do |source|
+            asset_file_path!(path_to_stylesheet(source))
+          end
+          return sources
+        end
+
+        def ensure_javascript_sources!(sources)
+          sources.each do |source|
+            asset_file_path!(path_to_javascript(source))
+          end
+          return sources
+        end
+
         def join_asset_file_contents(paths)
-          paths.collect { |path| File.read(asset_file_path(path)) }.join("\n\n")
+          paths.collect { |path| File.read(asset_file_path!(path)) }.join("\n\n")
         end
 
         def write_asset_file_contents(joined_asset_path, asset_paths)
+
           FileUtils.mkdir_p(File.dirname(joined_asset_path))
-          File.open(joined_asset_path, "w+") { |cache| cache.write(join_asset_file_contents(asset_paths)) }
+          File.atomic_write(joined_asset_path) { |cache| cache.write(join_asset_file_contents(asset_paths)) }
 
           # Set mtime to the latest of the combined files to allow for
           # consistent ETag without a shared filesystem.
@@ -682,6 +698,14 @@ module ActionView
           File.join(ASSETS_DIR, path.split('?').first)
         end
 
+        def asset_file_path!(path)
+          unless path =~ %r{^[-a-z]+://}
+            absolute_path = asset_file_path(path)
+            raise(Errno::ENOENT, "Asset file not found at '#{absolute_path}'" ) unless File.exist?(absolute_path)
+            return absolute_path
+          end
+        end
+
         def collect_asset_files(*path)
           dir = path.first
 
diff --git a/actionpack/lib/action_view/helpers/capture_helper.rb b/actionpack/lib/action_view/helpers/capture_helper.rb
index a8b5a9dbb9..c90acc5ac2 100644
--- a/actionpack/lib/action_view/helpers/capture_helper.rb
+++ b/actionpack/lib/action_view/helpers/capture_helper.rb
@@ -117,6 +117,28 @@ module ActionView
         @_content_for[name]
       end
 
+      # content_for? simply checks whether any content has been captured yet using content_for
+      # Useful to render parts of your layout differently based on what is in your views.
+      # 
+      # ==== Examples
+      #
+      # Perhaps you will use different css in you layout if no content_for :right_column
+      #
+      #   <%# This is the layout %>
+      #   <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+      #   <head>
+      #	    <title>My Website</title>
+      #	    <%= yield :script %>
+      #   </head>
+      #   <body class="<%= content_for?(:right_col) ? 'one-column' : 'two-column' %>">
+      #     <%= yield %>
+      #     <%= yield :right_col %>
+      #   </body>
+      #   </html>
+      def content_for?(name)
+        @_content_for[name].present?
+      end
+
       # Use an alternate output buffer for the duration of the block.
       # Defaults to a new empty string.
       def with_output_buffer(buf = nil) #:nodoc:
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index 8ab78e7bc6..ca6ba501e2 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -231,6 +231,8 @@ module ActionView
       # * <tt>:rows</tt> - Specify the number of rows in the textarea
       # * <tt>:cols</tt> - Specify the number of columns in the textarea
       # * <tt>:disabled</tt> - If set to true, the user will not be able to use this input.
+      # * <tt>:escape</tt> - By default, the contents of the text input are HTML escaped.
+      #   If you need unescaped contents, set this to false.
       # * Any other key creates standard HTML attributes for the tag.
       #
       # ==== Examples
@@ -258,6 +260,9 @@ module ActionView
           options["cols"], options["rows"] = size.split("x") if size.respond_to?(:split)
         end
 
+        escape = options.key?("escape") ? options.delete("escape") : true
+        content = html_escape(content) if escape
+
         content_tag :textarea, content, { "name" => name, "id" => sanitize_to_id(name) }.update(options.stringify_keys)
       end
 
diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index 87314fff67..a80ffe3c20 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -232,18 +232,6 @@ module ActionView
       ensure
         @_proc_for_layout = nil
       end
-      
-      def _deprecated_ivar_assign(template)
-        if respond_to?(:controller)
-          ivar = :"@#{template.variable_name}"
-          object =
-            if controller.instance_variable_defined?(ivar)
-              ActiveSupport::Deprecation::DeprecatedObjectProxy.new(
-                controller.instance_variable_get(ivar),
-                "#{ivar} will no longer be implicitly assigned to #{template.variable_name}")
-            end
-        end
-      end
 
       def _render_partial_with_layout(layout, options)
         if layout
@@ -253,18 +241,6 @@ module ActionView
         content = _render_partial(options)
         return _render_content_with_layout(content, layout, options[:locals])
       end
-    
-      def _deprecated_ivar_assign(template)
-        if respond_to?(:controller)
-          ivar = :"@#{template.variable_name}"
-          object =
-            if controller.instance_variable_defined?(ivar)
-              ActiveSupport::Deprecation::DeprecatedObjectProxy.new(
-                controller.instance_variable_get(ivar),
-                "#{ivar} will no longer be implicitly assigned to #{template.variable_name}")
-            end
-        end
-      end
 
       def _array_like_objects
         array_like = [Array]
@@ -290,8 +266,6 @@ module ActionView
       end
 
       def _set_locals(object, locals, template, options)
-        object ||= _deprecated_ivar_assign(template)
-        
         locals[:object] = locals[template.variable_name] = object
         locals[options[:as]] = object if options[:as]
       end
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index 588a64a652..162e38c484 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -84,7 +84,7 @@ module ActionView
     # ==== Example
     #
     #   # The template
-    #   <% render :layout => "my_layout" do |name| %>Hello <%= customer.name %><% end %>
+    #   <% render :layout => "my_layout" do |customer| %>Hello <%= customer.name %><% end %>
     #
     #   # The layout
     #   <html><% yield Struct.new(:name).new("David") %></html>
@@ -99,14 +99,12 @@ module ActionView
 
     def _render_template(template, local_assigns = {})
       with_template(template) do
-        _evaluate_assigns_and_ivars
-
         template.render(self, local_assigns) do |*names|
           capture(*names, &layout_proc(names.first))
         end
       end
     rescue Exception => e
-      if TemplateError === e
+      if e.is_a?(TemplateError)
         e.sub_template_of(template)
         raise e
       else
diff --git a/actionpack/lib/action_view/template/handlers/builder.rb b/actionpack/lib/action_view/template/handlers/builder.rb
index abe140af0b..5f381f7bf0 100644
--- a/actionpack/lib/action_view/template/handlers/builder.rb
+++ b/actionpack/lib/action_view/template/handlers/builder.rb
@@ -1,5 +1,3 @@
-require 'builder'
-
 module ActionView
   module TemplateHandlers
     class Builder < TemplateHandler
@@ -8,6 +6,7 @@ module ActionView
       self.default_format = Mime::XML
 
       def compile(template)
+        require 'builder'
         "xml = ::Builder::XmlMarkup.new(:indent => 2);" +
           "self.output_buffer = xml.target!;" +
           template.source +
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index 21272ef089..e3a7d96941 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -1,4 +1,3 @@
-require 'erb'
 require 'active_support/core_ext/class/attribute_accessors'
 
 module ActionView
@@ -16,6 +15,8 @@ module ActionView
       self.default_format = Mime::HTML
 
       def compile(template)
+        require 'erb'
+
         magic = $1 if template.source =~ /\A(<%#.*coding:\s*(\S+)\s*-?%>)/
         erb = "#{magic}<% __in_erb_template=true %>#{template.source}"
         ::ERB.new(erb, nil, erb_trim_mode, '@output_buffer').src
diff --git a/actionpack/test/activerecord/polymorphic_routes_test.rb b/actionpack/test/activerecord/polymorphic_routes_test.rb
index b9f5be2361..2036d1eeb5 100644
--- a/actionpack/test/activerecord/polymorphic_routes_test.rb
+++ b/actionpack/test/activerecord/polymorphic_routes_test.rb
@@ -234,10 +234,13 @@ class PolymorphicRoutesTest < ActionController::TestCase
     with_admin_test_routes do
       @project.save
       @task.save
+
+      options = {}
       object_array = [:admin, @project, @task]
-      assert_no_difference 'object_array.size' do
-        polymorphic_url(object_array)
-      end
+      original_args = [object_array.dup, options.dup]
+
+      assert_no_difference('object_array.size') { polymorphic_path(object_array, options) }
+      assert_equal original_args, [object_array, options]
     end
   end
   
diff --git a/actionpack/test/controller/filter_params_test.rb b/actionpack/test/controller/filter_params_test.rb
index 8c9e4f81de..f7864745eb 100644
--- a/actionpack/test/controller/filter_params_test.rb
+++ b/actionpack/test/controller/filter_params_test.rb
@@ -40,7 +40,8 @@ class FilterParamTest < ActionController::TestCase
     [{'foo'=>'bar', 'bar'=>'foo'},{'foo'=>'[FILTERED]', 'bar'=>'foo'},%w'foo baz'],
     [{'foo'=>'bar', 'baz'=>'foo'},{'foo'=>'[FILTERED]', 'baz'=>'[FILTERED]'},%w'foo baz'],
     [{'bar'=>{'foo'=>'bar','bar'=>'foo'}},{'bar'=>{'foo'=>'[FILTERED]','bar'=>'foo'}},%w'fo'],
-    [{'foo'=>{'foo'=>'bar','bar'=>'foo'}},{'foo'=>'[FILTERED]'},%w'f banana']]
+    [{'foo'=>{'foo'=>'bar','bar'=>'foo'}},{'foo'=>'[FILTERED]'},%w'f banana'],
+    [{'baz'=>[{'foo'=>'baz'}]}, {'baz'=>[{'foo'=>'[FILTERED]'}]}, %w(foo)]]
 
     test_hashes.each do |before_filter, after_filter, filter_words|
       FilterParamController.filter_parameter_logging(*filter_words)
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 9934639d21..acb0c895e0 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -1268,13 +1268,6 @@ class RenderTest < ActionController::TestCase
     assert_equal "Hola: PratikHola: Amy", @response.body
   end
 
-  def test_partial_with_implicit_local_assignment
-    assert_deprecated do
-      get :partial_with_implicit_local_assignment
-      assert_equal "Hello: Marcel", @response.body
-    end
-  end
-
   def test_render_missing_partial_template
     assert_raise(ActionView::MissingTemplate) do
       get :missing_partial
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index c2acc03a1b..16d7df4843 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -1667,6 +1667,17 @@ class RouteSetTest < Test::Unit::TestCase
     assert_equal 1, set.routes.size
   end
 
+  def test_draw_symbol_controller_name
+    assert_equal 0, set.routes.size
+    set.draw do |map|
+      map.connect '/users/index', :controller => :users, :action => :index
+    end
+    @request = ActionController::TestRequest.new
+    @request.request_uri = '/users/index'
+    assert_nothing_raised { set.recognize(@request) }
+    assert_equal 1, set.routes.size
+  end
+
   def test_named_draw
     assert_equal 0, set.routes.size
     set.draw do |map|
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index d88d5c5dac..ae32ee5649 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -115,7 +115,7 @@ class SendFileTest < ActionController::TestCase
     @controller.send(:send_file_headers!, options)
 
     h = @controller.headers
-    assert_equal 1, h['Content-Length']
+    assert_equal '1', h['Content-Length']
     assert_equal 'image/png', @controller.content_type
     assert_equal 'disposition; filename="filename"', h['Content-Disposition']
     assert_equal 'binary', h['Content-Transfer-Encoding']
diff --git a/actionpack/test/fixtures/public/.gitignore b/actionpack/test/fixtures/public/.gitignore
new file mode 100644
index 0000000000..0c6759baec
--- /dev/null
+++ b/actionpack/test/fixtures/public/.gitignore
@@ -0,0 +1 @@
+absolute
\ No newline at end of file
diff --git a/actionpack/test/fixtures/public/elsewhere/cools.js b/actionpack/test/fixtures/public/elsewhere/cools.js
new file mode 100644
index 0000000000..6e12fe29c4
--- /dev/null
+++ b/actionpack/test/fixtures/public/elsewhere/cools.js
@@ -0,0 +1 @@
+// cools.js
\ No newline at end of file
diff --git a/actionpack/test/fixtures/public/elsewhere/file.css b/actionpack/test/fixtures/public/elsewhere/file.css
new file mode 100644
index 0000000000..6aea0733b1
--- /dev/null
+++ b/actionpack/test/fixtures/public/elsewhere/file.css
@@ -0,0 +1 @@
+/*file.css*/
\ No newline at end of file
diff --git a/actionpack/test/fixtures/public/javascripts/common.javascript b/actionpack/test/fixtures/public/javascripts/common.javascript
new file mode 100644
index 0000000000..2ae1929056
--- /dev/null
+++ b/actionpack/test/fixtures/public/javascripts/common.javascript
@@ -0,0 +1 @@
+// common.javascript
\ No newline at end of file
diff --git a/actionpack/test/fixtures/public/stylesheets/random.styles b/actionpack/test/fixtures/public/stylesheets/random.styles
new file mode 100644
index 0000000000..d4eeead95c
--- /dev/null
+++ b/actionpack/test/fixtures/public/stylesheets/random.styles
@@ -0,0 +1 @@
+/* random.styles */
\ No newline at end of file
diff --git a/actionpack/test/lib/fixture_template.rb b/actionpack/test/lib/fixture_template.rb
index 5cf414a1c6..ee526b5de5 100644
--- a/actionpack/test/lib/fixture_template.rb
+++ b/actionpack/test/lib/fixture_template.rb
@@ -12,7 +12,7 @@ module ActionView #:nodoc:
           @hash.select { |k,v| k =~ regexp }.each do |path, source|
             templates << Template.new(source, path, *path_to_details(path))
           end
-          templates
+          templates.sort_by {|t| -t.details.values.compact.size }
         end
       end
     end
@@ -44,7 +44,7 @@ module ActionView #:nodoc:
           k == :formats ? formats_regexp : ''
         end
       end
-      
+
       %r'^#{Regexp.escape(path)}#{extensions}#{handler_regexp}$'
     end
     
@@ -52,7 +52,7 @@ module ActionView #:nodoc:
     # :api: plugin
     def path_to_details(path)
       # [:erb, :format => :html, :locale => :en, :partial => true/false]
-      if m = path.match(%r'(_)?[\w-]+(\.[\w-]+)*\.(\w+)$')
+      if m = path.match(%r'(_)?[\w-]+((?:\.[\w-]+)*)\.(\w+)$')
         partial = m[1] == '_'
         details = (m[2]||"").split('.').reject { |e| e.empty? }
         handler = Template.handler_class_for_extension(m[3])
diff --git a/actionpack/test/old_base/abstract_unit.rb b/actionpack/test/old_base/abstract_unit.rb
index c71da7fa6c..3301041a41 100644
--- a/actionpack/test/old_base/abstract_unit.rb
+++ b/actionpack/test/old_base/abstract_unit.rb
@@ -12,9 +12,6 @@ require 'yaml'
 require 'stringio'
 require 'test/unit'
 
-gem 'mocha', '>= 0.9.5'
-require 'mocha'
-
 begin
   require 'ruby-debug'
   Debugger.settings[:autoeval] = true
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index f1dad9f50e..65289a59bc 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -75,22 +75,22 @@ class AssetTagHelperTest < ActionView::TestCase
   }
 
   JavascriptIncludeToTag = {
-    %(javascript_include_tag("xmlhr")) => %(<script src="/javascripts/xmlhr.js" type="text/javascript"></script>),
-    %(javascript_include_tag("xmlhr.js")) => %(<script src="/javascripts/xmlhr.js" type="text/javascript"></script>),
-    %(javascript_include_tag("xmlhr", :lang => "vbscript")) => %(<script lang="vbscript" src="/javascripts/xmlhr.js" type="text/javascript"></script>),
+    %(javascript_include_tag("bank")) => %(<script src="/javascripts/bank.js" type="text/javascript"></script>),
+    %(javascript_include_tag("bank.js")) => %(<script src="/javascripts/bank.js" type="text/javascript"></script>),
+    %(javascript_include_tag("bank", :lang => "vbscript")) => %(<script lang="vbscript" src="/javascripts/bank.js" type="text/javascript"></script>),
     %(javascript_include_tag("common.javascript", "/elsewhere/cools")) => %(<script src="/javascripts/common.javascript" type="text/javascript"></script>\n<script src="/elsewhere/cools.js" type="text/javascript"></script>),
     %(javascript_include_tag(:defaults)) => %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>),
     %(javascript_include_tag(:all)) => %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>\n<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/robber.js" type="text/javascript"></script>\n<script src="/javascripts/version.1.0.js" type="text/javascript"></script>),
     %(javascript_include_tag(:all, :recursive => true)) => %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>\n<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/robber.js" type="text/javascript"></script>\n<script src="/javascripts/subdir/subdir.js" type="text/javascript"></script>\n<script src="/javascripts/version.1.0.js" type="text/javascript"></script>),
-    %(javascript_include_tag(:defaults, "test")) => %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/test.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>),
-    %(javascript_include_tag("test", :defaults)) => %(<script src="/javascripts/test.js" type="text/javascript"></script>\n<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>)
+    %(javascript_include_tag(:defaults, "bank")) => %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>),
+    %(javascript_include_tag("bank", :defaults)) => %(<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>)
   }
 
   StylePathToTag = {
-    %(stylesheet_path("style")) => %(/stylesheets/style.css),
-    %(stylesheet_path("style.css")) => %(/stylesheets/style.css),
-    %(stylesheet_path('dir/file')) => %(/stylesheets/dir/file.css),
-    %(stylesheet_path('/dir/file.rcss')) => %(/dir/file.rcss)
+    %(stylesheet_path("bank")) => %(/stylesheets/bank.css),
+    %(stylesheet_path("bank.css")) => %(/stylesheets/bank.css),
+    %(stylesheet_path('subdir/subdir')) => %(/stylesheets/subdir/subdir.css),
+    %(stylesheet_path('/subdir/subdir.css')) => %(/subdir/subdir.css)
   }
 
   PathToStyleToTag = {
@@ -101,15 +101,16 @@ class AssetTagHelperTest < ActionView::TestCase
   }
 
   StyleLinkToTag = {
-    %(stylesheet_link_tag("style")) => %(<link href="/stylesheets/style.css" media="screen" rel="stylesheet" type="text/css" />),
-    %(stylesheet_link_tag("style.css")) => %(<link href="/stylesheets/style.css" media="screen" rel="stylesheet" type="text/css" />),
-    %(stylesheet_link_tag("/dir/file")) => %(<link href="/dir/file.css" media="screen" rel="stylesheet" type="text/css" />),
-    %(stylesheet_link_tag("dir/file")) => %(<link href="/stylesheets/dir/file.css" media="screen" rel="stylesheet" type="text/css" />),
-    %(stylesheet_link_tag("style", :media => "all")) => %(<link href="/stylesheets/style.css" media="all" rel="stylesheet" type="text/css" />),
+    %(stylesheet_link_tag("bank")) => %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" type="text/css" />),
+    %(stylesheet_link_tag("bank.css")) => %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" type="text/css" />),
+    %(stylesheet_link_tag("/elsewhere/file")) => %(<link href="/elsewhere/file.css" media="screen" rel="stylesheet" type="text/css" />),
+    %(stylesheet_link_tag("subdir/subdir")) => %(<link href="/stylesheets/subdir/subdir.css" media="screen" rel="stylesheet" type="text/css" />),
+    %(stylesheet_link_tag("bank", :media => "all")) => %(<link href="/stylesheets/bank.css" media="all" rel="stylesheet" type="text/css" />),
     %(stylesheet_link_tag(:all)) => %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/robber.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/version.1.0.css" media="screen" rel="stylesheet" type="text/css" />),
     %(stylesheet_link_tag(:all, :recursive => true)) => %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/robber.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/subdir/subdir.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/version.1.0.css" media="screen" rel="stylesheet" type="text/css" />),
     %(stylesheet_link_tag(:all, :media => "all")) => %(<link href="/stylesheets/bank.css" media="all" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/robber.css" media="all" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/version.1.0.css" media="all" rel="stylesheet" type="text/css" />),
-    %(stylesheet_link_tag("random.styles", "/css/stylish")) => %(<link href="/stylesheets/random.styles" media="screen" rel="stylesheet" type="text/css" />\n<link href="/css/stylish.css" media="screen" rel="stylesheet" type="text/css" />),
+    %(stylesheet_link_tag("random.styles", "/elsewhere/file")) => %(<link href="/stylesheets/random.styles" media="screen" rel="stylesheet" type="text/css" />\n<link href="/elsewhere/file.css" media="screen" rel="stylesheet" type="text/css" />),
+
     %(stylesheet_link_tag("http://www.example.com/styles/style")) => %(<link href="http://www.example.com/styles/style.css" media="screen" rel="stylesheet" type="text/css" />)
   }
 
@@ -160,6 +161,20 @@ class AssetTagHelperTest < ActionView::TestCase
     JavascriptIncludeToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
 
+  def test_javascript_include_tag_with_missing_source
+    assert_raise(Errno::ENOENT) {
+      javascript_include_tag('missing_security_guard')
+    }
+
+    assert_raise(Errno::ENOENT) {
+      javascript_include_tag(:defaults, 'missing_security_guard')
+    }
+
+    assert_nothing_raised {
+      javascript_include_tag('http://example.com/css/missing_security_guard')
+    }
+  end
+
   def test_javascript_include_tag_with_given_asset_id
     ENV["RAILS_ASSET_ID"] = "1"
     assert_dom_equal(%(<script src="/javascripts/prototype.js?1" type="text/javascript"></script>\n<script src="/javascripts/effects.js?1" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js?1" type="text/javascript"></script>\n<script src="/javascripts/controls.js?1" type="text/javascript"></script>\n<script src="/javascripts/application.js?1" type="text/javascript"></script>), javascript_include_tag(:defaults))
@@ -167,26 +182,27 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_register_javascript_include_default
     ENV["RAILS_ASSET_ID"] = ""
-    ActionView::Helpers::AssetTagHelper::register_javascript_include_default 'slider'
-    assert_dom_equal  %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/slider.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>), javascript_include_tag(:defaults)
+    ActionView::Helpers::AssetTagHelper::register_javascript_include_default 'bank'
+    assert_dom_equal  %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>), javascript_include_tag(:defaults)
   end
 
   def test_register_javascript_include_default_mixed_defaults
     ENV["RAILS_ASSET_ID"] = ""
-    ActionView::Helpers::AssetTagHelper::register_javascript_include_default 'slider'
-    ActionView::Helpers::AssetTagHelper::register_javascript_include_default 'lib1', '/elsewhere/blub/lib2'
-    assert_dom_equal  %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/slider.js" type="text/javascript"></script>\n<script src="/javascripts/lib1.js" type="text/javascript"></script>\n<script src="/elsewhere/blub/lib2.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>), javascript_include_tag(:defaults)
+    ActionView::Helpers::AssetTagHelper::register_javascript_include_default 'bank'
+    ActionView::Helpers::AssetTagHelper::register_javascript_include_default 'robber', '/elsewhere/cools.js'
+    assert_dom_equal  %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/robber.js" type="text/javascript"></script>\n<script src="/elsewhere/cools.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>), javascript_include_tag(:defaults)
   end
 
   def test_custom_javascript_expansions
-    ActionView::Helpers::AssetTagHelper::register_javascript_expansion :monkey => ["head", "body", "tail"]
-    assert_dom_equal  %(<script src="/javascripts/first.js" type="text/javascript"></script>\n<script src="/javascripts/head.js" type="text/javascript"></script>\n<script src="/javascripts/body.js" type="text/javascript"></script>\n<script src="/javascripts/tail.js" type="text/javascript"></script>\n<script src="/javascripts/last.js" type="text/javascript"></script>), javascript_include_tag('first', :monkey, 'last')
+    ENV["RAILS_ASSET_ID"] = ""
+    ActionView::Helpers::AssetTagHelper::register_javascript_expansion :robbery => ["bank", "robber"]
+    assert_dom_equal  %(<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/robber.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>), javascript_include_tag('controls', :robbery, 'effects')
   end
 
   def test_custom_javascript_expansions_and_defaults_puts_application_js_at_the_end
     ENV["RAILS_ASSET_ID"] = ""
-    ActionView::Helpers::AssetTagHelper::register_javascript_expansion :monkey => ["head", "body", "tail"]
-    assert_dom_equal  %(<script src="/javascripts/first.js" type="text/javascript"></script>\n<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/head.js" type="text/javascript"></script>\n<script src="/javascripts/body.js" type="text/javascript"></script>\n<script src="/javascripts/tail.js" type="text/javascript"></script>\n<script src="/javascripts/last.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>), javascript_include_tag('first', :defaults, :monkey, 'last')
+    ActionView::Helpers::AssetTagHelper::register_javascript_expansion :robbery => ["bank", "robber"]
+    assert_dom_equal  %(<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/robber.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>), javascript_include_tag('controls',:defaults, :robbery, 'effects')
   end
 
   def test_custom_javascript_expansions_with_undefined_symbol
@@ -195,6 +211,7 @@ class AssetTagHelperTest < ActionView::TestCase
   end
 
   def test_stylesheet_path
+    ENV["RAILS_ASSET_ID"] = ""
     StylePathToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
 
@@ -207,9 +224,20 @@ class AssetTagHelperTest < ActionView::TestCase
     StyleLinkToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
 
+  def test_stylesheet_link_tag_with_missing_source
+    assert_raise(Errno::ENOENT) {
+      stylesheet_link_tag('missing_security_guard')
+    }
+
+    assert_nothing_raised {
+      stylesheet_link_tag('http://example.com/css/missing_security_guard')
+    }
+  end
+
   def test_custom_stylesheet_expansions
-    ActionView::Helpers::AssetTagHelper::register_stylesheet_expansion :monkey => ["head", "body", "tail"]
-    assert_dom_equal  %(<link href="/stylesheets/first.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/head.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/body.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/tail.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/last.css" media="screen" rel="stylesheet" type="text/css" />), stylesheet_link_tag('first', :monkey, 'last')
+    ENV["RAILS_ASSET_ID"] = ''
+    ActionView::Helpers::AssetTagHelper::register_stylesheet_expansion :robbery => ["bank", "robber"]
+    assert_dom_equal  %(<link href="/stylesheets/version.1.0.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/robber.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/subdir/subdir.css" media="screen" rel="stylesheet" type="text/css" />), stylesheet_link_tag('version.1.0', :robbery, 'subdir/subdir')
   end
 
   def test_custom_stylesheet_expansions_with_undefined_symbol
@@ -546,8 +574,14 @@ class AssetTagHelperTest < ActionView::TestCase
       stylesheet_link_tag(:all, :cache => true)
     )
 
-    expected = Dir["#{ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR}/*.css"].map { |p| File.mtime(p) }.max
-    assert_equal expected, File.mtime(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
+    files_to_be_joined = Dir["#{ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR}/[^all]*.css"]
+
+    expected_mtime = files_to_be_joined.map { |p| File.mtime(p) }.max
+    assert_equal expected_mtime, File.mtime(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
+
+    bytes_added_by_join = "\n\n".size * files_to_be_joined.size - "\n\n".size
+    expected_size = files_to_be_joined.sum { |p| File.size(p) } + bytes_added_by_join
+    assert_equal expected_size, File.size(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
 
     assert_dom_equal(
       %(<link href="http://a0.example.com/stylesheets/money.css" media="screen" rel="stylesheet" type="text/css" />),
@@ -598,6 +632,28 @@ class AssetTagHelperTest < ActionView::TestCase
     FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::ASSETS_DIR, 'absolute'))
   end
 
+  def test_caching_stylesheet_link_tag_when_caching_on_and_missing_css_file
+    ENV["RAILS_ASSET_ID"] = ""
+    ActionController::Base.asset_host = 'http://a0.example.com'
+    ActionController::Base.perform_caching = true
+
+    assert_raise(Errno::ENOENT) {
+      stylesheet_link_tag('bank', 'robber', 'missing_security_guard', :cache => true)
+    }
+
+    assert ! File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
+
+    assert_raise(Errno::ENOENT) {
+      stylesheet_link_tag('bank', 'robber', 'missing_security_guard', :cache => "money")
+    }
+
+    assert ! File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
+
+  ensure
+    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
+
   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" }
@@ -625,8 +681,10 @@ class AssetTagHelperTest < ActionView::TestCase
       stylesheet_link_tag(:all, :cache => true)
     )
 
-    expected = Dir["#{ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR}/*.css"].map { |p| File.mtime(p) }.max
-    assert_equal expected, File.mtime(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
+    files_to_be_joined = Dir["#{ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR}/[^all]*.css"]
+
+    expected_mtime = files_to_be_joined.map { |p| File.mtime(p) }.max
+    assert_equal expected_mtime, File.mtime(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
 
     assert_dom_equal(
       %(<link href="/collaboration/hieraki/stylesheets/money.css" media="screen" rel="stylesheet" type="text/css" />),
diff --git a/actionpack/test/template/capture_helper_test.rb b/actionpack/test/template/capture_helper_test.rb
new file mode 100644
index 0000000000..2017a18806
--- /dev/null
+++ b/actionpack/test/template/capture_helper_test.rb
@@ -0,0 +1,15 @@
+require 'abstract_unit'
+
+class CaptureHelperTest < ActionView::TestCase
+  def setup
+    super
+    @_content_for = Hash.new {|h,k| h[k] = "" }
+  end
+
+  def test_content_for
+    assert ! content_for?(:title)
+    content_for :title, 'title'
+    assert content_for?(:title)
+    assert ! content_for?(:something_else)
+  end
+end
diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb
index 09d199b75d..f387123117 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -159,6 +159,18 @@ class FormTagHelperTest < ActionView::TestCase
     assert_match VALID_HTML_ID, input_elem['id']
   end
 
+  def test_text_area_tag_escape_content
+    actual = text_area_tag "body", "<b>hello world</b>", :size => "20x40"
+    expected = %(<textarea cols="20" id="body" name="body" rows="40">&lt;b&gt;hello world&lt;/b&gt;</textarea>)
+    assert_dom_equal expected, actual
+  end
+
+  def test_text_area_tag_unescaped_content
+    actual = text_area_tag "body", "<b>hello world</b>", :size => "20x40", :escape => false
+    expected = %(<textarea cols="20" id="body" name="body" rows="40"><b>hello world</b></textarea>)
+    assert_dom_equal expected, actual
+  end
+
   def test_text_field_tag
     actual = text_field_tag "title", "Hello!"
     expected = %(<input id="title" name="title" type="text" value="Hello!" />)
diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb
index f023109a60..3c0bd15236 100644
--- a/activemodel/test/cases/helper.rb
+++ b/activemodel/test/cases/helper.rb
@@ -10,8 +10,6 @@ ActiveSupport::Deprecation.debug = true
 
 require 'rubygems'
 require 'test/unit'
-gem 'mocha', '>= 0.9.5'
-require 'mocha'
 
 begin
   require 'ruby-debug'
diff --git a/activerecord/Rakefile b/activerecord/Rakefile
index 0b3f50d17e..0d33b9d516 100644
--- a/activerecord/Rakefile
+++ b/activerecord/Rakefile
@@ -187,7 +187,7 @@ spec = Gem::Specification.new do |s|
     s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   end
 
-  s.add_dependency('activesupport', '= 2.3.2' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 3.0.pre' + PKG_BUILD)
 
   s.files.delete FIXTURES_ROOT + "/fixture_database.sqlite"
   s.files.delete FIXTURES_ROOT + "/fixture_database_2.sqlite"
diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb
index e12f6be35d..84edaec15e 100644
--- a/activerecord/lib/active_record/associations/association_collection.rb
+++ b/activerecord/lib/active_record/associations/association_collection.rb
@@ -351,7 +351,19 @@ module ActiveRecord
       protected
         def construct_find_options!(options)
         end
-        
+
+        def construct_counter_sql
+          if @reflection.options[:counter_sql]
+            @counter_sql = interpolate_sql(@reflection.options[:counter_sql])
+          elsif @reflection.options[:finder_sql]
+            # replace the SELECT clause with COUNT(*), preserving any hints within /* ... */
+            @reflection.options[:counter_sql] = @reflection.options[:finder_sql].sub(/SELECT\b(\/\*.*?\*\/ )?(.*)\bFROM\b/im) { "SELECT #{$1}COUNT(*) FROM" }
+            @counter_sql = interpolate_sql(@reflection.options[:counter_sql])
+          else
+            @counter_sql = @finder_sql
+          end
+        end
+
         def load_target
           if !@owner.new_record? || foreign_key_present
             begin
diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index af9ce3dfb2..fd23e59e82 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -85,15 +85,7 @@ module ActiveRecord
 
           @join_sql = "INNER JOIN #{@owner.connection.quote_table_name @reflection.options[:join_table]} ON #{@reflection.quoted_table_name}.#{@reflection.klass.primary_key} = #{@owner.connection.quote_table_name @reflection.options[:join_table]}.#{@reflection.association_foreign_key}"
 
-          if @reflection.options[:counter_sql]
-            @counter_sql = interpolate_sql(@reflection.options[:counter_sql])
-          elsif @reflection.options[:finder_sql]
-            # replace the SELECT clause with COUNT(*), preserving any hints within /* ... */
-            @reflection.options[:counter_sql] = @reflection.options[:finder_sql].sub(/SELECT (\/\*.*?\*\/ )?(.*)\bFROM\b/im) { "SELECT #{$1}COUNT(*) FROM" }
-            @counter_sql = interpolate_sql(@reflection.options[:counter_sql])
-          else
-            @counter_sql = @finder_sql
-          end
+          construct_counter_sql
         end
 
         def construct_scope
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb
index 73dd50dd07..e4b631bc54 100644
--- a/activerecord/lib/active_record/associations/has_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_association.rb
@@ -97,15 +97,7 @@ module ActiveRecord
               @finder_sql << " AND (#{conditions})" if conditions
           end
 
-          if @reflection.options[:counter_sql]
-            @counter_sql = interpolate_sql(@reflection.options[:counter_sql])
-          elsif @reflection.options[:finder_sql]
-            # replace the SELECT clause with COUNT(*), preserving any hints within /* ... */
-            @reflection.options[:counter_sql] = @reflection.options[:finder_sql].sub(/SELECT (\/\*.*?\*\/ )?(.*)\bFROM\b/im) { "SELECT #{$1}COUNT(*) FROM" }
-            @counter_sql = interpolate_sql(@reflection.options[:counter_sql])
-          else
-            @counter_sql = @finder_sql
-          end
+          construct_counter_sql
         end
 
         def construct_scope
diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb
index 67631f0120..e21ef90391 100644
--- a/activerecord/lib/active_record/associations/has_many_through_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_through_association.rb
@@ -90,15 +90,7 @@ module ActiveRecord
               @finder_sql = construct_conditions
           end
 
-          if @reflection.options[:counter_sql]
-            @counter_sql = interpolate_sql(@reflection.options[:counter_sql])
-          elsif @reflection.options[:finder_sql]
-            # replace the SELECT clause with COUNT(*), preserving any hints within /* ... */
-            @reflection.options[:counter_sql] = @reflection.options[:finder_sql].sub(/SELECT (\/\*.*?\*\/ )?(.*)\bFROM\b/im) { "SELECT #{$1}COUNT(*) FROM" }
-            @counter_sql = interpolate_sql(@reflection.options[:counter_sql])
-          else
-            @counter_sql = @finder_sql
-          end
+          construct_counter_sql
         end
 
         def has_cached_counter?
diff --git a/activerecord/lib/active_record/associations/through_association_scope.rb b/activerecord/lib/active_record/associations/through_association_scope.rb
index 7661c50039..8e7ce33814 100644
--- a/activerecord/lib/active_record/associations/through_association_scope.rb
+++ b/activerecord/lib/active_record/associations/through_association_scope.rb
@@ -94,10 +94,17 @@ module ActiveRecord
       def construct_join_attributes(associate)
         # TODO: revist this to allow it for deletion, supposing dependent option is supported
         raise ActiveRecord::HasManyThroughCantAssociateThroughHasManyReflection.new(@owner, @reflection) if @reflection.source_reflection.macro == :has_many
+
         join_attributes = construct_owner_attributes(@reflection.through_reflection).merge(@reflection.source_reflection.primary_key_name => associate.id)
+
         if @reflection.options[:source_type]
           join_attributes.merge!(@reflection.source_reflection.options[:foreign_type] => associate.class.base_class.name.to_s)
         end
+
+        if @reflection.through_reflection.options[:conditions].is_a?(Hash)
+          join_attributes.merge!(@reflection.through_reflection.options[:conditions])
+        end
+
         join_attributes
       end
 
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 39fac0b7e7..deab56e219 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -67,6 +67,25 @@ module ActiveRecord #:nodoc:
   class StatementInvalid < 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.
   #
@@ -1385,14 +1404,14 @@ module ActiveRecord #:nodoc:
       end
 
       # Transform the modelname into a more humane format, using I18n.
-      # Defaults to the basic humanize method.
+      # By default, it will underscore then humanize the class name (BlogPost.human_name #=> "Blog post").
       # Default scope of the translation is activerecord.models
       # Specify +options+ with additional translating options.
       def human_name(options = {})
         defaults = self_and_descendants_from_active_record.map do |klass|
           :"#{klass.name.underscore}"
-        end 
-        defaults << self.name.humanize
+        end
+        defaults << self.name.underscore.humanize
         I18n.translate(defaults.shift, {:scope => [:activerecord, :models], :count => 1, :default => defaults}.merge(options))
       end
 
@@ -2851,6 +2870,13 @@ module ActiveRecord #:nodoc:
         @attributes.frozen?
       end
 
+      # Returns duplicated record with unfreezed attributes.
+      def dup
+        obj = super
+        obj.instance_variable_set('@attributes', instance_variable_get('@attributes').dup)
+        obj
+      end
+
       # Returns +true+ if the record is read only. Records loaded through joins with piggy-back
       # attributes will be marked as read only since they cannot be saved.
       def readonly?
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index ff63ea3a2e..f44cd0bd5a 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -101,7 +101,7 @@ module ActiveRecord
         table_definition = TableDefinition.new(self)
         table_definition.primary_key(options[:primary_key] || Base.get_primary_key(table_name)) unless options[:id] == false
 
-        yield table_definition
+        yield table_definition if block_given?
 
         if options[:force] && table_exists?(table_name)
           drop_table(table_name, options)
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index 91b111ab55..c533d4cdb6 100755
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -211,9 +211,14 @@ module ActiveRecord
           @last_verification = 0
           message = "#{e.class.name}: #{e.message}: #{sql}"
           log_info(message, name, 0)
-          raise ActiveRecord::StatementInvalid, message
+          raise translate_exception(e, message)
         end
 
+      def translate_exception(e, message)
+        # override in derived class
+        ActiveRecord::StatementInvalid.new(message)
+      end
+
         def format_log_entry(message, dump = nil)
           if ActiveRecord::Base.colorize_logging
             if @@row_even
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index d5536e4d67..83cb9cff15 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -563,6 +563,19 @@ module ActiveRecord
         where_sql
       end
 
+      protected
+
+        def translate_exception(exception, message)
+          case exception.errno
+          when 1062
+            RecordNotUnique.new(message, exception)
+          when 1452
+            InvalidForeignKey.new(message, exception)
+          else
+            super
+          end
+        end
+
       private
         def connect
           encoding = @config[:encoding]
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 18b499904e..e77ae93c21 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -941,6 +941,17 @@ module ActiveRecord
             end
         end
 
+        def translate_exception(exception, message)
+          case exception.message
+          when /duplicate key value violates unique constraint/
+            RecordNotUnique.new(message, exception)
+          when /violates foreign key constraint/
+            InvalidForeignKey.new(message, exception)
+          else
+            super
+          end
+        end
+
       private
         # The internal PostgreSQL identifier of the money data type.
         MONEY_COLUMN_TYPE_OID = 790 #:nodoc:
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index c9d0c9574f..5e5e30776a 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -245,7 +245,7 @@ module ActiveRecord
       end
 
       def rename_table(name, new_name)
-        execute "ALTER TABLE #{name} RENAME TO #{new_name}"
+        execute "ALTER TABLE #{quote_table_name(name)} RENAME TO #{quote_table_name(new_name)}"
       end
 
       # See: http://www.sqlite.org/lang_altertable.html
@@ -431,6 +431,16 @@ module ActiveRecord
             'INTEGER PRIMARY KEY NOT NULL'.freeze
           end
         end
+
+        def translate_exception(exception, message)
+          case exception.message
+          when /column(s)? .* (is|are) not unique/
+            RecordNotUnique.new(message, exception)
+          else
+            super
+          end
+        end
+
     end
 
     class SQLite2Adapter < SQLiteAdapter # :nodoc:
diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb
index 852807b4c5..10ef9d7594 100644
--- a/activerecord/lib/active_record/version.rb
+++ b/activerecord/lib/active_record/version.rb
@@ -1,8 +1,8 @@
 module ActiveRecord
   module VERSION #:nodoc:
-    MAJOR = 2
-    MINOR = 3
-    TINY  = 2
+    MAJOR = 3
+    MINOR = 0
+    TINY  = "pre"
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/activerecord/test/cases/adapter_test.rb b/activerecord/test/cases/adapter_test.rb
index 04770646b2..80530194ff 100644
--- a/activerecord/test/cases/adapter_test.rb
+++ b/activerecord/test/cases/adapter_test.rb
@@ -130,4 +130,19 @@ class AdapterTest < ActiveRecord::TestCase
       assert_equal " LIMIT 1,7 OFFSET 7", @connection.add_limit_offset!("", :limit=>sql_inject, :offset=>7)
     end
   end
+
+  def test_uniqueness_violations_are_translated_to_specific_exception
+    @connection.execute "INSERT INTO subscribers(nick) VALUES('me')"
+    assert_raises(ActiveRecord::RecordNotUnique) do
+      @connection.execute "INSERT INTO subscribers(nick) VALUES('me')"
+    end
+  end
+
+  def test_foreign_key_violations_are_translated_to_specific_exception
+    unless @connection.adapter_name == 'SQLite'
+      assert_raises(ActiveRecord::InvalidForeignKey) do
+        @connection.execute "INSERT INTO fk_test_has_fk (fk_id) VALUES (0)"
+      end
+    end
+  end
 end
diff --git a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
index 8dc95806b9..14b96caaae 100644
--- a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
@@ -803,6 +803,13 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 1, developer.projects.count
   end
 
+  unless current_adapter?(:PostgreSQLAdapter)
+    def test_count_with_finder_sql
+      assert_equal 3, projects(:active_record).developers_with_finder_sql.count
+      assert_equal 3, projects(:active_record).developers_with_multiline_finder_sql.count
+    end
+  end
+
   def test_association_proxy_transaction_method_starts_transaction_in_association_class
     Post.expects(:transaction)
     Category.find(:first).posts.transaction do
diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index d99424f9cd..15919e2289 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -163,6 +163,11 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 0, Firm.find(:first).no_clients_using_counter_sql.size
   end
 
+  def test_counting_using_finder_sql
+    assert_equal 2, Firm.find(4).clients_using_sql.count
+    assert_equal 2, Firm.find(4).clients_using_multiline_sql.count
+  end
+
   def test_belongs_to_sanity
     c = Client.new
     assert_nil c.firm
diff --git a/activerecord/test/cases/associations/has_many_through_associations_test.rb b/activerecord/test/cases/associations/has_many_through_associations_test.rb
index 4254badef2..7a4712d7c8 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -157,6 +157,12 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
     assert_equal peeps + 1, posts(:thinking).people.count
   end
 
+  def test_associate_with_create_with_through_having_conditions
+    impatient_people = posts(:thinking).impatient_people.count
+    posts(:thinking).impatient_people.create!(:first_name => 'foo')
+    assert_equal impatient_people + 1, posts(:thinking).impatient_people.count
+  end
+
   def test_associate_with_create_exclamation_and_no_options
     peeps = posts(:thinking).people.count
     posts(:thinking).people.create!(:first_name => 'foo')
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 96270118d8..f9ac37cc87 100755
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -599,9 +599,9 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_destroy_many
-    assert_equal 3, Client.count
-    Client.destroy([2, 3])
-    assert_equal 1, Client.count
+    assert_difference('Client.count', -2) do
+      Client.destroy([2, 3])
+    end
   end
 
   def test_delete_many
@@ -2116,4 +2116,8 @@ class BasicsTest < ActiveRecord::TestCase
       assert_equal custom_datetime, parrot[attribute]
     end
   end
+
+  def test_dup
+    assert !Minimalistic.new.freeze.dup.frozen?
+  end
 end
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index fd455e0864..75f52dfa4a 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -203,7 +203,7 @@ class CalculationsTest < ActiveRecord::TestCase
     c = Company.count(:all, :group => "UPPER(#{QUOTED_TYPE})")
     assert_equal 2, c[nil]
     assert_equal 1, c['DEPENDENTFIRM']
-    assert_equal 3, c['CLIENT']
+    assert_equal 4, c['CLIENT']
     assert_equal 2, c['FIRM']
   end
 
@@ -211,7 +211,7 @@ class CalculationsTest < ActiveRecord::TestCase
     c = Company.count(:all, :group => "UPPER(companies.#{QUOTED_TYPE})")
     assert_equal 2, c[nil]
     assert_equal 1, c['DEPENDENTFIRM']
-    assert_equal 3, c['CLIENT']
+    assert_equal 4, c['CLIENT']
     assert_equal 2, c['FIRM']
   end
 
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index 037b67ec84..d8f5695a0f 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -1044,8 +1044,8 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_select_values
-    assert_equal ["1","2","3","4","5","6","7","8","9"], Company.connection.select_values("SELECT id FROM companies ORDER BY id").map! { |i| i.to_s }
-    assert_equal ["37signals","Summit","Microsoft", "Flamboyant Software", "Ex Nihilo", "RailsCore", "Leetsoft", "Jadedpixel", "Odegy"], Company.connection.select_values("SELECT name FROM companies ORDER BY id")
+    assert_equal ["1","2","3","4","5","6","7","8","9", "10"], Company.connection.select_values("SELECT id FROM companies ORDER BY id").map! { |i| i.to_s }
+    assert_equal ["37signals","Summit","Microsoft", "Flamboyant Software", "Ex Nihilo", "RailsCore", "Leetsoft", "Jadedpixel", "Odegy", "Ex Nihilo Part Deux"], Company.connection.select_values("SELECT name FROM companies ORDER BY id")
   end
 
   def test_select_rows
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index c30186286d..d1e7caed89 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -6,8 +6,6 @@ require 'config'
 require 'rubygems'
 require 'test/unit'
 require 'stringio'
-gem 'mocha', '>= 0.9.5'
-require 'mocha'
 
 require 'active_record'
 require 'active_record/test_case'
diff --git a/activerecord/test/cases/inheritance_test.rb b/activerecord/test/cases/inheritance_test.rb
index eae5a60829..167d3abad9 100644
--- a/activerecord/test/cases/inheritance_test.rb
+++ b/activerecord/test/cases/inheritance_test.rb
@@ -112,9 +112,9 @@ class InheritanceTest < ActiveRecord::TestCase
   end
 
   def test_inheritance_condition
-    assert_equal 9, Company.count
+    assert_equal 10, Company.count
     assert_equal 2, Firm.count
-    assert_equal 3, Client.count
+    assert_equal 4, Client.count
   end
 
   def test_alt_inheritance_condition
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 16861f21b1..215b5a427a 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -293,6 +293,13 @@ if ActiveRecord::Base.connection.supports_migrations?
       Person.connection.drop_table table_name rescue nil
     end
 
+    def test_create_table_without_a_block
+      table_name = :testings
+      Person.connection.create_table table_name
+    ensure
+      Person.connection.drop_table table_name rescue nil
+    end
+
     # Sybase, and SQLite3 will not allow you to add a NOT NULL
     # column to a table without a default value.
     unless current_adapter?(:SybaseAdapter, :SQLiteAdapter)
@@ -635,6 +642,32 @@ if ActiveRecord::Base.connection.supports_migrations?
       end
     end
 
+    if current_adapter?(:SQLiteAdapter)
+      def test_rename_table_for_sqlite_should_work_with_reserved_words
+        begin
+          assert_nothing_raised do
+            ActiveRecord::Base.connection.rename_table :references, :old_references
+            ActiveRecord::Base.connection.create_table :octopuses do |t|
+              t.column :url, :string
+            end
+          end
+
+          assert_nothing_raised { ActiveRecord::Base.connection.rename_table :octopuses, :references }
+
+          # Using explicit id in insert for compatibility across all databases
+          con = ActiveRecord::Base.connection
+          assert_nothing_raised do
+            con.execute "INSERT INTO 'references' (#{con.quote_column_name('id')}, #{con.quote_column_name('url')}) VALUES (1, 'http://rubyonrails.com')"
+          end
+          assert_equal 'http://rubyonrails.com', ActiveRecord::Base.connection.select_value("SELECT url FROM 'references' WHERE id=1")
+
+        ensure
+          ActiveRecord::Base.connection.drop_table :references
+          ActiveRecord::Base.connection.rename_table :old_references, :references
+        end
+      end
+    end
+
     def test_rename_table
       begin
         ActiveRecord::Base.connection.create_table :octopuses do |t|
diff --git a/activerecord/test/cases/reflection_test.rb b/activerecord/test/cases/reflection_test.rb
index db64bbb806..194d5e9dff 100644
--- a/activerecord/test/cases/reflection_test.rb
+++ b/activerecord/test/cases/reflection_test.rb
@@ -5,14 +5,20 @@ require 'models/company'
 require 'models/company_in_module'
 require 'models/subscriber'
 require 'models/pirate'
+require 'models/price_estimate'
 
 class ReflectionTest < ActiveRecord::TestCase
-  fixtures :topics, :customers, :companies, :subscribers
+  fixtures :topics, :customers, :companies, :subscribers, :price_estimates
 
   def setup
     @first = Topic.find(1)
   end
 
+  def test_human_name
+    assert_equal "Price estimate", PriceEstimate.human_name
+    assert_equal "Subscriber", Subscriber.human_name
+  end
+
   def test_column_null_not_null
     subscriber = Subscriber.find(:first)
     assert subscriber.column_for_attribute("name").null
@@ -170,8 +176,8 @@ class ReflectionTest < ActiveRecord::TestCase
 
   def test_reflection_of_all_associations
     # FIXME these assertions bust a lot
-    assert_equal 28, Firm.reflect_on_all_associations.size
-    assert_equal 21, Firm.reflect_on_all_associations(:has_many).size
+    assert_equal 29, Firm.reflect_on_all_associations.size
+    assert_equal 22, Firm.reflect_on_all_associations(:has_many).size
     assert_equal 7, Firm.reflect_on_all_associations(:has_one).size
     assert_equal 0, Firm.reflect_on_all_associations(:belongs_to).size
   end
diff --git a/activerecord/test/fixtures/companies.yml b/activerecord/test/fixtures/companies.yml
index e7691fde46..9ad68fbe11 100644
--- a/activerecord/test/fixtures/companies.yml
+++ b/activerecord/test/fixtures/companies.yml
@@ -35,6 +35,14 @@ another_client:
   name: Ex Nihilo
   ruby_type: Client
 
+a_third_client:
+  id: 10
+  type: Client
+  firm_id: 4
+  client_of: 4
+  name: Ex Nihilo Part Deux
+  ruby_type: Client
+
 rails_core:
   id: 6          
   name: RailsCore
diff --git a/activerecord/test/models/company.rb b/activerecord/test/models/company.rb
index 4c2514b0b3..840527ddeb 100644
--- a/activerecord/test/models/company.rb
+++ b/activerecord/test/models/company.rb
@@ -48,6 +48,10 @@ class Firm < Company
   has_many :clients_with_interpolated_conditions, :class_name => "Client", :conditions => 'rating > #{rating}'
   has_many :clients_like_ms_with_hash_conditions, :conditions => { :name => 'Microsoft' }, :class_name => "Client", :order => "id"
   has_many :clients_using_sql, :class_name => "Client", :finder_sql => 'SELECT * FROM companies WHERE client_of = #{id}'
+  has_many :clients_using_multiline_sql, :class_name => "Client", :finder_sql => '
+  SELECT
+  companies.*
+  FROM companies WHERE companies.client_of = #{id}'
   has_many :clients_using_counter_sql, :class_name => "Client",
            :finder_sql  => 'SELECT * FROM companies WHERE client_of = #{id}',
            :counter_sql => 'SELECT COUNT(*) FROM companies WHERE client_of = #{id}'
diff --git a/activerecord/test/models/post.rb b/activerecord/test/models/post.rb
index 374e536a5b..7392515ec7 100644
--- a/activerecord/test/models/post.rb
+++ b/activerecord/test/models/post.rb
@@ -69,6 +69,8 @@ class Post < ActiveRecord::Base
               :after_add     => lambda {|owner, reader| log(:added,   :after,  reader.first_name) },
               :before_remove => lambda {|owner, reader| log(:removed, :before, reader.first_name) },
               :after_remove  => lambda {|owner, reader| log(:removed, :after,  reader.first_name) }
+  has_many :skimmers, :class_name => 'Reader', :conditions => { :skimmer => true }
+  has_many :impatient_people, :through => :skimmers, :source => :person
 
   def self.top(limit)
     ranked_by_comments.limit(limit)
diff --git a/activerecord/test/models/project.rb b/activerecord/test/models/project.rb
index f25b2ddf77..422b12dc83 100644
--- a/activerecord/test/models/project.rb
+++ b/activerecord/test/models/project.rb
@@ -8,6 +8,12 @@ class Project < ActiveRecord::Base
   has_and_belongs_to_many :developers_named_david_with_hash_conditions, :class_name => "Developer", :conditions => { :name => 'David' }, :uniq => true
   has_and_belongs_to_many :salaried_developers, :class_name => "Developer", :conditions => "salary > 0"
   has_and_belongs_to_many :developers_with_finder_sql, :class_name => "Developer", :finder_sql => 'SELECT t.*, j.* FROM developers_projects j, developers t WHERE t.id = j.developer_id AND j.project_id = #{id} ORDER BY t.id'
+  has_and_belongs_to_many :developers_with_multiline_finder_sql, :class_name => "Developer", :finder_sql => '
+    SELECT
+      t.*, j.*
+    FROM
+      developers_projects j,
+      developers t WHERE t.id = j.developer_id AND j.project_id = #{id} ORDER BY t.id'
   has_and_belongs_to_many :developers_by_sql, :class_name => "Developer", :delete_sql => "DELETE FROM developers_projects WHERE project_id = \#{id} AND developer_id = \#{record.id}"
   has_and_belongs_to_many :developers_with_callbacks, :class_name => "Developer", :before_add => Proc.new {|o, r| o.developers_log << "before_adding#{r.id || '<new>'}"},
                             :after_add => Proc.new {|o, r| o.developers_log << "after_adding#{r.id || '<new>'}"},
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index b2aaccb352..d2d6d1f4b3 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -364,6 +364,7 @@ ActiveRecord::Schema.define do
   create_table :readers, :force => true do |t|
     t.integer :post_id, :null => false
     t.integer :person_id, :null => false
+    t.boolean :skimmer, :default => false
   end
 
   create_table :shape_expressions, :force => true do |t|
diff --git a/activeresource/Rakefile b/activeresource/Rakefile
index eb5b1dd1ac..def489fad9 100644
--- a/activeresource/Rakefile
+++ b/activeresource/Rakefile
@@ -73,7 +73,7 @@ spec = Gem::Specification.new do |s|
     s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   end
   
-  s.add_dependency('activesupport', '= 2.3.2' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 3.0.pre' + PKG_BUILD)
 
   s.require_path = 'lib'
   s.autorequire = 'active_resource'
diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb
index 3df2555d53..0f312eac39 100644
--- a/activeresource/lib/active_resource/version.rb
+++ b/activeresource/lib/active_resource/version.rb
@@ -1,8 +1,8 @@
 module ActiveResource
   module VERSION #:nodoc:
-    MAJOR = 2
-    MINOR = 3
-    TINY  = 2
+    MAJOR = 3
+    MINOR = 0
+    TINY  = "pre"
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/activeresource/test/abstract_unit.rb b/activeresource/test/abstract_unit.rb
index 863c7bf709..05efac79cf 100644
--- a/activeresource/test/abstract_unit.rb
+++ b/activeresource/test/abstract_unit.rb
@@ -1,8 +1,6 @@
 require 'rubygems'
 require 'test/unit'
-
-gem 'mocha', '>= 0.9.5'
-require 'mocha'
+require 'active_support/test_case'
 
 $:.unshift "#{File.dirname(__FILE__)}/../lib"
 require 'active_resource'
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index feb6b1f2cf..3c422e0252 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -2,7 +2,12 @@ require 'benchmark'
 require 'active_support/core_ext/benchmark'
 require 'active_support/core_ext/exception'
 require 'active_support/core_ext/class/attribute_accessors'
-require 'active_support/core_ext' # FIXME: pulling in all to_param extensions
+
+%w(hash nil string time date date_time array big_decimal range object boolean).each do |library|
+  require "active_support/core_ext/#{library}/conversions"
+end
+
+# require 'active_support/core_ext' # FIXME: pulling in all to_param extensions
 
 module ActiveSupport
   # See ActiveSupport::Cache::Store for documentation.
@@ -129,8 +134,8 @@ module ActiveSupport
       #
       # For example, MemCacheStore's #write method supports the +:expires_in+
       # option, which tells the memcached server to automatically expire the
-      # cache item after a certain period. We can use this option with #fetch
-      # too:
+      # cache item after a certain period. This options is also supported by
+      # FileStore's #read method. We can use this option with #fetch too:
       #
       #   cache = ActiveSupport::Cache::MemCacheStore.new
       #   cache.fetch("foo", :force => true, :expires_in => 5.seconds) do
@@ -169,6 +174,10 @@ module ActiveSupport
       # You may also specify additional options via the +options+ argument.
       # The specific cache store implementation will decide what to do with
       # +options+.
+      #
+      # For example, FileStore supports the +:expires_in+ option, which
+      # makes the method return nil for cache items older than the specified
+      # period.
       def read(key, options = nil)
         log("read", key, options)
       end
@@ -223,6 +232,10 @@ module ActiveSupport
       end
 
       private
+        def expires_in(options)
+          (options && options[:expires_in]) || 0
+        end
+
         def log(operation, key, options)
           logger.debug("Cache #{operation}: #{key}#{options ? " (#{options.inspect})" : ""}") if logger && !@silence && !@logger_off
         end
diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb
index 3217350d58..75eed5ed94 100644
--- a/activesupport/lib/active_support/cache/file_store.rb
+++ b/activesupport/lib/active_support/cache/file_store.rb
@@ -10,11 +10,23 @@ module ActiveSupport
         @cache_path = cache_path
       end
 
+      # Reads a value from the cache.
+      #
+      # Possible options:
+      # - +:expires_in+ - the number of seconds that this value may stay in
+      #   the cache.
       def read(name, options = nil)
         super
-        File.open(real_file_path(name), 'rb') { |f| Marshal.load(f) } rescue nil
+
+        file_name = real_file_path(name)
+        expires = expires_in(options)
+
+        if File.exist?(file_name) && (expires <= 0 || Time.now - File.mtime(file_name) < expires)
+          File.open(file_name, 'rb') { |f| Marshal.load(f) }
+        end
       end
 
+      # Writes a value to the cache.
       def write(name, value, options = nil)
         super
         ensure_cache_path(File.dirname(real_file_path(name)))
diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb
index 38b3409ca6..954d0f5423 100644
--- a/activesupport/lib/active_support/cache/mem_cache_store.rb
+++ b/activesupport/lib/active_support/cache/mem_cache_store.rb
@@ -130,10 +130,6 @@ module ActiveSupport
       end
 
       private
-        def expires_in(options)
-          (options && options[:expires_in]) || 0
-        end
-
         def raw?(options)
           options && options[:raw]
         end
diff --git a/activesupport/lib/active_support/cache/memory_store.rb b/activesupport/lib/active_support/cache/memory_store.rb
index 1b30d49155..21ba79cf3d 100644
--- a/activesupport/lib/active_support/cache/memory_store.rb
+++ b/activesupport/lib/active_support/cache/memory_store.rb
@@ -26,7 +26,7 @@ module ActiveSupport
 
       def write(name, value, options = nil)
         super
-        @data[name] = value.freeze
+        @data[name] = (value.duplicable? ? value.dup : value).freeze
       end
 
       def delete(name, options = nil)
diff --git a/activesupport/lib/active_support/inflector.rb b/activesupport/lib/active_support/inflector.rb
index ff70d6d76e..92c1de057b 100644
--- a/activesupport/lib/active_support/inflector.rb
+++ b/activesupport/lib/active_support/inflector.rb
@@ -183,7 +183,7 @@ module ActiveSupport
       if first_letter_in_uppercase
         lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
       else
-        lower_case_and_underscored_word.first.downcase + camelize(lower_case_and_underscored_word)[1..-1]
+        lower_case_and_underscored_word.to_s.first.downcase + camelize(lower_case_and_underscored_word)[1..-1]
       end
     end
 
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb
index bab2a401eb..d5282bad6a 100644
--- a/activesupport/lib/active_support/test_case.rb
+++ b/activesupport/lib/active_support/test_case.rb
@@ -1,5 +1,13 @@
+require 'test/unit/testcase'
+require 'active_support/testing/setup_and_teardown'
+require 'active_support/testing/assertions'
+require 'active_support/testing/deprecation'
+require 'active_support/testing/declarative'
+require 'active_support/testing/pending'
+require 'active_support/testing/isolation'
+
 begin
-  gem 'mocha', '>= 0.9.3'
+  gem 'mocha', ">= 0.9.7"
   require 'mocha'
 rescue LoadError
   # Fake Mocha::ExpectationError so we can rescue it in #run. Bleh.
@@ -7,13 +15,6 @@ rescue LoadError
   Mocha.const_set :ExpectationError, Class.new(StandardError)
 end
 
-require 'test/unit/testcase'
-require 'active_support/testing/setup_and_teardown'
-require 'active_support/testing/assertions'
-require 'active_support/testing/deprecation'
-require 'active_support/testing/declarative'
-require 'active_support/testing/pending'
-
 module ActiveSupport
   class TestCase < ::Test::Unit::TestCase
     if defined? MiniTest
diff --git a/activesupport/lib/active_support/testing/declarative.rb b/activesupport/lib/active_support/testing/declarative.rb
index a7af7f4224..a7df473644 100644
--- a/activesupport/lib/active_support/testing/declarative.rb
+++ b/activesupport/lib/active_support/testing/declarative.rb
@@ -15,12 +15,6 @@ module ActiveSupport
             end
           end
           
-          if defined?(Spec)
-            class << self
-              alias_method :test, :it
-            end
-          end          
-          
         end
       end 
 
diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb
new file mode 100644
index 0000000000..090e0c5c89
--- /dev/null
+++ b/activesupport/lib/active_support/testing/isolation.rb
@@ -0,0 +1,98 @@
+module ActiveSupport::Testing
+  class ProxyTestResult
+    def initialize
+      @calls = []
+    end
+
+    def __replay__(result)
+      @calls.each do |name, args|
+        result.send(name, *args)
+      end
+    end
+
+    def method_missing(name, *args)
+      @calls << [name, args]
+    end
+  end
+
+  module Isolation
+    def self.forking_env?
+      !ENV["NO_FORK"] && RUBY_PLATFORM !~ /mswin|mingw|java/
+    end
+
+    def run(result)
+      yield(Test::Unit::TestCase::STARTED, name)
+
+      @_result = result
+
+      proxy = run_in_isolation do |proxy|
+        super(proxy) { }
+      end
+
+      proxy.__replay__(@_result)
+
+      yield(Test::Unit::TestCase::FINISHED, name)
+    end
+
+    module Forking
+      def run_in_isolation(&blk)
+        read, write = IO.pipe
+
+        pid = fork do
+          read.close
+          proxy = ProxyTestResult.new
+          yield proxy
+          write.puts [Marshal.dump(proxy)].pack("m")
+          exit!
+        end
+
+        write.close
+        result = read.read
+        Process.wait2(pid)
+        Marshal.load(result.unpack("m")[0])
+      end
+    end
+
+    module Subprocess
+      # Crazy H4X to get this working in windows / jruby with
+      # no forking.
+      def run_in_isolation(&blk)
+        require "tempfile"
+
+        if ENV["ISOLATION_TEST"]
+          proxy = ProxyTestResult.new
+          yield proxy
+          File.open(ENV["ISOLATION_OUTPUT"], "w") do |file|
+            file.puts [Marshal.dump(proxy)].pack("m")
+          end
+          exit!
+        else
+          Tempfile.open("isolation") do |tmpfile|
+            ENV["ISOLATION_TEST"]   = @method_name
+            ENV["ISOLATION_OUTPUT"] = tmpfile.path
+
+            load_paths = $-I.map {|p| "-I\"#{File.expand_path(p)}\"" }.join(" ")
+            `#{Gem.ruby} #{load_paths} #{$0} #{ORIG_ARGV.join(" ")} -t\"#{self.class}\"`
+
+            ENV.delete("ISOLATION_TEST")
+            ENV.delete("ISOLATION_OUTPUT")
+
+            return Marshal.load(tmpfile.read.unpack("m")[0])
+          end
+        end
+      end
+    end
+
+    include forking_env? ? Forking : Subprocess
+  end
+end
+
+# Only in subprocess for windows / jruby.
+if ENV['ISOLATION_TEST']
+  require "test/unit/collector/objectspace"
+  class Test::Unit::Collector::ObjectSpace
+    def include?(test)
+      super && test.method_name == ENV['ISOLATION_TEST']
+    end
+  end
+end
\ No newline at end of file
diff --git a/activesupport/lib/active_support/testing/setup_and_teardown.rb b/activesupport/lib/active_support/testing/setup_and_teardown.rb
index 4537c30e9c..b59ac79e7b 100644
--- a/activesupport/lib/active_support/testing/setup_and_teardown.rb
+++ b/activesupport/lib/active_support/testing/setup_and_teardown.rb
@@ -10,8 +10,6 @@ module ActiveSupport
 
           if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
             include ForMiniTest
-          elsif defined? Spec
-            include ForRspec
           else
             include ForClassicTestUnit
           end
diff --git a/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_exceptions_test.rb b/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_exceptions_test.rb
index dfcba6901f..4e78e71b34 100644
--- a/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_exceptions_test.rb
+++ b/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_exceptions_test.rb
@@ -2,7 +2,6 @@ $:.unshift "lib"
 
 require 'rubygems'
 require 'test/unit'
-require 'mocha'
 require 'i18n'
 require 'active_support'
 
diff --git a/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_test.rb b/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_test.rb
index 50d6832c9e..2835ec4eab 100644
--- a/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_test.rb
+++ b/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_test.rb
@@ -2,7 +2,6 @@ $:.unshift "lib"
 
 require 'rubygems'
 require 'test/unit'
-require 'mocha'
 require 'i18n'
 require 'active_support'
 
diff --git a/activesupport/lib/active_support/vendor/i18n-0.1.3/test/simple_backend_test.rb b/activesupport/lib/active_support/vendor/i18n-0.1.3/test/simple_backend_test.rb
index 65f3ac11a6..a1696c77f6 100644
--- a/activesupport/lib/active_support/vendor/i18n-0.1.3/test/simple_backend_test.rb
+++ b/activesupport/lib/active_support/vendor/i18n-0.1.3/test/simple_backend_test.rb
@@ -3,7 +3,6 @@ $:.unshift "lib"
 
 require 'rubygems'
 require 'test/unit'
-require 'mocha'
 require 'i18n'
 require 'time'
 require 'yaml'
diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb
index 30f598a8de..3ae6150f2d 100644
--- a/activesupport/lib/active_support/version.rb
+++ b/activesupport/lib/active_support/version.rb
@@ -1,8 +1,8 @@
 module ActiveSupport
   module VERSION #:nodoc:
-    MAJOR = 2
-    MINOR = 3
-    TINY  = 2
+    MAJOR = 3
+    MINOR = 0
+    TINY  = "pre"
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb
index 428a06b0bf..61914231ef 100644
--- a/activesupport/test/abstract_unit.rb
+++ b/activesupport/test/abstract_unit.rb
@@ -1,9 +1,8 @@
+ORIG_ARGV = ARGV.dup
+
 require 'rubygems'
 require 'test/unit'
 
-gem 'mocha', '>= 0.9.5'
-require 'mocha'
-
 ENV['NO_RELOAD'] = '1'
 $:.unshift "#{File.dirname(__FILE__)}/../lib"
 require 'active_support'
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 51d04d9388..928af256f4 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -146,6 +146,22 @@ class FileStoreTest < ActiveSupport::TestCase
   end
 
   include CacheStoreBehavior
+
+  def test_expires_in
+    time = Time.local(2008, 4, 24)
+    Time.stubs(:now).returns(time)
+    File.stubs(:mtime).returns(time)
+
+    @cache.write('foo', 'bar')
+    cache_read = lambda { @cache.read('foo', :expires_in => 1.minute) }
+    assert_equal 'bar', cache_read.call
+
+    Time.stubs(:now).returns(time + 30.seconds)
+    assert_equal 'bar', cache_read.call
+
+    Time.stubs(:now).returns(time + 2.minutes)
+    assert_nil cache_read.call
+  end
 end
 
 class MemoryStoreTest < ActiveSupport::TestCase
@@ -160,6 +176,12 @@ class MemoryStoreTest < ActiveSupport::TestCase
     assert_raise(ActiveSupport::FrozenObjectError) { @cache.read('foo').gsub!(/.*/, 'baz') }
     assert_equal 'bar', @cache.read('foo')
   end
+
+  def test_original_store_objects_should_not_be_immutable
+    bar = 'bar'
+    @cache.write('foo', bar)
+    assert_nothing_raised { bar.gsub!(/.*/, 'baz') }
+  end
 end
 
 uses_memcached 'memcached backed store' do
diff --git a/activesupport/test/inflector_test.rb b/activesupport/test/inflector_test.rb
index 8c4d831a39..7d1554910e 100644
--- a/activesupport/test/inflector_test.rb
+++ b/activesupport/test/inflector_test.rb
@@ -202,6 +202,12 @@ class InflectorTest < Test::Unit::TestCase
     end
   end
 
+  def test_symbol_to_lower_camel
+    SymbolToLowerCamel.each do |symbol, lower_camel|
+      assert_equal(lower_camel, ActiveSupport::Inflector.camelize(symbol, false))
+    end
+  end
+
   %w{plurals singulars uncountables humans}.each do |inflection_type|
     class_eval "
       def test_clear_#{inflection_type}
diff --git a/activesupport/test/inflector_test_cases.rb b/activesupport/test/inflector_test_cases.rb
index 584cbff3e7..2fa94b8e9c 100644
--- a/activesupport/test/inflector_test_cases.rb
+++ b/activesupport/test/inflector_test_cases.rb
@@ -117,6 +117,13 @@ module InflectorTestCases
     "area51_controller"      => "area51Controller"
   }
 
+  SymbolToLowerCamel = {
+    :product                => 'product',
+    :special_guest          => 'specialGuest',
+    :application_controller => 'applicationController',
+    :area51_controller      => 'area51Controller'
+  }
+
   CamelToUnderscoreWithoutReverse = {
     "HTMLTidy"              => "html_tidy",
     "HTMLTidyGenerator"     => "html_tidy_generator",
diff --git a/activesupport/test/isolation_test.rb b/activesupport/test/isolation_test.rb
new file mode 100644
index 0000000000..4adf49ff62
--- /dev/null
+++ b/activesupport/test/isolation_test.rb
@@ -0,0 +1,141 @@
+require 'abstract_unit'
+
+# Does awesome
+if ENV['CHILD']
+  class ChildIsolationTest < ActiveSupport::TestCase
+    include ActiveSupport::Testing::Isolation
+
+    def setup
+      @instance = "HELLO"
+    end
+
+    def teardown
+      raise if @boom
+    end
+
+    test "runs the test" do
+      assert true
+    end
+
+    test "captures errors" do
+      raise
+    end
+
+    test "captures failures" do
+      assert false
+    end
+
+    test "first runs in isolation" do
+      assert_nil $x
+      $x = 1
+    end
+
+    test "second runs in isolation" do
+      assert_nil $x
+      $x = 2
+    end
+
+    test "runs with slow tests" do
+      sleep 0.3
+      assert true
+      sleep 0.2
+    end
+
+    test "runs setup" do
+      assert "HELLO", @instance
+    end
+
+    test "runs teardown" do
+      @boom = true
+    end
+
+    test "resets requires one" do
+      assert !defined?(Racc)
+      require 'racc/parser'
+    end
+
+    test "resets requires two" do
+      assert !defined?(Racc)
+      require 'racc/parser'
+    end
+  end
+else
+  class ParentIsolationTest < ActiveSupport::TestCase
+
+    ENV["CHILD"] = "1"
+    OUTPUT = `#{Gem.ruby} -I#{File.dirname(__FILE__)} #{File.expand_path(__FILE__)} -v`
+    ENV.delete("CHILD")
+
+    def setup
+      # Extract the results
+      @results = {}
+      OUTPUT[/Started\n\s*(.*)\s*\nFinished/mi, 1].split(/\s*\n\s*/).each do |result|
+        result =~ %r'^(\w+)\(\w+\):\s*(\.|E|F)$'
+        @results[$1] = { 'E' => :error, '.' => :success, 'F' => :failure }[$2]
+      end
+
+      # Extract the backtraces
+      @backtraces = {}
+      OUTPUT.scan(/^\s*\d+\).*?\n\n/m).each do |backtrace|
+        # \n  1) Error:\ntest_captures_errors(ChildIsolationTest):
+        backtrace =~ %r'\s*\d+\)\s*(Error|Failure):\n(\w+)'i
+        @backtraces[$2] = { :type => $1, :output => backtrace }
+      end
+    end
+
+    def assert_failing(name)
+      assert_equal :failure, @results[name.to_s], "Test #{name} did not fail"
+    end
+
+    def assert_passing(name)
+      assert_equal :success, @results[name.to_s], "Test #{name} did not pass"
+    end
+
+    def assert_erroring(name)
+      assert_equal :error, @results[name.to_s], "Test #{name} did not error"
+    end
+
+    test "has all tests" do
+      assert_equal 10, @results.length
+    end
+
+    test "passing tests are still reported" do
+      assert_passing :test_runs_the_test
+      assert_passing :test_runs_with_slow_tests
+    end
+
+    test "resets global variables" do
+      assert_passing :test_first_runs_in_isolation
+      assert_passing :test_second_runs_in_isolation
+    end
+
+    test "resets requires" do
+      assert_passing :test_resets_requires_one
+      assert_passing :test_resets_requires_two
+    end
+
+    test "erroring tests are still reported" do
+      assert_erroring :test_captures_errors
+    end
+
+    test "runs setup and teardown methods" do
+      assert_passing :test_runs_setup
+      assert_erroring :test_runs_teardown
+    end
+
+    test "correct tests fail" do
+      assert_failing :test_captures_failures
+    end
+
+    test "backtrace is printed for errors" do
+      assert_equal 'Error', @backtraces["test_captures_errors"][:type]
+      assert_match %{isolation_test.rb:21:in `test_captures_errors'}, @backtraces["test_captures_errors"][:output]
+    end
+
+    test "backtrace is printed for failures" do
+      assert_equal 'Failure', @backtraces["test_captures_failures"][:type]
+      assert_match %{isolation_test.rb:25:in `test_captures_failures'}, @backtraces["test_captures_failures"][:output]
+    end
+
+  end
+end
\ No newline at end of file
diff --git a/railties/Rakefile b/railties/Rakefile
index 69c1ca762a..61c094150a 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -316,11 +316,11 @@ spec = Gem::Specification.new do |s|
   EOF
 
   s.add_dependency('rake', '>= 0.8.3')
-  s.add_dependency('activesupport',    '= 2.3.2' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 2.3.2' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 2.3.2' + PKG_BUILD)
-  s.add_dependency('actionmailer',     '= 2.3.2' + PKG_BUILD)
-  s.add_dependency('activeresource',   '= 2.3.2' + PKG_BUILD)
+  s.add_dependency('activesupport',    '= 3.0.pre' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 3.0.pre' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 3.0.pre' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 3.0.pre' + PKG_BUILD)
+  s.add_dependency('activeresource',   '= 3.0.pre' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 1aa71c31b5..cd23158e98 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -1,596 +1,397 @@
-require 'logger'
-require 'set'
-require 'pathname'
+require "pathname"
 
 $LOAD_PATH.unshift File.dirname(__FILE__)
 require 'railties_path'
 require 'rails/version'
 require 'rails/gem_dependency'
 require 'rails/rack'
+require 'rails/paths'
+require 'rails/core'
+require 'rails/configuration'
 
 RAILS_ENV = (ENV['RAILS_ENV'] || 'development').dup unless defined?(RAILS_ENV)
 
 module Rails
-  class << self
-    # The Configuration instance used to configure the Rails environment
-    def configuration
-      @@configuration
-    end
+  class Initializer
+    class Error < StandardError ; end
 
-    def configuration=(configuration)
-      @@configuration = configuration
-    end
+    class Base
+      class << self
+        def run(&blk)
+          define_method(:run, &blk)
+        end
 
-    def initialized?
-      @initialized || false
-    end
+        def config=(config)
+          @@config = config
+        end
 
-    def initialized=(initialized)
-      @initialized ||= initialized
-    end
+        def config
+          @@config
+        end
+        alias configuration config
 
-    def logger
-      if defined?(RAILS_DEFAULT_LOGGER)
-        RAILS_DEFAULT_LOGGER
-      else
-        nil
-      end
-    end
+        def gems_dependencies_loaded
+          config.gems_dependencies_loaded
+        end
 
-    def backtrace_cleaner
-      @@backtrace_cleaner ||= begin
-        # Relies on ActiveSupport, so we have to lazy load to postpone definition until AS has been loaded
-        require 'rails/backtrace_cleaner'
-        Rails::BacktraceCleaner.new
+        def plugin_loader
+          @plugin_loader ||= configuration.plugin_loader.new(self)
+        end
       end
-    end
-
-    def root
-      Pathname.new(RAILS_ROOT) if defined?(RAILS_ROOT)
-    end
-
-    def env
-      @_env ||= ActiveSupport::StringInquirer.new(RAILS_ENV)
-    end
 
-    def cache
-      RAILS_CACHE
-    end
-
-    def version
-      VERSION::STRING
-    end
-
-    def public_path
-      @@public_path ||= self.root ? File.join(self.root, "public") : "public"
-    end
-
-    def public_path=(path)
-      @@public_path = path
-    end
-  end
-
-  # The Initializer is responsible for processing the Rails configuration, such
-  # as setting the $LOAD_PATH, requiring the right frameworks, initializing
-  # logging, and more. It can be run either as a single command that'll just
-  # use the default configuration, like this:
-  #
-  #   Rails::Initializer.run
-  #
-  # But normally it's more interesting to pass in a custom configuration
-  # through the block running:
-  #
-  #   Rails::Initializer.run do |config|
-  #     config.frameworks -= [ :action_mailer ]
-  #   end
-  #
-  # This will use the default configuration options from Rails::Configuration,
-  # but allow for overwriting on select areas.
-  class Initializer
-    # The Configuration instance used by this Initializer instance.
-    attr_reader :configuration
-
-    # The set of loaded plugins.
-    attr_reader :loaded_plugins
-
-    # Whether or not all the gem dependencies have been met
-    attr_reader :gems_dependencies_loaded
-
-    # Runs the initializer. By default, this will invoke the #process method,
-    # which simply executes all of the initialization routines. Alternately,
-    # you can specify explicitly which initialization routine you want:
-    #
-    #   Rails::Initializer.run(:set_load_path)
-    #
-    # This is useful if you only want the load path initialized, without
-    # incurring the overhead of completely loading the entire environment.
-    def self.run(command = :process, configuration = Configuration.new)
-      yield configuration if block_given?
-      initializer = new configuration
-      initializer.send(command)
-      initializer
-    end
+      def gems_dependencies_loaded
+        self.class.gems_dependencies_loaded
+      end
 
-    # Create a new Initializer instance that references the given Configuration
-    # instance.
-    def initialize(configuration)
-      @configuration = configuration
-      @loaded_plugins = []
+      def plugin_loader
+        self.class.plugin_loader
+      end
     end
 
-    # Sequentially step through all of the available initialization routines,
-    # in order (view execution order in source).
-    def process
-      Rails.configuration = configuration
-
-      check_ruby_version
-      install_gem_spec_stubs
-      set_load_path
-      add_gem_load_paths
+    class Runner
 
-      require_frameworks
-      set_autoload_paths
-      add_plugin_load_paths
-      load_environment
-      preload_frameworks
+      attr_reader :names, :initializers
+      attr_accessor :config
+      alias configuration config
 
-      initialize_encoding
-      initialize_database
-
-      initialize_cache
-      initialize_framework_caches
-
-      initialize_logger
-      initialize_framework_logging
-
-      initialize_dependency_mechanism
-      initialize_whiny_nils
-
-      initialize_time_zone
-      initialize_i18n
-
-      initialize_framework_settings
-      initialize_framework_views
-
-      initialize_metal
-
-      add_support_load_paths
-
-      check_for_unbuilt_gems
-
-      load_gems
-      load_plugins
-
-      # pick up any gems that plugins depend on
-      add_gem_load_paths
-      load_gems
-      check_gem_dependencies
-
-      # bail out if gems are missing - note that check_gem_dependencies will have
-      # already called abort() unless $gems_rake_task is set
-      return unless gems_dependencies_loaded
-
-      load_application_initializers
-
-      # the framework is now fully initialized
-      after_initialize
-
-      # Setup database middleware after initializers have run
-      initialize_database_middleware
+      def initialize(parent = nil)
+        @names        = parent ? parent.names.dup        : {}
+        @initializers = parent ? parent.initializers.dup : []
+      end
 
-      # Prepare dispatcher callbacks and run 'prepare' callbacks
-      prepare_dispatcher
+      def add(name, options = {}, &block)
+        # If :before or :after is specified, set the index to the right spot
+        if other = options[:before] || options[:after]
+          raise Error, "The #{other.inspect} initializer does not exist" unless @names[other]
+          index = @initializers.index(@names[other])
+          index += 1 if options[:after]
+        end
 
-      # Routing must be initialized after plugins to allow the former to extend the routes
-      initialize_routing
+        @initializers.insert(index || -1, block)
+        @names[name] = block
+      end
 
-      # Observers are loaded after plugins in case Observers or observed models are modified by plugins.
-      load_observers
+      def delete(name)
+        @names[name].tap do |initializer|
+          @initializers.delete(initializer)
+          @names.delete(name)
+        end
+      end
 
-      # Load view path cache
-      load_view_paths
+      def run_initializer(initializer)
+        init_block = initializer.is_a?(Proc) ? initializer : @names[initializer]
+        container = Class.new(Base, &init_block).new
+        container.run if container.respond_to?(:run)
+      end
 
-      # Load application classes
-      load_application_classes
+      def run(initializer = nil)
+        Rails.configuration = Base.config = @config
 
-      # Disable dependency loading during request cycle
-      disable_dependency_loading
+        if initializer
+          run_initializer(initializer)
+        else
+          @initializers.each {|block| run_initializer(block) }
+        end
+      end
+    end
 
-      # Flag initialized
-      Rails.initialized = true
+    def self.default
+      @default ||= Runner.new
     end
 
-    # Check for valid Ruby version
-    # This is done in an external file, so we can use it
-    # from the `rails` program as well without duplication.
-    def check_ruby_version
-      require 'ruby_version_check'
+    def self.run(initializer = nil, config = nil)
+      default.config = config if config
+      default.config ||= Configuration.new
+      yield default.config if block_given?
+      default.run(initializer)
     end
+  end
 
-    # If Rails is vendored and RubyGems is available, install stub GemSpecs
-    # for Rails, Active Support, Active Record, Action Pack, Action Mailer, and
-    # Active Resource. This allows Gem plugins to depend on Rails even when
-    # the Gem version of Rails shouldn't be loaded.
-    def install_gem_spec_stubs
-      unless Rails.respond_to?(:vendor_rails?)
-        abort %{Your config/boot.rb is outdated: Run "rake rails:update".}
-      end
+  # Check for valid Ruby version (1.8.2 or 1.8.4 or higher). This is done in an
+  # external file, so we can use it from the `rails` program as well without duplication.
+  Initializer.default.add :check_ruby_version do
+    require 'ruby_version_check'
+  end
 
-      if Rails.vendor_rails?
-        begin; require "rubygems"; rescue LoadError; return; end
+  # If Rails is vendored and RubyGems is available, install stub GemSpecs
+  # for Rails, Active Support, Active Record, Action Pack, Action Mailer, and
+  # Active Resource. This allows Gem plugins to depend on Rails even when
+  # the Gem version of Rails shouldn't be loaded.
+  Initializer.default.add :install_gem_spec_stubs do
+    unless Rails.respond_to?(:vendor_rails?)
+      abort %{Your config/boot.rb is outdated: Run "rake rails:update".}
+    end
+
+    if Rails.vendor_rails?
+      begin; require "rubygems"; rescue LoadError; return; end
 
-        stubs = %w(rails activesupport activerecord actionpack actionmailer activeresource)
-        stubs.reject! { |s| Gem.loaded_specs.key?(s) }
+      stubs = %w(rails activesupport activerecord actionpack actionmailer activeresource)
+      stubs.reject! { |s| Gem.loaded_specs.key?(s) }
 
-        stubs.each do |stub|
-          Gem.loaded_specs[stub] = Gem::Specification.new do |s|
-            s.name = stub
-            s.version = Rails::VERSION::STRING
-            s.loaded_from = ""
-          end
+      stubs.each do |stub|
+        Gem.loaded_specs[stub] = Gem::Specification.new do |s|
+          s.name = stub
+          s.version = Rails::VERSION::STRING
+          s.loaded_from = ""
         end
       end
     end
+  end
 
-    # Set the <tt>$LOAD_PATH</tt> based on the value of
-    # Configuration#load_paths. Duplicates are removed.
-    def set_load_path
-      load_paths = configuration.load_paths + configuration.framework_paths
-      load_paths.reverse_each { |dir| $LOAD_PATH.unshift(dir) if File.directory?(dir) }
-      $LOAD_PATH.uniq!
-    end
-
-    # Set the paths from which Rails will automatically load source files, and
-    # the load_once paths.
-    def set_autoload_paths
-      require 'active_support/dependencies'
-      ActiveSupport::Dependencies.load_paths = configuration.load_paths.uniq
-      ActiveSupport::Dependencies.load_once_paths = configuration.load_once_paths.uniq
-
-      extra = ActiveSupport::Dependencies.load_once_paths - ActiveSupport::Dependencies.load_paths
-      unless extra.empty?
-        abort <<-end_error
-          load_once_paths must be a subset of the load_paths.
-          Extra items in load_once_paths: #{extra * ','}
-        end_error
-      end
+  # Set the <tt>$LOAD_PATH</tt> based on the value of
+  # Configuration#load_paths. Duplicates are removed.
+  Initializer.default.add :set_load_path do
+    # TODO: Think about unifying this with the general Rails paths
+    configuration.framework_paths.reverse_each { |dir| $LOAD_PATH.unshift(dir) if File.directory?(dir) }
+    configuration.paths.add_to_load_path
+    $LOAD_PATH.uniq!
+  end
 
-      # Freeze the arrays so future modifications will fail rather than do nothing mysteriously
-      configuration.load_once_paths.freeze
+  Initializer.default.add :add_gem_load_paths do
+    require 'rails/gem_dependency'
+    Rails::GemDependency.add_frozen_gem_path
+    unless config.gems.empty?
+      require "rubygems"
+      config.gems.each { |gem| gem.add_load_paths }
     end
+  end
 
-    # Requires all frameworks specified by the Configuration#frameworks
-    # list. By default, all frameworks (Active Record, Active Support,
-    # Action Pack, Action Mailer, and Active Resource) are loaded.
-    def require_frameworks
-      require 'active_support/all'
+  # Requires all frameworks specified by the Configuration#frameworks
+  # list. By default, all frameworks (Active Record, Active Support,
+  # Action Pack, Action Mailer, and Active Resource) are loaded.
+  Initializer.default.add :require_frameworks do
+    begin
+      require 'active_support'
+      require 'active_support/core_ext/kernel/reporting'
+      require 'active_support/core_ext/logger'
+
+      # TODO: This is here to make Sam Ruby's tests pass. Needs discussion.
+      require 'active_support/core_ext/numeric/bytes'
       configuration.frameworks.each { |framework| require(framework.to_s) }
     rescue LoadError => e
       # Re-raise as RuntimeError because Mongrel would swallow LoadError.
       raise e.to_s
     end
+  end
 
-    # Preload all frameworks specified by the Configuration#frameworks.
-    # Used by Passenger to ensure everything's loaded before forking and
-    # to avoid autoload race conditions in JRuby.
-    def preload_frameworks
-      if configuration.preload_frameworks
-        configuration.frameworks.each do |framework|
-          # String#classify and #constantize aren't available yet.
-          toplevel = Object.const_get(framework.to_s.gsub(/(?:^|_)(.)/) { $1.upcase })
-          toplevel.load_all! if toplevel.respond_to?(:load_all!)
-        end
-      end
-    end
+  # Set the paths from which Rails will automatically load source files, and
+  # the load_once paths.
+  Initializer.default.add :set_autoload_paths do
+    require 'active_support/dependencies'
+    ActiveSupport::Dependencies.load_paths = configuration.load_paths.uniq
+    ActiveSupport::Dependencies.load_once_paths = configuration.load_once_paths.uniq
 
-    # Add the load paths used by support functions such as the info controller
-    def add_support_load_paths
+    extra = ActiveSupport::Dependencies.load_once_paths - ActiveSupport::Dependencies.load_paths
+    unless extra.empty?
+      abort <<-end_error
+        load_once_paths must be a subset of the load_paths.
+        Extra items in load_once_paths: #{extra * ','}
+      end_error
     end
 
-    # Adds all load paths from plugins to the global set of load paths, so that
-    # code from plugins can be required (explicitly or automatically via ActiveSupport::Dependencies).
-    def add_plugin_load_paths
-      require 'active_support/dependencies'
-      plugin_loader.add_plugin_load_paths
-    end
+    # Freeze the arrays so future modifications will fail rather than do nothing mysteriously
+    configuration.load_once_paths.freeze
+  end
 
-    def add_gem_load_paths
-      require 'rails/gem_dependency'
-      Rails::GemDependency.add_frozen_gem_path
-      unless @configuration.gems.empty?
-        require "rubygems"
-        @configuration.gems.each { |gem| gem.add_load_paths }
-      end
-    end
+  # Adds all load paths from plugins to the global set of load paths, so that
+  # code from plugins can be required (explicitly or automatically via ActiveSupport::Dependencies).
+  Initializer.default.add :add_plugin_load_paths do
+    require 'active_support/dependencies'
+    plugin_loader.add_plugin_load_paths
+  end
 
-    def load_gems
-      unless $gems_rake_task
-        @configuration.gems.each { |gem| gem.load }
-      end
-    end
+  # Loads the environment specified by Configuration#environment_path, which
+  # is typically one of development, test, or production.
+  Initializer.default.add :load_environment do
+    silence_warnings do
+      next if @environment_loaded
+      next unless File.file?(configuration.environment_path)
 
-    def check_for_unbuilt_gems
-      unbuilt_gems = @configuration.gems.select {|gem| gem.frozen? && !gem.built? }
-      if unbuilt_gems.size > 0
-        # don't print if the gems:build rake tasks are being run
-        unless $gems_build_rake_task
-          abort <<-end_error
-The following gems have native components that need to be built
-  #{unbuilt_gems.map { |gem| "#{gem.name}  #{gem.requirement}" } * "\n  "}
+      @environment_loaded = true
 
-You're running:
-  ruby #{Gem.ruby_version} at #{Gem.ruby}
-  rubygems #{Gem::RubyGemsVersion} at #{Gem.path * ', '}
+      config = configuration
+      constants = self.class.constants
 
-Run `rake gems:build` to build the unbuilt gems.
-          end_error
-        end
+      eval(IO.read(configuration.environment_path), binding, configuration.environment_path)
+
+      (self.class.constants - constants).each do |const|
+        Object.const_set(const, self.class.const_get(const))
       end
     end
+  end
 
-    def check_gem_dependencies
-      unloaded_gems = @configuration.gems.reject { |g| g.loaded? }
-      if unloaded_gems.size > 0
-        @gems_dependencies_loaded = false
-        # don't print if the gems rake tasks are being run
-        unless $gems_rake_task
-          abort <<-end_error
-Missing these required gems:
-  #{unloaded_gems.map { |gem| "#{gem.name}  #{gem.requirement}" } * "\n  "}
-
-You're running:
-  ruby #{Gem.ruby_version} at #{Gem.ruby}
-  rubygems #{Gem::RubyGemsVersion} at #{Gem.path * ', '}
-
-Run `rake gems:install` to install the missing gems.
-          end_error
-        end
-      else
-        @gems_dependencies_loaded = true
+  # Preload all frameworks specified by the Configuration#frameworks.
+  # Used by Passenger to ensure everything's loaded before forking and
+  # to avoid autoload race conditions in JRuby.
+  Initializer.default.add :preload_frameworks do
+    if configuration.preload_frameworks
+      configuration.frameworks.each do |framework|
+        # String#classify and #constantize aren't available yet.
+        toplevel = Object.const_get(framework.to_s.gsub(/(?:^|_)(.)/) { $1.upcase })
+        toplevel.load_all! if toplevel.respond_to?(:load_all!)
       end
     end
+  end
 
-    # Loads all plugins in <tt>config.plugin_paths</tt>.  <tt>plugin_paths</tt>
-    # defaults to <tt>vendor/plugins</tt> but may also be set to a list of
-    # paths, such as
-    #   config.plugin_paths = ["#{RAILS_ROOT}/lib/plugins", "#{RAILS_ROOT}/vendor/plugins"]
-    #
-    # In the default implementation, as each plugin discovered in <tt>plugin_paths</tt> is initialized:
-    # * its +lib+ directory, if present, is added to the load path (immediately after the applications lib directory)
-    # * <tt>init.rb</tt> is evaluated, if present
-    #
-    # After all plugins are loaded, duplicates are removed from the load path.
-    # If an array of plugin names is specified in config.plugins, only those plugins will be loaded
-    # and they plugins will be loaded in that order. Otherwise, plugins are loaded in alphabetical
-    # order.
-    #
-    # if config.plugins ends contains :all then the named plugins will be loaded in the given order and all other
-    # plugins will be loaded in alphabetical order
-    def load_plugins
-      plugin_loader.load_plugins
+  # For Ruby 1.8, this initialization sets $KCODE to 'u' to enable the
+  # multibyte safe operations. Plugin authors supporting other encodings
+  # should override this behaviour and set the relevant +default_charset+
+  # on ActionController::Base.
+  #
+  # For Ruby 1.9, UTF-8 is the default internal and external encoding.
+  Initializer.default.add :initialize_encoding do
+    if RUBY_VERSION < '1.9'
+      $KCODE='u'
+    else
+      Encoding.default_internal = Encoding::UTF_8
+      Encoding.default_external = Encoding::UTF_8
     end
+  end
 
-    def plugin_loader
-      @plugin_loader ||= configuration.plugin_loader.new(self)
+  # This initialization routine does nothing unless <tt>:active_record</tt>
+  # is one of the frameworks to load (Configuration#frameworks). If it is,
+  # this sets the database configuration from Configuration#database_configuration
+  # and then establishes the connection.
+  Initializer.default.add :initialize_database do
+    if configuration.frameworks.include?(:active_record)
+      ActiveRecord::Base.configurations = configuration.database_configuration
+      ActiveRecord::Base.establish_connection
     end
+  end
 
-    # Loads the environment specified by Configuration#environment_path, which
-    # is typically one of development, test, or production.
-    def load_environment
-      silence_warnings do
-        return if @environment_loaded
-        @environment_loaded = true
-
-        config = configuration
-        constants = self.class.constants
-
-        eval(IO.read(configuration.environment_path), binding, configuration.environment_path)
+  Initializer.default.add :initialize_cache do
+    unless defined?(RAILS_CACHE)
+      silence_warnings { Object.const_set "RAILS_CACHE", ActiveSupport::Cache.lookup_store(configuration.cache_store) }
 
-        (self.class.constants - constants).each do |const|
-          Object.const_set(const, self.class.const_get(const))
-        end
+      if RAILS_CACHE.respond_to?(:middleware)
+        # Insert middleware to setup and teardown local cache for each request
+        configuration.middleware.insert_after(:"Rack::Lock", RAILS_CACHE.middleware)
       end
     end
+  end
 
-    def load_observers
-      if gems_dependencies_loaded && configuration.frameworks.include?(:active_record)
-        ActiveRecord::Base.instantiate_observers
-      end
+  Initializer.default.add :initialize_framework_caches do
+    if configuration.frameworks.include?(:action_controller)
+      ActionController::Base.cache_store ||= RAILS_CACHE
     end
+  end
 
-    def load_view_paths
-      if configuration.frameworks.include?(:action_view)
-        if configuration.cache_classes
-          view_path = ActionView::FileSystemResolverWithFallback.new(configuration.view_path)
-          ActionController::Base.view_paths = view_path if configuration.frameworks.include?(:action_controller)
-          ActionMailer::Base.template_root = view_path if configuration.frameworks.include?(:action_mailer)
-        end
-      end
-    end
+  Initializer.default.add :initialize_logger do
+    # if the environment has explicitly defined a logger, use it
+    next if Rails.logger
 
-    # Eager load application classes
-    def load_application_classes
-      return if $rails_rake_task
-      if configuration.cache_classes
-        configuration.eager_load_paths.each do |load_path|
-          matcher = /\A#{Regexp.escape(load_path)}(.*)\.rb\Z/
-          Dir.glob("#{load_path}/**/*.rb").sort.each do |file|
-            require_dependency file.sub(matcher, '\1')
-          end
+    unless logger = configuration.logger
+      begin
+        logger = ActiveSupport::BufferedLogger.new(configuration.log_path)
+        logger.level = ActiveSupport::BufferedLogger.const_get(configuration.log_level.to_s.upcase)
+        if RAILS_ENV == "production"
+          logger.auto_flushing = false
         end
+      rescue StandardError => e
+        logger = ActiveSupport::BufferedLogger.new(STDERR)
+        logger.level = ActiveSupport::BufferedLogger::WARN
+        logger.warn(
+          "Rails Error: Unable to access log file. Please ensure that #{configuration.log_path} exists and is chmod 0666. " +
+          "The log level has been raised to WARN and the output directed to STDERR until the problem is fixed."
+        )
       end
     end
 
-    # For Ruby 1.8, this initialization sets $KCODE to 'u' to enable the
-    # multibyte safe operations. Plugin authors supporting other encodings
-    # should override this behaviour and set the relevant +default_charset+
-    # on ActionController::Base.
-    #
-    # For Ruby 1.9, UTF-8 is the default internal and external encoding.
-    def initialize_encoding
-      if RUBY_VERSION < '1.9'
-        $KCODE='u'
-      else
-        Encoding.default_internal = Encoding::UTF_8
-        Encoding.default_external = Encoding::UTF_8
-      end
-    end
+    # TODO: Why are we silencing warning here?
+    silence_warnings { Object.const_set "RAILS_DEFAULT_LOGGER", logger }
+  end
 
-    # This initialization routine does nothing unless <tt>:active_record</tt>
-    # is one of the frameworks to load (Configuration#frameworks). If it is,
-    # this sets the database configuration from Configuration#database_configuration
-    # and then establishes the connection.
-    def initialize_database
-      if configuration.frameworks.include?(:active_record)
-        ActiveRecord::Base.configurations = configuration.database_configuration
-        ActiveRecord::Base.establish_connection
-      end
+  # Sets the logger for Active Record, Action Controller, and Action Mailer
+  # (but only for those frameworks that are to be loaded). If the framework's
+  # logger is already set, it is not changed, otherwise it is set to use
+  # RAILS_DEFAULT_LOGGER.
+  Initializer.default.add :initialize_framework_logging do
+    for framework in ([ :active_record, :action_controller, :action_mailer ] & configuration.frameworks)
+      framework.to_s.camelize.constantize.const_get("Base").logger ||= Rails.logger
     end
 
-    def initialize_database_middleware
-      if configuration.frameworks.include?(:active_record)
-        if configuration.frameworks.include?(:action_controller) &&
-            ActionController::Base.session_store.name == 'ActiveRecord::SessionStore'
-          configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::ConnectionAdapters::ConnectionManagement
-          configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::QueryCache
-        else
-          configuration.middleware.use ActiveRecord::ConnectionAdapters::ConnectionManagement
-          configuration.middleware.use ActiveRecord::QueryCache
-        end
-      end
-    end
+    ActiveSupport::Dependencies.logger ||= Rails.logger
+    Rails.cache.logger ||= Rails.logger
+  end
 
-    def initialize_cache
-      unless defined?(RAILS_CACHE)
-        silence_warnings { Object.const_set "RAILS_CACHE", ActiveSupport::Cache.lookup_store(configuration.cache_store) }
+  # Sets the dependency loading mechanism based on the value of
+  # Configuration#cache_classes.
+  Initializer.default.add :initialize_dependency_mechanism do
+    # TODO: Remove files from the $" and always use require
+    ActiveSupport::Dependencies.mechanism = configuration.cache_classes ? :require : :load
+  end
 
-        if RAILS_CACHE.respond_to?(:middleware)
-          # Insert middleware to setup and teardown local cache for each request
-          configuration.middleware.insert_after(:"Rack::Lock", RAILS_CACHE.middleware)
-        end
-      end
-    end
+  # Loads support for "whiny nil" (noisy warnings when methods are invoked
+  # on +nil+ values) if Configuration#whiny_nils is true.
+  Initializer.default.add :initialize_whiny_nils do
+    require('active_support/whiny_nil') if configuration.whiny_nils
+  end
 
-    def initialize_framework_caches
-      if configuration.frameworks.include?(:action_controller)
-        ActionController::Base.cache_store ||= RAILS_CACHE
-      end
-    end
 
-    # If the RAILS_DEFAULT_LOGGER constant is already set, this initialization
-    # routine does nothing. If the constant is not set, and Configuration#logger
-    # is not +nil+, this also does nothing. Otherwise, a new logger instance
-    # is created at Configuration#log_path, with a default log level of
-    # Configuration#log_level.
-    #
-    # If the log could not be created, the log will be set to output to
-    # +STDERR+, with a log level of +WARN+.
-    def initialize_logger
-      # if the environment has explicitly defined a logger, use it
-      return if Rails.logger
-
-      unless logger = configuration.logger
-        begin
-          logger = ActiveSupport::BufferedLogger.new(configuration.log_path)
-          logger.level = ActiveSupport::BufferedLogger.const_get(configuration.log_level.to_s.upcase)
-          if configuration.environment == "production"
-            logger.auto_flushing = false
-          end
-        rescue StandardError => e
-          logger = ActiveSupport::BufferedLogger.new(STDERR)
-          logger.level = ActiveSupport::BufferedLogger::WARN
-          logger.warn(
-            "Rails Error: Unable to access log file. Please ensure that #{configuration.log_path} exists and is chmod 0666. " +
-            "The log level has been raised to WARN and the output directed to STDERR until the problem is fixed."
-          )
-        end
-      end
-
-      silence_warnings { Object.const_set "RAILS_DEFAULT_LOGGER", logger }
-    end
+  # Sets the default value for Time.zone, and turns on ActiveRecord::Base#time_zone_aware_attributes.
+  # If assigned value cannot be matched to a TimeZone, an exception will be raised.
+  Initializer.default.add :initialize_time_zone do
+    if configuration.time_zone
+      zone_default = Time.__send__(:get_zone, configuration.time_zone)
 
-    # Sets the logger for Active Record, Action Controller, and Action Mailer
-    # (but only for those frameworks that are to be loaded). If the framework's
-    # logger is already set, it is not changed, otherwise it is set to use
-    # RAILS_DEFAULT_LOGGER.
-    def initialize_framework_logging
-      for framework in ([ :active_record, :action_controller, :action_mailer ] & configuration.frameworks)
-        framework.to_s.camelize.constantize.const_get("Base").logger ||= Rails.logger
+      unless zone_default
+        raise \
+          'Value assigned to config.time_zone not recognized.' +
+          'Run "rake -D time" for a list of tasks for finding appropriate time zone names.'
       end
 
-      ActiveSupport::Dependencies.logger ||= Rails.logger
-      Rails.cache.logger ||= Rails.logger
-    end
+      Time.zone_default = zone_default
 
-    # Sets +ActionController::Base#view_paths+ and +ActionMailer::Base#template_root+
-    # (but only for those frameworks that are to be loaded). If the framework's
-    # paths have already been set, it is not changed, otherwise it is
-    # set to use Configuration#view_path.
-    def initialize_framework_views
-      if configuration.frameworks.include?(:action_view)
-        view_path = ActionView::PathSet.type_cast(configuration.view_path)
-        ActionMailer::Base.template_root  = view_path if configuration.frameworks.include?(:action_mailer) && ActionMailer::Base.view_paths.blank?
-        ActionController::Base.view_paths = view_path if configuration.frameworks.include?(:action_controller) && ActionController::Base.view_paths.blank?
+      if configuration.frameworks.include?(:active_record)
+        ActiveRecord::Base.time_zone_aware_attributes = true
+        ActiveRecord::Base.default_timezone = :utc
       end
     end
+  end
 
-    # If Action Controller is not one of the loaded frameworks (Configuration#frameworks)
-    # this does nothing. Otherwise, it loads the routing definitions and sets up
-    # loading module used to lazily load controllers (Configuration#controller_paths).
-    def initialize_routing
-      return unless configuration.frameworks.include?(:action_controller)
-
-      ActionController::Routing.controller_paths += configuration.controller_paths
-      ActionController::Routing::Routes.add_configuration_file(configuration.routes_configuration_file)
-      ActionController::Routing::Routes.reload!
-    end
-
-    # Sets the dependency loading mechanism based on the value of
-    # Configuration#cache_classes.
-    def initialize_dependency_mechanism
-      ActiveSupport::Dependencies.mechanism = configuration.cache_classes ? :require : :load
-    end
-
-    # Loads support for "whiny nil" (noisy warnings when methods are invoked
-    # on +nil+ values) if Configuration#whiny_nils is true.
-    def initialize_whiny_nils
-      require('active_support/whiny_nil') if configuration.whiny_nils
+  # Set the i18n configuration from config.i18n but special-case for the load_path which should be
+  # appended to what's already set instead of overwritten.
+  Initializer.default.add :initialize_i18n do
+    configuration.i18n.each do |setting, value|
+      if setting == :load_path
+        I18n.load_path += value
+      else
+        I18n.send("#{setting}=", value)
+      end
     end
+  end
 
-    # Sets the default value for Time.zone, and turns on ActiveRecord::Base#time_zone_aware_attributes.
-    # If assigned value cannot be matched to a TimeZone, an exception will be raised.
-    def initialize_time_zone
-      if configuration.time_zone
-        zone_default = Time.__send__(:get_zone, configuration.time_zone)
-
-        unless zone_default
-          raise \
-            'Value assigned to config.time_zone not recognized.' +
-            'Run "rake -D time" for a list of tasks for finding appropriate time zone names.'
-        end
-
-        Time.zone_default = zone_default
+  # Initializes framework-specific settings for each of the loaded frameworks
+  # (Configuration#frameworks). The available settings map to the accessors
+  # on each of the corresponding Base classes.
+  Initializer.default.add :initialize_framework_settings do
+    configuration.frameworks.each do |framework|
+      base_class = framework.to_s.camelize.constantize.const_get("Base")
 
-        if configuration.frameworks.include?(:active_record)
-          ActiveRecord::Base.time_zone_aware_attributes = true
-          ActiveRecord::Base.default_timezone = :utc
-        end
+      configuration.send(framework).each do |setting, value|
+        base_class.send("#{setting}=", value)
       end
     end
+    configuration.active_support.each do |setting, value|
+      ActiveSupport.send("#{setting}=", value)
+    end
+  end
 
-    # Set the i18n configuration from config.i18n but special-case for the load_path which should be
-    # appended to what's already set instead of overwritten.
-    def initialize_i18n
-      configuration.i18n.each do |setting, value|
-        if setting == :load_path
-          I18n.load_path += value
-        else
-          I18n.send("#{setting}=", value)
-        end
-      end
+  # Sets +ActionController::Base#view_paths+ and +ActionMailer::Base#template_root+
+  # (but only for those frameworks that are to be loaded). If the framework's
+  # paths have already been set, it is not changed, otherwise it is
+  # set to use Configuration#view_path.
+  Initializer.default.add :initialize_framework_views do
+    if configuration.frameworks.include?(:action_view)
+      view_path = ActionView::PathSet.type_cast(configuration.view_path)
+      ActionMailer::Base.template_root  = view_path if configuration.frameworks.include?(:action_mailer) && ActionMailer::Base.view_paths.blank?
+      ActionController::Base.view_paths = view_path if configuration.frameworks.include?(:action_controller) && ActionController::Base.view_paths.blank?
     end
+  end
 
-    def initialize_metal
+  Initializer.default.add :initialize_metal do
+    # TODO: Make Rails and metal work without ActionController
+    if defined?(ActionController)
       Rails::Rack::Metal.requested_metals = configuration.metals
       Rails::Rack::Metal.metal_paths += plugin_loader.engine_metal_paths
 
@@ -598,540 +399,172 @@ Run `rake gems:install` to install the missing gems.
         :"ActionDispatch::ParamsParser",
         Rails::Rack::Metal, :if => Rails::Rack::Metal.metals.any?)
     end
+  end
 
-    # Initializes framework-specific settings for each of the loaded frameworks
-    # (Configuration#frameworks). The available settings map to the accessors
-    # on each of the corresponding Base classes.
-    def initialize_framework_settings
-      configuration.frameworks.each do |framework|
-        base_class = framework.to_s.camelize.constantize.const_get("Base")
-
-        configuration.send(framework).each do |setting, value|
-          base_class.send("#{setting}=", value)
-        end
-      end
-      configuration.active_support.each do |setting, value|
-        ActiveSupport.send("#{setting}=", value)
-      end
-    end
+  Initializer.default.add :check_for_unbuilt_gems do
+    unbuilt_gems = config.gems.select {|gem| gem.frozen? && !gem.built? }
+    if unbuilt_gems.size > 0
+      # don't print if the gems:build rake tasks are being run
+      unless $gems_build_rake_task
+        abort <<-end_error
+The following gems have native components that need to be built
+#{unbuilt_gems.map { |gemm| "#{gemm.name}  #{gemm.requirement}" } * "\n  "}
 
-    # Fires the user-supplied after_initialize block (Configuration#after_initialize)
-    def after_initialize
-      if gems_dependencies_loaded
-        configuration.after_initialize_blocks.each do |block|
-          block.call
-        end
-      end
-    end
+You're running:
+ruby #{Gem.ruby_version} at #{Gem.ruby}
+rubygems #{Gem::RubyGemsVersion} at #{Gem.path * ', '}
 
-    def load_application_initializers
-      if gems_dependencies_loaded
-        Dir["#{configuration.root_path}/config/initializers/**/*.rb"].sort.each do |initializer|
-          load(initializer)
-        end
+Run `rake gems:build` to build the unbuilt gems.
+        end_error
       end
     end
+  end
 
-    def prepare_dispatcher
-      return unless configuration.frameworks.include?(:action_controller)
-      require 'dispatcher' unless defined?(::Dispatcher)
-      Dispatcher.define_dispatcher_callbacks(configuration.cache_classes)
-    end
-
-    def disable_dependency_loading
-      if configuration.cache_classes && !configuration.dependency_loading
-        ActiveSupport::Dependencies.unhook!
-      end
+  Initializer.default.add :load_gems do
+    unless $gems_rake_task
+      config.gems.each { |gem| gem.load }
     end
   end
 
-  # The Configuration class holds all the parameters for the Initializer and
-  # ships with defaults that suites most Rails applications. But it's possible
-  # to overwrite everything. Usually, you'll create an Configuration file
-  # implicitly through the block running on the Initializer, but it's also
-  # possible to create the Configuration instance in advance and pass it in
-  # like this:
+  # Loads all plugins in <tt>config.plugin_paths</tt>.  <tt>plugin_paths</tt>
+  # defaults to <tt>vendor/plugins</tt> but may also be set to a list of
+  # paths, such as
+  #   config.plugin_paths = ["#{RAILS_ROOT}/lib/plugins", "#{RAILS_ROOT}/vendor/plugins"]
   #
-  #   config = Rails::Configuration.new
-  #   Rails::Initializer.run(:process, config)
-  class Configuration
-    # The application's base directory.
-    attr_reader :root_path
-
-    # A stub for setting options on ActionController::Base.
-    attr_accessor :action_controller
-
-    # A stub for setting options on ActionMailer::Base.
-    attr_accessor :action_mailer
-
-    # A stub for setting options on ActionView::Base.
-    attr_accessor :action_view
-
-    # A stub for setting options on ActiveRecord::Base.
-    attr_accessor :active_record
-
-    # A stub for setting options on ActiveResource::Base.
-    attr_accessor :active_resource
-
-    # A stub for setting options on ActiveSupport.
-    attr_accessor :active_support
-
-    # Whether to preload all frameworks at startup.
-    attr_accessor :preload_frameworks
-
-    # Whether or not classes should be cached (set to false if you want
-    # application classes to be reloaded on each request)
-    attr_accessor :cache_classes
-
-    # The list of paths that should be searched for controllers. (Defaults
-    # to <tt>app/controllers</tt>.)
-    attr_accessor :controller_paths
-
-    # The path to the database configuration file to use. (Defaults to
-    # <tt>config/database.yml</tt>.)
-    attr_accessor :database_configuration_file
-
-    # The path to the routes configuration file to use. (Defaults to
-    # <tt>config/routes.rb</tt>.)
-    attr_accessor :routes_configuration_file
-
-    # The list of rails framework components that should be loaded. (Defaults
-    # to <tt>:active_record</tt>, <tt>:action_controller</tt>,
-    # <tt>:action_view</tt>, <tt>:action_mailer</tt>, and
-    # <tt>:active_resource</tt>).
-    attr_accessor :frameworks
-
-    # An array of additional paths to prepend to the load path. By default,
-    # all +app+, +lib+, +vendor+ and mock paths are included in this list.
-    attr_accessor :load_paths
-
-    # An array of paths from which Rails will automatically load from only once.
-    # All elements of this array must also be in +load_paths+.
-    attr_accessor :load_once_paths
-
-    # An array of paths from which Rails will eager load on boot if cache
-    # classes is enabled. All elements of this array must also be in
-    # +load_paths+.
-    attr_accessor :eager_load_paths
-
-    # The log level to use for the default Rails logger. In production mode,
-    # this defaults to <tt>:info</tt>. In development mode, it defaults to
-    # <tt>:debug</tt>.
-    attr_accessor :log_level
-
-    # The path to the log file to use. Defaults to log/#{environment}.log
-    # (e.g. log/development.log or log/production.log).
-    attr_accessor :log_path
-
-    # The specific logger to use. By default, a logger will be created and
-    # initialized using #log_path and #log_level, but a programmer may
-    # specifically set the logger to use via this accessor and it will be
-    # used directly.
-    attr_accessor :logger
-
-    # The specific cache store to use. By default, the ActiveSupport::Cache::Store will be used.
-    attr_accessor :cache_store
-
-    # The root of the application's views. (Defaults to <tt>app/views</tt>.)
-    attr_accessor :view_path
-
-    # Set to +true+ if you want to be warned (noisily) when you try to invoke
-    # any method of +nil+. Set to +false+ for the standard Ruby behavior.
-    attr_accessor :whiny_nils
-
-    # The list of plugins to load. If this is set to <tt>nil</tt>, all plugins will
-    # be loaded. If this is set to <tt>[]</tt>, no plugins will be loaded. Otherwise,
-    # plugins will be loaded in the order specified.
-    attr_reader :plugins
-    def plugins=(plugins)
-      @plugins = plugins.nil? ? nil : plugins.map { |p| p.to_sym }
-    end
-
-    # The list of metals to load. If this is set to <tt>nil</tt>, all metals will
-    # be loaded in alphabetical order. If this is set to <tt>[]</tt>, no metals will
-    # be loaded. Otherwise metals will be loaded in the order specified
-    attr_accessor :metals
-
-    # The path to the root of the plugins directory. By default, it is in
-    # <tt>vendor/plugins</tt>.
-    attr_accessor :plugin_paths
-
-    # The classes that handle finding the desired plugins that you'd like to load for
-    # your application. By default it is the Rails::Plugin::FileSystemLocator which finds
-    # plugins to load in <tt>vendor/plugins</tt>. You can hook into gem location by subclassing
-    # Rails::Plugin::Locator and adding it onto the list of <tt>plugin_locators</tt>.
-    attr_accessor :plugin_locators
-
-    # The class that handles loading each plugin. Defaults to Rails::Plugin::Loader, but
-    # a sub class would have access to fine grained modification of the loading behavior. See
-    # the implementation of Rails::Plugin::Loader for more details.
-    attr_accessor :plugin_loader
-
-    # Enables or disables plugin reloading.  You can get around this setting per plugin.
-    # If <tt>reload_plugins?</tt> is false, add this to your plugin's <tt>init.rb</tt>
-    # to make it reloadable:
-    #
-    #   ActiveSupport::Dependencies.load_once_paths.delete lib_path
-    #
-    # If <tt>reload_plugins?</tt> is true, add this to your plugin's <tt>init.rb</tt>
-    # to only load it once:
-    #
-    #   ActiveSupport::Dependencies.load_once_paths << lib_path
-    #
-    attr_accessor :reload_plugins
-
-    # Returns true if plugin reloading is enabled.
-    def reload_plugins?
-      !!@reload_plugins
-    end
-
-    # Enables or disables dependency loading during the request cycle. Setting
-    # <tt>dependency_loading</tt> to true will allow new classes to be loaded
-    # during a request. Setting it to false will disable this behavior.
-    #
-    # Those who want to run in a threaded environment should disable this
-    # option and eager load or require all there classes on initialization.
-    #
-    # If <tt>cache_classes</tt> is disabled, dependency loaded will always be
-    # on.
-    attr_accessor :dependency_loading
-
-    # An array of gems that this rails application depends on.  Rails will automatically load
-    # these gems during installation, and allow you to install any missing gems with:
-    #
-    #   rake gems:install
-    #
-    # You can add gems with the #gem method.
-    attr_accessor :gems
-
-    # Adds a single Gem dependency to the rails application. By default, it will require
-    # the library with the same name as the gem. Use :lib to specify a different name.
-    #
-    #   # gem 'aws-s3', '>= 0.4.0'
-    #   # require 'aws/s3'
-    #   config.gem 'aws-s3', :lib => 'aws/s3', :version => '>= 0.4.0', \
-    #     :source => "http://code.whytheluckystiff.net"
-    #
-    # To require a library be installed, but not attempt to load it, pass :lib => false
-    #
-    #   config.gem 'qrp', :version => '0.4.1', :lib => false
-    def gem(name, options = {})
-      @gems << Rails::GemDependency.new(name, options)
-    end
-
-    # Deprecated options:
-    def breakpoint_server(_ = nil)
-      $stderr.puts %(
-      *******************************************************************
-      * config.breakpoint_server has been deprecated and has no effect. *
-      *******************************************************************
-      )
-    end
-    alias_method :breakpoint_server=, :breakpoint_server
-
-    # Sets the default +time_zone+.  Setting this will enable +time_zone+
-    # awareness for Active Record models and set the Active Record default
-    # timezone to <tt>:utc</tt>.
-    attr_accessor :time_zone
-
-    # Accessor for i18n settings.
-    attr_accessor :i18n
-
-    # Create a new Configuration instance, initialized with the default
-    # values.
-    def initialize
-      set_root_path!
-
-      self.frameworks                   = default_frameworks
-      self.load_paths                   = default_load_paths
-      self.load_once_paths              = default_load_once_paths
-      self.eager_load_paths             = default_eager_load_paths
-      self.log_path                     = default_log_path
-      self.log_level                    = default_log_level
-      self.view_path                    = default_view_path
-      self.controller_paths             = default_controller_paths
-      self.preload_frameworks           = default_preload_frameworks
-      self.cache_classes                = default_cache_classes
-      self.dependency_loading           = default_dependency_loading
-      self.whiny_nils                   = default_whiny_nils
-      self.plugins                      = default_plugins
-      self.plugin_paths                 = default_plugin_paths
-      self.plugin_locators              = default_plugin_locators
-      self.plugin_loader                = default_plugin_loader
-      self.database_configuration_file  = default_database_configuration_file
-      self.routes_configuration_file    = default_routes_configuration_file
-      self.gems                         = default_gems
-      self.i18n                         = default_i18n
-
-      for framework in default_frameworks
-        self.send("#{framework}=", Rails::OrderedOptions.new)
-      end
-      self.active_support = Rails::OrderedOptions.new
-    end
-
-    # Set the root_path to RAILS_ROOT and canonicalize it.
-    def set_root_path!
-      raise 'RAILS_ROOT is not set' unless defined?(::RAILS_ROOT)
-      raise 'RAILS_ROOT is not a directory' unless File.directory?(::RAILS_ROOT)
-
-      @root_path =
-        # Pathname is incompatible with Windows, but Windows doesn't have
-        # real symlinks so File.expand_path is safe.
-        if RUBY_PLATFORM =~ /(:?mswin|mingw)/
-          File.expand_path(::RAILS_ROOT)
-
-        # Otherwise use Pathname#realpath which respects symlinks.
-        else
-          Pathname.new(::RAILS_ROOT).realpath.to_s
-        end
-
-      Object.const_set(:RELATIVE_RAILS_ROOT, ::RAILS_ROOT.dup) unless defined?(::RELATIVE_RAILS_ROOT)
-      ::RAILS_ROOT.replace @root_path
-    end
-
-    # Enable threaded mode. Allows concurrent requests to controller actions and
-    # multiple database connections. Also disables automatic dependency loading
-    # after boot, and disables reloading code on every request, as these are
-    # fundamentally incompatible with thread safety.
-    def threadsafe!
-      self.preload_frameworks = true
-      self.cache_classes = true
-      self.dependency_loading = false
-      self.action_controller.allow_concurrency = true
-      self
-    end
-
-    # Loads and returns the contents of the #database_configuration_file. The
-    # contents of the file are processed via ERB before being sent through
-    # YAML::load.
-    def database_configuration
-      require 'erb'
-      YAML::load(ERB.new(IO.read(database_configuration_file)).result)
-    end
+  # In the default implementation, as each plugin discovered in <tt>plugin_paths</tt> is initialized:
+  # * its +lib+ directory, if present, is added to the load path (immediately after the applications lib directory)
+  # * <tt>init.rb</tt> is evaluated, if present
+  #
+  # After all plugins are loaded, duplicates are removed from the load path.
+  # If an array of plugin names is specified in config.plugins, only those plugins will be loaded
+  # and they plugins will be loaded in that order. Otherwise, plugins are loaded in alphabetical
+  # order.
+  #
+  # if config.plugins ends contains :all then the named plugins will be loaded in the given order and all other
+  # plugins will be loaded in alphabetical order
+  Initializer.default.add :load_plugins do
+    plugin_loader.load_plugins
+  end
 
-    # The path to the current environment's file (<tt>development.rb</tt>, etc.). By
-    # default the file is at <tt>config/environments/#{environment}.rb</tt>.
-    def environment_path
-      "#{root_path}/config/environments/#{environment}.rb"
+  #
+  # # pick up any gems that plugins depend on
+  Initializer.default.add :add_gem_load_paths do
+    require 'rails/gem_dependency'
+    # TODO: This seems extraneous
+    Rails::GemDependency.add_frozen_gem_path
+    unless config.gems.empty?
+      require "rubygems"
+      config.gems.each { |gem| gem.add_load_paths }
     end
+  end
 
-    # Return the currently selected environment. By default, it returns the
-    # value of the RAILS_ENV constant.
-    def environment
-      ::RAILS_ENV
-    end
+  # TODO: Figure out if this needs to run a second time
+  # load_gems
 
-    # Adds a block which will be executed after rails has been fully initialized.
-    # Useful for per-environment configuration which depends on the framework being
-    # fully initialized.
-    def after_initialize(&after_initialize_block)
-      after_initialize_blocks << after_initialize_block if after_initialize_block
-    end
+  Initializer.default.add :check_gem_dependencies do
+    unloaded_gems = config.gems.reject { |g| g.loaded? }
+    if unloaded_gems.size > 0
+      configuration.gems_dependencies_loaded = false
+      # don't print if the gems rake tasks are being run
+      unless $gems_rake_task
+        abort <<-end_error
+Missing these required gems:
+#{unloaded_gems.map { |gemm| "#{gemm.name}  #{gemm.requirement}" } * "\n  "}
 
-    # Returns the blocks added with Configuration#after_initialize
-    def after_initialize_blocks
-      @after_initialize_blocks ||= []
-    end
+You're running:
+ruby #{Gem.ruby_version} at #{Gem.ruby}
+rubygems #{Gem::RubyGemsVersion} at #{Gem.path * ', '}
 
-    # Add a preparation callback that will run before every request in development
-    # mode, or before the first request in production.
-    #
-    # See Dispatcher#to_prepare.
-    def to_prepare(&callback)
-      after_initialize do
-        require 'dispatcher' unless defined?(::Dispatcher)
-        Dispatcher.to_prepare(&callback)
+Run `rake gems:install` to install the missing gems.
+        end_error
       end
+    else
+      configuration.gems_dependencies_loaded = true
     end
+  end
 
-    def middleware
-      require 'action_controller'
-      ActionController::Dispatcher.middleware
-    end
-
-    def builtin_directories
-      # Include builtins only in the development environment.
-      (environment == 'development') ? Dir["#{RAILTIES_PATH}/builtin/*/"] : []
-    end
-
-    def framework_paths
-      paths = %w(railties railties/lib activesupport/lib)
-      paths << 'actionpack/lib' if frameworks.include?(:action_controller) || frameworks.include?(:action_view)
+  # # bail out if gems are missing - note that check_gem_dependencies will have
+  # # already called abort() unless $gems_rake_task is set
+  # return unless gems_dependencies_loaded
 
-      [:active_record, :action_mailer, :active_resource, :action_web_service].each do |framework|
-        paths << "#{framework.to_s.gsub('_', '')}/lib" if frameworks.include?(framework)
+  Initializer.default.add :load_application_initializers do
+    if gems_dependencies_loaded
+      Dir["#{configuration.root_path}/config/initializers/**/*.rb"].sort.each do |initializer|
+        load(initializer)
       end
-
-      paths.map { |dir| "#{framework_root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
     end
+  end
 
-    private
-      def framework_root_path
-        defined?(::RAILS_FRAMEWORK_ROOT) ? ::RAILS_FRAMEWORK_ROOT : "#{root_path}/vendor/rails"
-      end
-
-      def default_frameworks
-        [ :active_record, :action_controller, :action_view, :action_mailer, :active_resource ]
-      end
-
-      def default_load_paths
-        paths = []
-
-        # Add the old mock paths only if the directories exists
-        paths.concat(Dir["#{root_path}/test/mocks/#{environment}"]) if File.exists?("#{root_path}/test/mocks/#{environment}")
-
-        # Add the app's controller directory
-        paths.concat(Dir["#{root_path}/app/controllers/"])
-
-        # Followed by the standard includes.
-        paths.concat %w(
-          app
-          app/metal
-          app/models
-          app/controllers
-          app/helpers
-          app/services
-          lib
-          vendor
-        ).map { |dir| "#{root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
-
-        paths.concat builtin_directories
-      end
-
-      # Doesn't matter since plugins aren't in load_paths yet.
-      def default_load_once_paths
-        []
-      end
-
-      def default_eager_load_paths
-        %w(
-          app/metal
-          app/models
-          app/controllers
-          app/helpers
-        ).map { |dir| "#{root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
-      end
-
-      def default_log_path
-        File.join(root_path, 'log', "#{environment}.log")
-      end
-
-      def default_log_level
-        environment == 'production' ? :info : :debug
-      end
-
-      def default_database_configuration_file
-        File.join(root_path, 'config', 'database.yml')
-      end
-
-      def default_routes_configuration_file
-        File.join(root_path, 'config', 'routes.rb')
-      end
-
-      def default_view_path
-        File.join(root_path, 'app', 'views')
-      end
-
-      def default_controller_paths
-        paths = [File.join(root_path, 'app', 'controllers')]
-        paths.concat builtin_directories
-        paths
-      end
-
-      def default_dependency_loading
-        true
-      end
-
-      def default_preload_frameworks
-        false
-      end
-
-      def default_cache_classes
-        true
-      end
-
-      def default_whiny_nils
-        false
-      end
-
-      def default_plugins
-        nil
-      end
-
-      def default_plugin_paths
-        ["#{root_path}/vendor/plugins"]
-      end
-
-      def default_plugin_locators
-        require 'rails/plugin/locator'
-        locators = []
-        locators << Plugin::GemLocator if defined? Gem
-        locators << Plugin::FileSystemLocator
-      end
-
-      def default_plugin_loader
-        require 'rails/plugin/loader'
-        Plugin::Loader
-      end
-
-      def default_cache_store
-        if File.exist?("#{root_path}/tmp/cache/")
-          [ :file_store, "#{root_path}/tmp/cache/" ]
-        else
-          :memory_store
-        end
+  # Fires the user-supplied after_initialize block (Configuration#after_initialize)
+  Initializer.default.add :after_initialize do
+    if gems_dependencies_loaded
+      configuration.after_initialize_blocks.each do |block|
+        block.call
       end
+    end
+  end
 
-      def default_gems
-        []
+  # # Setup database middleware after initializers have run
+  Initializer.default.add :initialize_database_middleware do
+    if configuration.frameworks.include?(:active_record)
+      if configuration.frameworks.include?(:action_controller) &&
+          ActionController::Base.session_store.name == 'ActiveRecord::SessionStore'
+        configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::ConnectionAdapters::ConnectionManagement
+        configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::QueryCache
+      else
+        configuration.middleware.use ActiveRecord::ConnectionAdapters::ConnectionManagement
+        configuration.middleware.use ActiveRecord::QueryCache
       end
+    end
+  end
 
-      def default_i18n
-        i18n = Rails::OrderedOptions.new
-        i18n.load_path = []
-
-        if File.exist?(File.join(RAILS_ROOT, 'config', 'locales'))
-          i18n.load_path << Dir[File.join(RAILS_ROOT, 'config', 'locales', '*.{rb,yml}')]
-          i18n.load_path.flatten!
-        end
+  # TODO: Make a DSL way to limit an initializer to a particular framework
 
-        i18n
-      end
+  # # Prepare dispatcher callbacks and run 'prepare' callbacks
+  Initializer.default.add :prepare_dispatcher do
+    next unless configuration.frameworks.include?(:action_controller)
+    require 'dispatcher' unless defined?(::Dispatcher)
+    Dispatcher.define_dispatcher_callbacks(configuration.cache_classes)
   end
-end
 
-# Needs to be duplicated from Active Support since its needed before Active
-# Support is available. Here both Options and Hash are namespaced to prevent
-# conflicts with other implementations AND with the classes residing in Active Support.
-class Rails::OrderedOptions < Array #:nodoc:
-  def []=(key, value)
-    key = key.to_sym
-
-    if pair = find_pair(key)
-      pair.pop
-      pair << value
-    else
-      self << [key, value]
+  # Routing must be initialized after plugins to allow the former to extend the routes
+  # ---
+  # If Action Controller is not one of the loaded frameworks (Configuration#frameworks)
+  # this does nothing. Otherwise, it loads the routing definitions and sets up
+  # loading module used to lazily load controllers (Configuration#controller_paths).
+  Initializer.default.add :initialize_routing do
+    next unless configuration.frameworks.include?(:action_controller)
+
+    ActionController::Routing.controller_paths += configuration.controller_paths
+    ActionController::Routing::Routes.add_configuration_file(configuration.routes_configuration_file)
+    ActionController::Routing::Routes.reload!
+  end
+  #
+  # # Observers are loaded after plugins in case Observers or observed models are modified by plugins.
+  Initializer.default.add :load_observers do
+    if gems_dependencies_loaded && configuration.frameworks.include?(:active_record)
+      ActiveRecord::Base.instantiate_observers
     end
   end
 
-  def [](key)
-    pair = find_pair(key.to_sym)
-    pair ? pair.last : nil
-  end
+  # Eager load application classes
+  Initializer.default.add :load_application_classes do
+    next if $rails_rake_task
 
-  def method_missing(name, *args)
-    if name.to_s =~ /(.*)=$/
-      self[$1.to_sym] = args.first
-    else
-      self[name]
+    if configuration.cache_classes
+      configuration.eager_load_paths.each do |load_path|
+        matcher = /\A#{Regexp.escape(load_path)}(.*)\.rb\Z/
+        Dir.glob("#{load_path}/**/*.rb").sort.each do |file|
+          require_dependency file.sub(matcher, '\1')
+        end
+      end
     end
   end
 
-  private
-    def find_pair(key)
-      self.each { |i| return i if i.first == key }
-      return false
+  # Disable dependency loading during request cycle
+  Initializer.default.add :disable_dependency_loading do
+    if configuration.cache_classes && !configuration.dependency_loading
+      ActiveSupport::Dependencies.unhook!
     end
+  end
 end
-
diff --git a/railties/lib/initializer_old.rb b/railties/lib/initializer_old.rb
new file mode 100644
index 0000000000..cee5c7bcb6
--- /dev/null
+++ b/railties/lib/initializer_old.rb
@@ -0,0 +1,1137 @@
+require 'logger'
+require 'set'
+require 'pathname'
+
+$LOAD_PATH.unshift File.dirname(__FILE__)
+require 'railties_path'
+require 'rails/version'
+require 'rails/gem_dependency'
+require 'rails/rack'
+
+RAILS_ENV = (ENV['RAILS_ENV'] || 'development').dup unless defined?(RAILS_ENV)
+
+module Rails
+  class << self
+    # The Configuration instance used to configure the Rails environment
+    def configuration
+      @@configuration
+    end
+
+    def configuration=(configuration)
+      @@configuration = configuration
+    end
+
+    def initialized?
+      @initialized || false
+    end
+
+    def initialized=(initialized)
+      @initialized ||= initialized
+    end
+
+    def logger
+      if defined?(RAILS_DEFAULT_LOGGER)
+        RAILS_DEFAULT_LOGGER
+      else
+        nil
+      end
+    end
+
+    def backtrace_cleaner
+      @@backtrace_cleaner ||= begin
+        # Relies on ActiveSupport, so we have to lazy load to postpone definition until AS has been loaded
+        require 'rails/backtrace_cleaner'
+        Rails::BacktraceCleaner.new
+      end
+    end
+
+    def root
+      Pathname.new(RAILS_ROOT) if defined?(RAILS_ROOT)
+    end
+
+    def env
+      @_env ||= ActiveSupport::StringInquirer.new(RAILS_ENV)
+    end
+
+    def cache
+      RAILS_CACHE
+    end
+
+    def version
+      VERSION::STRING
+    end
+
+    def public_path
+      @@public_path ||= self.root ? File.join(self.root, "public") : "public"
+    end
+
+    def public_path=(path)
+      @@public_path = path
+    end
+  end
+
+  # The Initializer is responsible for processing the Rails configuration, such
+  # as setting the $LOAD_PATH, requiring the right frameworks, initializing
+  # logging, and more. It can be run either as a single command that'll just
+  # use the default configuration, like this:
+  #
+  #   Rails::Initializer.run
+  #
+  # But normally it's more interesting to pass in a custom configuration
+  # through the block running:
+  #
+  #   Rails::Initializer.run do |config|
+  #     config.frameworks -= [ :action_mailer ]
+  #   end
+  #
+  # This will use the default configuration options from Rails::Configuration,
+  # but allow for overwriting on select areas.
+  class Initializer
+    # The Configuration instance used by this Initializer instance.
+    attr_reader :configuration
+
+    # The set of loaded plugins.
+    attr_reader :loaded_plugins
+
+    # Whether or not all the gem dependencies have been met
+    attr_reader :gems_dependencies_loaded
+
+    # Runs the initializer. By default, this will invoke the #process method,
+    # which simply executes all of the initialization routines. Alternately,
+    # you can specify explicitly which initialization routine you want:
+    #
+    #   Rails::Initializer.run(:set_load_path)
+    #
+    # This is useful if you only want the load path initialized, without
+    # incurring the overhead of completely loading the entire environment.
+    def self.run(command = :process, configuration = Configuration.new)
+      yield configuration if block_given?
+      initializer = new configuration
+      initializer.send(command)
+      initializer
+    end
+
+    # Create a new Initializer instance that references the given Configuration
+    # instance.
+    def initialize(configuration)
+      @configuration = configuration
+      @loaded_plugins = []
+    end
+
+    # Sequentially step through all of the available initialization routines,
+    # in order (view execution order in source).
+    def process
+      Rails.configuration = configuration
+
+      check_ruby_version
+      install_gem_spec_stubs
+      set_load_path
+      add_gem_load_paths
+
+      require_frameworks
+      set_autoload_paths
+      add_plugin_load_paths
+      load_environment
+      preload_frameworks
+
+      initialize_encoding
+      initialize_database
+
+      initialize_cache
+      initialize_framework_caches
+
+      initialize_logger
+      initialize_framework_logging
+
+      initialize_dependency_mechanism
+      initialize_whiny_nils
+
+      initialize_time_zone
+      initialize_i18n
+
+      initialize_framework_settings
+      initialize_framework_views
+
+      initialize_metal
+
+      add_support_load_paths
+
+      check_for_unbuilt_gems
+
+      load_gems
+      load_plugins
+
+      # pick up any gems that plugins depend on
+      add_gem_load_paths
+      load_gems
+      check_gem_dependencies
+
+      # bail out if gems are missing - note that check_gem_dependencies will have
+      # already called abort() unless $gems_rake_task is set
+      return unless gems_dependencies_loaded
+
+      load_application_initializers
+
+      # the framework is now fully initialized
+      after_initialize
+
+      # Setup database middleware after initializers have run
+      initialize_database_middleware
+
+      # Prepare dispatcher callbacks and run 'prepare' callbacks
+      prepare_dispatcher
+
+      # Routing must be initialized after plugins to allow the former to extend the routes
+      initialize_routing
+
+      # Observers are loaded after plugins in case Observers or observed models are modified by plugins.
+      load_observers
+
+      # Load view path cache
+      load_view_paths
+
+      # Load application classes
+      load_application_classes
+
+      # Disable dependency loading during request cycle
+      disable_dependency_loading
+
+      # Flag initialized
+      Rails.initialized = true
+    end
+
+    # Check for valid Ruby version
+    # This is done in an external file, so we can use it
+    # from the `rails` program as well without duplication.
+    def check_ruby_version
+      require 'ruby_version_check'
+    end
+
+    # If Rails is vendored and RubyGems is available, install stub GemSpecs
+    # for Rails, Active Support, Active Record, Action Pack, Action Mailer, and
+    # Active Resource. This allows Gem plugins to depend on Rails even when
+    # the Gem version of Rails shouldn't be loaded.
+    def install_gem_spec_stubs
+      unless Rails.respond_to?(:vendor_rails?)
+        abort %{Your config/boot.rb is outdated: Run "rake rails:update".}
+      end
+
+      if Rails.vendor_rails?
+        begin; require "rubygems"; rescue LoadError; return; end
+
+        stubs = %w(rails activesupport activerecord actionpack actionmailer activeresource)
+        stubs.reject! { |s| Gem.loaded_specs.key?(s) }
+
+        stubs.each do |stub|
+          Gem.loaded_specs[stub] = Gem::Specification.new do |s|
+            s.name = stub
+            s.version = Rails::VERSION::STRING
+            s.loaded_from = ""
+          end
+        end
+      end
+    end
+
+    # Set the <tt>$LOAD_PATH</tt> based on the value of
+    # Configuration#load_paths. Duplicates are removed.
+    def set_load_path
+      load_paths = configuration.load_paths + configuration.framework_paths
+      load_paths.reverse_each { |dir| $LOAD_PATH.unshift(dir) if File.directory?(dir) }
+      $LOAD_PATH.uniq!
+    end
+
+    # Set the paths from which Rails will automatically load source files, and
+    # the load_once paths.
+    def set_autoload_paths
+      require 'active_support/dependencies'
+      ActiveSupport::Dependencies.load_paths = configuration.load_paths.uniq
+      ActiveSupport::Dependencies.load_once_paths = configuration.load_once_paths.uniq
+
+      extra = ActiveSupport::Dependencies.load_once_paths - ActiveSupport::Dependencies.load_paths
+      unless extra.empty?
+        abort <<-end_error
+          load_once_paths must be a subset of the load_paths.
+          Extra items in load_once_paths: #{extra * ','}
+        end_error
+      end
+
+      # Freeze the arrays so future modifications will fail rather than do nothing mysteriously
+      configuration.load_once_paths.freeze
+    end
+
+    # Requires all frameworks specified by the Configuration#frameworks
+    # list. By default, all frameworks (Active Record, Active Support,
+    # Action Pack, Action Mailer, and Active Resource) are loaded.
+    def require_frameworks
+      require 'active_support/all'
+      configuration.frameworks.each { |framework| require(framework.to_s) }
+    rescue LoadError => e
+      # Re-raise as RuntimeError because Mongrel would swallow LoadError.
+      raise e.to_s
+    end
+
+    # Preload all frameworks specified by the Configuration#frameworks.
+    # Used by Passenger to ensure everything's loaded before forking and
+    # to avoid autoload race conditions in JRuby.
+    def preload_frameworks
+      if configuration.preload_frameworks
+        configuration.frameworks.each do |framework|
+          # String#classify and #constantize aren't available yet.
+          toplevel = Object.const_get(framework.to_s.gsub(/(?:^|_)(.)/) { $1.upcase })
+          toplevel.load_all! if toplevel.respond_to?(:load_all!)
+        end
+      end
+    end
+
+    # Add the load paths used by support functions such as the info controller
+    def add_support_load_paths
+    end
+
+    # Adds all load paths from plugins to the global set of load paths, so that
+    # code from plugins can be required (explicitly or automatically via ActiveSupport::Dependencies).
+    def add_plugin_load_paths
+      require 'active_support/dependencies'
+      plugin_loader.add_plugin_load_paths
+    end
+
+    def add_gem_load_paths
+      require 'rails/gem_dependency'
+      Rails::GemDependency.add_frozen_gem_path
+      unless @configuration.gems.empty?
+        require "rubygems"
+        @configuration.gems.each { |gem| gem.add_load_paths }
+      end
+    end
+
+    def load_gems
+      unless $gems_rake_task
+        @configuration.gems.each { |gem| gem.load }
+      end
+    end
+
+    def check_for_unbuilt_gems
+      unbuilt_gems = @configuration.gems.select {|gem| gem.frozen? && !gem.built? }
+      if unbuilt_gems.size > 0
+        # don't print if the gems:build rake tasks are being run
+        unless $gems_build_rake_task
+          abort <<-end_error
+The following gems have native components that need to be built
+  #{unbuilt_gems.map { |gemm| "#{gemm.name}  #{gemm.requirement}" } * "\n  "}
+
+You're running:
+  ruby #{Gem.ruby_version} at #{Gem.ruby}
+  rubygems #{Gem::RubyGemsVersion} at #{Gem.path * ', '}
+
+Run `rake gems:build` to build the unbuilt gems.
+          end_error
+        end
+      end
+    end
+
+    def check_gem_dependencies
+      unloaded_gems = @configuration.gems.reject { |g| g.loaded? }
+      if unloaded_gems.size > 0
+        @gems_dependencies_loaded = false
+        # don't print if the gems rake tasks are being run
+        unless $gems_rake_task
+          abort <<-end_error
+Missing these required gems:
+  #{unloaded_gems.map { |gemm| "#{gemm.name}  #{gemm.requirement}" } * "\n  "}
+
+You're running:
+  ruby #{Gem.ruby_version} at #{Gem.ruby}
+  rubygems #{Gem::RubyGemsVersion} at #{Gem.path * ', '}
+
+Run `rake gems:install` to install the missing gems.
+          end_error
+        end
+      else
+        @gems_dependencies_loaded = true
+      end
+    end
+
+    # Loads all plugins in <tt>config.plugin_paths</tt>.  <tt>plugin_paths</tt>
+    # defaults to <tt>vendor/plugins</tt> but may also be set to a list of
+    # paths, such as
+    #   config.plugin_paths = ["#{RAILS_ROOT}/lib/plugins", "#{RAILS_ROOT}/vendor/plugins"]
+    #
+    # In the default implementation, as each plugin discovered in <tt>plugin_paths</tt> is initialized:
+    # * its +lib+ directory, if present, is added to the load path (immediately after the applications lib directory)
+    # * <tt>init.rb</tt> is evaluated, if present
+    #
+    # After all plugins are loaded, duplicates are removed from the load path.
+    # If an array of plugin names is specified in config.plugins, only those plugins will be loaded
+    # and they plugins will be loaded in that order. Otherwise, plugins are loaded in alphabetical
+    # order.
+    #
+    # if config.plugins ends contains :all then the named plugins will be loaded in the given order and all other
+    # plugins will be loaded in alphabetical order
+    def load_plugins
+      plugin_loader.load_plugins
+    end
+
+    def plugin_loader
+      @plugin_loader ||= configuration.plugin_loader.new(self)
+    end
+
+    # Loads the environment specified by Configuration#environment_path, which
+    # is typically one of development, test, or production.
+    def load_environment
+      silence_warnings do
+        return if @environment_loaded
+        @environment_loaded = true
+
+        config = configuration
+        constants = self.class.constants
+
+        eval(IO.read(configuration.environment_path), binding, configuration.environment_path)
+
+        (self.class.constants - constants).each do |const|
+          Object.const_set(const, self.class.const_get(const))
+        end
+      end
+    end
+
+    def load_observers
+      if gems_dependencies_loaded && configuration.frameworks.include?(:active_record)
+        ActiveRecord::Base.instantiate_observers
+      end
+    end
+
+    def load_view_paths
+      if configuration.frameworks.include?(:action_view)
+        if configuration.cache_classes
+          view_path = ActionView::FileSystemResolverWithFallback.new(configuration.view_path)
+          ActionController::Base.view_paths = view_path if configuration.frameworks.include?(:action_controller)
+          ActionMailer::Base.template_root = view_path if configuration.frameworks.include?(:action_mailer)
+        end
+      end
+    end
+
+    # Eager load application classes
+    def load_application_classes
+      return if $rails_rake_task
+      if configuration.cache_classes
+        configuration.eager_load_paths.each do |load_path|
+          matcher = /\A#{Regexp.escape(load_path)}(.*)\.rb\Z/
+          Dir.glob("#{load_path}/**/*.rb").sort.each do |file|
+            require_dependency file.sub(matcher, '\1')
+          end
+        end
+      end
+    end
+
+    # For Ruby 1.8, this initialization sets $KCODE to 'u' to enable the
+    # multibyte safe operations. Plugin authors supporting other encodings
+    # should override this behaviour and set the relevant +default_charset+
+    # on ActionController::Base.
+    #
+    # For Ruby 1.9, UTF-8 is the default internal and external encoding.
+    def initialize_encoding
+      if RUBY_VERSION < '1.9'
+        $KCODE='u'
+      else
+        Encoding.default_internal = Encoding::UTF_8
+        Encoding.default_external = Encoding::UTF_8
+      end
+    end
+
+    # This initialization routine does nothing unless <tt>:active_record</tt>
+    # is one of the frameworks to load (Configuration#frameworks). If it is,
+    # this sets the database configuration from Configuration#database_configuration
+    # and then establishes the connection.
+    def initialize_database
+      if configuration.frameworks.include?(:active_record)
+        ActiveRecord::Base.configurations = configuration.database_configuration
+        ActiveRecord::Base.establish_connection
+      end
+    end
+
+    def initialize_database_middleware
+      if configuration.frameworks.include?(:active_record)
+        if configuration.frameworks.include?(:action_controller) &&
+            ActionController::Base.session_store.name == 'ActiveRecord::SessionStore'
+          configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::ConnectionAdapters::ConnectionManagement
+          configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::QueryCache
+        else
+          configuration.middleware.use ActiveRecord::ConnectionAdapters::ConnectionManagement
+          configuration.middleware.use ActiveRecord::QueryCache
+        end
+      end
+    end
+
+    def initialize_cache
+      unless defined?(RAILS_CACHE)
+        silence_warnings { Object.const_set "RAILS_CACHE", ActiveSupport::Cache.lookup_store(configuration.cache_store) }
+
+        if RAILS_CACHE.respond_to?(:middleware)
+          # Insert middleware to setup and teardown local cache for each request
+          configuration.middleware.insert_after(:"Rack::Lock", RAILS_CACHE.middleware)
+        end
+      end
+    end
+
+    def initialize_framework_caches
+      if configuration.frameworks.include?(:action_controller)
+        ActionController::Base.cache_store ||= RAILS_CACHE
+      end
+    end
+
+    # If the RAILS_DEFAULT_LOGGER constant is already set, this initialization
+    # routine does nothing. If the constant is not set, and Configuration#logger
+    # is not +nil+, this also does nothing. Otherwise, a new logger instance
+    # is created at Configuration#log_path, with a default log level of
+    # Configuration#log_level.
+    #
+    # If the log could not be created, the log will be set to output to
+    # +STDERR+, with a log level of +WARN+.
+    def initialize_logger
+      # if the environment has explicitly defined a logger, use it
+      return if Rails.logger
+
+      unless logger = configuration.logger
+        begin
+          logger = ActiveSupport::BufferedLogger.new(configuration.log_path)
+          logger.level = ActiveSupport::BufferedLogger.const_get(configuration.log_level.to_s.upcase)
+          if configuration.environment == "production"
+            logger.auto_flushing = false
+          end
+        rescue StandardError => e
+          logger = ActiveSupport::BufferedLogger.new(STDERR)
+          logger.level = ActiveSupport::BufferedLogger::WARN
+          logger.warn(
+            "Rails Error: Unable to access log file. Please ensure that #{configuration.log_path} exists and is chmod 0666. " +
+            "The log level has been raised to WARN and the output directed to STDERR until the problem is fixed."
+          )
+        end
+      end
+
+      silence_warnings { Object.const_set "RAILS_DEFAULT_LOGGER", logger }
+    end
+
+    # Sets the logger for Active Record, Action Controller, and Action Mailer
+    # (but only for those frameworks that are to be loaded). If the framework's
+    # logger is already set, it is not changed, otherwise it is set to use
+    # RAILS_DEFAULT_LOGGER.
+    def initialize_framework_logging
+      for framework in ([ :active_record, :action_controller, :action_mailer ] & configuration.frameworks)
+        framework.to_s.camelize.constantize.const_get("Base").logger ||= Rails.logger
+      end
+
+      ActiveSupport::Dependencies.logger ||= Rails.logger
+      Rails.cache.logger ||= Rails.logger
+    end
+
+    # Sets +ActionController::Base#view_paths+ and +ActionMailer::Base#template_root+
+    # (but only for those frameworks that are to be loaded). If the framework's
+    # paths have already been set, it is not changed, otherwise it is
+    # set to use Configuration#view_path.
+    def initialize_framework_views
+      if configuration.frameworks.include?(:action_view)
+        view_path = ActionView::PathSet.type_cast(configuration.view_path)
+        ActionMailer::Base.template_root  = view_path if configuration.frameworks.include?(:action_mailer) && ActionMailer::Base.view_paths.blank?
+        ActionController::Base.view_paths = view_path if configuration.frameworks.include?(:action_controller) && ActionController::Base.view_paths.blank?
+      end
+    end
+
+    # If Action Controller is not one of the loaded frameworks (Configuration#frameworks)
+    # this does nothing. Otherwise, it loads the routing definitions and sets up
+    # loading module used to lazily load controllers (Configuration#controller_paths).
+    def initialize_routing
+      return unless configuration.frameworks.include?(:action_controller)
+
+      ActionController::Routing.controller_paths += configuration.controller_paths
+      ActionController::Routing::Routes.add_configuration_file(configuration.routes_configuration_file)
+      ActionController::Routing::Routes.reload!
+    end
+
+    # Sets the dependency loading mechanism based on the value of
+    # Configuration#cache_classes.
+    def initialize_dependency_mechanism
+      ActiveSupport::Dependencies.mechanism = configuration.cache_classes ? :require : :load
+    end
+
+    # Loads support for "whiny nil" (noisy warnings when methods are invoked
+    # on +nil+ values) if Configuration#whiny_nils is true.
+    def initialize_whiny_nils
+      require('active_support/whiny_nil') if configuration.whiny_nils
+    end
+
+    # Sets the default value for Time.zone, and turns on ActiveRecord::Base#time_zone_aware_attributes.
+    # If assigned value cannot be matched to a TimeZone, an exception will be raised.
+    def initialize_time_zone
+      if configuration.time_zone
+        zone_default = Time.__send__(:get_zone, configuration.time_zone)
+
+        unless zone_default
+          raise \
+            'Value assigned to config.time_zone not recognized.' +
+            'Run "rake -D time" for a list of tasks for finding appropriate time zone names.'
+        end
+
+        Time.zone_default = zone_default
+
+        if configuration.frameworks.include?(:active_record)
+          ActiveRecord::Base.time_zone_aware_attributes = true
+          ActiveRecord::Base.default_timezone = :utc
+        end
+      end
+    end
+
+    # Set the i18n configuration from config.i18n but special-case for the load_path which should be
+    # appended to what's already set instead of overwritten.
+    def initialize_i18n
+      configuration.i18n.each do |setting, value|
+        if setting == :load_path
+          I18n.load_path += value
+        else
+          I18n.send("#{setting}=", value)
+        end
+      end
+    end
+
+    def initialize_metal
+      Rails::Rack::Metal.requested_metals = configuration.metals
+      Rails::Rack::Metal.metal_paths += plugin_loader.engine_metal_paths
+
+      configuration.middleware.insert_before(
+        :"ActionDispatch::ParamsParser",
+        Rails::Rack::Metal, :if => Rails::Rack::Metal.metals.any?)
+    end
+
+    # Initializes framework-specific settings for each of the loaded frameworks
+    # (Configuration#frameworks). The available settings map to the accessors
+    # on each of the corresponding Base classes.
+    def initialize_framework_settings
+      configuration.frameworks.each do |framework|
+        base_class = framework.to_s.camelize.constantize.const_get("Base")
+
+        configuration.send(framework).each do |setting, value|
+          base_class.send("#{setting}=", value)
+        end
+      end
+      configuration.active_support.each do |setting, value|
+        ActiveSupport.send("#{setting}=", value)
+      end
+    end
+
+    # Fires the user-supplied after_initialize block (Configuration#after_initialize)
+    def after_initialize
+      if gems_dependencies_loaded
+        configuration.after_initialize_blocks.each do |block|
+          block.call
+        end
+      end
+    end
+
+    def load_application_initializers
+      if gems_dependencies_loaded
+        Dir["#{configuration.root_path}/config/initializers/**/*.rb"].sort.each do |initializer|
+          load(initializer)
+        end
+      end
+    end
+
+    def prepare_dispatcher
+      return unless configuration.frameworks.include?(:action_controller)
+      require 'dispatcher' unless defined?(::Dispatcher)
+      Dispatcher.define_dispatcher_callbacks(configuration.cache_classes)
+    end
+
+    def disable_dependency_loading
+      if configuration.cache_classes && !configuration.dependency_loading
+        ActiveSupport::Dependencies.unhook!
+      end
+    end
+  end
+
+  # The Configuration class holds all the parameters for the Initializer and
+  # ships with defaults that suites most Rails applications. But it's possible
+  # to overwrite everything. Usually, you'll create an Configuration file
+  # implicitly through the block running on the Initializer, but it's also
+  # possible to create the Configuration instance in advance and pass it in
+  # like this:
+  #
+  #   config = Rails::Configuration.new
+  #   Rails::Initializer.run(:process, config)
+  class Configuration
+    # The application's base directory.
+    attr_reader :root_path
+
+    # A stub for setting options on ActionController::Base.
+    attr_accessor :action_controller
+
+    # A stub for setting options on ActionMailer::Base.
+    attr_accessor :action_mailer
+
+    # A stub for setting options on ActionView::Base.
+    attr_accessor :action_view
+
+    # A stub for setting options on ActiveRecord::Base.
+    attr_accessor :active_record
+
+    # A stub for setting options on ActiveResource::Base.
+    attr_accessor :active_resource
+
+    # A stub for setting options on ActiveSupport.
+    attr_accessor :active_support
+
+    # Whether to preload all frameworks at startup.
+    attr_accessor :preload_frameworks
+
+    # Whether or not classes should be cached (set to false if you want
+    # application classes to be reloaded on each request)
+    attr_accessor :cache_classes
+
+    # The list of paths that should be searched for controllers. (Defaults
+    # to <tt>app/controllers</tt>.)
+    attr_accessor :controller_paths
+
+    # The path to the database configuration file to use. (Defaults to
+    # <tt>config/database.yml</tt>.)
+    attr_accessor :database_configuration_file
+
+    # The path to the routes configuration file to use. (Defaults to
+    # <tt>config/routes.rb</tt>.)
+    attr_accessor :routes_configuration_file
+
+    # The list of rails framework components that should be loaded. (Defaults
+    # to <tt>:active_record</tt>, <tt>:action_controller</tt>,
+    # <tt>:action_view</tt>, <tt>:action_mailer</tt>, and
+    # <tt>:active_resource</tt>).
+    attr_accessor :frameworks
+
+    # An array of additional paths to prepend to the load path. By default,
+    # all +app+, +lib+, +vendor+ and mock paths are included in this list.
+    attr_accessor :load_paths
+
+    # An array of paths from which Rails will automatically load from only once.
+    # All elements of this array must also be in +load_paths+.
+    attr_accessor :load_once_paths
+
+    # An array of paths from which Rails will eager load on boot if cache
+    # classes is enabled. All elements of this array must also be in
+    # +load_paths+.
+    attr_accessor :eager_load_paths
+
+    # The log level to use for the default Rails logger. In production mode,
+    # this defaults to <tt>:info</tt>. In development mode, it defaults to
+    # <tt>:debug</tt>.
+    attr_accessor :log_level
+
+    # The path to the log file to use. Defaults to log/#{environment}.log
+    # (e.g. log/development.log or log/production.log).
+    attr_accessor :log_path
+
+    # The specific logger to use. By default, a logger will be created and
+    # initialized using #log_path and #log_level, but a programmer may
+    # specifically set the logger to use via this accessor and it will be
+    # used directly.
+    attr_accessor :logger
+
+    # The specific cache store to use. By default, the ActiveSupport::Cache::Store will be used.
+    attr_accessor :cache_store
+
+    # The root of the application's views. (Defaults to <tt>app/views</tt>.)
+    attr_accessor :view_path
+
+    # Set to +true+ if you want to be warned (noisily) when you try to invoke
+    # any method of +nil+. Set to +false+ for the standard Ruby behavior.
+    attr_accessor :whiny_nils
+
+    # The list of plugins to load. If this is set to <tt>nil</tt>, all plugins will
+    # be loaded. If this is set to <tt>[]</tt>, no plugins will be loaded. Otherwise,
+    # plugins will be loaded in the order specified.
+    attr_reader :plugins
+    def plugins=(plugins)
+      @plugins = plugins.nil? ? nil : plugins.map { |p| p.to_sym }
+    end
+
+    # The list of metals to load. If this is set to <tt>nil</tt>, all metals will
+    # be loaded in alphabetical order. If this is set to <tt>[]</tt>, no metals will
+    # be loaded. Otherwise metals will be loaded in the order specified
+    attr_accessor :metals
+
+    # The path to the root of the plugins directory. By default, it is in
+    # <tt>vendor/plugins</tt>.
+    attr_accessor :plugin_paths
+
+    # The classes that handle finding the desired plugins that you'd like to load for
+    # your application. By default it is the Rails::Plugin::FileSystemLocator which finds
+    # plugins to load in <tt>vendor/plugins</tt>. You can hook into gem location by subclassing
+    # Rails::Plugin::Locator and adding it onto the list of <tt>plugin_locators</tt>.
+    attr_accessor :plugin_locators
+
+    # The class that handles loading each plugin. Defaults to Rails::Plugin::Loader, but
+    # a sub class would have access to fine grained modification of the loading behavior. See
+    # the implementation of Rails::Plugin::Loader for more details.
+    attr_accessor :plugin_loader
+
+    # Enables or disables plugin reloading.  You can get around this setting per plugin.
+    # If <tt>reload_plugins?</tt> is false, add this to your plugin's <tt>init.rb</tt>
+    # to make it reloadable:
+    #
+    #   ActiveSupport::Dependencies.load_once_paths.delete lib_path
+    #
+    # If <tt>reload_plugins?</tt> is true, add this to your plugin's <tt>init.rb</tt>
+    # to only load it once:
+    #
+    #   ActiveSupport::Dependencies.load_once_paths << lib_path
+    #
+    attr_accessor :reload_plugins
+
+    # Returns true if plugin reloading is enabled.
+    def reload_plugins?
+      !!@reload_plugins
+    end
+
+    # Enables or disables dependency loading during the request cycle. Setting
+    # <tt>dependency_loading</tt> to true will allow new classes to be loaded
+    # during a request. Setting it to false will disable this behavior.
+    #
+    # Those who want to run in a threaded environment should disable this
+    # option and eager load or require all there classes on initialization.
+    #
+    # If <tt>cache_classes</tt> is disabled, dependency loaded will always be
+    # on.
+    attr_accessor :dependency_loading
+
+    # An array of gems that this rails application depends on.  Rails will automatically load
+    # these gems during installation, and allow you to install any missing gems with:
+    #
+    #   rake gems:install
+    #
+    # You can add gems with the #gem method.
+    attr_accessor :gems
+
+    # Adds a single Gem dependency to the rails application. By default, it will require
+    # the library with the same name as the gem. Use :lib to specify a different name.
+    #
+    #   # gem 'aws-s3', '>= 0.4.0'
+    #   # require 'aws/s3'
+    #   config.gem 'aws-s3', :lib => 'aws/s3', :version => '>= 0.4.0', \
+    #     :source => "http://code.whytheluckystiff.net"
+    #
+    # To require a library be installed, but not attempt to load it, pass :lib => false
+    #
+    #   config.gem 'qrp', :version => '0.4.1', :lib => false
+    def gem(name, options = {})
+      @gems << Rails::GemDependency.new(name, options)
+    end
+
+    # Deprecated options:
+    def breakpoint_server(_ = nil)
+      $stderr.puts %(
+      *******************************************************************
+      * config.breakpoint_server has been deprecated and has no effect. *
+      *******************************************************************
+      )
+    end
+    alias_method :breakpoint_server=, :breakpoint_server
+
+    # Sets the default +time_zone+.  Setting this will enable +time_zone+
+    # awareness for Active Record models and set the Active Record default
+    # timezone to <tt>:utc</tt>.
+    attr_accessor :time_zone
+
+    # Accessor for i18n settings.
+    attr_accessor :i18n
+
+    # Create a new Configuration instance, initialized with the default
+    # values.
+    def initialize
+      set_root_path!
+
+      self.frameworks                   = default_frameworks
+      self.load_paths                   = default_load_paths
+      self.load_once_paths              = default_load_once_paths
+      self.eager_load_paths             = default_eager_load_paths
+      self.log_path                     = default_log_path
+      self.log_level                    = default_log_level
+      self.view_path                    = default_view_path
+      self.controller_paths             = default_controller_paths
+      self.preload_frameworks           = default_preload_frameworks
+      self.cache_classes                = default_cache_classes
+      self.dependency_loading           = default_dependency_loading
+      self.whiny_nils                   = default_whiny_nils
+      self.plugins                      = default_plugins
+      self.plugin_paths                 = default_plugin_paths
+      self.plugin_locators              = default_plugin_locators
+      self.plugin_loader                = default_plugin_loader
+      self.database_configuration_file  = default_database_configuration_file
+      self.routes_configuration_file    = default_routes_configuration_file
+      self.gems                         = default_gems
+      self.i18n                         = default_i18n
+
+      for framework in default_frameworks
+        self.send("#{framework}=", Rails::OrderedOptions.new)
+      end
+      self.active_support = Rails::OrderedOptions.new
+    end
+
+    # Set the root_path to RAILS_ROOT and canonicalize it.
+    def set_root_path!
+      raise 'RAILS_ROOT is not set' unless defined?(::RAILS_ROOT)
+      raise 'RAILS_ROOT is not a directory' unless File.directory?(::RAILS_ROOT)
+
+      @root_path =
+        # Pathname is incompatible with Windows, but Windows doesn't have
+        # real symlinks so File.expand_path is safe.
+        if RUBY_PLATFORM =~ /(:?mswin|mingw)/
+          File.expand_path(::RAILS_ROOT)
+
+        # Otherwise use Pathname#realpath which respects symlinks.
+        else
+          Pathname.new(::RAILS_ROOT).realpath.to_s
+        end
+
+      Object.const_set(:RELATIVE_RAILS_ROOT, ::RAILS_ROOT.dup) unless defined?(::RELATIVE_RAILS_ROOT)
+      ::RAILS_ROOT.replace @root_path
+    end
+
+    # Enable threaded mode. Allows concurrent requests to controller actions and
+    # multiple database connections. Also disables automatic dependency loading
+    # after boot, and disables reloading code on every request, as these are
+    # fundamentally incompatible with thread safety.
+    def threadsafe!
+      self.preload_frameworks = true
+      self.cache_classes = true
+      self.dependency_loading = false
+      self.action_controller.allow_concurrency = true
+      self
+    end
+
+    # Loads and returns the contents of the #database_configuration_file. The
+    # contents of the file are processed via ERB before being sent through
+    # YAML::load.
+    def database_configuration
+      require 'erb'
+      YAML::load(ERB.new(IO.read(database_configuration_file)).result)
+    end
+
+    # The path to the current environment's file (<tt>development.rb</tt>, etc.). By
+    # default the file is at <tt>config/environments/#{environment}.rb</tt>.
+    def environment_path
+      "#{root_path}/config/environments/#{environment}.rb"
+    end
+
+    # Return the currently selected environment. By default, it returns the
+    # value of the RAILS_ENV constant.
+    def environment
+      ::RAILS_ENV
+    end
+
+    # Adds a block which will be executed after rails has been fully initialized.
+    # Useful for per-environment configuration which depends on the framework being
+    # fully initialized.
+    def after_initialize(&after_initialize_block)
+      after_initialize_blocks << after_initialize_block if after_initialize_block
+    end
+
+    # Returns the blocks added with Configuration#after_initialize
+    def after_initialize_blocks
+      @after_initialize_blocks ||= []
+    end
+
+    # Add a preparation callback that will run before every request in development
+    # mode, or before the first request in production.
+    #
+    # See Dispatcher#to_prepare.
+    def to_prepare(&callback)
+      after_initialize do
+        require 'dispatcher' unless defined?(::Dispatcher)
+        Dispatcher.to_prepare(&callback)
+      end
+    end
+
+    def middleware
+      require 'action_controller'
+      ActionController::Dispatcher.middleware
+    end
+
+    def builtin_directories
+      # Include builtins only in the development environment.
+      (environment == 'development') ? Dir["#{RAILTIES_PATH}/builtin/*/"] : []
+    end
+
+    def framework_paths
+      paths = %w(railties railties/lib activesupport/lib)
+      paths << 'actionpack/lib' if frameworks.include?(:action_controller) || frameworks.include?(:action_view)
+
+      [:active_record, :action_mailer, :active_resource, :action_web_service].each do |framework|
+        paths << "#{framework.to_s.gsub('_', '')}/lib" if frameworks.include?(framework)
+      end
+
+      paths.map { |dir| "#{framework_root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
+    end
+
+    private
+      def framework_root_path
+        defined?(::RAILS_FRAMEWORK_ROOT) ? ::RAILS_FRAMEWORK_ROOT : "#{root_path}/vendor/rails"
+      end
+
+      def default_frameworks
+        [ :active_record, :action_controller, :action_view, :action_mailer, :active_resource ]
+      end
+
+      def default_load_paths
+        paths = []
+
+        # Add the old mock paths only if the directories exists
+        paths.concat(Dir["#{root_path}/test/mocks/#{environment}"]) if File.exists?("#{root_path}/test/mocks/#{environment}")
+
+        # Add the app's controller directory
+        paths.concat(Dir["#{root_path}/app/controllers/"])
+
+        # Followed by the standard includes.
+        paths.concat %w(
+          app
+          app/metal
+          app/models
+          app/controllers
+          app/helpers
+          app/services
+          lib
+          vendor
+        ).map { |dir| "#{root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
+
+        paths.concat builtin_directories
+      end
+
+      # Doesn't matter since plugins aren't in load_paths yet.
+      def default_load_once_paths
+        []
+      end
+
+      def default_eager_load_paths
+        %w(
+          app/metal
+          app/models
+          app/controllers
+          app/helpers
+        ).map { |dir| "#{root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
+      end
+
+      def default_log_path
+        File.join(root_path, 'log', "#{environment}.log")
+      end
+
+      def default_log_level
+        environment == 'production' ? :info : :debug
+      end
+
+      def default_database_configuration_file
+        File.join(root_path, 'config', 'database.yml')
+      end
+
+      def default_routes_configuration_file
+        File.join(root_path, 'config', 'routes.rb')
+      end
+
+      def default_view_path
+        File.join(root_path, 'app', 'views')
+      end
+
+      def default_controller_paths
+        paths = [File.join(root_path, 'app', 'controllers')]
+        paths.concat builtin_directories
+        paths
+      end
+
+      def default_dependency_loading
+        true
+      end
+
+      def default_preload_frameworks
+        false
+      end
+
+      def default_cache_classes
+        true
+      end
+
+      def default_whiny_nils
+        false
+      end
+
+      def default_plugins
+        nil
+      end
+
+      def default_plugin_paths
+        ["#{root_path}/vendor/plugins"]
+      end
+
+      def default_plugin_locators
+        require 'rails/plugin/locator'
+        locators = []
+        locators << Plugin::GemLocator if defined? Gem
+        locators << Plugin::FileSystemLocator
+      end
+
+      def default_plugin_loader
+        require 'rails/plugin/loader'
+        Plugin::Loader
+      end
+
+      def default_cache_store
+        if File.exist?("#{root_path}/tmp/cache/")
+          [ :file_store, "#{root_path}/tmp/cache/" ]
+        else
+          :memory_store
+        end
+      end
+
+      def default_gems
+        []
+      end
+
+      def default_i18n
+        i18n = Rails::OrderedOptions.new
+        i18n.load_path = []
+
+        if File.exist?(File.join(RAILS_ROOT, 'config', 'locales'))
+          i18n.load_path << Dir[File.join(RAILS_ROOT, 'config', 'locales', '*.{rb,yml}')]
+          i18n.load_path.flatten!
+        end
+
+        i18n
+      end
+  end
+end
+
+# Needs to be duplicated from Active Support since its needed before Active
+# Support is available. Here both Options and Hash are namespaced to prevent
+# conflicts with other implementations AND with the classes residing in Active Support.
+class Rails::OrderedOptions < Array #:nodoc:
+  def []=(key, value)
+    key = key.to_sym
+
+    if pair = find_pair(key)
+      pair.pop
+      pair << value
+    else
+      self << [key, value]
+    end
+  end
+
+  def [](key)
+    pair = find_pair(key.to_sym)
+    pair ? pair.last : nil
+  end
+
+  def method_missing(name, *args)
+    if name.to_s =~ /(.*)=$/
+      self[$1.to_sym] = args.first
+    else
+      self[name]
+    end
+  end
+
+  private
+    def find_pair(key)
+      self.each { |i| return i if i.first == key }
+      return false
+    end
+end
+
diff --git a/railties/lib/performance_test_help.rb b/railties/lib/performance_test_help.rb
index 5148b4ab77..2aaa21e85f 100644
--- a/railties/lib/performance_test_help.rb
+++ b/railties/lib/performance_test_help.rb
@@ -1,4 +1,4 @@
-require 'action_controller/performance_test'
+require 'action_controller/testing/performance_test'
 
 ActionController::Base.perform_caching = true
 ActiveSupport::Dependencies.mechanism = :require
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
new file mode 100644
index 0000000000..d877915460
--- /dev/null
+++ b/railties/lib/rails/configuration.rb
@@ -0,0 +1,267 @@
+module Rails
+  class Configuration
+    attr_accessor :cache_classes, :load_paths, :eager_load_paths, :framework_paths,
+                  :load_once_paths, :gems_dependencies_loaded, :after_initialize_blocks,
+                  :frameworks, :framework_root_path, :root_path, :plugin_paths, :plugins,
+                  :plugin_loader, :plugin_locators, :gems, :loaded_plugins, :reload_plugins,
+                  :i18n, :gems, :whiny_nils, :consider_all_requests_local,
+                  :action_controller, :active_record, :action_view, :active_support,
+                  :action_mailer, :active_resource,
+                  :log_path, :log_level, :logger, :preload_frameworks,
+                  :database_configuration_file, :cache_store, :time_zone,
+                  :view_path, :metals, :controller_paths, :routes_configuration_file,
+                  :eager_load_paths, :dependency_loading, :paths
+
+    def initialize
+      set_root_path!
+
+      @framework_paths              = []
+      @load_once_paths              = []
+      @after_initialize_blocks      = []
+      @loaded_plugins               = []
+      @dependency_loading           = true
+      @eager_load_paths             = default_eager_load_paths
+      @load_paths                   = default_load_paths
+      @plugin_paths                 = default_plugin_paths
+      @frameworks                   = default_frameworks
+      @plugin_loader                = default_plugin_loader
+      @plugin_locators              = default_plugin_locators
+      @gems                         = default_gems
+      @i18n                         = default_i18n
+      @log_path                     = default_log_path
+      @log_level                    = default_log_level
+      @cache_store                  = default_cache_store
+      @view_path                    = default_view_path
+      @controller_paths             = default_controller_paths
+      @routes_configuration_file    = default_routes_configuration_file
+      @database_configuration_file  = default_database_configuration_file
+
+      for framework in default_frameworks
+        self.send("#{framework}=", Rails::OrderedOptions.new)
+      end
+      self.active_support = Rails::OrderedOptions.new
+    end
+
+    def after_initialize(&blk)
+      @after_initialize_blocks << blk if blk
+    end
+
+    def set_root_path!
+      raise 'RAILS_ROOT is not set' unless defined?(RAILS_ROOT)
+      raise 'RAILS_ROOT is not a directory' unless File.directory?(RAILS_ROOT)
+
+      self.root_path =
+        # Pathname is incompatible with Windows, but Windows doesn't have
+        # real symlinks so File.expand_path is safe.
+        if RUBY_PLATFORM =~ /(:?mswin|mingw)/
+          File.expand_path(RAILS_ROOT)
+
+        # Otherwise use Pathname#realpath which respects symlinks.
+        else
+          Pathname.new(RAILS_ROOT).realpath.to_s
+        end
+
+      @paths = Rails::Application::Root.new(root_path)
+      @paths.app                 = "app"
+      @paths.app.metals          = "app/metal"
+      @paths.app.models          = "app/models"
+      @paths.app.controllers     = "app/controllers"
+      @paths.app.helpers         = "app/helpers"
+      @paths.app.services        = "app/services"
+      @paths.lib                 = "lib"
+      @paths.vendor              = "vendor"
+      @paths.vendor.plugins      = "vendor/plugins"
+      @paths.cache               = "tmp/cache"
+      @paths.config              = "config"
+      @paths.config.locales      = "config/locales"
+      @paths.config.environments = "config/environments"
+
+      @paths.app.controllers.concat builtin_directories
+
+      @paths.app.load_path!
+      @paths.app.metals.load_path!
+      @paths.app.models.eager_load!
+      @paths.app.controllers.eager_load!
+      @paths.app.helpers.eager_load!
+      @paths.app.services.load_path!
+      @paths.app.metals.eager_load!
+      @paths.lib.load_path!
+      @paths.vendor.load_path!
+
+      @paths.config.environments.glob = "#{RAILS_ENV}.rb"
+
+      RAILS_ROOT.replace root_path
+    end
+
+    # Enable threaded mode. Allows concurrent requests to controller actions and
+    # multiple database connections. Also disables automatic dependency loading
+    # after boot, and disables reloading code on every request, as these are
+    # fundamentally incompatible with thread safety.
+    def threadsafe!
+      self.preload_frameworks = true
+      self.cache_classes = true
+      self.dependency_loading = false
+      self.action_controller.allow_concurrency = true
+      self
+    end
+
+    def framework_paths
+      paths = %w(railties railties/lib activesupport/lib)
+      paths << 'actionpack/lib' if frameworks.include?(:action_controller) || frameworks.include?(:action_view)
+
+      [:active_record, :action_mailer, :active_resource, :action_web_service].each do |framework|
+        paths << "#{framework.to_s.gsub('_', '')}/lib" if frameworks.include?(framework)
+      end
+
+      paths.map { |dir| "#{framework_root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
+    end
+
+    def framework_root_path
+      defined?(::RAILS_FRAMEWORK_ROOT) ? ::RAILS_FRAMEWORK_ROOT : "#{root_path}/vendor/rails"
+    end
+
+    # TODO: Fix this when there is an application object
+    def middleware
+      ActionController::Dispatcher.middleware
+    end
+
+    # Loads and returns the contents of the #database_configuration_file. The
+    # contents of the file are processed via ERB before being sent through
+    # YAML::load.
+    def database_configuration
+      require 'erb'
+      YAML::load(ERB.new(IO.read(database_configuration_file)).result)
+    end
+
+    def default_routes_configuration_file
+      File.join(root_path, 'config', 'routes.rb')
+    end
+
+    def default_controller_paths
+      paths = [File.join(root_path, 'app', 'controllers')]
+      paths.concat builtin_directories
+      paths
+    end
+
+    def default_cache_store
+      if File.exist?("#{root_path}/tmp/cache/")
+        [ :file_store, "#{root_path}/tmp/cache/" ]
+      else
+        :memory_store
+      end
+    end
+
+    def default_database_configuration_file
+      File.join(root_path, 'config', 'database.yml')
+    end
+
+    def default_view_path
+      File.join(root_path, 'app', 'views')
+    end
+
+    def default_eager_load_paths
+      %w(
+        app/metal
+        app/models
+        app/controllers
+        app/helpers
+      ).map { |dir| "#{root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
+    end
+
+    def default_load_paths
+      paths = []
+
+      # Add the old mock paths only if the directories exists
+      paths.concat(Dir["#{root_path}/test/mocks/#{RAILS_ENV}"]) if File.exists?("#{root_path}/test/mocks/#{RAILS_ENV}")
+
+      # Add the app's controller directory
+      paths.concat(Dir["#{root_path}/app/controllers/"])
+
+      # Followed by the standard includes.
+      paths.concat %w(
+        app
+        app/metal
+        app/models
+        app/controllers
+        app/helpers
+        app/services
+        lib
+        vendor
+      ).map { |dir| "#{root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
+
+      paths.concat builtin_directories
+    end
+
+    def builtin_directories
+      # Include builtins only in the development environment.
+      (RAILS_ENV == 'development') ? Dir["#{RAILTIES_PATH}/builtin/*/"] : []
+    end
+
+    def default_log_path
+      File.join(root_path, 'log', "#{RAILS_ENV}.log")
+    end
+
+    def default_log_level
+      RAILS_ENV == 'production' ? :info : :debug
+    end
+
+    def default_frameworks
+      [ :active_record, :action_controller, :action_view, :action_mailer, :active_resource ]
+    end
+
+    def default_plugin_paths
+      ["#{root_path}/vendor/plugins"]
+    end
+
+    def default_plugin_loader
+      require 'rails/plugin/loader'
+      Plugin::Loader
+    end
+
+    def default_plugin_locators
+      require 'rails/plugin/locator'
+      locators = []
+      locators << Plugin::GemLocator if defined? Gem
+      locators << Plugin::FileSystemLocator
+    end
+
+    def default_i18n
+      i18n = Rails::OrderedOptions.new
+      i18n.load_path = []
+
+      if File.exist?(File.join(RAILS_ROOT, 'config', 'locales'))
+        i18n.load_path << Dir[File.join(RAILS_ROOT, 'config', 'locales', '*.{rb,yml}')]
+        i18n.load_path.flatten!
+      end
+
+      i18n
+    end
+
+    # Adds a single Gem dependency to the rails application. By default, it will require
+    # the library with the same name as the gem. Use :lib to specify a different name.
+    #
+    #   # gem 'aws-s3', '>= 0.4.0'
+    #   # require 'aws/s3'
+    #   config.gem 'aws-s3', :lib => 'aws/s3', :version => '>= 0.4.0', \
+    #     :source => "http://code.whytheluckystiff.net"
+    #
+    # To require a library be installed, but not attempt to load it, pass :lib => false
+    #
+    #   config.gem 'qrp', :version => '0.4.1', :lib => false
+    def gem(name, options = {})
+      @gems << Rails::GemDependency.new(name, options)
+    end
+
+    def default_gems
+      []
+    end
+
+    def environment_path
+      "#{root_path}/config/environments/#{RAILS_ENV}.rb"
+    end
+
+    def reload_plugins?
+      @reload_plugins
+    end
+  end
+end
\ No newline at end of file
diff --git a/railties/lib/rails/core.rb b/railties/lib/rails/core.rb
new file mode 100644
index 0000000000..33695a27b9
--- /dev/null
+++ b/railties/lib/rails/core.rb
@@ -0,0 +1,97 @@
+module Rails
+  # Needs to be duplicated from Active Support since its needed before Active
+  # Support is available. Here both Options and Hash are namespaced to prevent
+  # conflicts with other implementations AND with the classes residing in Active Support.
+  # ---
+  # TODO: w0t?
+  class << self
+    # The Configuration instance used to configure the Rails environment
+    def configuration
+      @@configuration
+    end
+
+    def configuration=(configuration)
+      @@configuration = configuration
+    end
+
+    def initialized?
+      @initialized || false
+    end
+
+    def initialized=(initialized)
+      @initialized ||= initialized
+    end
+
+    def logger
+      if defined?(RAILS_DEFAULT_LOGGER)
+        RAILS_DEFAULT_LOGGER
+      else
+        nil
+      end
+    end
+
+    def backtrace_cleaner
+      @@backtrace_cleaner ||= begin
+        # Relies on ActiveSupport, so we have to lazy load to postpone definition until AS has been loaded
+        require 'rails/backtrace_cleaner'
+        Rails::BacktraceCleaner.new
+      end
+    end
+
+    def root
+      Pathname.new(RAILS_ROOT) if defined?(RAILS_ROOT)
+    end
+
+    def env
+      @_env ||= ActiveSupport::StringInquirer.new(RAILS_ENV)
+    end
+
+    def cache
+      RAILS_CACHE
+    end
+
+    def version
+      VERSION::STRING
+    end
+
+    def public_path
+      @@public_path ||= self.root ? File.join(self.root, "public") : "public"
+    end
+
+    def public_path=(path)
+      @@public_path = path
+    end
+  end
+
+  class OrderedOptions < Array #:nodoc:
+    def []=(key, value)
+      key = key.to_sym
+
+      if pair = find_pair(key)
+        pair.pop
+        pair << value
+      else
+        self << [key, value]
+      end
+    end
+
+    def [](key)
+      pair = find_pair(key.to_sym)
+      pair ? pair.last : nil
+    end
+
+    def method_missing(name, *args)
+      if name.to_s =~ /(.*)=$/
+        self[$1.to_sym] = args.first
+      else
+        self[name]
+      end
+    end
+
+  private
+    def find_pair(key)
+      self.each { |i| return i if i.first == key }
+      return false
+    end
+  end
+end
\ No newline at end of file
diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
new file mode 100644
index 0000000000..d2f6d83659
--- /dev/null
+++ b/railties/lib/rails/paths.rb
@@ -0,0 +1,124 @@
+require 'set'
+
+module Rails
+  class Application
+    module PathParent
+      def method_missing(id, *args)
+        name = id.to_s
+
+        if name =~ /^(.*)=$/
+          @children[$1] = Path.new(args.first, @root)
+        elsif path = @children[name]
+          path
+        else
+          super
+        end
+      end
+    end
+
+    class Root
+      include PathParent
+
+      attr_reader :path
+      def initialize(path)
+        raise unless path.is_a?(String)
+
+        @children = {}
+
+        # TODO: Move logic from set_root_path initializer
+        @path = File.expand_path(path)
+        @root = self
+        @load_once, @eager_load, @all_paths = [], [], []
+      end
+
+      def load_once
+        @load_once.uniq!
+        @load_once
+      end
+
+      def eager_load
+        @eager_load.uniq!
+        @eager_load
+      end
+
+      def all_paths
+        @all_paths.uniq!
+        @all_paths
+      end
+
+      def load_paths
+        all_paths.map { |path| path.paths }.flatten
+      end
+
+      def add_to_load_path
+        load_paths.reverse_each do |path|
+          $LOAD_PATH.unshift(path) if File.directory?(path)
+        end
+      end
+    end
+
+    class Path
+      include PathParent
+
+      attr_reader :path
+      attr_accessor :glob
+
+      def initialize(path, root)
+        @children = {}
+        @root     = root
+        @paths    = [path].flatten
+        @glob     = "**/*.rb"
+      end
+
+      def push(path)
+        @paths.push path
+      end
+
+      alias << push
+
+      def unshift(path)
+        @paths.unshift path
+      end
+
+      def concat(paths)
+        @paths.concat paths
+      end
+
+      def load_once!
+        @load_once = true
+        @root.load_once.push *self.paths
+      end
+
+      def load_once?
+        @load_once
+      end
+
+      def eager_load!
+        @eager_load = true
+        @root.all_paths << self
+        @root.eager_load.push *self.paths
+      end
+
+      def eager_load?
+        @eager_load
+      end
+
+      def load_path!
+        @load_path = true
+        @root.all_paths << self
+      end
+
+      def load_path?
+        @load_path
+      end
+
+      def paths
+        @paths.map do |path|
+          path.index('/') == 0 ? path : File.join(@root.path, path)
+        end
+      end
+
+      alias to_a paths
+    end
+  end
+end
\ No newline at end of file
diff --git a/railties/lib/rails/plugin/loader.rb b/railties/lib/rails/plugin/loader.rb
index bc22dfc591..7ea9c7c0f3 100644
--- a/railties/lib/rails/plugin/loader.rb
+++ b/railties/lib/rails/plugin/loader.rb
@@ -105,7 +105,7 @@ module Rails
         end
 
         def register_plugin_as_loaded(plugin)
-          initializer.loaded_plugins << plugin
+          initializer.config.loaded_plugins << plugin
         end
 
         def configuration
@@ -174,7 +174,7 @@ module Rails
         end
 
         def loaded?(plugin_name)
-          initializer.loaded_plugins.detect { |plugin| plugin.name == plugin_name.to_s }
+          initializer.config.loaded_plugins.detect { |plugin| plugin.name == plugin_name.to_s }
         end
 
         def ensure_all_registered_plugins_are_loaded!
diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb
index 99c7516a65..9a65096061 100644
--- a/railties/lib/rails/version.rb
+++ b/railties/lib/rails/version.rb
@@ -1,8 +1,8 @@
 module Rails
   module VERSION #:nodoc:
-    MAJOR = 2
-    MINOR = 3
-    TINY  = 2
+    MAJOR = 3
+    MINOR = 0
+    TINY  = "pre"
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/railties/lib/railties_path.rb b/railties/lib/railties_path.rb
index a298a4cc27..b729c095c8 100644
--- a/railties/lib/railties_path.rb
+++ b/railties/lib/railties_path.rb
@@ -1 +1 @@
-RAILTIES_PATH = File.join(File.dirname(__FILE__), '..')
+RAILTIES_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..'))
diff --git a/railties/lib/test_help.rb b/railties/lib/test_help.rb
index 622b1f547c..4318203a42 100644
--- a/railties/lib/test_help.rb
+++ b/railties/lib/test_help.rb
@@ -3,6 +3,7 @@
 silence_warnings { RAILS_ENV = "test" }
 
 require 'test/unit'
+require 'active_support/core_ext/kernel/requires'
 require 'action_controller/testing/test_case'
 require 'action_view/test_case'
 require 'action_controller/testing/integration'
diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb
index 0addcb8bf3..9a640bdbc5 100644
--- a/railties/test/abstract_unit.rb
+++ b/railties/test/abstract_unit.rb
@@ -1,7 +1,10 @@
+ORIG_ARGV = ARGV.dup
+
 $:.unshift File.dirname(__FILE__) + "/../../activesupport/lib"
 $:.unshift File.dirname(__FILE__) + "/../../activerecord/lib"
 $:.unshift File.dirname(__FILE__) + "/../../actionpack/lib"
 $:.unshift File.dirname(__FILE__) + "/../../actionmailer/lib"
+$:.unshift File.dirname(__FILE__) + "/../../activeresource/lib"
 $:.unshift File.dirname(__FILE__) + "/../lib"
 $:.unshift File.dirname(__FILE__) + "/../builtin/rails_info"
 
@@ -9,9 +12,6 @@ require 'stringio'
 require 'rubygems'
 require 'test/unit'
 
-gem 'mocha', '>= 0.9.5'
-require 'mocha'
-
 require 'active_support'
 require 'active_support/test_case'
 
diff --git a/railties/test/generator_lookup_test.rb b/railties/test/generator_lookup_test.rb
index b650f304ed..b67087e5ea 100644
--- a/railties/test/generator_lookup_test.rb
+++ b/railties/test/generator_lookup_test.rb
@@ -7,9 +7,11 @@ class GeneratorLookupTest < Test::Unit::TestCase
     # We need to add our testing plugin directory to the plugin paths so
     # the locator knows where to look for our plugins
     @configuration.plugin_paths += @fixture_dirs.map{|fd| plugin_fixture_path(fd)}
-    @initializer = Rails::Initializer.new(@configuration)
-    @initializer.add_plugin_load_paths
-    @initializer.load_plugins
+    @initializer = Rails::Initializer.default
+    @initializer.config = @configuration
+    @initializer.run(:add_plugin_load_paths)
+    @initializer.run(:load_plugins)
+    @initializer.run(:set_root_path)
     load 'rails_generator.rb'
     require 'rails_generator/scripts'
   end
diff --git a/railties/test/initializer/path_test.rb b/railties/test/initializer/path_test.rb
new file mode 100644
index 0000000000..8fbad24a73
--- /dev/null
+++ b/railties/test/initializer/path_test.rb
@@ -0,0 +1,103 @@
+require 'abstract_unit'
+require 'active_support/ruby/shim'
+require 'initializer'
+
+RAILS_ROOT.replace File.join(File.dirname(__FILE__), "root")
+
+module Rails
+  def self.vendor_rails? ; false ; end
+end
+
+# TODO: Can this be reset?
+Rails::Initializer.run do |config|
+  config.frameworks = [:action_controller, :action_view, :action_mailer, :active_record]
+end
+
+class PathsTest < ActiveSupport::TestCase
+  include ActiveSupport::Testing::Isolation
+
+  def setup
+    @paths = Rails::Initializer.default.config.paths
+  end
+
+  def root(*path)
+    File.expand_path(File.join(File.dirname(__FILE__), "root", *path))
+  end
+
+  def assert_path(paths, *dir)
+    assert_equal [root(*dir)], paths.paths
+  end
+
+  test "booting up Rails yields a valid paths object" do
+    assert_path @paths.app, "app"
+    assert_path @paths.app.metals, "app", "metal"
+    assert_path @paths.app.models, "app", "models"
+    assert_path @paths.app.helpers, "app", "helpers"
+    assert_path @paths.app.services, "app", "services"
+    assert_path @paths.lib, "lib"
+    assert_path @paths.vendor, "vendor"
+    assert_path @paths.vendor.plugins, "vendor", "plugins"
+    assert_path @paths.cache, "tmp", "cache"
+    assert_path @paths.config, "config"
+    assert_path @paths.config.locales, "config", "locales"
+    assert_path @paths.config.environments, "config", "environments"
+
+    assert_equal Pathname.new(File.dirname(__FILE__)).join("root", "app", "controllers").expand_path,
+      Pathname.new(@paths.app.controllers.to_a.first).expand_path
+    assert_equal Pathname.new(File.dirname(__FILE__)).join("..", "..", "builtin", "rails_info").expand_path,
+      Pathname.new(@paths.app.controllers.to_a[1]).expand_path
+  end
+
+  test "booting up Rails yields a list of paths that are eager" do
+    assert @paths.app.models.eager_load?
+    assert @paths.app.controllers.eager_load?
+    assert @paths.app.helpers.eager_load?
+    assert @paths.app.metals.eager_load?
+  end
+
+  test "environments has a glob equal to the current environment" do
+    assert_equal "#{RAILS_ENV}.rb", @paths.config.environments.glob
+  end
+
+  def assert_in_load_path(*path)
+    assert $:.any? { |p| File.expand_path(p) == root(*path) }, "Load path does not include '#{root(*path)}'. They are:\n-----\n #{$:.join("\n")}\n-----"
+  end
+
+  def assert_not_in_load_path(*path)
+    assert !$:.any? { |p| File.expand_path(p) == root(*path) }, "Load path includes '#{root(*path)}'. They are:\n-----\n #{$:.join("\n")}\n-----"
+  end
+
+  test "load path includes each of the paths in config.paths as long as the directories exist" do
+    assert_in_load_path "app"
+    assert_in_load_path "app", "controllers"
+    assert_in_load_path "app", "metal"
+    assert_in_load_path "app", "models"
+    assert_in_load_path "app", "helpers"
+    assert_in_load_path "lib"
+    assert_in_load_path "vendor"
+
+    assert_not_in_load_path "app", "views"
+    assert_not_in_load_path "app", "services"
+    assert_not_in_load_path "config"
+    assert_not_in_load_path "config", "locales"
+    assert_not_in_load_path "config", "environments"
+    assert_not_in_load_path "tmp"
+    assert_not_in_load_path "tmp", "cache"
+  end
+
+  test "controller paths include builtin in development mode" do
+    RAILS_ENV.replace "development"
+    assert Rails::Configuration.new.paths.app.controllers.paths.any? { |p| p =~ /builtin/ }
+  end
+
+  test "controller paths does not have builtin_directories in test mode" do
+    RAILS_ENV.replace "test"
+    assert !Rails::Configuration.new.paths.app.controllers.paths.any? { |p| p =~ /builtin/ }
+  end
+
+  test "controller paths does not have builtin_directories in production mode" do
+    RAILS_ENV.replace "production"
+    assert !Rails::Configuration.new.paths.app.controllers.paths.any? { |p| p =~ /builtin/ }
+  end
+
+end
\ No newline at end of file
diff --git a/railties/test/initializer/root/app/controllers/.keep b/railties/test/initializer/root/app/controllers/.keep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/test/initializer/root/app/controllers/.keep
diff --git a/railties/test/initializer/root/app/helpers/.keep b/railties/test/initializer/root/app/helpers/.keep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/test/initializer/root/app/helpers/.keep
diff --git a/railties/test/initializer/root/app/metal/.keep b/railties/test/initializer/root/app/metal/.keep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/test/initializer/root/app/metal/.keep
diff --git a/railties/test/initializer/root/app/models/.keep b/railties/test/initializer/root/app/models/.keep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/test/initializer/root/app/models/.keep
diff --git a/railties/test/initializer/root/app/views/.keep b/railties/test/initializer/root/app/views/.keep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/test/initializer/root/app/views/.keep
diff --git a/railties/test/initializer/root/config/database.yml b/railties/test/initializer/root/config/database.yml
new file mode 100644
index 0000000000..ce3356be0c
--- /dev/null
+++ b/railties/test/initializer/root/config/database.yml
@@ -0,0 +1,4 @@
+development:
+  adapter: sqlite3
+  database: db/railties.db
+  timeout: 5000
\ No newline at end of file
diff --git a/railties/test/initializer/root/config/environments/.keep b/railties/test/initializer/root/config/environments/.keep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/test/initializer/root/config/environments/.keep
diff --git a/railties/test/initializer/root/config/locales/.keep b/railties/test/initializer/root/config/locales/.keep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/test/initializer/root/config/locales/.keep
diff --git a/railties/test/initializer/root/config/routes.rb b/railties/test/initializer/root/config/routes.rb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/test/initializer/root/config/routes.rb
diff --git a/railties/test/initializer/root/lib/.keep b/railties/test/initializer/root/lib/.keep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/test/initializer/root/lib/.keep
diff --git a/railties/test/initializer/root/tmp/.keep b/railties/test/initializer/root/tmp/.keep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/test/initializer/root/tmp/.keep
diff --git a/railties/test/initializer/root/tmp/cache/.keep b/railties/test/initializer/root/tmp/cache/.keep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/test/initializer/root/tmp/cache/.keep
diff --git a/railties/test/initializer/root/vendor/.keep b/railties/test/initializer/root/vendor/.keep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/test/initializer/root/vendor/.keep
diff --git a/railties/test/initializer_test.rb b/railties/test/initializer_test.rb
index 987a5ada86..5caa5858a4 100644
--- a/railties/test/initializer_test.rb
+++ b/railties/test/initializer_test.rb
@@ -38,14 +38,15 @@ class Initializer_eager_loading_Test < Test::Unit::TestCase
     @config.cache_classes = true
     @config.load_paths = [File.expand_path(File.dirname(__FILE__) + "/fixtures/eager")]
     @config.eager_load_paths = [File.expand_path(File.dirname(__FILE__) + "/fixtures/eager")]
-    @initializer = Rails::Initializer.new(@config)
-    @initializer.set_load_path
-    @initializer.set_autoload_paths
+    @initializer = Rails::Initializer.default
+    @initializer.config = @config
+    @initializer.run(:set_load_path)
+    @initializer.run(:set_autoload_paths)
   end
 
   def test_eager_loading_loads_parent_classes_before_children
     assert_nothing_raised do
-      @initializer.load_application_classes
+      @initializer.run(:load_application_classes)
     end
   end
 end
@@ -62,7 +63,7 @@ class Initializer_after_initialize_with_blocks_environment_Test < Test::Unit::Te
     assert_nil $test_after_initialize_block1
     assert_nil $test_after_initialize_block2
 
-    Rails::Initializer.any_instance.expects(:gems_dependencies_loaded).returns(true)
+    config.expects(:gems_dependencies_loaded).returns(true)
     Rails::Initializer.run(:after_initialize, config)
   end
 
@@ -92,7 +93,7 @@ class Initializer_after_initialize_with_no_block_environment_Test < Test::Unit::
     end
     assert_nil $test_after_initialize_block1
 
-    Rails::Initializer.any_instance.expects(:gems_dependencies_loaded).returns(true)
+    config.expects(:gems_dependencies_loaded).returns(true)
     Rails::Initializer.run(:after_initialize, config)
   end
 
@@ -114,68 +115,65 @@ class ConfigurationFrameworkPathsTests < Test::Unit::TestCase
   def setup
     @config = Rails::Configuration.new
     @config.frameworks.clear
+    @initializer = Rails::Initializer.default
+    @initializer.config = @config
 
     File.stubs(:directory?).returns(true)
-    @config.stubs(:framework_root_path).returns('')
+    Rails::Initializer.run(:set_root_path, @config)
   end
 
   def test_minimal
-    expected = %w(
-      /railties
-      /railties/lib
-      /activesupport/lib
-    )
-    assert_equal expected, @config.framework_paths
+    expected = %w(railties railties/lib activesupport/lib)
+    assert_equal expected.map {|e| "#{@config.framework_root_path}/#{e}"}, @config.framework_paths
   end
 
   def test_actioncontroller_or_actionview_add_actionpack
     @config.frameworks << :action_controller
-    assert_framework_path '/actionpack/lib'
+    assert_framework_path "actionpack/lib"
 
     @config.frameworks = [:action_view]
-    assert_framework_path '/actionpack/lib'
+    assert_framework_path 'actionpack/lib'
   end
 
   def test_paths_for_ar_ares_and_mailer
     [:active_record, :action_mailer, :active_resource, :action_web_service].each do |framework|
       @config.frameworks = [framework]
-      assert_framework_path "/#{framework.to_s.gsub('_', '')}/lib"
+      assert_framework_path "#{framework.to_s.gsub('_', '')}/lib"
     end
   end
 
   def test_unknown_framework_raises_error
     @config.frameworks << :action_foo
-    initializer = Rails::Initializer.new @config
-    initializer.expects(:require).raises(LoadError)
+
+    Class.any_instance.expects(:require).raises(LoadError)
 
     assert_raise RuntimeError do
-      initializer.send :require_frameworks
+      @initializer.run(:require_frameworks)
     end
   end
 
   def test_action_mailer_load_paths_set_only_if_action_mailer_in_use
     @config.frameworks = [:action_controller]
-    initializer = Rails::Initializer.new @config
-    initializer.send :require_frameworks
+    @initializer.config = @config
+    @initializer.run :require_frameworks
 
     assert_nothing_raised NameError do
-      initializer.send :load_view_paths
+      @initializer.run :load_view_paths
     end
   end
 
   def test_action_controller_load_paths_set_only_if_action_controller_in_use
     @config.frameworks = []
-    initializer = Rails::Initializer.new @config
-    initializer.send :require_frameworks
+    @initializer.run :require_frameworks
 
     assert_nothing_raised NameError do
-      initializer.send :load_view_paths
+      @initializer.run :load_view_paths
     end
   end
 
   protected
     def assert_framework_path(path)
-      assert @config.framework_paths.include?(path),
+      assert @config.framework_paths.include?("#{@config.framework_root_path}/#{path}"),
         "<#{path.inspect}> not found among <#{@config.framework_paths.inspect}>"
     end
 end
@@ -187,28 +185,29 @@ class InitializerPluginLoadingTests < Test::Unit::TestCase
     @configuration     = Rails::Configuration.new
     @configuration.frameworks -= [:action_mailer]
     @configuration.plugin_paths << plugin_fixture_root_path
-    @initializer       = Rails::Initializer.new(@configuration)
+    @initializer       = Rails::Initializer.default
+    @initializer.config = @configuration
     @valid_plugin_path = plugin_fixture_path('default/stubby')
     @empty_plugin_path = plugin_fixture_path('default/empty')
   end
 
   def test_no_plugins_are_loaded_if_the_configuration_has_an_empty_plugin_list
     only_load_the_following_plugins! []
-    @initializer.load_plugins
-    assert_equal [], @initializer.loaded_plugins
+    @initializer.run :load_plugins
+    assert_equal [], @configuration.loaded_plugins
   end
 
   def test_only_the_specified_plugins_are_located_in_the_order_listed
     plugin_names = [:plugin_with_no_lib_dir, :acts_as_chunky_bacon]
     only_load_the_following_plugins! plugin_names
     load_plugins!
-    assert_plugins plugin_names, @initializer.loaded_plugins
+    assert_plugins plugin_names, @configuration.loaded_plugins
   end
 
   def test_all_plugins_are_loaded_when_registered_plugin_list_is_untouched
     failure_tip = "It's likely someone has added a new plugin fixture without updating this list"
     load_plugins!
-    assert_plugins [:a, :acts_as_chunky_bacon, :engine, :gemlike, :plugin_with_no_lib_dir, :stubby], @initializer.loaded_plugins, failure_tip
+    assert_plugins [:a, :acts_as_chunky_bacon, :engine, :gemlike, :plugin_with_no_lib_dir, :stubby], @configuration.loaded_plugins, failure_tip
   end
 
   def test_all_plugins_loaded_when_all_is_used
@@ -216,7 +215,7 @@ class InitializerPluginLoadingTests < Test::Unit::TestCase
     only_load_the_following_plugins! plugin_names
     load_plugins!
     failure_tip = "It's likely someone has added a new plugin fixture without updating this list"
-    assert_plugins [:stubby, :acts_as_chunky_bacon, :a, :engine, :gemlike, :plugin_with_no_lib_dir], @initializer.loaded_plugins, failure_tip
+    assert_plugins [:stubby, :acts_as_chunky_bacon, :a, :engine, :gemlike, :plugin_with_no_lib_dir], @configuration.loaded_plugins, failure_tip
   end
 
   def test_all_plugins_loaded_after_all
@@ -224,7 +223,7 @@ class InitializerPluginLoadingTests < Test::Unit::TestCase
     only_load_the_following_plugins! plugin_names
     load_plugins!
     failure_tip = "It's likely someone has added a new plugin fixture without updating this list"
-    assert_plugins [:stubby, :a, :engine, :gemlike, :plugin_with_no_lib_dir, :acts_as_chunky_bacon], @initializer.loaded_plugins, failure_tip
+    assert_plugins [:stubby, :a, :engine, :gemlike, :plugin_with_no_lib_dir, :acts_as_chunky_bacon], @configuration.loaded_plugins, failure_tip
   end
 
   def test_plugin_names_may_be_strings
@@ -232,7 +231,7 @@ class InitializerPluginLoadingTests < Test::Unit::TestCase
     only_load_the_following_plugins! plugin_names
     load_plugins!
     failure_tip = "It's likely someone has added a new plugin fixture without updating this list"
-    assert_plugins plugin_names, @initializer.loaded_plugins, failure_tip
+    assert_plugins plugin_names, @configuration.loaded_plugins, failure_tip
   end
 
   def test_registering_a_plugin_name_that_does_not_exist_raises_a_load_error
@@ -251,7 +250,7 @@ class InitializerPluginLoadingTests < Test::Unit::TestCase
       flunk "Expected a LoadError but did not get one"
     rescue LoadError => e
       failure_tip = "It's likely someone renamed or deleted plugin fixtures without updating this test"
-      assert_plugins valid_plugin_names, @initializer.loaded_plugins, failure_tip
+      assert_plugins valid_plugin_names, @configuration.loaded_plugins, failure_tip
       invalid_plugin_names.each do |plugin|
         assert_match(/#{plugin.to_s}/, e.message, "LoadError message should mention plugin '#{plugin}'")
       end
@@ -265,7 +264,7 @@ class InitializerPluginLoadingTests < Test::Unit::TestCase
   def test_should_ensure_all_loaded_plugins_load_paths_are_added_to_the_load_path
     only_load_the_following_plugins! [:stubby, :acts_as_chunky_bacon]
 
-    @initializer.add_plugin_load_paths
+    @initializer.run(:add_plugin_load_paths)
 
     assert $LOAD_PATH.include?(File.join(plugin_fixture_path('default/stubby'), 'lib'))
     assert $LOAD_PATH.include?(File.join(plugin_fixture_path('default/acts/acts_as_chunky_bacon'), 'lib'))
@@ -274,8 +273,8 @@ class InitializerPluginLoadingTests < Test::Unit::TestCase
   private
 
     def load_plugins!
-      @initializer.add_plugin_load_paths
-      @initializer.load_plugins
+      @initializer.run(:add_plugin_load_paths)
+      @initializer.run(:load_plugins)
     end
 end
 
@@ -315,7 +314,7 @@ class InitializerSetupI18nTests < Test::Unit::TestCase
      File.expand_path(File.dirname(__FILE__) + "/../../activemodel/lib/active_model/locale/en.yml"),
      File.expand_path(File.dirname(__FILE__) + "/../../activerecord/lib/active_record/locale/en.yml"),
      "my/test/locale.yml",
-     "my/other/locale.yml" ], I18n.load_path.collect { |path| path =~ /^\./ ? File.expand_path(path) : path }
+     "my/other/locale.yml" ], I18n.load_path.collect { |path| path =~ /\.\./ ? File.expand_path(path) : path }
   end
 
   def test_setting_another_default_locale
diff --git a/railties/test/new_initializer_test.rb b/railties/test/new_initializer_test.rb
new file mode 100644
index 0000000000..8d9ef7bee3
--- /dev/null
+++ b/railties/test/new_initializer_test.rb
@@ -0,0 +1,165 @@
+require 'abstract_unit'
+require 'active_support/ruby/shim'
+require 'initializer'
+
+class InitializerRunnerTest < ActiveSupport::TestCase
+
+  def setup
+    @runner = Rails::Initializer::Runner.new
+  end
+
+  test "A new runner can be created" do
+    assert @runner
+  end
+
+  test "The initializers actually get run when the runner is run" do
+    state = nil
+
+    @runner.add :foo do
+      run { state = true }
+    end
+
+    @runner.run
+    assert state
+  end
+
+  test "By default, initializers get run in the order that they are added" do
+    state = []
+
+    @runner.add :first do
+      run { state << :first }
+    end
+
+    @runner.add :second do
+      run { state << :second }
+    end
+
+    @runner.run
+    assert_equal [:first, :second], state
+  end
+
+  test "Raises an exception if :before or :after are specified, but don't exist" do
+    assert_raise(Rails::Initializer::Error) do
+      @runner.add(:fail, :before => :whale) { 1 }
+    end
+
+    assert_raise(Rails::Initializer::Error) do
+      @runner.add(:fail, :after => :whale) { 1 }
+    end
+  end
+
+  test "When adding an initializer, specifying :after allows you to move an initializer after another" do
+    state = []
+
+    @runner.add :first do
+      run { state << :first }
+    end
+
+    @runner.add :second do
+      run { state << :second }
+    end
+
+    @runner.add :third, :after => :first do
+      run { state << :third }
+    end
+
+    @runner.run
+    assert_equal [:first, :third, :second], state
+  end
+
+  test "An initializer can be deleted" do
+    state = []
+
+    @runner.add :first do
+      run { state << :first }
+    end
+
+    @runner.add :second do
+      run { state << :second }
+    end
+
+    @runner.delete(:second)
+
+    @runner.run
+    assert_equal [:first], state
+  end
+
+  test "A runner can be initialized with an existing runner, which it copies" do
+    state = []
+
+    @runner.add :first do
+      run { state << :first }
+    end
+
+    @runner.add :second do
+      run { state << :second }
+    end
+
+    Rails::Initializer::Runner.new(@runner).run
+    assert_equal [:first, :second], state
+  end
+
+  test "A child runner can be still be modified without modifying the parent" do
+    state = []
+
+    @runner.add :first do
+      run { state << :first }
+    end
+
+    @runner.add :second do
+      run { state << :second }
+    end
+
+    new_runner = Rails::Initializer::Runner.new(@runner)
+    new_runner.add :trois do
+      run { state << :trois }
+    end
+    new_runner.delete(:second)
+
+    new_runner.run
+    assert_equal [:first, :trois], state
+    state.clear
+    @runner.run
+    assert_equal [:first, :second], state
+  end
+
+  test "A child runner that is modified does not modify any other children of the same parent" do
+    state = []
+
+    @runner.add :first do
+      run { state << :first }
+    end
+
+    @runner.add :second do
+      run { state << :second }
+    end
+
+    child_one = Rails::Initializer::Runner.new(@runner)
+    child_two = Rails::Initializer::Runner.new(@runner)
+
+    child_one.delete(:second)
+    child_two.run
+
+    assert_equal [:first, :second], state
+  end
+
+  test "It does not run the initializer block immediately" do
+    state = []
+    @runner.add :first do
+      state << :first
+    end
+
+    assert_equal [], state
+  end
+
+  test "It runs the block when the runner is run" do
+    state = []
+    @runner.add :first do
+      state << :first
+    end
+
+    @runner.run
+    assert_equal [:first], state
+  end
+
+end
\ No newline at end of file
diff --git a/railties/test/paths_test.rb b/railties/test/paths_test.rb
new file mode 100644
index 0000000000..fa2f6ceee2
--- /dev/null
+++ b/railties/test/paths_test.rb
@@ -0,0 +1,126 @@
+require 'abstract_unit'
+require 'rails/paths'
+
+class PathsTest < ActiveSupport::TestCase
+
+  def setup
+    @root = Rails::Application::Root.new("/foo/bar")
+  end
+
+  test "the paths object is initialized with the root path" do
+    root = Rails::Application::Root.new("/fiz/baz")
+    assert_equal "/fiz/baz", root.path
+  end
+
+  test "creating a root level path" do
+    @root.app = "/foo/bar"
+    assert_equal ["/foo/bar"], @root.app.to_a
+  end
+
+  test "relative paths are relative to the paths root" do
+    @root.app = "app"
+    assert_equal ["/foo/bar/app"], @root.app.to_a
+  end
+
+  test "creating a child level path" do
+    @root.app        = "/foo/bar"
+    @root.app.models = "/foo/bar/baz"
+    assert_equal ["/foo/bar/baz"], @root.app.models.to_a
+  end
+
+  test "child level paths are relative from the root" do
+    @root.app        = "/app"
+    @root.app.models = "baz"
+
+    assert_equal ["/foo/bar/baz"], @root.app.models.to_a
+  end
+
+  test "adding multiple physical paths as an array" do
+    @root.app = ["/app", "/app2"]
+    assert_equal ["/app", "/app2"], @root.app.to_a
+  end
+
+  test "adding multiple physical paths using #push" do
+    @root.app = "/app"
+    @root.app.push "/app2"
+    assert_equal ["/app", "/app2"], @root.app.to_a
+  end
+
+  test "adding multiple physical paths using <<" do
+    @root.app = "/app"
+    @root.app << "/app2"
+    assert_equal ["/app", "/app2"], @root.app.to_a
+  end
+
+  test "adding multiple physical paths using concat" do
+    @root.app = "/app"
+    @root.app.concat ["/app2", "/app3"]
+    assert_equal ["/app", "/app2", "/app3"], @root.app.to_a
+  end
+
+  test "adding multiple physical paths using #unshift" do
+    @root.app = "/app"
+    @root.app.unshift "/app2"
+    assert_equal ["/app2", "/app"], @root.app.to_a
+  end
+
+  test "the root can only have one physical path" do
+    assert_raise(RuntimeError) { Rails::Application::Root.new(["/fiz", "/biz"]) }
+    assert_raise(NoMethodError) { @root.push "/biz"    }
+    assert_raise(NoMethodError) { @root.unshift "/biz" }
+    assert_raise(NoMethodError) { @root.concat ["/biz"]}
+    assert_raise(NoMethodError) { @root << "/biz"      }
+  end
+
+  test "it is possible to add a path that should be loaded only once" do
+    @root.app = "/app"
+    @root.app.load_once!
+    assert @root.app.load_once?
+    assert @root.load_once.include?(@root.app.paths.first)
+  end
+
+  test "making a path load_once more than once only includes it once in @root.load_once" do
+    @root.app = "/app"
+    @root.app.load_once!
+    @root.app.load_once!
+    assert_equal 1, @root.load_once.select {|p| p == @root.app.paths.first }.size
+  end
+
+  test "it is possible to mark a path as eager" do
+    @root.app = "/app"
+    @root.app.eager_load!
+    assert @root.app.eager_load?
+    assert @root.eager_load.include?(@root.app.paths.first)
+  end
+
+  test "making a path eager more than once only includes it once in @root.eager_paths" do
+    @root.app = "/app"
+    @root.app.eager_load!
+    @root.app.eager_load!
+    assert_equal 1, @root.eager_load.select {|p| p == @root.app.paths.first }.size
+  end
+
+  test "a path should have a glob that defaults to **/*.rb" do
+    @root.app = "/app"
+    assert_equal "**/*.rb", @root.app.glob
+  end
+
+  test "it should be possible to override a path's default glob" do
+    @root.app = "/app"
+    @root.app.glob = "*.rb"
+    assert_equal "*.rb", @root.app.glob
+  end
+
+  test "a path can be added to the load path" do
+    @root.app = "app"
+    @root.app.load_path!
+    @root.app.models = "app/models"
+    assert_equal ["/foo/bar/app"], @root.load_paths
+  end
+
+  test "adding a path to the eager paths also adds it to the load path" do
+    @root.app = "app"
+    @root.app.eager_load!
+    assert_equal ["/foo/bar/app"], @root.load_paths
+  end
+end
\ No newline at end of file
diff --git a/railties/test/plugin_loader_test.rb b/railties/test/plugin_loader_test.rb
index c647d7b478..873e000222 100644
--- a/railties/test/plugin_loader_test.rb
+++ b/railties/test/plugin_loader_test.rb
@@ -20,7 +20,8 @@ class TestPluginLoader < Test::Unit::TestCase
 
     @configuration     = Rails::Configuration.new
     @configuration.plugin_paths << plugin_fixture_root_path
-    @initializer       = Rails::Initializer.new(@configuration)
+    @initializer       = Rails::Initializer.default
+    @initializer.config = @configuration
     @valid_plugin_path = plugin_fixture_path('default/stubby')
     @empty_plugin_path = plugin_fixture_path('default/empty')
 
diff --git a/railties/test/plugin_locator_test.rb b/railties/test/plugin_locator_test.rb
index 855ac7d82f..da1548dee1 100644
--- a/railties/test/plugin_locator_test.rb
+++ b/railties/test/plugin_locator_test.rb
@@ -27,7 +27,8 @@ class PluginFileSystemLocatorTest < Test::Unit::TestCase
     # We need to add our testing plugin directory to the plugin paths so
     # the locator knows where to look for our plugins
     @configuration.plugin_paths << plugin_fixture_root_path
-    @initializer       = Rails::Initializer.new(@configuration)
+    @initializer       = Rails::Initializer.default
+    @initializer.config = @configuration
     @locator           = Rails::Plugin::FileSystemLocator.new(@initializer)
     @valid_plugin_path = plugin_fixture_path('default/stubby')
     @empty_plugin_path = plugin_fixture_path('default/empty')
diff --git a/railties/test/plugin_test.rb b/railties/test/plugin_test.rb
index a6c390a45a..ae03ea4662 100644
--- a/railties/test/plugin_test.rb
+++ b/railties/test/plugin_test.rb
@@ -2,7 +2,8 @@ require 'plugin_test_helper'
 
 class PluginTest < Test::Unit::TestCase
   def setup
-    @initializer         = Rails::Initializer.new(Rails::Configuration.new)
+    @initializer         = Rails::Initializer.default
+    @initializer.config  = Rails::Configuration.new
     @valid_plugin_path   = plugin_fixture_path('default/stubby')
     @empty_plugin_path   = plugin_fixture_path('default/empty')
     @gemlike_plugin_path = plugin_fixture_path('default/gemlike')
diff --git a/railties/test/rails_generator_test.rb b/railties/test/rails_generator_test.rb
index b2fc2f585d..38bd90dcc1 100644
--- a/railties/test/rails_generator_test.rb
+++ b/railties/test/rails_generator_test.rb
@@ -50,6 +50,9 @@ class RailsGeneratorTest < Test::Unit::TestCase
 
   def setup
     ActiveRecord::Base.pluralize_table_names = true
+    @initializer = Rails::Initializer.default
+    @initializer.config = Rails.configuration
+    @initializer.run(:set_root_path)
   end
 
   def test_sources