railties 3.2.22.5 → 4.0.0.beta1

data/lib/rails/commands/destroy.rb

@@ -1,10 +1,9 @@
 require 'rails/generators'
-require 'active_support/core_ext/object/inclusion'
 
-if ARGV.first.in?([nil, "-h", "--help"])
+if [nil, "-h", "--help"].include?(ARGV.first)
   Rails::Generators.help 'destroy'
   exit
 end
 
 name = ARGV.shift
-Rails::Generators.invoke name, ARGV, :behavior => :revoke, :destination_root => Rails.root
+Rails::Generators.invoke name, ARGV, behavior: :revoke, destination_root: Rails.root

data/lib/rails/commands/generate.rb

@@ -1,7 +1,6 @@
 require 'rails/generators'
-require 'active_support/core_ext/object/inclusion'
 
-if ARGV.first.in?([nil, "-h", "--help"])
+if [nil, "-h", "--help"].include?(ARGV.first)
   Rails::Generators.help 'generate'
   exit
 end
@@ -9,4 +8,4 @@ end
 name = ARGV.shift
 
 root = defined?(ENGINE_ROOT) ? ENGINE_ROOT : Rails.root
-Rails::Generators.invoke name, ARGV, :behavior => :invoke, :destination_root => root
+Rails::Generators.invoke name, ARGV, behavior: :invoke, destination_root: root

data/lib/rails/commands/plugin_new.rb

@@ -1,5 +1,3 @@
-require 'rubygems' if ARGV.include?("--dev")
-
 if ARGV.first != "new"
   ARGV[0] = "--help"
 else

data/lib/rails/commands/runner.rb

@@ -1,7 +1,7 @@
 require 'optparse'
 require 'rbconfig'
 
-options = { :environment => (ENV['RAILS_ENV'] || "development").dup }
+options = { environment: (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development").dup }
 code_or_file = nil
 
 if ARGV.first.nil?
@@ -9,8 +9,7 @@ if ARGV.first.nil?
 end
 
 ARGV.clone.options do |opts|
-  script_name = File.basename($0)
-  opts.banner = "Usage: runner [options] ('Some.ruby(code)' or a filename)"
+  opts.banner = "Usage: rails runner [options] ('Some.ruby(code)' or a filename)"
 
   opts.separator ""
 
@@ -25,7 +24,7 @@ ARGV.clone.options do |opts|
 
   if RbConfig::CONFIG['host_os'] !~ /mswin|mingw/
     opts.separator ""
-    opts.separator "You can also use runner as a shebang line for your scripts like this:"
+    opts.separator "You can also use runner as a shebang line for your executables:"
     opts.separator "-------------------------------------------------------------"
     opts.separator "#!/usr/bin/env #{File.expand_path($0)} runner"
     opts.separator ""
@@ -42,7 +41,7 @@ ENV["RAILS_ENV"] = options[:environment]
 
 require APP_PATH
 Rails.application.require_environment!
- Rails.application.load_runner
+Rails.application.load_runner
 
 if code_or_file.nil?
   $stderr.puts "Run '#{$0} -h' for help."

data/lib/rails/commands/server.rb

@@ -17,7 +17,7 @@ module Rails
           opts.on("-c", "--config=file", String,
                   "Use custom rackup configuration file") { |v| options[:config] = v }
           opts.on("-d", "--daemon", "Make server run as a Daemon.") { options[:daemonize] = true }
-          opts.on("-u", "--debugger", "Enable ruby-debugging for the server.") { options[:debugger] = true }
+          opts.on("-u", "--debugger", "Enable the debugger") { options[:debugger] = true }
           opts.on("-e", "--environment=name", String,
                   "Specifies the environment to run this server under (test/development/production).",
                   "Default: development") { |v| options[:environment] = v }
@@ -64,7 +64,17 @@ module Rails
 
       #Create required tmp directories if not found
       %w(cache pids sessions sockets).each do |dir_to_make|
-        FileUtils.mkdir_p(Rails.root.join('tmp', dir_to_make))
+        FileUtils.mkdir_p(File.join(Rails.root, 'tmp', dir_to_make))
+      end
+
+      unless options[:daemonize]
+        wrapped_app # touch the app so the logger is set up
+
+        console = ActiveSupport::Logger.new($stdout)
+        console.formatter = Rails.logger.formatter
+        console.level = Rails.logger.level
+
+        Rails.logger.extend(ActiveSupport::Logger.broadcast(console))
       end
 
       super
@@ -76,9 +86,17 @@ module Rails
 
     def middleware
       middlewares = []
-      middlewares << [Rails::Rack::LogTailer, log_path] unless options[:daemonize]
       middlewares << [Rails::Rack::Debugger]  if options[:debugger]
       middlewares << [::Rack::ContentLength]
+
+      # FIXME: add Rack::Lock in the case people are using webrick.
+      # This is to remain backwards compatible for those who are
+      # running webrick in production. We should consider removing this
+      # in development.
+      if server.name == 'Rack::Handler::WEBrick'
+        middlewares << [::Rack::Lock]
+      end
+
       Hash.new(middlewares)
     end
 
@@ -88,12 +106,13 @@ module Rails
 
     def default_options
       super.merge({
-        :Port        => 3000,
-        :environment => (ENV['RAILS_ENV'] || "development").dup,
-        :daemonize   => false,
-        :debugger    => false,
-        :pid         => File.expand_path("tmp/pids/server.pid"),
-        :config      => File.expand_path("config.ru")
+        Port:         3000,
+        DoNotReverseLookup:  true,
+        environment:  (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development").dup,
+        daemonize:    false,
+        debugger:     false,
+        pid:          File.expand_path("tmp/pids/server.pid"),
+        config:       File.expand_path("config.ru")
       })
     end
   end

data/lib/rails/commands/update.rb

@@ -6,4 +6,4 @@ if ARGV.size == 0
 end
 
 name = ARGV.shift
-Rails::Generators.invoke name, ARGV, :behavior => :skip
+Rails::Generators.invoke name, ARGV, behavior: :skip

data/lib/rails/configuration.rb

@@ -1,39 +1,66 @@
 require 'active_support/deprecation'
 require 'active_support/ordered_options'
-require 'active_support/core_ext/hash/deep_dup'
+require 'active_support/core_ext/object'
 require 'rails/paths'
 require 'rails/rack'
 
 module Rails
   module Configuration
-    class MiddlewareStackProxy #:nodoc:
+    # MiddlewareStackProxy is a proxy for the Rails middleware stack that allows
+    # you to configure middlewares in your application. It works basically as a
+    # command recorder, saving each command to be applied after initialization
+    # over the default middleware stack, so you can add, swap, or remove any
+    # middleware in Rails.
+    #
+    # You can add your own middlewares by using the +config.middleware.use+ method:
+    #
+    #     config.middleware.use Magical::Unicorns
+    #
+    # This will put the <tt>Magical::Unicorns</tt> middleware on the end of the stack.
+    # You can use +insert_before+ if you wish to add a middleware before another:
+    #
+    #     config.middleware.insert_before ActionDispatch::Head, Magical::Unicorns
+    #
+    # There's also +insert_after+ which will insert a middleware after another:
+    #
+    #     config.middleware.insert_after ActionDispatch::Head, Magical::Unicorns
+    #
+    # Middlewares can also be completely swapped out and replaced with others:
+    #
+    #     config.middleware.swap ActionDispatch::Flash, Magical::Unicorns
+    #
+    # And finally they can also be removed from the stack completely:
+    #
+    #     config.middleware.delete ActionDispatch::Flash
+    #
+    class MiddlewareStackProxy
       def initialize
         @operations = []
       end
 
       def insert_before(*args, &block)
-        @operations << [:insert_before, args, block]
+        @operations << [__method__, args, block]
       end
 
       alias :insert :insert_before
 
       def insert_after(*args, &block)
-        @operations << [:insert_after, args, block]
+        @operations << [__method__, args, block]
       end
 
       def swap(*args, &block)
-        @operations << [:swap, args, block]
+        @operations << [__method__, args, block]
       end
 
       def use(*args, &block)
-        @operations << [:use, args, block]
+        @operations << [__method__, args, block]
       end
 
       def delete(*args, &block)
-        @operations << [:delete, args, block]
+        @operations << [__method__, args, block]
       end
 
-      def merge_into(other)
+      def merge_into(other) #:nodoc:
         @operations.each do |operation, args, block|
           other.send(operation, *args, &block)
         end

data/lib/rails/console/app.rb

@@ -1,10 +1,6 @@
 require 'active_support/all'
-require 'active_support/test_case'
 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=)
-
 module Rails
   module ConsoleMethods
     # reference the global "app" instance, created on demand. To recreate the

data/lib/rails/deprecation.rb

@@ -0,0 +1,19 @@
+require 'active_support/deprecation/proxy_wrappers'
+
+module Rails
+  class DeprecatedConstant < ActiveSupport::Deprecation::DeprecatedConstantProxy
+    def self.deprecate(old, current)
+      # double assignment is used to avoid "assigned but unused variable" warning
+      constant = constant = new(old, current)
+      eval "::#{old} = constant"
+    end
+
+    private
+
+    def target
+      ::Kernel.eval @new_const.to_s
+    end
+  end
+
+  DeprecatedConstant.deprecate('RAILS_CACHE', '::Rails.cache')
+end

data/lib/rails/engine.rb

@@ -2,12 +2,11 @@ require 'rails/railtie'
 require 'active_support/core_ext/module/delegation'
 require 'pathname'
 require 'rbconfig'
-require 'rails/engine/railties'
 
 module Rails
   # <tt>Rails::Engine</tt> allows you to wrap a specific Rails application or subset of
-  # functionality and share it with other applications. Since Rails 3.0, every
-  # <tt>Rails::Application</tt> is just an engine, which allows for simple
+  # functionality and share it with other applications or within a larger packaged application.
+  # Since Rails 3.0, every <tt>Rails::Application</tt> is just an engine, which allows for simple
   # feature and application sharing.
   #
   # Any <tt>Rails::Engine</tt> is also a <tt>Rails::Railtie</tt>, so the same
@@ -39,8 +38,6 @@ module Rails
   # and <tt>autoload_once_paths</tt>, which, differently from a <tt>Railtie</tt>, are scoped to
   # the current engine.
   #
-  # Example:
-  #
   #   class MyEngine < Rails::Engine
   #     # Add a load path for this specific Engine
   #     config.autoload_paths << File.expand_path("../lib/some/path", __FILE__)
@@ -109,7 +106,7 @@ module Rails
   #
   # The <tt>Application</tt> class adds a couple more paths to this set. And as in your
   # <tt>Application</tt>, all folders under +app+ are automatically added to the load path.
-  # If you have an <tt>app/observers</tt> folder for example, it will be added by default.
+  # If you have an <tt>app/services/tt> folder for example, it will be added by default.
   #
   # == Endpoint
   #
@@ -148,7 +145,7 @@ module Rails
   #
   #   # ENGINE/config/routes.rb
   #   MyEngine::Engine.routes.draw do
-  #     match "/" => "posts#index"
+  #     get "/" => "posts#index"
   #   end
   #
   # == Mount priority
@@ -158,7 +155,7 @@ module Rails
   #
   #   MyRailsApp::Application.routes.draw do
   #     mount MyEngine::Engine => "/blog"
-  #     match "/blog/omg" => "main#omg"
+  #     get "/blog/omg" => "main#omg"
   #   end
   #
   # +MyEngine+ is mounted at <tt>/blog</tt>, and <tt>/blog/omg</tt> points to application's
@@ -167,7 +164,7 @@ module Rails
   # It's much better to swap that:
   #
   #   MyRailsApp::Application.routes.draw do
-  #     match "/blog/omg" => "main#omg"
+  #     get "/blog/omg" => "main#omg"
   #     mount MyEngine::Engine => "/blog"
   #   end
   #
@@ -178,9 +175,8 @@ module Rails
   # There are some places where an Engine's name is used:
   #
   # * routes: when you mount an Engine with <tt>mount(MyEngine::Engine => '/my_engine')</tt>,
-  #   it's used as default :as option
-  # * some of the rake tasks are based on engine name, e.g. <tt>my_engine:install:migrations</tt>,
-  #   <tt>my_engine:install:assets</tt>
+  #   it's used as default <tt>:as</tt> option
+  # * rake task for installing migrations <tt>my_engine:install:migrations</tt>
   #
   # Engine name is set by default based on class name. For <tt>MyEngine::Engine</tt> it will be
   # <tt>my_engine_engine</tt>. You can change it manually using the <tt>engine_name</tt> method:
@@ -228,7 +224,7 @@ module Rails
   #     resources :articles
   #   end
   #
-  # The routes above will automatically point to <tt>MyEngine::ApplicationController</tt>. Furthermore, you don't
+  # The routes above will automatically point to <tt>MyEngine::ArticlesController</tt>. Furthermore, you don't
   # need to use longer url helpers like <tt>my_engine_articles_path</tt>. Instead, you should simply use
   # <tt>articles_path</tt> as you would do with your application.
   #
@@ -255,8 +251,8 @@ module Rails
   #
   #   # config/routes.rb
   #   MyApplication::Application.routes.draw do
-  #     mount MyEngine::Engine => "/my_engine", :as => "my_engine"
-  #     match "/foo" => "foo#index"
+  #     mount MyEngine::Engine => "/my_engine", as: "my_engine"
+  #     get "/foo" => "foo#index"
   #   end
   #
   # Now, you can use the <tt>my_engine</tt> helper inside your application:
@@ -300,7 +296,7 @@ module Rails
   #     helper MyEngine::SharedEngineHelper
   #   end
   #
-  # If you want to include all of the engine's helpers, you can use #helpers method on an engine's
+  # If you want to include all of the engine's helpers, you can use #helper method on an engine's
   # instance:
   #
   #   class ApplicationController < ActionController::Base
@@ -326,40 +322,33 @@ module Rails
   # migration in the application and rerun copying migrations.
   #
   # If your engine has migrations, you may also want to prepare data for the database in
-  # the <tt>seeds.rb</tt> file. You can load that data using the <tt>load_seed</tt> method, e.g.
+  # the <tt>db/seeds.rb</tt> file. You can load that data using the <tt>load_seed</tt> method, e.g.
   #
   #   MyEngine::Engine.load_seed
   #
   # == Loading priority
   #
-  # In order to change engine's priority you can use config.railties_order in main application.
+  # In order to change engine's priority you can use +config.railties_order+ in main application.
   # It will affect the priority of loading views, helpers, assets and all the other files
   # related to engine or application.
   #
-  # Example:
-  #
   #   # load Blog::Engine with highest priority, followed by application and other railties
   #   config.railties_order = [Blog::Engine, :main_app, :all]
-  #
   class Engine < Railtie
     autoload :Configuration, "rails/engine/configuration"
-    autoload :Railties,      "rails/engine/railties"
-
-    def load_generators(app=self)
-      initialize_generators
-      railties.all { |r| r.load_generators(app) }
-      Rails::Generators.configure!(app.config.generators)
-      super
-      self
-    end
 
     class << self
       attr_accessor :called_from, :isolated
+
       alias :isolated? :isolated
       alias :engine_name :railtie_name
 
+      delegate :eager_load!, to: :instance
+
       def inherited(base)
         unless base.abstract_railtie?
+          Rails::Railtie::Configuration.eager_load_namespaces << base
+
           base.called_from = begin
             # Remove the line number from backtraces making sure we don't leave anything behind
             call_stack = caller.map { |p| p.sub(/:\d+.*/, '') }
@@ -379,7 +368,7 @@ module Rails
       def isolate_namespace(mod)
         engine_name(generate_railtie_name(mod))
 
-        self.routes.default_scope = { :module => ActiveSupport::Inflector.underscore(mod.name) }
+        self.routes.default_scope = { module: ActiveSupport::Inflector.underscore(mod.name) }
         self.isolated = true
 
         unless mod.respond_to?(:railtie_namespace)
@@ -401,7 +390,7 @@ module Rails
             end
 
             unless mod.respond_to?(:railtie_routes_url_helpers)
-              define_method(:railtie_routes_url_helpers) { railtie.routes_url_helpers }
+              define_method(:railtie_routes_url_helpers) { railtie.routes.url_helpers }
             end
           end
         end
@@ -409,35 +398,66 @@ module Rails
 
       # Finds engine with given path
       def find(path)
-        expanded_path = File.expand_path path.to_s
-        Rails::Engine::Railties.engines.find { |engine|
-          File.expand_path(engine.root.to_s) == expanded_path
-        }
+        expanded_path = File.expand_path path
+        Rails::Engine.subclasses.each do |klass|
+          engine = klass.instance
+          return engine if File.expand_path(engine.root) == expanded_path
+        end
+        nil
       end
     end
 
-    delegate :middleware, :root, :paths, :to => :config
-    delegate :engine_name, :isolated?, :to => "self.class"
+    delegate :middleware, :root, :paths, to: :config
+    delegate :engine_name, :isolated?, to: :class
 
-    def load_tasks(app=self)
-      railties.all { |r| r.load_tasks(app) }
+    def initialize
+      @_all_autoload_paths = nil
+      @_all_load_paths     = nil
+      @app                 = nil
+      @config              = nil
+      @env_config          = nil
+      @helpers             = nil
+      @routes              = nil
       super
-      paths["lib/tasks"].existent.sort.each { |ext| load(ext) }
     end
 
+    # Load console and invoke the registered hooks.
+    # Check <tt>Rails::Railtie.console</tt> for more info.
     def load_console(app=self)
-      railties.all { |r| r.load_console(app) }
-      super
+      require "pp"
+      require "rails/console/app"
+      require "rails/console/helpers"
+      run_console_blocks(app)
+      self
     end
 
+    # Load Rails runner and invoke the registered hooks.
+    # Check <tt>Rails::Railtie.runner</tt> for more info.
     def load_runner(app=self)
-      railties.all { |r| r.load_runner(app) }
-      super
+      run_runner_blocks(app)
+      self
     end
 
-    def eager_load!
-      railties.all(&:eager_load!)
+    # Load Rake, railties tasks and invoke the registered hooks.
+    # Check <tt>Rails::Railtie.rake_tasks</tt> for more info.
+    def load_tasks(app=self)
+      require "rake"
+      run_tasks_blocks(app)
+      self
+    end
 
+    # Load rails generators and invoke the registered hooks.
+    # Check <tt>Rails::Railtie.generators</tt> for more info.
+    def load_generators(app=self)
+      require "rails/generators"
+      run_generators_blocks(app)
+      Rails::Generators.configure!(app.config.generators)
+      self
+    end
+
+    # Eager load the application by loading all ruby
+    # files inside eager_load paths.
+    def eager_load!
       config.eager_load_paths.each do |load_path|
         matcher = /\A#{Regexp.escape(load_path)}\/(.*)\.rb\Z/
         Dir.glob("#{load_path}/**/*.rb").sort.each do |file|
@@ -447,9 +467,10 @@ module Rails
     end
 
     def railties
-      @railties ||= self.class::Railties.new(config)
+      @railties ||= self.class::Railties.new
     end
 
+    # Returns a module with all the helpers defined for the engine.
     def helpers
       @helpers ||= begin
         helpers = Module.new
@@ -461,14 +482,12 @@ module Rails
       end
     end
 
+    # Returns all registered helpers paths.
     def helpers_paths
       paths["app/helpers"].existent
     end
 
-    def routes_url_helpers
-      routes.url_helpers
-    end
-
+    # Returns the underlying rack application for this engine.
     def app
       @app ||= begin
         config.middleware = config.middleware.merge_into(default_middleware_stack)
@@ -476,42 +495,37 @@ module Rails
       end
     end
 
+    # Returns the endpoint for this engine. If none is registered,
+    # defaults to an ActionDispatch::Routing::RouteSet.
     def endpoint
       self.class.endpoint || routes
     end
 
+    # Define the Rack API for this engine.
     def call(env)
-      app.call(env.merge!(env_config))
+      env.merge!(env_config)
+      if env['SCRIPT_NAME']
+        env.merge! "ROUTES_#{routes.object_id}_SCRIPT_NAME" => env['SCRIPT_NAME'].dup
+      end
+      app.call(env)
     end
 
+    # Defines additional Rack env configuration that is added on each call.
     def env_config
       @env_config ||= {
         'action_dispatch.routes' => routes
       }
     end
 
+    # Defines the routes for this engine. If a block is given to
+    # routes, it is appended to the engine.
     def routes
       @routes ||= ActionDispatch::Routing::RouteSet.new
       @routes.append(&Proc.new) if block_given?
       @routes
     end
 
-    def ordered_railties
-      railties.all + [self]
-    end
-
-    def initializers
-      initializers = []
-      ordered_railties.each do |r|
-        if r == self
-          initializers += super
-        else
-          initializers += r.initializers
-        end
-      end
-      initializers
-    end
-
+    # Define the configuration object for the engine.
     def config
       @config ||= Engine::Configuration.new(find_root_with_flag("lib"))
     end
@@ -521,12 +535,12 @@ module Rails
     #
     # Blog::Engine.load_seed
     def load_seed
-      seed_file = paths["db/seeds"].existent.first
+      seed_file = paths["db/seeds.rb"].existent.first
       load(seed_file) if seed_file
     end
 
     # Add configured load paths to ruby load paths and remove duplicates.
-    initializer :set_load_path, :before => :bootstrap_hook do
+    initializer :set_load_path, before: :bootstrap_hook do
       _all_load_paths.reverse_each do |path|
         $LOAD_PATH.unshift(path) if File.directory?(path)
       end
@@ -538,7 +552,7 @@ module Rails
     #
     # This needs to be an initializer, since it needs to run once
     # per engine and get the engine as a block parameter
-    initializer :set_autoload_paths, :before => :bootstrap_hook do |app|
+    initializer :set_autoload_paths, before: :bootstrap_hook do |app|
       ActiveSupport::Dependencies.autoload_paths.unshift(*_all_autoload_paths)
       ActiveSupport::Dependencies.autoload_once_paths.unshift(*_all_autoload_once_paths)
 
@@ -549,7 +563,7 @@ module Rails
     end
 
     initializer :add_routing_paths do |app|
-      paths = self.paths["config/routes"].existent
+      paths = self.paths["config/routes.rb"].existent
 
       if routes? || paths.any?
         app.routes_reloader.paths.unshift(*paths)
@@ -566,17 +580,18 @@ module Rails
     initializer :add_view_paths do
       views = paths["app/views"].existent
       unless views.empty?
-        ActiveSupport.on_load(:action_controller){ prepend_view_path(views) }
+        ActiveSupport.on_load(:action_controller){ prepend_view_path(views) if respond_to?(:prepend_view_path) }
         ActiveSupport.on_load(:action_mailer){ prepend_view_path(views) }
       end
     end
 
-    initializer :load_environment_config, :before => :load_environment_hook, :group => :all do
-      environment = paths["config/environments"].existent.first
-      require environment if environment
+    initializer :load_environment_config, before: :load_environment_hook, group: :all do
+      paths["config/environments"].existent.each do |environment|
+        require environment
+      end
     end
 
-    initializer :append_assets_path, :group => :all do |app|
+    initializer :append_assets_path, group: :all do |app|
       app.config.assets.paths.unshift(*paths["vendor/assets"].existent_directories)
       app.config.assets.paths.unshift(*paths["lib/assets"].existent_directories)
       app.config.assets.paths.unshift(*paths["app/assets"].existent_directories)
@@ -608,27 +623,32 @@ module Rails
           desc "Copy migrations from #{railtie_name} to application"
           task :migrations do
             ENV["FROM"] = railtie_name
-            Rake::Task["railties:install:migrations"].invoke
+            if Rake::Task.task_defined?("railties:install:migrations")
+              Rake::Task["railties:install:migrations"].invoke
+            else
+              Rake::Task["app:railties:install:migrations"].invoke
+            end
           end
         end
       end
     end
 
-  protected
+    protected
 
-    def initialize_generators
-      require "rails/generators"
+    def run_tasks_blocks(*) #:nodoc:
+      super
+      paths["lib/tasks"].existent.sort.each { |ext| load(ext) }
     end
 
-    def routes?
-      defined?(@routes)
+    def routes? #:nodoc:
+      @routes
     end
 
-    def has_migrations?
+    def has_migrations? #:nodoc:
       paths["db/migrate"].existent.any?
     end
 
-    def find_root_with_flag(flag, default=nil)
+    def find_root_with_flag(flag, default=nil) #:nodoc:
       root_path = self.class.called_from
 
       while root_path && File.directory?(root_path) && !File.exist?("#{root_path}/#{flag}")
@@ -639,23 +659,22 @@ module Rails
       root = File.exist?("#{root_path}/#{flag}") ? root_path : default
       raise "Could not find root path for #{self}" unless root
 
-      RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ?
-        Pathname.new(root).expand_path : Pathname.new(root).realpath
+      Pathname.new File.realpath root
     end
 
-    def default_middleware_stack
+    def default_middleware_stack #:nodoc:
       ActionDispatch::MiddlewareStack.new
     end
 
-    def _all_autoload_once_paths
+    def _all_autoload_once_paths #:nodoc:
       config.autoload_once_paths
     end
 
-    def _all_autoload_paths
+    def _all_autoload_paths #:nodoc:
       @_all_autoload_paths ||= (config.autoload_paths + config.eager_load_paths + config.autoload_once_paths).uniq
     end
 
-    def _all_load_paths
+    def _all_load_paths #:nodoc:
       @_all_load_paths ||= (config.paths.load_paths + _all_autoload_paths).uniq
     end
   end