Merge branch 'rails'

Conflicts:
	actionmailer/lib/action_mailer.rb
	actionmailer/lib/action_mailer/delivery_method/smtp.rb

78 files changed, 697 insertions, 372 deletions

diff --git a/railties/Rakefile b/railties/Rakefile
index e6f698fc74..cb482c90bf 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -10,7 +10,7 @@ $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/lib"
 require 'rails/version'
 
 PKG_BUILD       = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-PKG_NAME        = ENV['PKG_NAME'] || 'rails'
+PKG_NAME        = ENV['PKG_NAME'] || 'railties'
 PKG_VERSION     = Rails::VERSION::STRING + PKG_BUILD
 PKG_FILE_NAME   = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
@@ -141,7 +141,7 @@ Rake::RDocTask.new { |rdoc|
 
 # Generate GEM ----------------------------------------------------------------------------
 
-spec = eval(File.read('rails.gemspec'))
+spec = eval(File.read('railties.gemspec'))
 
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
diff --git a/railties/bin/rails b/railties/bin/rails
index 808df97429..0f51d5739f 100755
--- a/railties/bin/rails
+++ b/railties/bin/rails
@@ -4,9 +4,10 @@ rescue LoadError
   # If people are not using gems, the load path must still
   # be correct.
   # TODO: Remove the begin / rescue block somehow
-  $:.unshift File.dirname(__FILE__) + '/../lib'
-  $:.unshift File.dirname(__FILE__) + '/../../activesupport/lib'
-  retry
+  $:.unshift File.expand_path('../../lib', __FILE__)
+  $:.unshift File.expand_path('../../../activesupport/lib', __FILE__)
+  $:.unshift File.expand_path('../../../actionpack/lib', __FILE__)
+  require 'rails/ruby_version_check'
 end
 
 Signal.trap("INT") { puts; exit }
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index c23b67e321..85aeb4af24 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -1,7 +1,13 @@
 require "pathname"
 
+require 'active_support'
+require 'active_support/core_ext/kernel/reporting'
+require 'active_support/core_ext/logger'
+require 'action_dispatch'
+
 require 'rails/initializable'
 require 'rails/application'
+require 'rails/plugin'
 require 'rails/railties_path'
 require 'rails/version'
 require 'rails/rack'
@@ -10,4 +16,18 @@ require 'rails/core'
 require 'rails/configuration'
 require 'rails/deprecation'
 require 'rails/initializer'
-require 'rails/plugin'
\ No newline at end of file
+require 'rails/ruby_version_check'
+
+# 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.
+if RUBY_VERSION < '1.9'
+  $KCODE='u'
+else
+  Encoding.default_external = Encoding::UTF_8
+end
+
+RAILS_ENV = (ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development").dup unless defined?(RAILS_ENV)
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 7c2d8eab67..e65c20de2c 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -3,11 +3,6 @@ module Rails
     include Initializable
 
     class << self
-      def inherited(klass)
-        Rails.application ||= klass unless klass.name =~ /Rails/
-        super
-      end
-
       # Stub out App initialize
       def initialize!
         new
@@ -18,7 +13,11 @@ module Rails
       end
 
       def config
-        @config ||= Configuration.new
+        @config ||= begin
+          config = Configuration.new
+          Plugin.plugins.each { |p| config.merge(p.config) }
+          config
+        end
       end
 
       # TODO: change the plugin loader to use config
@@ -32,12 +31,28 @@ module Rails
         config.root
       end
 
+      def load_tasks
+        require "rails/tasks"
+        Dir["#{root}/vendor/plugins/*/**/tasks/**/*.rake"].sort.each { |ext| load ext }
+        Dir["#{root}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
+        task :environment do
+          $rails_rake_task = true
+          initialize!
+        end
+      end
+
       def call(env)
         new.call(env)
       end
     end
 
+    attr_reader :route_configuration_files
+
     def initialize
+      Rails.application ||= self
+
+      @route_configuration_files = []
+
       run_initializers(self)
     end
 
@@ -45,6 +60,10 @@ module Rails
       self.class.config
     end
 
+    def root
+      config.root
+    end
+
     alias configuration config
 
     def middleware
@@ -55,6 +74,32 @@ module Rails
       ActionController::Routing::Routes
     end
 
+    def routes_changed_at
+      routes_changed_at = nil
+
+      route_configuration_files.each do |config|
+        config_changed_at = File.stat(config).mtime
+
+        if routes_changed_at.nil? || config_changed_at > routes_changed_at
+          routes_changed_at = config_changed_at
+        end
+      end
+
+      routes_changed_at
+    end
+
+    def reload_routes!
+      routes.disable_clear_and_finalize = true
+
+      routes.clear!
+      route_configuration_files.each { |config| load(config) }
+      routes.finalize!
+
+      nil
+    ensure
+      routes.disable_clear_and_finalize = false
+    end
+
     def initializers
       initializers = super
       plugins.each { |p| initializers += p.initializers }
@@ -63,6 +108,8 @@ module Rails
 
     def plugins
       @plugins ||= begin
+        plugin_names = config.plugins || [:all]
+        Plugin.plugins.select { |p| plugin_names.include?(p.plugin_name) } +
         Plugin::Vendored.all(config.plugins || [:all], config.paths.vendor.plugins)
       end
     end
@@ -72,8 +119,21 @@ module Rails
       @app.call(env)
     end
 
-    initializer :initialize_rails do
-      Rails.run_initializers
+
+    # Loads the environment specified by Configuration#environment_path, which
+    # is typically one of development, test, or production.
+    initializer :load_environment do
+      next unless File.file?(config.environment_path)
+
+      config = self.config
+
+      Kernel.class_eval do
+        meth = instance_method(:config) if Object.respond_to?(:config)
+        define_method(:config) { config }
+        require config.environment_path
+        remove_method :config
+        define_method(:config, &meth) if meth
+      end
     end
 
     # Set the <tt>$LOAD_PATH</tt> based on the value of
@@ -87,18 +147,8 @@ module Rails
     # list. By default, all frameworks (Active Record, Active Support,
     # Action Pack, Action Mailer, and Active Resource) are loaded.
     initializer :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'
-        config.frameworks.each { |framework| require(framework.to_s) }
-      rescue LoadError => e
-        # Re-raise as RuntimeError because Mongrel would swallow LoadError.
-        raise e.to_s
-      end
+      require 'active_support/all' unless config.active_support.bare
+      config.frameworks.each { |framework| require(framework.to_s) }
     end
 
     # Set the paths from which Rails will automatically load source files, and
@@ -127,24 +177,6 @@ module Rails
       end
     end
 
-    # Loads the environment specified by Configuration#environment_path, which
-    # is typically one of development, test, or production.
-    initializer :load_environment do
-      silence_warnings do
-        next if @environment_loaded
-        next unless File.file?(config.environment_path)
-
-        @environment_loaded = true
-        constants = self.class.constants
-
-        eval(IO.read(config.environment_path), binding, config.environment_path)
-
-        (self.class.constants - constants).each do |const|
-          Object.const_set(const, self.class.const_get(const))
-        end
-      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.
@@ -178,9 +210,9 @@ module Rails
 
     initializer :initialize_middleware_stack do
       if config.frameworks.include?(:action_controller)
-        config.middleware.use(::Rack::Lock) unless ActionController::Base.allow_concurrency
-        config.middleware.use(ActionDispatch::ShowExceptions, ActionController::Base.consider_all_requests_local)
-        config.middleware.use(ActionDispatch::Callbacks, ActionController::Dispatcher.prepare_each_request)
+        config.middleware.use(::Rack::Lock, :if => lambda { ActionController::Base.allow_concurrency })
+        config.middleware.use(ActionDispatch::ShowExceptions, lambda { ActionController::Base.consider_all_requests_local })
+        config.middleware.use(ActionDispatch::Callbacks, lambda { ActionController::Dispatcher.prepare_each_request })
         config.middleware.use(lambda { ActionController::Base.session_store }, lambda { ActionController::Base.session_options })
         config.middleware.use(ActionDispatch::ParamsParser)
         config.middleware.use(::Rack::MethodOverride)
@@ -302,9 +334,6 @@ module Rails
           base_class.send("#{setting}=", value)
         end
       end
-      config.active_support.each do |setting, value|
-        ActiveSupport.send("#{setting}=", value)
-      end
     end
 
     # Sets +ActionController::Base#view_paths+ and +ActionMailer::Base#template_root+
@@ -367,6 +396,18 @@ module Rails
       next unless configuration.frameworks.include?(:action_controller)
       require 'rails/dispatcher' unless defined?(::Dispatcher)
       Dispatcher.define_dispatcher_callbacks(configuration.cache_classes)
+
+      unless configuration.cache_classes
+        # Setup dev mode route reloading
+        routes_last_modified = routes_changed_at
+        reload_routes = lambda do
+          unless routes_changed_at == routes_last_modified
+            routes_last_modified = routes_changed_at
+            reload_routes!
+          end
+        end
+        ActionDispatch::Callbacks.before_dispatch { |callbacks| reload_routes.call }
+      end
     end
 
     # Routing must be initialized after plugins to allow the former to extend the routes
@@ -376,10 +417,8 @@ module Rails
     # loading module used to lazily load controllers (Configuration#controller_paths).
     initializer :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!
+      route_configuration_files << configuration.routes_configuration_file
+      reload_routes!
     end
     #
     # # Observers are loaded after plugins in case Observers or observed models are modified by plugins.
diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb
index fc22ad64a9..37eb6d40ea 100644
--- a/railties/lib/rails/commands/console.rb
+++ b/railties/lib/rails/commands/console.rb
@@ -6,8 +6,12 @@ module Rails
   class Console
     ENVIRONMENTS = %w(production development test)
 
-    def self.start
-      new.start
+    def self.start(app)
+      new(app).start
+    end
+
+    def initialize(app)
+      @app = app
     end
 
     def start
@@ -25,7 +29,7 @@ module Rails
         ENV['RAILS_ENV'] = ENVIRONMENTS.find { |e| e.index(env) } || env
       end
 
-      require "#{Rails.root}/config/environment"
+      @app.initialize!
       require "rails/console_app"
       require "rails/console_sandbox" if options[:sandbox]
       require "rails/console_with_helpers"
@@ -41,10 +45,10 @@ module Rails
       end
 
       if options[:sandbox]
-        puts "Loading #{ENV['RAILS_ENV']} environment in sandbox (Rails #{Rails.version})"
+        puts "Loading #{Rails.env} environment in sandbox (Rails #{Rails.version})"
         puts "Any modifications you make will be rolled back on exit"
       else
-        puts "Loading #{ENV['RAILS_ENV']} environment (Rails #{Rails.version})"
+        puts "Loading #{Rails.env} environment (Rails #{Rails.version})"
       end
       IRB.start
     end
diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb
index 4e699acf6b..77c3404343 100644
--- a/railties/lib/rails/commands/dbconsole.rb
+++ b/railties/lib/rails/commands/dbconsole.rb
@@ -2,86 +2,99 @@ require 'erb'
 require 'yaml'
 require 'optparse'
 
-include_password = false
-options = {}
-
-OptionParser.new do |opt|
-  opt.banner = "Usage: dbconsole [options] [environment]"
-  opt.on("-p", "--include-password", "Automatically provide the password from database.yml") do |v|
-    include_password = true
-  end
-
-  opt.on("--mode [MODE]", ['html', 'list', 'line', 'column'],
-    "Automatically put the sqlite3 database in the specified mode (html, list, line, column).") do |mode|
-      options['mode'] = mode
-  end
-
-  opt.on("-h", "--header") do |h|
-    options['header'] = h
-  end
-
-  opt.parse!(ARGV)
-  abort opt.to_s unless (0..1).include?(ARGV.size)
-end
-
-env = ARGV.first || ENV['RAILS_ENV'] || 'development'
-unless config = YAML::load(ERB.new(IO.read(Rails.root + "/config/database.yml")).result)[env]
-  abort "No database is configured for the environment '#{env}'"
-end
-
+module Rails
+  class DBConsole
+    def self.start(app)
+      new(app).start
+    end
 
-def find_cmd(*commands)
-  dirs_on_path = ENV['PATH'].to_s.split(File::PATH_SEPARATOR)
-  commands += commands.map{|cmd| "#{cmd}.exe"} if RUBY_PLATFORM =~ /win32/
+    def initialize(app)
+      @app = app
+    end
 
-  full_path_command = nil
-  found = commands.detect do |cmd|
-    dir = dirs_on_path.detect do |path|
-      full_path_command = File.join(path, cmd)
-      File.executable? full_path_command
+    def start
+      include_password = false
+      options = {}
+      OptionParser.new do |opt|
+        opt.banner = "Usage: dbconsole [options] [environment]"
+        opt.on("-p", "--include-password", "Automatically provide the password from database.yml") do |v|
+          include_password = true
+        end
+
+        opt.on("--mode [MODE]", ['html', 'list', 'line', 'column'],
+          "Automatically put the sqlite3 database in the specified mode (html, list, line, column).") do |mode|
+            options['mode'] = mode
+        end
+
+        opt.on("-h", "--header") do |h|
+          options['header'] = h
+        end
+
+        opt.parse!(ARGV)
+        abort opt.to_s unless (0..1).include?(ARGV.size)
+      end
+
+      env = ARGV.first || ENV['RAILS_ENV'] || 'development'
+      unless config = YAML::load(ERB.new(IO.read("#{@app.root}/config/database.yml")).result)[env]
+        abort "No database is configured for the environment '#{env}'"
+      end
+
+
+      def find_cmd(*commands)
+        dirs_on_path = ENV['PATH'].to_s.split(File::PATH_SEPARATOR)
+        commands += commands.map{|cmd| "#{cmd}.exe"} if RUBY_PLATFORM =~ /win32/
+
+        full_path_command = nil
+        found = commands.detect do |cmd|
+          dir = dirs_on_path.detect do |path|
+            full_path_command = File.join(path, cmd)
+            File.executable? full_path_command
+          end
+        end
+        found ? full_path_command : abort("Couldn't find database client: #{commands.join(', ')}. Check your $PATH and try again.")
+      end
+
+      case config["adapter"]
+      when "mysql"
+        args = {
+          'host'      => '--host',
+          'port'      => '--port',
+          'socket'    => '--socket',
+          'username'  => '--user',
+          'encoding'  => '--default-character-set'
+        }.map { |opt, arg| "#{arg}=#{config[opt]}" if config[opt] }.compact
+
+        if config['password'] && include_password
+          args << "--password=#{config['password']}"
+        elsif config['password'] && !config['password'].to_s.empty?
+          args << "-p"
+        end
+
+        args << config['database']
+
+        exec(find_cmd('mysql', 'mysql5'), *args)
+
+      when "postgresql"
+        ENV['PGUSER']     = config["username"] if config["username"]
+        ENV['PGHOST']     = config["host"] if config["host"]
+        ENV['PGPORT']     = config["port"].to_s if config["port"]
+        ENV['PGPASSWORD'] = config["password"].to_s if config["password"] && include_password
+        exec(find_cmd('psql'), config["database"])
+
+      when "sqlite"
+        exec(find_cmd('sqlite'), config["database"])
+
+      when "sqlite3"
+        args = []
+
+        args << "-#{options['mode']}" if options['mode']
+        args << "-header" if options['header']
+        args << config['database']
+
+        exec(find_cmd('sqlite3'), *args)
+      else
+        abort "Unknown command-line client for #{config['database']}. Submit a Rails patch to add support!"
+      end
     end
   end
-  found ? full_path_command : abort("Couldn't find database client: #{commands.join(', ')}. Check your $PATH and try again.")
-end
-
-case config["adapter"]
-when "mysql"
-  args = {
-    'host'      => '--host',
-    'port'      => '--port',
-    'socket'    => '--socket',
-    'username'  => '--user',
-    'encoding'  => '--default-character-set'
-  }.map { |opt, arg| "#{arg}=#{config[opt]}" if config[opt] }.compact
-
-  if config['password'] && include_password
-    args << "--password=#{config['password']}"
-  elsif config['password'] && !config['password'].to_s.empty?
-    args << "-p"
-  end
-
-  args << config['database']
-
-  exec(find_cmd('mysql', 'mysql5'), *args)
-
-when "postgresql"
-  ENV['PGUSER']     = config["username"] if config["username"]
-  ENV['PGHOST']     = config["host"] if config["host"]
-  ENV['PGPORT']     = config["port"].to_s if config["port"]
-  ENV['PGPASSWORD'] = config["password"].to_s if config["password"] && include_password
-  exec(find_cmd('psql'), config["database"])
-
-when "sqlite"
-  exec(find_cmd('sqlite'), config["database"])
-
-when "sqlite3"
-  args = []
-
-  args << "-#{options['mode']}" if options['mode']
-  args << "-header" if options['header']
-  args << config['database']
-
-  exec(find_cmd('sqlite3'), *args)
-else
-  abort "Unknown command-line client for #{config['database']}. Submit a Rails patch to add support!"
-end
+end
\ No newline at end of file
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index ff2282a534..3687b4460e 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -37,6 +37,15 @@ module Rails
       Options.new
     end
 
+    def self.start(app)
+      new(app).start
+    end
+
+    def initialize(app_const)
+      super() # Call Rack::Server#initialize without passing any options to use.
+      @app_const = app_const
+    end
+
     def start
       puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
       puts "=> Rails #{Rails.version} application starting on http://#{options[:Host]}:#{options[:Port]}"
@@ -54,20 +63,24 @@ module Rails
 
     def middleware
       middlewares = []
-      middlewares << [Rails::Rack::LogTailer] unless options[:daemonize]
+      middlewares << [Rails::Rack::LogTailer, log_path] unless options[:daemonize]
       middlewares << [Rails::Rack::Debugger]  if options[:debugger]
       Hash.new(middlewares)
     end
 
+    def log_path
+      "#{File.expand_path(@app_const.root)}/log/#{options[:environment]}.log"
+    end
+
     def default_options
       {
         :Port        => 3000,
         :Host        => "0.0.0.0",
         :environment => (ENV['RAILS_ENV'] || "development").dup,
-        :rack_file   => "#{Rails.root}/config.ru",
+        :rack_file   => "#{@app_const.root}/config.ru",
         :daemonize   => false,
         :debugger    => false,
-        :pid         => "#{Rails.root}/tmp/pids/server.pid",
+        :pid         => "#{@app_const.root}/tmp/pids/server.pid",
         :AccessLog   => []
       }
     end
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index 3f43a48e2e..0fa42091dd 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -1,27 +1,71 @@
 require 'active_support/ordered_options'
 
 module Rails
-  class Configuration
-    attr_accessor :cache_classes, :load_paths, :load_once_paths, :after_initialize_blocks,
-                  :frameworks, :framework_root_path, :root, :gems, :plugins,
-                  :i18n, :gems, :whiny_nils, :consider_all_requests_local,
-                  :action_controller, :active_record, :action_view, :active_support,
-                  :action_mailer, :active_resource,
-                  :reload_plugins, :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, :serve_static_assets
+  # Temporarily separate the plugin configuration class from the main
+  # configuration class while this bit is being cleaned up.
+  class Plugin::Configuration
 
     def initialize
+      @options = Hash.new { |h,k| h[k] = ActiveSupport::OrderedOptions.new }
+    end
+
+    def middleware
+      @middleware ||= ActionDispatch::MiddlewareStack.new
+    end
+
+    def respond_to?(name)
+      super || name.to_s =~ config_key_regexp
+    end
+
+    def merge(config)
+      @options = config.options.merge(@options)
+    end
+
+  protected
+
+    attr_reader :options
+
+  private
+
+    def method_missing(name, *args, &blk)
+      if name.to_s =~ config_key_regexp
+        return $2 == '=' ? @options[$1] = args.first : @options[$1]
+      end
+
+      super
+    end
+
+    def config_key_regexp
+      bits = config_keys.map { |n| Regexp.escape(n.to_s) }.join('|')
+      /^(#{bits})(?:=)?$/
+    end
+
+    def config_keys
+      ([ :active_support, :active_record, :action_controller,
+         :action_view, :action_mailer, :active_resource ] +
+        Plugin.plugin_names).map { |n| n.to_s }.uniq
+    end
+  end
+
+  class Configuration < Plugin::Configuration
+    attr_accessor :after_initialize_blocks, :cache_classes,
+                  :consider_all_requests_local, :dependency_loading, :gems,
+                  :load_once_paths, :logger, :metals, :plugins,
+                  :preload_frameworks, :reload_plugins, :serve_static_assets,
+                  :time_zone, :whiny_nils
+
+    attr_writer :cache_store, :controller_paths,
+                :database_configuration_file, :eager_load_paths,
+                :frameworks, :framework_root_path, :i18n, :load_paths,
+                :log_level, :log_path, :paths, :routes_configuration_file,
+                :view_path
+
+    def initialize
+      super
       @load_once_paths              = []
       @after_initialize_blocks      = []
       @dependency_loading           = true
       @serve_static_assets          = true
-
-      for framework in frameworks
-        self.send("#{framework}=", ActiveSupport::OrderedOptions.new)
-      end
-      self.active_support = ActiveSupport::OrderedOptions.new
     end
 
     def after_initialize(&blk)
@@ -80,7 +124,10 @@ module Rails
       self.preload_frameworks = true
       self.cache_classes = true
       self.dependency_loading = false
-      self.action_controller.allow_concurrency = true
+
+      if respond_to?(:action_controller)
+        action_controller.allow_concurrency = true
+      end
       self
     end
 
@@ -99,11 +146,6 @@ module Rails
       defined?(::RAILS_FRAMEWORK_ROOT) ? ::RAILS_FRAMEWORK_ROOT : "#{root}/vendor/rails"
     end
 
-    def middleware
-      require 'action_dispatch'
-      @middleware ||= ActionDispatch::MiddlewareStack.new
-    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.
diff --git a/railties/lib/rails/console_app.rb b/railties/lib/rails/console_app.rb
index 1ad62e5058..2c4a7a51e8 100644
--- a/railties/lib/rails/console_app.rb
+++ b/railties/lib/rails/console_app.rb
@@ -27,6 +27,6 @@ end
 def reload!
   puts "Reloading..."
   ActionDispatch::Callbacks.new(lambda {}, true)
-  ActionController::Routing::Routes.reload
+  Rails.application.reload_routes!
   true
 end
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 85c2fd52a4..0e66c9f58f 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -1,5 +1,6 @@
-activesupport_path = "#{File.dirname(__FILE__)}/../../../activesupport/lib"
-$LOAD_PATH.unshift(activesupport_path) if File.directory?(activesupport_path)
+activesupport_path = File.expand_path('../../../../activesupport/lib', __FILE__)
+$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
+
 require 'active_support'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/metaclass'
@@ -9,7 +10,7 @@ require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/string/inflections'
 
 # TODO: Do not always push on vendored thor
-$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/vendor/thor-0.12.0/lib")
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/vendor/thor-0.12.1/lib")
 require 'rails/generators/base'
 require 'rails/generators/named_base'
 
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index 8677bf283b..2efdf29127 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -104,7 +104,7 @@ module Rails
       # file in config/environments.
       #
       def environment(data=nil, options={}, &block)
-        sentinel = "Rails::Initializer.run do |config|"
+        sentinel = /class [a-z_:]+ < Rails::Application/i
         data = block.call if !data && block_given?
 
         in_root do
@@ -269,7 +269,7 @@ module Rails
       #
       # === Example
       #
-      #   route "map.root :controller => :welcome"
+      #   route "root :to => 'welcome'"
       #
       def route(routing_code)
         log :route, routing_code
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 2bcea4bc8f..ae18fa843b 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -48,9 +48,9 @@ module Rails::Generators
     end
 
     def create_root_files
-      copy_file "Rakefile"
       copy_file "README"
-      copy_file "config.ru"
+      template "Rakefile"
+      template "config.ru"
       template "Gemfile"
     end
 
@@ -123,10 +123,10 @@ module Rails::Generators
     end
 
     def create_script_files
-      directory "script" do |file|
-        prepend_file file, "#{shebang}\n", :verbose => false
-        chmod file, 0755, :verbose => false
+      directory "script" do |content|
+        "#{shebang}\n" + content
       end
+      chmod "script", 0755, :verbose => false
     end
 
     def create_test_files
@@ -181,6 +181,10 @@ module Rails::Generators
         @app_name ||= File.basename(destination_root)
       end
 
+      def app_const
+        @app_const ||= app_name.classify
+      end
+
       def app_secret
         ActiveSupport::SecureRandom.hex(64)
       end
diff --git a/railties/lib/rails/generators/rails/app/templates/Rakefile b/railties/lib/rails/generators/rails/app/templates/Rakefile
index 6b6d07e8cc..c19ad0e945 100755
--- a/railties/lib/rails/generators/rails/app/templates/Rakefile
+++ b/railties/lib/rails/generators/rails/app/templates/Rakefile
@@ -7,4 +7,4 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-require 'rails/tasks'
+<%= app_const %>.load_tasks
diff --git a/railties/lib/rails/generators/rails/app/templates/config.ru b/railties/lib/rails/generators/rails/app/templates/config.ru
index 509a0da5b7..f3bf3d6117 100644
--- a/railties/lib/rails/generators/rails/app/templates/config.ru
+++ b/railties/lib/rails/generators/rails/app/templates/config.ru
@@ -2,4 +2,4 @@
 require ::File.expand_path('../config/environment',  __FILE__)
 
 # Dispatch the request
-run Rails.application
+run <%= app_const%>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index 8008c6ba07..2c17de2a23 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -1,6 +1,6 @@
 require File.expand_path('../boot', __FILE__)
 
-Rails::Initializer.run do |config|
+class <%= app_const %> < Rails::Application
   # Settings in config/environments/* take precedence over those specified here.
   # Application configuration should go into files in config/initializers
   # -- all .rb files in that directory are automatically loaded.
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environment.rb b/railties/lib/rails/generators/rails/app/templates/config/environment.rb
index 0bb191f205..1684986a59 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environment.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/environment.rb
@@ -2,4 +2,4 @@
 require File.expand_path('../application', __FILE__)
 
 # Initialize the rails application
-Rails.initialize!
+<%= app_const %>.initialize!
diff --git a/railties/lib/rails/generators/rails/app/templates/config/routes.rb b/railties/lib/rails/generators/rails/app/templates/config/routes.rb
index ea14ce1bfc..e0f9ca8a12 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/routes.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/routes.rb
@@ -1,43 +1,60 @@
 ActionController::Routing::Routes.draw do |map|
-  # The priority is based upon order of creation: first created -> highest priority.
+  # The priority is based upon order of creation:
+  # first created -> highest priority.
 
   # Sample of regular route:
-  #   map.connect 'products/:id', :controller => 'catalog', :action => 'view'
+  #   match 'products/:id', :to => 'catalog#view'
   # Keep in mind you can assign values other than :controller and :action
 
   # Sample of named route:
-  #   map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase'
+  #   match 'products/:id/purchase', :to => 'catalog#purchase', :as => :purchase
   # This route can be invoked with purchase_url(:id => product.id)
 
   # Sample resource route (maps HTTP verbs to controller actions automatically):
-  #   map.resources :products
+  #   resources :products
 
   # Sample resource route with options:
-  #   map.resources :products, :member => { :short => :get, :toggle => :post }, :collection => { :sold => :get }
+  #   resources :products do
+  #     member do
+  #       get :short
+  #       post :toggle
+  #     end
+  #
+  #     collection do
+  #       get :sold
+  #     end
+  #   end
 
   # Sample resource route with sub-resources:
-  #   map.resources :products, :has_many => [ :comments, :sales ], :has_one => :seller
-  
+  #   resources :products do
+  #     resources :comments, :sales
+  #     resource :seller
+  #   end
+
   # Sample resource route with more complex sub-resources
-  #   map.resources :products do |products|
-  #     products.resources :comments
-  #     products.resources :sales, :collection => { :recent => :get }
+  #   resources :products do
+  #     resources :comments
+  #     resources :sales do
+  #       get :recent, :on => :collection
+  #     end
   #   end
 
   # Sample resource route within a namespace:
-  #   map.namespace :admin do |admin|
-  #     # Directs /admin/products/* to Admin::ProductsController (app/controllers/admin/products_controller.rb)
-  #     admin.resources :products
+  #   namespace :admin do
+  #     # Directs /admin/products/* to Admin::ProductsController
+  #     # (app/controllers/admin/products_controller.rb)
+  #     resources :products
   #   end
 
-  # You can have the root of your site routed with map.root -- just remember to delete public/index.html.
-  # map.root :controller => "welcome"
+  # You can have the root of your site routed with "root"
+  # just remember to delete public/index.html.
+  # root :to => "welcome"
 
   # See how all your routes lay out with "rake routes"
 
-  # Install the default routes as the lowest priority.
-  # Note: These default routes make all actions in every controller accessible via GET requests. You should
-  # consider removing or commenting them out if you're using named routes and resources.
-  map.connect ':controller/:action/:id'
-  map.connect ':controller/:action/:id.:format'
+  # Install the default route as the lowest priority.
+  # Note: The default route make all actions in every controller accessible
+  # via GET requests. You should consider removing or commenting it out if
+  # you're using named routes and resources.
+  match ':controller(/:action(/:id(.:format)))'
 end
diff --git a/railties/lib/rails/generators/rails/app/templates/script/console b/railties/lib/rails/generators/rails/app/templates/script/console.tt
index 6043f3792b..4262439e52 100755
--- a/railties/lib/rails/generators/rails/app/templates/script/console
+++ b/railties/lib/rails/generators/rails/app/templates/script/console.tt
@@ -1,3 +1,3 @@
 require File.expand_path('../../config/application',  __FILE__)
 require 'rails/commands/console'
-Rails::Console.start
+Rails::Console.start(<%= app_const %>)
diff --git a/railties/lib/rails/generators/rails/app/templates/script/dbconsole b/railties/lib/rails/generators/rails/app/templates/script/dbconsole.tt
index e6a1c59394..9dfa24c378 100755
--- a/railties/lib/rails/generators/rails/app/templates/script/dbconsole
+++ b/railties/lib/rails/generators/rails/app/templates/script/dbconsole.tt
@@ -1,2 +1,3 @@
 require File.expand_path('../../config/application',  __FILE__)
 require 'rails/commands/dbconsole'
+Rails::DBConsole.start(<%= app_const %>)
\ No newline at end of file
diff --git a/railties/lib/rails/generators/rails/app/templates/script/server b/railties/lib/rails/generators/rails/app/templates/script/server.tt
index 709ca002df..d98f677475 100755
--- a/railties/lib/rails/generators/rails/app/templates/script/server
+++ b/railties/lib/rails/generators/rails/app/templates/script/server.tt
@@ -1,3 +1,3 @@
 require File.expand_path('../../config/application',  __FILE__)
 require 'rails/commands/server'
-Rails::Server.start
+Rails::Server.start(<%= app_const %>)
diff --git a/railties/lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt b/railties/lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt
index 675f00043f..d8757460e4 100644
--- a/railties/lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt
+++ b/railties/lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt
@@ -1,5 +1,5 @@
 class <%= class_name %>Generator < Rails::Generators::NamedBase
   def self.source_root
-    @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+    @source_root ||= File.expand_path('../templates', __FILE__)
   end
 end
diff --git a/railties/lib/rails/generators/rails/plugin/templates/Rakefile b/railties/lib/rails/generators/rails/plugin/templates/Rakefile
index 85e8ff1834..23c2245a41 100644
--- a/railties/lib/rails/generators/rails/plugin/templates/Rakefile
+++ b/railties/lib/rails/generators/rails/plugin/templates/Rakefile
@@ -10,7 +10,6 @@ Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
 end
 
 desc 'Generate documentation for the <%= file_name %> plugin.'
diff --git a/railties/lib/rails/generators/rails/resource/resource_generator.rb b/railties/lib/rails/generators/rails/resource/resource_generator.rb
index e49f9aea1b..a89ce7faed 100644
--- a/railties/lib/rails/generators/rails/resource/resource_generator.rb
+++ b/railties/lib/rails/generators/rails/resource/resource_generator.rb
@@ -16,7 +16,7 @@ module Rails
       class_option :singleton, :type => :boolean, :desc => "Supply to create a singleton controller"
 
       def add_resource_route
-        route "map.resource#{:s unless options[:singleton]} :#{pluralize?(file_name)}"
+        route "resource#{:s unless options[:singleton]} :#{pluralize?(file_name)}"
       end
 
       protected
diff --git a/railties/lib/rails/generators/rails/scaffold/USAGE b/railties/lib/rails/generators/rails/scaffold/USAGE
index 71edd2f469..530ccdaf0a 100644
--- a/railties/lib/rails/generators/rails/scaffold/USAGE
+++ b/railties/lib/rails/generators/rails/scaffold/USAGE
@@ -17,7 +17,7 @@ Description:
     For example, 'scaffold post title:string body:text published:boolean'
     gives you a model with those three attributes, a controller that handles
     the create/show/update/destroy, forms to create and edit your posts, and
-    an index that lists them all, as well as a map.resources :posts
+    an index that lists them all, as well as a resources :posts
     declaration in config/routes.rb.
 
     If you want to remove all the generated files, run
diff --git a/railties/lib/rails/initializable.rb b/railties/lib/rails/initializable.rb
index 3866b856b2..add10bd207 100644
--- a/railties/lib/rails/initializable.rb
+++ b/railties/lib/rails/initializable.rb
@@ -5,7 +5,7 @@ module Rails
     end
 
     class Initializer
-      attr_reader :name, :before, :after, :global, :block
+      attr_reader :name, :block
 
       def initialize(name, context, options, &block)
         @name, @context, @options, @block = name, context, options, block
@@ -62,7 +62,7 @@ module Rails
     end
 
     def run_initializers(*args)
-      return if @ran
+      return if instance_variable_defined?(:@ran)
       initializers.each do |initializer|
         initializer.run(*args)
       end
@@ -106,26 +106,4 @@ module Rails
       end
     end
   end
-
-  include Initializable
-
-  # 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 :check_ruby_version, :global => true do
-    require 'rails/ruby_version_check'
-  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.
-  initializer :initialize_encoding, :global => true do
-    if RUBY_VERSION < '1.9'
-      $KCODE='u'
-    else
-      Encoding.default_external = Encoding::UTF_8
-    end
-  end
 end
\ No newline at end of file
diff --git a/railties/lib/rails/initializer.rb b/railties/lib/rails/initializer.rb
index 44101dcc94..95478428ec 100644
--- a/railties/lib/rails/initializer.rb
+++ b/railties/lib/rails/initializer.rb
@@ -1,7 +1,5 @@
 require "rails" # In case people require this file directly
 
-RAILS_ENV = (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development').dup unless defined?(RAILS_ENV)
-
 module Rails
   class Initializer
     class Error < StandardError ; end
diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index 86bf032641..90dc1ad8dd 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -2,6 +2,27 @@ module Rails
   class Plugin
     include Initializable
 
+    def self.plugin_name
+      @plugin_name || name.demodulize.underscore
+    end
+
+    def self.inherited(klass)
+      @plugins ||= []
+      @plugins << klass unless klass == Vendored
+    end
+
+    def self.plugins
+      @plugins
+    end
+
+    def self.plugin_names
+      plugins.map { |p| p.plugin_name }
+    end
+
+    def self.config
+      @config ||= Configuration.new
+    end
+
     class Vendored < Plugin
       def self.all(list, paths)
         plugins = []
@@ -55,8 +76,8 @@ module Rails
       initializer :add_routing_file, :after => :initialize_routing do |app|
         routing_file = "#{path}/config/routes.rb"
         if File.exist?(routing_file)
-          app.routes.add_configuration_file(routing_file)
-          app.routes.reload!
+          app.route_configuration_files << routing_file
+          app.reload_routes!
         end
       end
     end
diff --git a/railties/lib/rails/rack/log_tailer.rb b/railties/lib/rails/rack/log_tailer.rb
index a237cee6bc..077311be3c 100644
--- a/railties/lib/rails/rack/log_tailer.rb
+++ b/railties/lib/rails/rack/log_tailer.rb
@@ -1,12 +1,10 @@
 module Rails
   module Rack
     class LogTailer
-      EnvironmentLog = "#{File.expand_path(Rails.root)}/log/#{Rails.env}.log"
-
       def initialize(app, log = nil)
         @app = app
 
-        path = Pathname.new(log || EnvironmentLog).cleanpath
+        path = Pathname.new(log || "#{File.expand_path(Rails.root)}/log/#{Rails.env}.log").cleanpath
         @cursor = ::File.size(path)
         @last_checked = Time.now.to_f
 
diff --git a/railties/lib/rails/tasks.rb b/railties/lib/rails/tasks.rb
index 82113a297c..dc886f4a4d 100644
--- a/railties/lib/rails/tasks.rb
+++ b/railties/lib/rails/tasks.rb
@@ -16,8 +16,3 @@ $VERBOSE = nil
 ).each do |task|
   load "rails/tasks/#{task}.rake"
 end
-
-# Load any custom rakefile extensions
-# TODO: Don't hardcode these paths.
-Dir["#{Rails.root}/vendor/plugins/*/**/tasks/**/*.rake"].sort.each { |ext| load ext }
-Dir["#{Rails.root}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
diff --git a/railties/lib/rails/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake
index 1611d1d94d..f7b53885c8 100644
--- a/railties/lib/rails/tasks/framework.rake
+++ b/railties/lib/rails/tasks/framework.rake
@@ -92,7 +92,7 @@ namespace :rails do
 
   namespace :update do
     def invoke_from_app_generator(method)
-      require 'generators'
+      require 'rails/generators'
       require 'rails/generators/rails/app/app_generator'
 
       generator = Rails::Generators::AppGenerator.new ["rails"], { :with_dispatchers => true },
@@ -100,6 +100,12 @@ namespace :rails do
       generator.invoke(method)
     end
 
+    desc "Update config/boot.rb from your current rails install"
+    task :configs do
+      invoke_from_app_generator :create_boot_file
+      invoke_from_app_generator :create_config_files
+    end
+
     desc "Update Prototype javascripts from your current rails install"
     task :javascripts do
       invoke_from_app_generator :create_prototype_files
diff --git a/railties/lib/rails/tasks/misc.rake b/railties/lib/rails/tasks/misc.rake
index 7f244ebaed..9433b3556a 100644
--- a/railties/lib/rails/tasks/misc.rake
+++ b/railties/lib/rails/tasks/misc.rake
@@ -1,8 +1,4 @@
 task :default => :test
-task :environment do
-  $rails_rake_task = true
-  require(File.join(Rails.root, 'config', 'environment'))
-end
 
 task :rails_env do
   unless defined? RAILS_ENV
diff --git a/railties/lib/rails/tasks/testing.rake b/railties/lib/rails/tasks/testing.rake
index fd5e52a05b..57857fb911 100644
--- a/railties/lib/rails/tasks/testing.rake
+++ b/railties/lib/rails/tasks/testing.rake
@@ -48,7 +48,7 @@ task :test do
       task
     end
   end.compact
-  abort "Errors running #{errors.to_sentence(:locale => :en)}!" if errors.any?
+  abort "Errors running #{errors * ', '}!" if errors.any?
 end
 
 namespace :test do
@@ -59,7 +59,6 @@ namespace :test do
       recent_tests('app/controllers/**/*.rb', 'test/functional', since)
 
     t.libs << 'test'
-    t.verbose = true
     t.test_files = touched.uniq
   end
   Rake::Task['test:recent'].comment = "Test recent changes"
@@ -84,35 +83,30 @@ namespace :test do
     end
 
     t.libs << 'test'
-    t.verbose = true
   end
   Rake::Task['test:uncommitted'].comment = "Test changes since last checkin (only Subversion and Git)"
 
   Rake::TestTask.new(:units => "db:test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/unit/**/*_test.rb'
-    t.verbose = true
   end
   Rake::Task['test:units'].comment = "Run the unit tests in test/unit"
 
   Rake::TestTask.new(:functionals => "db:test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/functional/**/*_test.rb'
-    t.verbose = true
   end
   Rake::Task['test:functionals'].comment = "Run the functional tests in test/functional"
 
   Rake::TestTask.new(:integration => "db:test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/integration/**/*_test.rb'
-    t.verbose = true
   end
   Rake::Task['test:integration'].comment = "Run the integration tests in test/integration"
 
   Rake::TestTask.new(:benchmark => 'db:test:prepare') do |t|
     t.libs << 'test'
     t.pattern = 'test/performance/**/*_test.rb'
-    t.verbose = true
     t.options = '-- --benchmark'
   end
   Rake::Task['test:benchmark'].comment = 'Benchmark the performance tests'
@@ -120,7 +114,6 @@ namespace :test do
   Rake::TestTask.new(:profile => 'db:test:prepare') do |t|
     t.libs << 'test'
     t.pattern = 'test/performance/**/*_test.rb'
-    t.verbose = true
   end
   Rake::Task['test:profile'].comment = 'Profile the performance tests'
 
@@ -132,8 +125,6 @@ namespace :test do
     else
       t.pattern = 'vendor/plugins/*/**/test/**/*_test.rb'
     end
-
-    t.verbose = true
   end
   Rake::Task['test:plugins'].comment = "Run the plugin tests in vendor/plugins/*/**/test (or specify with PLUGIN=name)"
 end
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb
index 9f6c42945f..b89b7b5c27 100644
--- a/railties/lib/rails/test_help.rb
+++ b/railties/lib/rails/test_help.rb
@@ -8,8 +8,13 @@ gem "rack-test", "~> 0.5.0"
 
 require 'test/unit'
 require 'active_support/core_ext/kernel/requires'
+
+# AP is always present
+require 'action_controller/test_case'
 require 'action_view/test_case'
+
 require 'action_mailer/test_case' if defined?(ActionMailer)
+require 'active_model/test_case'  if defined?(ActiveModel)
 
 if defined?(ActiveRecord)
   require 'active_record/test_case'
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/version.rb b/railties/lib/rails/vendor/thor-0.12.0/lib/thor/version.rb
deleted file mode 100644
index 885230fac4..0000000000
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/version.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class Thor
-  VERSION = "0.11.8".freeze
-end
diff --git a/railties/lib/rails/vendor/thor-0.12.0/CHANGELOG.rdoc b/railties/lib/rails/vendor/thor-0.12.1/CHANGELOG.rdoc
index adedfeca9d..606a0cdb52 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/CHANGELOG.rdoc
+++ b/railties/lib/rails/vendor/thor-0.12.1/CHANGELOG.rdoc
@@ -17,7 +17,7 @@
 
 * thor help now show information about any class/task. All those calls are
   possible:
-  
+
     thor help describe
     thor help describe:amazing
 
@@ -47,7 +47,7 @@
   are in the 'standard' group. Running 'thor -T' will only show the standard
   tasks - adding --all will show all tasks. You can also filter on a specific
   group using the --group option: thor -T --group advanced
-  
+
 == 0.9.6, released 2008-09-13
 
 * Generic improvements
diff --git a/railties/lib/rails/vendor/thor-0.12.0/LICENSE b/railties/lib/rails/vendor/thor-0.12.1/LICENSE
index 98722da459..98722da459 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/LICENSE
+++ b/railties/lib/rails/vendor/thor-0.12.1/LICENSE
diff --git a/railties/lib/rails/vendor/thor-0.12.0/README.rdoc b/railties/lib/rails/vendor/thor-0.12.1/README.rdoc
index f1106f02b6..ee545f3d97 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/README.rdoc
+++ b/railties/lib/rails/vendor/thor-0.12.1/README.rdoc
@@ -7,7 +7,7 @@ Example:
 
     class App < Thor                                                 # [1]
       map "-L" => :list                                              # [2]
-      
+
       desc "install APP_NAME", "install one of the available apps"   # [3]
       method_options :force => :boolean, :alias => :string           # [4]
       def install(name)
@@ -17,7 +17,7 @@ Example:
         end
         # other code
       end
-      
+
       desc "list [SEARCH]", "list all of the available apps, limited by SEARCH"
       def list(search="")
         # list everything
@@ -126,13 +126,13 @@ invoked only once. For example:
         invoke :two
         invoke :three
       end
-      
+
       desc "two", "Prints 2, 3"
       def two
         puts 2
         invoke :three
       end
-      
+
       desc "three", "Prints 3"
       def three
         puts 3
@@ -155,15 +155,15 @@ Thor::Group as this:
 
     class Counter < Thor::Group
       desc "Prints 1, 2, 3"
-      
+
       def one
         puts 1
       end
-     
+
       def two
         puts 2
       end
-      
+
       def three
         puts 3
       end
@@ -184,15 +184,15 @@ Besides, Thor::Group can parse arguments and options as Thor tasks:
       # number will be available as attr_accessor
       argument :number, :type => :numeric, :desc => "The number to start counting"
       desc "Prints the 'number' given upto 'number+2'"
-      
+
       def one
         puts number + 0
       end
-      
+
       def two
         puts number + 1
       end
-      
+
       def three
         puts number + 2
       end
diff --git a/railties/lib/rails/vendor/thor-0.12.0/Thorfile b/railties/lib/rails/vendor/thor-0.12.1/Thorfile
index f71a1e57e2..ff1cb4498a 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/Thorfile
+++ b/railties/lib/rails/vendor/thor-0.12.1/Thorfile
@@ -56,7 +56,7 @@ class Default < Thor
       s.test_files.exclude 'spec/sandbox/**/*'
     end
 
-    Jeweler::RubyforgeTasks.new
+    Jeweler::GemcutterTasks.new
   rescue LoadError
     puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
   end
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor.rb
index 68944f140d..68944f140d 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor.rb
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/actions.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/actions.rb
index d561ccb2aa..4bfb7c2870 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/actions.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/actions.rb
@@ -114,7 +114,7 @@ class Thor
       @source_paths ||= self.class.source_paths_for_search
     end
 
-    # Receives a file or directory and search for it in the source paths. 
+    # Receives a file or directory and search for it in the source paths.
     #
     def find_in_source_paths(file)
       relative_root = relative_to_original_destination_root(destination_root, false)
@@ -222,7 +222,7 @@ class Thor
       run "#{command}", config.merge(:with => Thor::Util.ruby_command)
     end
 
-    # Run a thor command. A hash of options can be given and it's converted to 
+    # Run a thor command. A hash of options can be given and it's converted to
     # switches.
     #
     # ==== Parameters
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/actions/create_file.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/actions/create_file.rb
index a3d9296823..a3d9296823 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/actions/create_file.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/actions/create_file.rb
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/actions/directory.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/actions/directory.rb
index 467e63732a..2e0b459fa3 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/actions/directory.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/actions/directory.rb
@@ -79,11 +79,9 @@ class Thor
                 next if dirname == given_destination
                 base.empty_directory(dirname, config)
               when /\.tt$/
-                destination = base.template(file_source, file_destination[0..-4], config)
-                @block.call(destination) if @block
+                destination = base.template(file_source, file_destination[0..-4], config, &@block)
               else
-                destination = base.copy_file(file_source, file_destination, config)
-                @block.call(destination) if @block
+                destination = base.copy_file(file_source, file_destination, config, &@block)
             end
           end
         end
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/actions/empty_directory.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/actions/empty_directory.rb
index 484cb820f8..484cb820f8 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/actions/empty_directory.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/actions/empty_directory.rb
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/actions/file_manipulation.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/actions/file_manipulation.rb
index d77d90d448..8a45c83f25 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/actions/file_manipulation.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/actions/file_manipulation.rb
@@ -18,12 +18,14 @@ class Thor
     #
     #   copy_file "doc/README"
     #
-    def copy_file(source, destination=nil, config={})
+    def copy_file(source, destination=nil, config={}, &block)
       destination ||= source
       source = File.expand_path(find_in_source_paths(source.to_s))
 
       create_file destination, nil, config do
-        File.read(source)
+        content = File.read(source)
+        content = block.call(content) if block
+        content
       end
     end
 
@@ -72,13 +74,15 @@ class Thor
     #
     #   template "doc/README"
     #
-    def template(source, destination=nil, config={})
+    def template(source, destination=nil, config={}, &block)
       destination ||= source
       source  = File.expand_path(find_in_source_paths(source.to_s))
       context = instance_eval('binding')
 
       create_file destination, nil, config do
-        ERB.new(::File.read(source), nil, '-').result(context)
+        content = ERB.new(::File.read(source), nil, '-').result(context)
+        content = block.call(content) if block
+        content
       end
     end
 
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/actions/inject_into_file.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/actions/inject_into_file.rb
index 0636ec6591..6b0b42ea02 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/actions/inject_into_file.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/actions/inject_into_file.rb
@@ -11,7 +11,7 @@ class Thor
     # data<String>:: Data to add to the file. Can be given as a block.
     # config<Hash>:: give :verbose => false to not log the status and the flag
     #                for injection (:after or :before).
-    # 
+    #
     # ==== Examples
     #
     #   inject_into_file "config/environment.rb", "config.gem :thor", :after => "Rails::Initializer.run do |config|\n"
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/base.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/base.rb
index 700d794123..700d794123 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/base.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/base.rb
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/core_ext/hash_with_indifferent_access.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/core_ext/hash_with_indifferent_access.rb
index 78bc5cf4bf..40d201d9e4 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/core_ext/hash_with_indifferent_access.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/core_ext/hash_with_indifferent_access.rb
@@ -65,7 +65,7 @@ class Thor
             else
               self[$1] == args.first
             end
-          else 
+          else
             self[method]
           end
         end
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/core_ext/ordered_hash.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/core_ext/ordered_hash.rb
index 27fea5bb35..27fea5bb35 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/core_ext/ordered_hash.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/core_ext/ordered_hash.rb
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/error.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/error.rb
index f9b31a35d1..f9b31a35d1 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/error.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/error.rb
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/group.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/group.rb
index 0964a9667a..021a067a3e 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/group.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/group.rb
@@ -132,7 +132,7 @@ class Thor::Group
 
       names.each do |name|
         unless class_options.key?(name)
-          raise ArgumentError, "You have to define the option #{name.inspect} " << 
+          raise ArgumentError, "You have to define the option #{name.inspect} " <<
                                "before setting invoke_from_option."
         end
 
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/invocation.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/invocation.rb
index 32e6a72454..32e6a72454 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/invocation.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/invocation.rb
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/parser.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/parser.rb
index 57a3f6e1a5..57a3f6e1a5 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/parser.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/parser.rb
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/parser/argument.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/parser/argument.rb
index aa8ace4719..aa8ace4719 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/parser/argument.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/parser/argument.rb
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/parser/arguments.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/parser/arguments.rb
index fb5d965e06..fb5d965e06 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/parser/arguments.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/parser/arguments.rb
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/parser/option.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/parser/option.rb
index 9e40ec73fa..e09b4901e2 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/parser/option.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/parser/option.rb
@@ -36,7 +36,7 @@ class Thor
     # string (--foo=value) or booleans (just --foo).
     #
     # By default all options are optional, unless :required is given.
-    # 
+    #
     def self.parse(key, value)
       if key.is_a?(Array)
         name, *aliases = key
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/parser/options.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/parser/options.rb
index 75092308b5..75092308b5 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/parser/options.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/parser/options.rb
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/rake_compat.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/rake_compat.rb
index 0d0757fdda..0d0757fdda 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/rake_compat.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/rake_compat.rb
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/runner.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/runner.rb
index 9dc70ea069..079f9e0c65 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/runner.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/runner.rb
@@ -36,7 +36,7 @@ class Thor::Runner < Thor #:nodoc:
   def install(name)
     initialize_thorfiles
 
-    # If a directory name is provided as the argument, look for a 'main.thor' 
+    # If a directory name is provided as the argument, look for a 'main.thor'
     # task in said directory.
     begin
       if File.directory?(File.expand_path(name))
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/shell.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/shell.rb
index 1dc8f0e5b4..1dc8f0e5b4 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/shell.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/shell.rb
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/shell/basic.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/shell/basic.rb
index ea9665380b..f6be3575ca 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/shell/basic.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/shell/basic.rb
@@ -143,7 +143,7 @@ class Thor
           answer = ask %[Overwrite #{destination}? (enter "h" for help) #{options}]
 
           case answer
-            when is?(:yes), is?(:force)
+            when is?(:yes), is?(:force), ""
               return true
             when is?(:no), is?(:skip)
               return false
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/shell/color.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/shell/color.rb
index 24704f7885..24704f7885 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/shell/color.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/shell/color.rb
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/task.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/task.rb
index 91c7564d3f..91c7564d3f 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/task.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/task.rb
diff --git a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/util.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/util.rb
index ebae0a3193..ebae0a3193 100644
--- a/railties/lib/rails/vendor/thor-0.12.0/lib/thor/util.rb
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/util.rb
diff --git a/railties/lib/rails/vendor/thor-0.12.1/lib/thor/version.rb b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/version.rb
new file mode 100644
index 0000000000..650253d648
--- /dev/null
+++ b/railties/lib/rails/vendor/thor-0.12.1/lib/thor/version.rb
@@ -0,0 +1,3 @@
+class Thor
+  VERSION = "0.12.1".freeze
+end
diff --git a/railties/rails.gemspec b/railties/railties.gemspec
index dc66e1efea..a060c3c301 100644
--- a/railties/rails.gemspec
+++ b/railties/railties.gemspec
@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
-  s.name = 'rails'
+  s.name = 'railties'
   s.version = '3.0.pre'
-  s.summary = "Web-application framework with template engine, control-flow layer, and ORM."
+  s.summary = "Controls boot-up, rake tasks and generators for the Rails framework."
   s.description = <<-EOF
     Rails is a framework for building web-application using CGI, FCGI, mod_ruby, or WEBrick
     on top of either MySQL, PostgreSQL, SQLite, DB2, SQL Server, or Oracle with eRuby- or Builder-based templates.
@@ -10,10 +10,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency('rake', '>= 0.8.3')
   s.add_dependency('activesupport',    '= 3.0.pre')
-  s.add_dependency('activerecord',     '= 3.0.pre')
   s.add_dependency('actionpack',       '= 3.0.pre')
-  s.add_dependency('actionmailer',     '= 3.0.pre')
-  s.add_dependency('activeresource',   '= 3.0.pre')
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index a3e1916494..89337b7f66 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -44,5 +44,35 @@ module ApplicationTests
         assert_equal Pathname.new("#{app_path}/app"), Rails.application.root
       end
     end
+
+    test "config.active_support.bare does not require all of ActiveSupport" do
+      add_to_config "config.frameworks = []; config.active_support.bare = true"
+
+      Dir.chdir("#{app_path}/app") do
+        require "#{app_path}/config/environment"
+        assert_raises(NoMethodError) { 1.day }
+      end
+    end
+
+    test "marking the application as threadsafe sets the correct config variables" do
+      add_to_config <<-RUBY
+        config.threadsafe!
+      RUBY
+
+      require "#{app_path}/config/application"
+      assert AppTemplate.configuration.action_controller.allow_concurrency
+    end
+
+    test "the application can be marked as threadsafe when there are no frameworks" do
+      FileUtils.rm_rf("#{app_path}/config/environments")
+      add_to_config <<-RUBY
+        config.frameworks = []
+        config.threadsafe!
+      RUBY
+
+      assert_nothing_raised do
+        require "#{app_path}/config/application"
+      end
+    end
   end
-end
\ No newline at end of file
+end
diff --git a/railties/test/application/generators_test.rb b/railties/test/application/generators_test.rb
index ccbcd84176..2ed49d1057 100644
--- a/railties/test/application/generators_test.rb
+++ b/railties/test/application/generators_test.rb
@@ -11,8 +11,16 @@ module ApplicationTests
       require "rails/generators"
     end
 
+    def app_const
+      @app_const ||= Class.new(Rails::Application)
+    end
+
+    def with_config
+      yield app_const.config
+    end
+
     test "generators default values" do
-      Rails::Initializer.run do |c|
+      with_config do |c|
         assert_equal(true, c.generators.colorize_logging)
         assert_equal({}, c.generators.aliases)
         assert_equal({}, c.generators.options)
@@ -20,7 +28,7 @@ module ApplicationTests
     end
 
     test "generators set rails options" do
-      Rails::Initializer.run do |c|
+      with_config do |c|
         c.generators.orm            = :datamapper
         c.generators.test_framework = :rspec
         c.generators.helper         = false
@@ -30,7 +38,7 @@ module ApplicationTests
     end
 
     test "generators set rails aliases" do
-      Rails::Initializer.run do |c|
+      with_config do |c|
         c.generators.aliases = { :rails => { :test_framework => "-w" } }
         expected = { :rails => { :test_framework => "-w" } }
         assert_equal expected, c.generators.aliases
@@ -38,14 +46,14 @@ module ApplicationTests
     end
 
     test "generators aliases and options on initialization" do
-      Rails::Initializer.run do |c|
+      application = with_config do |c|
         c.frameworks = []
         c.generators.rails :aliases => { :test_framework => "-w" }
         c.generators.orm :datamapper
         c.generators.test_framework :rspec
       end
       # Initialize the application
-      Rails.initialize!
+      app_const.initialize!
       Rails::Generators.configure!
 
       assert_equal :rspec, Rails::Generators.options[:rails][:test_framework]
@@ -53,19 +61,19 @@ module ApplicationTests
     end
 
     test "generators no color on initialization" do
-      Rails::Initializer.run do |c|
+      with_config do |c|
         c.frameworks = []
         c.generators.colorize_logging = false
       end
       # Initialize the application
-      Rails.initialize!
+      app_const.initialize!
       Rails::Generators.configure!
 
       assert_equal Thor::Base.shell, Thor::Shell::Basic
     end
 
     test "generators with hashes for options and aliases" do
-      Rails::Initializer.run do |c|
+      with_config do |c|
         c.generators do |g|
           g.orm    :datamapper, :migration => false
           g.plugin :aliases => { :generator => "-g" },
@@ -84,7 +92,7 @@ module ApplicationTests
     end
 
     test "generators with hashes are deep merged" do
-      Rails::Initializer.run do |c|
+      with_config do |c|
         c.generators do |g|
           g.orm    :datamapper, :migration => false
           g.plugin :aliases => { :generator => "-g" },
diff --git a/railties/test/application/initializer_test.rb b/railties/test/application/initializer_test.rb
index 719520bf68..fa00d287ca 100644
--- a/railties/test/application/initializer_test.rb
+++ b/railties/test/application/initializer_test.rb
@@ -6,26 +6,11 @@ module ApplicationTests
 
     def setup
       build_app
+      FileUtils.rm_rf("#{app_path}/config/environments")
       boot_rails
       require "rails"
     end
 
-    test "initializing an application initializes rails" do
-      Rails::Initializer.run do |config|
-        config.root = app_path
-      end
-
-      if RUBY_VERSION < '1.9'
-        $KCODE = ''
-        Rails.initialize!
-        assert_equal 'UTF8', $KCODE
-      else
-        Encoding.default_external = Encoding::US_ASCII
-        Rails.initialize!
-        assert_equal Encoding::UTF_8, Encoding.default_external
-      end
-    end
-
     test "initializing an application adds the application paths to the load path" do
       Rails::Initializer.run do |config|
         config.root = app_path
@@ -41,7 +26,9 @@ module ApplicationTests
         config.frameworks << :action_foo
       end
 
-      assert_raises RuntimeError do
+      require "active_support/core_ext/load_error"
+
+      assert_raises MissingSourceFile do
         Rails.initialize!
       end
     end
diff --git a/railties/test/application/load_test.rb b/railties/test/application/load_test.rb
index 3da51c4355..e17f1ebdb0 100644
--- a/railties/test/application/load_test.rb
+++ b/railties/test/application/load_test.rb
@@ -7,21 +7,9 @@ module ApplicationTests
     include ActiveSupport::Testing::Isolation
 
     def rackup
-      config = "#{app_path}/config.ru"
-      # Copied from ActionDispatch::Utils.parse_config
-      # ActionDispatch is not necessarily available at this point.
-      require 'rack'
-      if config =~ /\.ru$/
-        cfgfile = ::File.read(config)
-        if cfgfile[/^#\\(.*)/]
-          opts.parse! $1.split(/\s+/)
-        end
-        inner_app = eval "Rack::Builder.new {( " + cfgfile + "\n )}.to_app",
-                         nil, config
-      else
-        require config
-        inner_app = Object.const_get(::File.basename(config, '.rb').capitalize)
-      end
+      require "rack"
+      app, options = Rack::Builder.parse_file("#{app_path}/config.ru")
+      app
     end
 
     def setup
@@ -40,14 +28,14 @@ module ApplicationTests
 
     test "Rails.application is available after config.ru has been racked up" do
       rackup
-      assert Rails.application < Rails::Application
+      assert Rails.application.is_a?(Rails::Application)
     end
 
     # Passenger still uses AC::Dispatcher, so we need to
     # keep it working for now
     test "deprecated ActionController::Dispatcher still works" do
       rackup
-      assert ActionController::Dispatcher.new < Rails::Application
+      assert ActionController::Dispatcher.new.is_a?(Rails::Application)
     end
 
     test "the config object is available on the application object" do
diff --git a/railties/test/application/notifications_test.rb b/railties/test/application/notifications_test.rb
index 28dfdfcd83..71e406f2c1 100644
--- a/railties/test/application/notifications_test.rb
+++ b/railties/test/application/notifications_test.rb
@@ -5,21 +5,8 @@ module ApplicationTests
     include ActiveSupport::Testing::Isolation
 
     class MyQueue
-      attr_reader :events, :subscribers
-
-      def initialize
-        @events = []
-        @subscribers = []
-        @listeners = []
-      end
-
       def publish(name, *args)
-        @events << name
-      end
-
-      def subscribe(listener, pattern=nil, &block)
-        @listeners << listener
-        @subscribers << pattern
+        raise name
       end
     end
 
@@ -28,21 +15,16 @@ module ApplicationTests
       boot_rails
       require "rails"
       require "active_support/notifications"
+      @events = []
       Rails::Initializer.run do |c|
-        c.notifications.queue = MyQueue.new
-        c.notifications.subscribe(/listening/) do
-          puts "Cool"
-        end
+        c.notifications.notifier = ActiveSupport::Notifications::Notifier.new(MyQueue.new)
       end
     end
 
     test "new queue is set" do
-      ActiveSupport::Notifications.instrument(:foo)
-      assert_equal :foo, ActiveSupport::Notifications.queue.events.first
-    end
-
-    test "configuration subscribers are loaded" do
-      assert_equal 1, ActiveSupport::Notifications.queue.subscribers.count { |s| s == /listening/ }
+      assert_raise RuntimeError do
+        ActiveSupport::Notifications.publish('foo')
+      end
     end
   end
 end
diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb
new file mode 100644
index 0000000000..decde056fd
--- /dev/null
+++ b/railties/test/application/routing_test.rb
@@ -0,0 +1,155 @@
+require 'isolation/abstract_unit'
+require 'rack/test'
+
+module ApplicationTests
+  class RoutingTest < Test::Unit::TestCase
+    include ActiveSupport::Testing::Isolation
+    include Rack::Test::Methods
+
+    def setup
+      build_app
+    end
+
+    def app
+      @app ||= begin
+        boot_rails
+        require "#{app_path}/config/environment"
+
+        Rails.application
+      end
+    end
+
+    test "simple controller" do
+      controller :foo, <<-RUBY
+        class FooController < ActionController::Base
+          def index
+            render :text => "foo"
+          end
+        end
+      RUBY
+
+      get '/foo'
+      assert_equal 'foo', last_response.body
+    end
+
+    test "multiple controllers" do
+      controller :foo, <<-RUBY
+        class FooController < ActionController::Base
+          def index
+            render :text => "foo"
+          end
+        end
+      RUBY
+
+      controller :bar, <<-RUBY
+        class BarController < ActionController::Base
+          def index
+            render :text => "bar"
+          end
+        end
+      RUBY
+
+      get '/foo'
+      assert_equal 'foo', last_response.body
+
+      get '/bar'
+      assert_equal 'bar', last_response.body
+    end
+
+    test "nested controller" do
+      controller 'foo', <<-RUBY
+        class FooController < ActionController::Base
+          def index
+            render :text => "foo"
+          end
+        end
+      RUBY
+
+      controller 'admin/foo', <<-RUBY
+        module Admin
+          class FooController < ActionController::Base
+            def index
+              render :text => "admin::foo"
+            end
+          end
+        end
+      RUBY
+
+      get '/foo'
+      assert_equal 'foo', last_response.body
+
+      get '/admin/foo'
+      assert_equal 'admin::foo', last_response.body
+    end
+
+    test "merges with plugin routes" do
+      controller 'foo', <<-RUBY
+        class FooController < ActionController::Base
+          def index
+            render :text => "foo"
+          end
+        end
+      RUBY
+
+      app_file 'config/routes.rb', <<-RUBY
+        ActionController::Routing::Routes.draw do |map|
+          match 'foo', :to => 'foo#index'
+        end
+      RUBY
+
+      plugin 'bar', 'require File.dirname(__FILE__) + "/app/controllers/bar"' do |plugin|
+        plugin.write 'app/controllers/bar.rb', <<-RUBY
+          class BarController < ActionController::Base
+            def index
+              render :text => "bar"
+            end
+          end
+        RUBY
+
+        plugin.write 'config/routes.rb', <<-RUBY
+          ActionController::Routing::Routes.draw do |map|
+            match 'bar', :to => 'bar#index'
+          end
+        RUBY
+      end
+
+      get '/foo'
+      assert_equal 'foo', last_response.body
+
+      get '/bar'
+      assert_equal 'bar', last_response.body
+    end
+
+    test "reloads routes when configuration is changed" do
+      controller :foo, <<-RUBY
+        class FooController < ActionController::Base
+          def bar
+            render :text => "bar"
+          end
+
+          def baz
+            render :text => "baz"
+          end
+        end
+      RUBY
+
+      app_file 'config/routes.rb', <<-RUBY
+        ActionController::Routing::Routes.draw do |map|
+          match 'foo', :to => 'foo#bar'
+        end
+      RUBY
+
+      get '/foo'
+      assert_equal 'bar', last_response.body
+
+      app_file 'config/routes.rb', <<-RUBY
+        ActionController::Routing::Routes.draw do |map|
+          match 'foo', :to => 'foo#baz'
+        end
+      RUBY
+
+      get '/foo'
+      assert_equal 'baz', last_response.body
+    end
+  end
+end
diff --git a/railties/test/fixtures/plugins/engines/engine/config/routes.rb b/railties/test/fixtures/plugins/engines/engine/config/routes.rb
index cca8d1b146..da44595693 100644
--- a/railties/test/fixtures/plugins/engines/engine/config/routes.rb
+++ b/railties/test/fixtures/plugins/engines/engine/config/routes.rb
@@ -1,3 +1,3 @@
 ActionController::Routing::Routes.draw do |map|
-  map.connect '/engine', :controller => "engine"
+  match '/engine', :to => "engine"
 end
diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb
index 7d03a37f2a..b69f23c965 100644
--- a/railties/test/generators/actions_test.rb
+++ b/railties/test/generators/actions_test.rb
@@ -171,7 +171,7 @@ class ActionsTest < GeneratorsTestCase
 
   def test_route_should_add_data_to_the_routes_block_in_config_routes
     run_generator
-    route_command = "map.route '/login', :controller => 'sessions', :action => 'new'"
+    route_command = "route '/login', :controller => 'sessions', :action => 'new'"
     action :route, route_command
     assert_file 'config/routes.rb', /#{Regexp.escape(route_command)}/
   end
diff --git a/railties/test/generators/resource_generator_test.rb b/railties/test/generators/resource_generator_test.rb
index 886af01b22..dff3908ea1 100644
--- a/railties/test/generators/resource_generator_test.rb
+++ b/railties/test/generators/resource_generator_test.rb
@@ -62,7 +62,7 @@ class ResourceGeneratorTest < GeneratorsTestCase
     run_generator
 
     assert_file "config/routes.rb" do |route|
-      assert_match /map\.resources :accounts$/, route
+      assert_match /resources :accounts$/, route
     end
   end
 
@@ -70,7 +70,7 @@ class ResourceGeneratorTest < GeneratorsTestCase
     run_generator ["account", "--singleton"]
 
     assert_file "config/routes.rb" do |route|
-      assert_match /map\.resource :account$/, route
+      assert_match /resource :account$/, route
     end
   end
 
@@ -93,7 +93,7 @@ class ResourceGeneratorTest < GeneratorsTestCase
     run_generator ["account"], :behavior => :revoke
 
     assert_file "config/routes.rb" do |route|
-      assert_no_match /map\.resources :accounts$/, route
+      assert_no_match /resources :accounts$/, route
     end
   end
 
diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb
index c0652c034f..0b961cee19 100644
--- a/railties/test/generators/scaffold_generator_test.rb
+++ b/railties/test/generators/scaffold_generator_test.rb
@@ -25,7 +25,7 @@ class ScaffoldGeneratorTest < GeneratorsTestCase
 
     # Route
     assert_file "config/routes.rb" do |route|
-      assert_match /map\.resources :product_lines$/, route
+      assert_match /resources :product_lines$/, route
     end
 
     # Controller
@@ -99,7 +99,7 @@ class ScaffoldGeneratorTest < GeneratorsTestCase
 
     # Route
     assert_file "config/routes.rb" do |route|
-      assert_no_match /map\.resources :product_lines$/, route
+      assert_no_match /resources :product_lines$/, route
     end
 
     # Controller
diff --git a/railties/test/initializer/check_ruby_version_test.rb b/railties/test/initializer/check_ruby_version_test.rb
index 97d884e1be..0691caad9d 100644
--- a/railties/test/initializer/check_ruby_version_test.rb
+++ b/railties/test/initializer/check_ruby_version_test.rb
@@ -7,7 +7,6 @@ module InitializerTests
     def setup
       build_app
       boot_rails
-      require "rails"
     end
 
     test "rails does not initialize with ruby version 1.8.1" do
@@ -50,8 +49,7 @@ module InitializerTests
     def assert_rails_boots(version = nil)
       set_ruby_version(version) if version
       assert_nothing_raised "It appears that rails does not boot" do
-        Rails::Initializer.run { |c| c.frameworks = [] }
-        Rails.initialize!
+        require "rails"
       end
     end
 
@@ -59,8 +57,7 @@ module InitializerTests
       set_ruby_version(version)
       $stderr = File.open("/dev/null", "w")
       assert_raises(SystemExit) do
-        Rails::Initializer.run { |c| c.frameworks = [] }
-        Rails.initialize!
+        require "rails"
       end
     end
   end
diff --git a/railties/test/plugins/configuration_test.rb b/railties/test/plugins/configuration_test.rb
new file mode 100644
index 0000000000..edf8bb37f5
--- /dev/null
+++ b/railties/test/plugins/configuration_test.rb
@@ -0,0 +1,36 @@
+require "isolation/abstract_unit"
+
+module PluginsTest
+  class ConfigurationTest < Test::Unit::TestCase
+    def setup
+      build_app
+      boot_rails
+      require "rails"
+    end
+
+    test "config is available to plugins" do
+      class Foo < Rails::Plugin ; end
+      assert_nil Foo.config.action_controller.foo
+    end
+
+    test "a config name is available for the plugin" do
+      class Foo < Rails::Plugin ; config.foo.greetings = "hello" ; end
+      assert_equal "hello", Foo.config.foo.greetings
+    end
+
+    test "plugin configurations are available in the application" do
+      class Foo < Rails::Plugin ; config.foo.greetings = "hello" ; end
+      require "#{app_path}/config/application"
+      assert_equal "hello", AppTemplate.config.foo.greetings
+    end
+
+    test "plugin config merges are deep" do
+      class Foo < Rails::Plugin ; config.foo.greetings = 'hello' ; end
+      class MyApp < Rails::Application
+        config.foo.bar = "bar"
+      end
+      assert_equal "hello", MyApp.config.foo.greetings
+      assert_equal "bar",   MyApp.config.foo.bar
+    end
+  end
+end
\ No newline at end of file
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index 39f23fa0be..435bd34925 100644
--- a/railties/test/rails_info_controller_test.rb
+++ b/railties/test/rails_info_controller_test.rb
@@ -1,5 +1,6 @@
 require 'abstract_unit'
 require 'action_controller'
+require 'action_controller/test_case'
 
 require 'rails/info'
 require 'rails/info_controller'
@@ -15,7 +16,7 @@ class InfoControllerTest < ActionController::TestCase
 
   def setup
     ActionController::Routing::Routes.draw do |map|
-      map.connect ':controller/:action/:id'
+      match ':controller/:action'
     end
     @controller.stubs(:consider_all_requests_local => false, :local_request? => true)
   end