Merge branch 'master' into serializers

32 files changed, 331 insertions, 325 deletions

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index cbb2d23238..0b72a7ed84 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -141,6 +141,10 @@ module Rails
       self
     end
 
+    def helpers_paths
+      config.helpers_paths
+    end
+
   protected
 
     alias :build_middleware_stack :app
@@ -164,8 +168,9 @@ module Rails
         middleware.use ::Rack::Lock unless config.allow_concurrency
         middleware.use ::Rack::Runtime
         middleware.use ::Rack::MethodOverride
-        middleware.use ::Rails::Rack::Logger # must come after Rack::MethodOverride to properly log overridden methods
-        middleware.use ::ActionDispatch::ShowExceptions, config.consider_all_requests_local
+        middleware.use ::ActionDispatch::RequestId
+        middleware.use ::Rails::Rack::Logger, config.log_tags # must come after Rack::MethodOverride to properly log overridden methods
+        middleware.use ::ActionDispatch::ShowExceptions
         middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies
         if config.action_dispatch.x_sendfile_header.present?
           middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb
index 0aff05b681..c2cb121e42 100644
--- a/railties/lib/rails/application/bootstrap.rb
+++ b/railties/lib/rails/application/bootstrap.rb
@@ -24,12 +24,12 @@ module Rails
       initializer :initialize_logger, :group => :all do
         Rails.logger ||= config.logger || begin
           path = config.paths["log"].first
-          logger = ActiveSupport::BufferedLogger.new(path)
+          logger = ActiveSupport::TaggedLogging.new(ActiveSupport::BufferedLogger.new(path))
           logger.level = ActiveSupport::BufferedLogger.const_get(config.log_level.to_s.upcase)
           logger.auto_flushing = false if Rails.env.production?
           logger
         rescue StandardError
-          logger = ActiveSupport::BufferedLogger.new(STDERR)
+          logger = ActiveSupport::TaggedLogging.new(ActiveSupport::BufferedLogger.new(STDERR))
           logger.level = ActiveSupport::BufferedLogger::WARN
           logger.warn(
             "Rails Error: Unable to access log file. Please ensure that #{path} exists and is chmod 0666. " +
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 448521d2f0..8f5b28faf8 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -8,7 +8,7 @@ module Rails
       attr_accessor :allow_concurrency, :asset_host, :asset_path, :assets,
                     :cache_classes, :cache_store, :consider_all_requests_local,
                     :dependency_loading, :filter_parameters,
-                    :force_ssl, :helpers_paths, :logger, :preload_frameworks,
+                    :force_ssl, :helpers_paths, :logger, :log_tags, :preload_frameworks,
                     :reload_plugins, :secret_token, :serve_static_assets,
                     :ssl_options, :static_cache_control, :session_options, 
                     :time_zone, :whiny_nils
diff --git a/railties/lib/rails/application/route_inspector.rb b/railties/lib/rails/application/route_inspector.rb
index 8c6911e6bb..8252f21aa7 100644
--- a/railties/lib/rails/application/route_inspector.rb
+++ b/railties/lib/rails/application/route_inspector.rb
@@ -10,20 +10,21 @@ module Rails
         end
 
         routes = all_routes.collect do |route|
+          route_reqs = route.requirements
 
-          reqs = route.requirements.dup
           rack_app = route.app unless route.app.class.name.to_s =~ /^ActionDispatch::Routing/
 
-          endpoint = rack_app ? rack_app.inspect : "#{reqs[:controller]}##{reqs[:action]}"
-          constraints = reqs.except(:controller, :action)
+          controller = route_reqs[:controller] || ':controller'
+          action     = route_reqs[:action]     || ':action'
 
-          reqs = endpoint == '#' ? '' : endpoint
+          endpoint = rack_app ? rack_app.inspect : "#{controller}##{action}"
+          constraints = route_reqs.except(:controller, :action)
 
-          unless constraints.empty?
-            reqs = reqs.empty? ? constraints.inspect : "#{reqs} #{constraints.inspect}"
-          end
+          reqs = endpoint
+          reqs += " #{constraints.inspect}" unless constraints.empty?
 
           verb = route.verb.source.gsub(/[$^]/, '')
+
           {:name => route.name.to_s, :verb => verb, :path => route.path.spec.to_s, :reqs => reqs}
         end
 
diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb
index 32e361d421..7733a8f116 100644
--- a/railties/lib/rails/commands/console.rb
+++ b/railties/lib/rails/commands/console.rb
@@ -42,6 +42,8 @@ module Rails
       else
         puts "Loading #{Rails.env} environment (Rails #{Rails.version})"
       end
+
+      IRB::ExtendCommandBundle.send :include, Rails::ConsoleMethods
       IRB.start
     end
   end
diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb
index b0ba76217a..4b0acc9d88 100644
--- a/railties/lib/rails/commands/dbconsole.rb
+++ b/railties/lib/rails/commands/dbconsole.rb
@@ -33,7 +33,7 @@ module Rails
             options['mode'] = mode
         end
 
-        opt.on("-h", "--header") do |h|
+        opt.on("--header") do |h|
           options['header'] = h
         end
 
diff --git a/railties/lib/rails/commands/plugin.rb b/railties/lib/rails/commands/plugin.rb
index 4df849447d..c99a2e6685 100644
--- a/railties/lib/rails/commands/plugin.rb
+++ b/railties/lib/rails/commands/plugin.rb
@@ -274,198 +274,200 @@ end
 
 # load default environment and parse arguments
 require 'optparse'
-module Commands
-  class Plugin
-    attr_reader :environment, :script_name
-    def initialize
-      @environment = RailsEnvironment.default
-      @rails_root = RailsEnvironment.default.root
-      @script_name = File.basename($0)
-    end
+module Rails
+  module Commands
+    class Plugin
+      attr_reader :environment, :script_name
+      def initialize
+        @environment = RailsEnvironment.default
+        @rails_root = RailsEnvironment.default.root
+        @script_name = File.basename($0)
+      end
 
-    def environment=(value)
-      @environment = value
-      RailsEnvironment.default = value
-    end
+      def environment=(value)
+        @environment = value
+        RailsEnvironment.default = value
+      end
 
-    def options
-      OptionParser.new do |o|
-        o.set_summary_indent('  ')
-        o.banner =    "Usage: plugin [OPTIONS] command"
-        o.define_head "Rails plugin manager."
+      def options
+        OptionParser.new do |o|
+          o.set_summary_indent('  ')
+          o.banner =    "Usage: plugin [OPTIONS] command"
+          o.define_head "Rails plugin manager."
 
-        o.separator ""
-        o.separator "GENERAL OPTIONS"
+          o.separator ""
+          o.separator "GENERAL OPTIONS"
 
-        o.on("-r", "--root=DIR", String,
-             "Set an explicit rails app directory.",
-             "Default: #{@rails_root}") { |rails_root| @rails_root = rails_root; self.environment = RailsEnvironment.new(@rails_root) }
+          o.on("-r", "--root=DIR", String,
+               "Set an explicit rails app directory.",
+               "Default: #{@rails_root}") { |rails_root| @rails_root = rails_root; self.environment = RailsEnvironment.new(@rails_root) }
 
-        o.on("-v", "--verbose", "Turn on verbose output.") { |verbose| $verbose = verbose }
-        o.on("-h", "--help", "Show this help message.") { puts o; exit }
+          o.on("-v", "--verbose", "Turn on verbose output.") { |verbose| $verbose = verbose }
+          o.on("-h", "--help", "Show this help message.") { puts o; exit }
 
-        o.separator ""
-        o.separator "COMMANDS"
+          o.separator ""
+          o.separator "COMMANDS"
 
-        o.separator "  install    Install plugin(s) from known repositories or URLs."
-        o.separator "  remove     Uninstall plugins."
+          o.separator "  install    Install plugin(s) from known repositories or URLs."
+          o.separator "  remove     Uninstall plugins."
 
-        o.separator ""
-        o.separator "EXAMPLES"
-        o.separator "  Install a plugin from a subversion URL:"
-        o.separator "    #{@script_name} plugin install http://example.com/my_svn_plugin\n"
-        o.separator "  Install a plugin from a git URL:"
-        o.separator "    #{@script_name} plugin install git://github.com/SomeGuy/my_awesome_plugin.git\n"
-        o.separator "  Install a plugin and add a svn:externals entry to vendor/plugins"
-        o.separator "    #{@script_name} plugin install -x my_svn_plugin\n"
+          o.separator ""
+          o.separator "EXAMPLES"
+          o.separator "  Install a plugin from a subversion URL:"
+          o.separator "    #{@script_name} plugin install http://example.com/my_svn_plugin\n"
+          o.separator "  Install a plugin from a git URL:"
+          o.separator "    #{@script_name} plugin install git://github.com/SomeGuy/my_awesome_plugin.git\n"
+          o.separator "  Install a plugin and add a svn:externals entry to vendor/plugins"
+          o.separator "    #{@script_name} plugin install -x my_svn_plugin\n"
+        end
       end
-    end
 
-    def parse!(args=ARGV)
-      general, sub = split_args(args)
-      options.parse!(general)
+      def parse!(args=ARGV)
+        general, sub = split_args(args)
+        options.parse!(general)
 
-      command = general.shift
-      if command =~ /^(install|remove)$/
-        command = Commands.const_get(command.capitalize).new(self)
-        command.parse!(sub)
-      else
-        puts "Unknown command: #{command}" unless command.blank?
-        puts options
-        exit 1
+        command = general.shift
+        if command =~ /^(install|remove)$/
+          command = Commands.const_get(command.capitalize).new(self)
+          command.parse!(sub)
+        else
+          puts "Unknown command: #{command}" unless command.blank?
+          puts options
+          exit 1
+        end
       end
-    end
 
-    def split_args(args)
-      left = []
-      left << args.shift while args[0] and args[0] =~ /^-/
-      left << args.shift if args[0]
-      [left, args]
-    end
-
-    def self.parse!(args=ARGV)
-      Plugin.new.parse!(args)
-    end
-  end
+      def split_args(args)
+        left = []
+        left << args.shift while args[0] and args[0] =~ /^-/
+        left << args.shift if args[0]
+        [left, args]
+      end
 
-  class Install
-    def initialize(base_command)
-      @base_command = base_command
-      @method = :http
-      @options = { :quiet => false, :revision => nil, :force => false }
+      def self.parse!(args=ARGV)
+        Plugin.new.parse!(args)
+      end
     end
 
-    def options
-      OptionParser.new do |o|
-        o.set_summary_indent('  ')
-        o.banner =    "Usage: #{@base_command.script_name} install PLUGIN [PLUGIN [PLUGIN] ...]"
-        o.define_head "Install one or more plugins."
-        o.separator   ""
-        o.separator   "Options:"
-        o.on(         "-x", "--externals",
-                      "Use svn:externals to grab the plugin.",
-                      "Enables plugin updates and plugin versioning.") { |v| @method = :externals }
-        o.on(         "-o", "--checkout",
-                      "Use svn checkout to grab the plugin.",
-                      "Enables updating but does not add a svn:externals entry.") { |v| @method = :checkout }
-        o.on(         "-e", "--export",
-                      "Use svn export to grab the plugin.",
-                      "Exports the plugin, allowing you to check it into your local repository. Does not enable updates or add an svn:externals entry.") { |v| @method = :export }
-        o.on(         "-q", "--quiet",
-                      "Suppresses the output from installation.",
-                      "Ignored if -v is passed (rails plugin -v install ...)") { |v| @options[:quiet] = true }
-        o.on(         "-r REVISION", "--revision REVISION",
-                      "Checks out the given revision from subversion or git.",
-                      "Ignored if subversion/git is not used.") { |v| @options[:revision] = v }
-        o.on(         "-f", "--force",
-                      "Reinstalls a plugin if it's already installed.") { |v| @options[:force] = true }
-        o.separator   ""
-        o.separator   "You can specify plugin names as given in 'plugin list' output or absolute URLs to "
-        o.separator   "a plugin repository."
+    class Install
+      def initialize(base_command)
+        @base_command = base_command
+        @method = :http
+        @options = { :quiet => false, :revision => nil, :force => false }
       end
-    end
 
-    def determine_install_method
-      best = @base_command.environment.best_install_method
-      @method = :http if best == :http and @method == :export
-      case
-      when (best == :http and @method != :http)
-        msg = "Cannot install using subversion because `svn' cannot be found in your PATH"
-      when (best == :export and (@method != :export and @method != :http))
-        msg = "Cannot install using #{@method} because this project is not under subversion."
-      when (best != :externals and @method == :externals)
-        msg = "Cannot install using externals because vendor/plugins is not under subversion."
+      def options
+        OptionParser.new do |o|
+          o.set_summary_indent('  ')
+          o.banner =    "Usage: #{@base_command.script_name} install PLUGIN [PLUGIN [PLUGIN] ...]"
+          o.define_head "Install one or more plugins."
+          o.separator   ""
+          o.separator   "Options:"
+          o.on(         "-x", "--externals",
+                        "Use svn:externals to grab the plugin.",
+                        "Enables plugin updates and plugin versioning.") { |v| @method = :externals }
+          o.on(         "-o", "--checkout",
+                        "Use svn checkout to grab the plugin.",
+                        "Enables updating but does not add a svn:externals entry.") { |v| @method = :checkout }
+          o.on(         "-e", "--export",
+                        "Use svn export to grab the plugin.",
+                        "Exports the plugin, allowing you to check it into your local repository. Does not enable updates or add an svn:externals entry.") { |v| @method = :export }
+          o.on(         "-q", "--quiet",
+                        "Suppresses the output from installation.",
+                        "Ignored if -v is passed (rails plugin -v install ...)") { |v| @options[:quiet] = true }
+          o.on(         "-r REVISION", "--revision REVISION",
+                        "Checks out the given revision from subversion or git.",
+                        "Ignored if subversion/git is not used.") { |v| @options[:revision] = v }
+          o.on(         "-f", "--force",
+                        "Reinstalls a plugin if it's already installed.") { |v| @options[:force] = true }
+          o.separator   ""
+          o.separator   "You can specify plugin names as given in 'plugin list' output or absolute URLs to "
+          o.separator   "a plugin repository."
+        end
       end
-      if msg
-        puts msg
-        exit 1
+
+      def determine_install_method
+        best = @base_command.environment.best_install_method
+        @method = :http if best == :http and @method == :export
+        case
+        when (best == :http and @method != :http)
+          msg = "Cannot install using subversion because `svn' cannot be found in your PATH"
+        when (best == :export and (@method != :export and @method != :http))
+          msg = "Cannot install using #{@method} because this project is not under subversion."
+        when (best != :externals and @method == :externals)
+          msg = "Cannot install using externals because vendor/plugins is not under subversion."
+        end
+        if msg
+          puts msg
+          exit 1
+        end
+        @method
       end
-      @method
-    end
 
-    def parse!(args)
-      options.parse!(args)
-      if args.blank?
-        puts options
+      def parse!(args)
+        options.parse!(args)
+        if args.blank?
+          puts options
+          exit 1
+        end
+        environment = @base_command.environment
+        install_method = determine_install_method
+        puts "Plugins will be installed using #{install_method}" if $verbose
+        args.each do |name|
+          ::Plugin.find(name).install(install_method, @options)
+        end
+      rescue StandardError => e
+        puts "Plugin not found: #{args.inspect}"
+        puts e.inspect if $verbose
         exit 1
       end
-      environment = @base_command.environment
-      install_method = determine_install_method
-      puts "Plugins will be installed using #{install_method}" if $verbose
-      args.each do |name|
-        ::Plugin.find(name).install(install_method, @options)
-      end
-    rescue StandardError => e
-      puts "Plugin not found: #{args.inspect}"
-      puts e.inspect if $verbose
-      exit 1
-    end
-  end
-
-  class Remove
-    def initialize(base_command)
-      @base_command = base_command
     end
 
-    def options
-      OptionParser.new do |o|
-        o.set_summary_indent('  ')
-        o.banner =    "Usage: #{@base_command.script_name} remove name [name]..."
-        o.define_head "Remove plugins."
+    class Remove
+      def initialize(base_command)
+        @base_command = base_command
       end
-    end
 
-    def parse!(args)
-      options.parse!(args)
-      if args.blank?
-        puts options
-        exit 1
+      def options
+        OptionParser.new do |o|
+          o.set_summary_indent('  ')
+          o.banner =    "Usage: #{@base_command.script_name} remove name [name]..."
+          o.define_head "Remove plugins."
+        end
       end
-      root = @base_command.environment.root
-      args.each do |name|
-        ::Plugin.new(name).uninstall
+
+      def parse!(args)
+        options.parse!(args)
+        if args.blank?
+          puts options
+          exit 1
+        end
+        root = @base_command.environment.root
+        args.each do |name|
+          ::Plugin.new(name).uninstall
+        end
       end
     end
-  end
 
-  class Info
-    def initialize(base_command)
-      @base_command = base_command
-    end
+    class Info
+      def initialize(base_command)
+        @base_command = base_command
+      end
 
-    def options
-      OptionParser.new do |o|
-        o.set_summary_indent('  ')
-        o.banner =    "Usage: #{@base_command.script_name} info name [name]..."
-        o.define_head "Shows plugin info at {url}/about.yml."
+      def options
+        OptionParser.new do |o|
+          o.set_summary_indent('  ')
+          o.banner =    "Usage: #{@base_command.script_name} info name [name]..."
+          o.define_head "Shows plugin info at {url}/about.yml."
+        end
       end
-    end
 
-    def parse!(args)
-      options.parse!(args)
-      args.each do |name|
-        puts ::Plugin.find(name).info
-        puts
+      def parse!(args)
+        options.parse!(args)
+        args.each do |name|
+          puts ::Plugin.find(name).info
+          puts
+        end
       end
     end
   end
@@ -539,4 +541,4 @@ class RecursiveHTTPFetcher
   end
 end
 
-Commands::Plugin.parse!
+Rails::Commands::Plugin.parse!
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 23392276d5..20484a10c8 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -78,7 +78,7 @@ module Rails
       middlewares = []
       middlewares << [Rails::Rack::LogTailer, log_path] unless options[:daemonize]
       middlewares << [Rails::Rack::Debugger]  if options[:debugger]
-      middlewares << [Rails::Rack::ContentLength]
+      middlewares << [::Rack::ContentLength]
       Hash.new(middlewares)
     end
 
diff --git a/railties/lib/rails/console/app.rb b/railties/lib/rails/console/app.rb
index 95c74baae2..23d57379ba 100644
--- a/railties/lib/rails/console/app.rb
+++ b/railties/lib/rails/console/app.rb
@@ -5,28 +5,32 @@ require 'action_controller'
 # work around the at_exit hook in test/unit, which kills IRB
 Test::Unit.run = true if Test::Unit.respond_to?(:run=)
 
-# reference the global "app" instance, created on demand. To recreate the
-# instance, pass a non-false value as the parameter.
-def app(create=false)
-  @app_integration_instance = nil if create
-  @app_integration_instance ||= new_session do |sess|
-    sess.host! "www.example.com"
-  end
-end
+module Rails
+  module ConsoleMethods
+    # reference the global "app" instance, created on demand. To recreate the
+    # instance, pass a non-false value as the parameter.
+    def app(create=false)
+      @app_integration_instance = nil if create
+      @app_integration_instance ||= new_session do |sess|
+        sess.host! "www.example.com"
+      end
+    end
 
-# create a new session. If a block is given, the new session will be yielded
-# to the block before being returned.
-def new_session
-  app = Rails.application
-  session = ActionDispatch::Integration::Session.new(app)
-  yield session if block_given?
-  session
-end
+    # create a new session. If a block is given, the new session will be yielded
+    # to the block before being returned.
+    def new_session
+      app = Rails.application
+      session = ActionDispatch::Integration::Session.new(app)
+      yield session if block_given?
+      session
+    end
 
-# reloads the environment
-def reload!(print=true)
-  puts "Reloading..." if print
-  ActionDispatch::Reloader.cleanup!
-  ActionDispatch::Reloader.prepare!
-  true
+    # reloads the environment
+    def reload!(print=true)
+      puts "Reloading..." if print
+      ActionDispatch::Reloader.cleanup!
+      ActionDispatch::Reloader.prepare!
+      true
+    end
+  end
 end
diff --git a/railties/lib/rails/console/helpers.rb b/railties/lib/rails/console/helpers.rb
index 212fc6125a..230d3d9d04 100644
--- a/railties/lib/rails/console/helpers.rb
+++ b/railties/lib/rails/console/helpers.rb
@@ -1,7 +1,11 @@
-def helper
-  @helper ||= ApplicationController.helpers
-end
+module Rails
+  module ConsoleMethods
+    def helper
+      @helper ||= ApplicationController.helpers
+    end
 
-def controller
-  @controller ||= ApplicationController.new
+    def controller
+      @controller ||= ApplicationController.new
+    end
+  end
 end
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 2d25273050..335a0fb1b5 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -296,16 +296,16 @@ module Rails
   # If you want to share just a few specific helpers you can add them to application's
   # helpers in ApplicationController:
   #
-  # class ApplicationController < ActionController::Base
-  #   helper MyEngine::SharedEngineHelper
-  # end
+  #   class ApplicationController < ActionController::Base
+  #     helper MyEngine::SharedEngineHelper
+  #   end
   #
   # If you want to include all of the engine's helpers, you can use #helpers method on an engine's
   # instance:
   #
-  # class ApplicationController < ActionController::Base
-  #   helper MyEngine::Engine.helpers
-  # end
+  #   class ApplicationController < ActionController::Base
+  #     helper MyEngine::Engine.helpers
+  #   end
   #
   # It will include all of the helpers from engine's directory. Take into account that this does
   # not include helpers defined in controllers with helper_method or other similar solutions,
@@ -371,20 +371,28 @@ module Rails
         self.routes.default_scope = { :module => ActiveSupport::Inflector.underscore(mod.name) }
         self.isolated = true
 
-        unless mod.respond_to?(:_railtie)
-          name = engine_name
-          _railtie = self
+        unless mod.respond_to?(:railtie_namespace)
+          name, railtie = engine_name, self
+
           mod.singleton_class.instance_eval do
-            define_method(:_railtie) do
-              _railtie
-            end
+            define_method(:railtie_namespace) { railtie }
 
             unless mod.respond_to?(:table_name_prefix)
-              define_method(:table_name_prefix) do
-                "#{name}_"
-              end
+              define_method(:table_name_prefix) { "#{name}_" }
+            end
+
+            unless mod.respond_to?(:use_relative_model_naming?)
+              class_eval "def use_relative_model_naming?; true; end", __FILE__, __LINE__
+            end
+
+            unless mod.respond_to?(:railtie_helpers_paths)
+              define_method(:railtie_helpers_paths) { railtie.helpers_paths }
+            end
+
+            unless mod.respond_to?(:railtie_routes_url_helpers)
+              define_method(:railtie_routes_url_helpers) { railtie.routes_url_helpers }
             end
-         end
+          end
         end
       end
 
@@ -429,13 +437,6 @@ module Rails
     def helpers
       @helpers ||= begin
         helpers = Module.new
-
-        helpers_paths = if config.respond_to?(:helpers_paths)
-          config.helpers_paths
-        else
-          paths["app/helpers"].existent
-        end
-
         all = ActionController::Base.all_helpers_from_path(helpers_paths)
         ActionController::Base.modules_for_helpers(all).each do |mod|
           helpers.send(:include, mod)
@@ -444,6 +445,14 @@ module Rails
       end
     end
 
+    def helpers_paths
+      paths["app/helpers"].existent
+    end
+
+    def routes_url_helpers
+      routes.url_helpers
+    end
+
     def app
       @app ||= begin
         config.middleware = config.middleware.merge_into(default_middleware_stack)
@@ -488,7 +497,7 @@ module Rails
     # Blog::Engine.load_seed
     def load_seed
       seed_file = paths["db/seeds"].existent.first
-      load(seed_file) if File.exist?(seed_file)
+      load(seed_file) if seed_file && File.exist?(seed_file)
     end
 
     # Add configured load paths to ruby load paths and remove duplicates.
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 134d86fab0..3fbde0d989 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -138,12 +138,14 @@ module Rails
         if options.dev?
           <<-GEMFILE.strip_heredoc
             gem 'rails',     :path => '#{Rails::Generators::RAILS_DEV_PATH}'
-            gem 'journey',   :path => '#{Rails::Generators::JOURNEY_DEV_PATH}'
+            gem 'journey',   :git => 'git://github.com/rails/journey.git'
+            gem 'arel',      :git => 'git://github.com/rails/arel.git'
           GEMFILE
         elsif options.edge?
           <<-GEMFILE.strip_heredoc
             gem 'rails',     :git => 'git://github.com/rails/rails.git'
             gem 'journey',   :git => 'git://github.com/rails/journey.git'
+            gem 'arel',      :git => 'git://github.com/rails/arel.git'
           GEMFILE
         else
           <<-GEMFILE.strip_heredoc
@@ -190,17 +192,6 @@ module Rails
         end
       end
 
-      def turn_gemfile_entry
-        unless RUBY_VERSION < "1.9.2" || options[:skip_test_unit]
-          <<-GEMFILE.strip_heredoc
-            group :test do
-              # Pretty printed test output
-              gem 'turn', :require => false
-            end
-          GEMFILE
-        end
-      end
-
       def assets_gemfile_entry
         <<-GEMFILE.strip_heredoc
           # Gems used only for assets and not required
@@ -208,6 +199,7 @@ module Rails
           group :assets do
             gem 'sass-rails',   :git => 'git://github.com/rails/sass-rails.git'
             gem 'coffee-rails', :git => 'git://github.com/rails/coffee-rails.git'
+            #{"gem 'therubyrhino'\n" if defined?(JRUBY_VERSION)}
             gem 'uglifier', '>= 1.0.3'
           end
         GEMFILE
diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb
index 911f80cf3a..f38a487a4e 100644
--- a/railties/lib/rails/generators/base.rb
+++ b/railties/lib/rails/generators/base.rb
@@ -34,7 +34,7 @@ module Rails
         usage = source_root && File.expand_path("../USAGE", source_root)
 
         @desc ||= if usage && File.exist?(usage)
-          File.read(usage)
+          ERB.new(File.read(usage)).result(binding)
         else
           "Description:\n    Create #{base_name.humanize.downcase} files for #{generator_name} generator."
         end
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index c8648d19f8..3e32f758a4 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -144,8 +144,6 @@ module Rails
     # We need to store the RAILS_DEV_PATH in a constant, otherwise the path
     # can change in Ruby 1.8.7 when we FileUtils.cd.
     RAILS_DEV_PATH = File.expand_path("../../../../../..", File.dirname(__FILE__))
-    JOURNEY_DEV_PATH = File.expand_path("../../../../../../../journey", File.dirname(__FILE__))
-
     RESERVED_NAMES = %w[application destroy benchmarker profiler plugin runner test]
 
     class AppGenerator < AppBase
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index 910cd16950..d3b8f4d595 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -21,5 +21,3 @@ source 'http://rubygems.org'
 
 # To use debugger
 # <%= ruby_debugger_gemfile_entry %>
-
-<%= turn_gemfile_entry -%>
diff --git a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
index c63d1b6ac5..bba96a7431 100644
--- a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title><%= camelized %></title>
-  <%%= stylesheet_link_tag    "application" %>
+  <%%= stylesheet_link_tag    "application", :media => "all" %>
   <%%= javascript_include_tag "application" %>
   <%%= csrf_meta_tags %>
 </head>
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 13fbe9e526..40fd843b1b 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -49,6 +49,11 @@ module <%= app_const_base %>
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 
+    # Use SQL instead of Active Record's schema dumper when creating the database.
+    # This is necessary if your schema can't be completely dumped by the schema dumper,
+    # like if you have constraints or database-specific column types
+    # config.active_record.schema_format = :sql
+
 <% unless options.skip_sprockets? -%>
     # Enable the asset pipeline
     config.assets.enabled = true
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
index 64e2c09467..50f2df3d35 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
@@ -33,8 +33,11 @@
   # See everything in the log (default is :info)
   # config.log_level = :debug
 
+  # Prepend all log lines with the following tags
+  # config.log_tags = [ :subdomain, :uuid ]
+
   # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
   # Use a different cache store in production
   # config.cache_store = :mem_cache_store
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
index 80198cc21e..37a8b81dad 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
@@ -29,11 +29,6 @@
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
-
   <%- unless options.skip_active_record? -%>
   # Raise exception on mass assignment protection for ActiveRecord models
   config.active_record.mass_assignment_sanitizer = :strict
diff --git a/railties/lib/rails/generators/rails/controller/templates/controller.rb b/railties/lib/rails/generators/rails/controller/templates/controller.rb
index 8f5f78556f..52243f4a2f 100644
--- a/railties/lib/rails/generators/rails/controller/templates/controller.rb
+++ b/railties/lib/rails/generators/rails/controller/templates/controller.rb
@@ -3,7 +3,7 @@ class <%= class_name %>Controller < ApplicationController
 <% actions.each do |action| -%>
   def <%= action %>
   end
-
+<%= "\n" unless action == actions.last -%>
 <% end -%>
 end
 <% end -%>
diff --git a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
index 4baa2110e7..cd7d51e628 100644
--- a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
@@ -39,7 +39,7 @@ module Rails
     end
 
     def gitignore
-      copy_file "gitignore", ".gitignore"
+      template "gitignore", ".gitignore"
     end
 
     def lib
@@ -246,8 +246,20 @@ task :default => :test
         "rails plugin new #{self.arguments.map(&:usage).join(' ')} [options]"
       end
 
+      def original_name
+        @original_name ||= File.basename(destination_root)
+      end
+
       def name
-        @name ||= File.basename(destination_root)
+        @name ||= begin
+          # same as ActiveSupport::Inflector#underscore except not replacing '-'
+          underscored = original_name.dup
+          underscored.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+          underscored.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+          underscored.downcase!
+
+          underscored
+        end
       end
 
       def camelized
@@ -256,11 +268,11 @@ task :default => :test
 
       def valid_const?
         if camelized =~ /^\d/
-          raise Error, "Invalid plugin name #{name}. Please give a name which does not start with numbers."
+          raise Error, "Invalid plugin name #{original_name}. Please give a name which does not start with numbers."
         elsif RESERVED_NAMES.include?(name)
-          raise Error, "Invalid plugin name #{name}. Please give a name which does not match one of the reserved rails words."
+          raise Error, "Invalid plugin name #{original_name}. Please give a name which does not match one of the reserved rails words."
         elsif Object.const_defined?(camelized)
-          raise Error, "Invalid plugin name #{name}, constant #{camelized} is already in use. Please choose another plugin name."
+          raise Error, "Invalid plugin name #{original_name}, constant #{camelized} is already in use. Please choose another plugin name."
         end
       end
 
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt b/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
index 01550dec2f..bd983fb90f 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title><%= camelized %></title>
-  <%%= stylesheet_link_tag    "<%= name %>/application" %>
+  <%%= stylesheet_link_tag    "<%= name %>/application", :media => "all" %>
   <%%= javascript_include_tag "<%= name %>/application" %>
   <%%= csrf_meta_tags %>
 </head>
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/gitignore b/railties/lib/rails/generators/rails/plugin_new/templates/gitignore
index 1463de6dfb..92bd3c614b 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/gitignore
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/gitignore
@@ -1,6 +1,6 @@
 .bundle/
 log/*.log
 pkg/
-test/dummy/db/*.sqlite3
-test/dummy/log/*.log
-test/dummy/tmp/
\ No newline at end of file
+<%= dummy_path %>/db/*.sqlite3
+<%= dummy_path %>/log/*.log
+<%= dummy_path %>/tmp/
\ No newline at end of file
diff --git a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
index 32b961d9fc..4ff15fd288 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
@@ -62,7 +62,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     respond_to do |format|
       if @<%= orm_instance.update_attributes("params[:#{singular_table_name}]") %>
         format.html { redirect_to @<%= singular_table_name %>, <%= key_value :notice, "'#{human_name} was successfully updated.'" %> }
-        format.json { head :ok }
+        format.json { head :no_content }
       else
         format.html { render <%= key_value :action, '"edit"' %> }
         format.json { render <%= key_value :json, "@#{orm_instance.errors}" %>, <%= key_value :status, ':unprocessable_entity' %> }
@@ -78,7 +78,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
     respond_to do |format|
       format.html { redirect_to <%= index_helper %>_url }
-      format.json { head :ok }
+      format.json { head :no_content }
     end
   end
 end
diff --git a/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb b/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
index 01fe6dda7a..9ec2e34545 100644
--- a/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
+++ b/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
@@ -26,23 +26,23 @@ class <%= controller_class_name %>ControllerTest < ActionController::TestCase
   end
 
   test "should show <%= singular_table_name %>" do
-    get :show, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+    get :show, <%= key_value :id, "@#{singular_table_name}" %>
     assert_response :success
   end
 
   test "should get edit" do
-    get :edit, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+    get :edit, <%= key_value :id, "@#{singular_table_name}" %>
     assert_response :success
   end
 
   test "should update <%= singular_table_name %>" do
-    put :update, <%= key_value :id, "@#{singular_table_name}.to_param" %>, <%= key_value singular_table_name, "@#{singular_table_name}.attributes" %>
+    put :update, <%= key_value :id, "@#{singular_table_name}" %>, <%= key_value singular_table_name, "@#{singular_table_name}.attributes" %>
     assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 
   test "should destroy <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count', -1) do
-      delete :destroy, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+      delete :destroy, <%= key_value :id, "@#{singular_table_name}" %>
     end
 
     assert_redirected_to <%= index_helper %>_path
diff --git a/railties/lib/rails/rack.rb b/railties/lib/rails/rack.rb
index d4a41b217e..d1ee96f7fd 100644
--- a/railties/lib/rails/rack.rb
+++ b/railties/lib/rails/rack.rb
@@ -1,6 +1,5 @@
 module Rails
   module Rack
-    autoload :ContentLength, "rails/rack/content_length"
     autoload :Debugger,      "rails/rack/debugger"
     autoload :Logger,        "rails/rack/logger"
     autoload :LogTailer,     "rails/rack/log_tailer"
diff --git a/railties/lib/rails/rack/content_length.rb b/railties/lib/rails/rack/content_length.rb
deleted file mode 100644
index 6839af4152..0000000000
--- a/railties/lib/rails/rack/content_length.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require 'action_dispatch'
-require 'rack/utils'
-
-module Rails
-  module Rack
-    # Sets the Content-Length header on responses with fixed-length bodies.
-    class ContentLength
-      include ::Rack::Utils
-
-      def initialize(app, sendfile=nil)
-        @app = app
-        @sendfile = sendfile
-      end
-
-      def call(env)
-        status, headers, body = @app.call(env)
-        headers = HeaderHash.new(headers)
-
-        if !STATUS_WITH_NO_ENTITY_BODY.include?(status.to_i) &&
-           !headers['Content-Length'] &&
-           !headers['Transfer-Encoding'] &&
-           !(@sendfile && headers[@sendfile])
-
-          old_body = body
-          body, length = [], 0
-          old_body.each do |part|
-            body << part
-            length += bytesize(part)
-          end
-          old_body.close if old_body.respond_to?(:close)
-          headers['Content-Length'] = length.to_s
-        end
-
-        [status, headers, body]
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/railties/lib/rails/rack/logger.rb b/railties/lib/rails/rack/logger.rb
index 3be262de08..89de10c83d 100644
--- a/railties/lib/rails/rack/logger.rb
+++ b/railties/lib/rails/rack/logger.rb
@@ -1,32 +1,46 @@
 require 'active_support/core_ext/time/conversions'
+require 'active_support/core_ext/object/blank'
 
 module Rails
   module Rack
     # Log the request started and flush all loggers after it.
     class Logger < ActiveSupport::LogSubscriber
-      def initialize(app)
-        @app = app
+      def initialize(app, tags=nil)
+        @app, @tags = app, tags.presence
       end
 
       def call(env)
-        before_dispatch(env)
-        @app.call(env)
-      ensure
-        after_dispatch(env)
+        if @tags
+          Rails.logger.tagged(compute_tags(env)) { call_app(env) }
+        else
+          call_app(env)
+        end
       end
 
     protected
 
-      def before_dispatch(env)
+      def call_app(env)
         request = ActionDispatch::Request.new(env)
         path = request.filtered_path
-
-        info "\n\nStarted #{request.request_method} \"#{path}\" " \
-             "for #{request.ip} at #{Time.now.to_default_s}"
+        Rails.logger.info "\n\nStarted #{request.request_method} \"#{path}\" for #{request.ip} at #{Time.now.to_default_s}"
+        @app.call(env)
+      ensure
+        ActiveSupport::LogSubscriber.flush_all!
       end
 
-      def after_dispatch(env)
-        ActiveSupport::LogSubscriber.flush_all!
+      def compute_tags(env)
+        request = ActionDispatch::Request.new(env)
+
+        @tags.collect do |tag|
+          case tag
+          when Proc
+            tag.call(request)
+          when Symbol
+            request.send(tag)
+          else
+            tag
+          end
+        end
       end
     end
   end
diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb
index e8fb1f3d98..f0991b99af 100644
--- a/railties/lib/rails/railtie.rb
+++ b/railties/lib/rails/railtie.rb
@@ -196,7 +196,7 @@ module Rails
     end
 
     def railtie_namespace
-      @railtie_namespace ||= self.class.parents.detect { |n| n.respond_to?(:_railtie) }
+      @railtie_namespace ||= self.class.parents.detect { |n| n.respond_to?(:railtie_namespace) }
     end
   end
 end
diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index ca8875ad9b..1e7da5ccae 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -66,43 +66,43 @@ namespace :doc do
     rdoc.rdoc_files.include('README')
 
     gem_path('actionmailer') do |actionmailer|
-      %w(README.rdoc CHANGELOG MIT-LICENSE lib/action_mailer/base.rb).each do |file|
+      %w(README.rdoc CHANGELOG.md MIT-LICENSE lib/action_mailer/base.rb).each do |file|
         rdoc.rdoc_files.include("#{actionmailer}/#{file}")
       end
     end
 
     gem_path('actionpack') do |actionpack|
-      %w(README.rdoc CHANGELOG MIT-LICENSE lib/action_controller/**/*.rb lib/action_view/**/*.rb).each do |file|
+      %w(README.rdoc CHANGELOG.md MIT-LICENSE lib/action_controller/**/*.rb lib/action_view/**/*.rb).each do |file|
         rdoc.rdoc_files.include("#{actionpack}/#{file}")
       end
     end
 
     gem_path('activemodel') do |activemodel|
-      %w(README.rdoc CHANGELOG MIT-LICENSE lib/active_model/**/*.rb).each do |file|
+      %w(README.rdoc CHANGELOG.md MIT-LICENSE lib/active_model/**/*.rb).each do |file|
         rdoc.rdoc_files.include("#{activemodel}/#{file}")
       end
     end
 
     gem_path('activerecord') do |activerecord|
-      %w(README.rdoc CHANGELOG lib/active_record/**/*.rb).each do |file|
+      %w(README.rdoc CHANGELOG.md lib/active_record/**/*.rb).each do |file|
         rdoc.rdoc_files.include("#{activerecord}/#{file}")
       end
     end
 
     gem_path('activeresource') do |activeresource|
-      %w(README.rdoc CHANGELOG lib/active_resource.rb lib/active_resource/*).each do |file|
+      %w(README.rdoc CHANGELOG.md lib/active_resource.rb lib/active_resource/*).each do |file|
         rdoc.rdoc_files.include("#{activeresource}/#{file}")
       end
     end
 
     gem_path('activesupport') do |activesupport|
-      %w(README.rdoc CHANGELOG lib/active_support/**/*.rb).each do |file|
+      %w(README.rdoc CHANGELOG.md lib/active_support/**/*.rb).each do |file|
         rdoc.rdoc_files.include("#{activesupport}/#{file}")
       end
     end
 
     gem_path('railties') do |railties|
-      %w(README.rdoc CHANGELOG lib/{*.rb,commands/*.rb,generators/*.rb}).each do |file|
+      %w(README.rdoc CHANGELOG.md lib/{*.rb,commands/*.rb,generators/*.rb}).each do |file|
         rdoc.rdoc_files.include("#{railties}/#{file}")
       end
     end
diff --git a/railties/lib/rails/tasks/engine.rake b/railties/lib/rails/tasks/engine.rake
index 2152e811f5..eea8abe7d2 100644
--- a/railties/lib/rails/tasks/engine.rake
+++ b/railties/lib/rails/tasks/engine.rake
@@ -2,6 +2,7 @@ task "load_app" do
   namespace :app do
     load APP_RAKEFILE
   end
+  task :environment => "app:environment"
 
   if !defined?(ENGINE_PATH) || !ENGINE_PATH
     ENGINE_PATH = find_engine_path(APP_RAKEFILE)
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index fa01f42c5b..52d92cdd96 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -61,6 +61,7 @@ end
 
 # Recreated here from Active Support because :uncommitted needs it before Rails is available
 module Kernel
+  remove_method :silence_stderr # Removing old method to prevent method redefined warning
   def silence_stderr
     old_stderr = STDERR.dup
     STDERR.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
@@ -122,8 +123,7 @@ namespace :test do
 
       unit_tests       = models.map { |model| "test/unit/#{File.basename(model, '.rb')}_test.rb" }
       functional_tests = controllers.map { |controller| "test/functional/#{File.basename(controller, '.rb')}_test.rb" }
-
-      unit_tests.uniq + functional_tests.uniq
+      (unit_tests + functional_tests).uniq.select { |file| File.exist?(file) }
     end
 
     t.libs << 'test'