1 files changed, 18 insertions, 11 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 9bf9cbe022..e0950c6929 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -39,8 +39,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__)
@@ -336,15 +334,24 @@ module Rails
   # 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 initialize
+      @_all_autoload_paths = nil
+      @_all_load_paths     = nil
+      @app                 = nil
+      @config              = nil
+      @env_config          = nil
+      @helpers             = nil
+      @railties            = nil
+      @routes              = nil
+      super
+    end
+
     def load_generators(app=self)
       initialize_generators
       railties.all { |r| r.load_generators(app) }
@@ -572,8 +579,9 @@ module Rails
     end
 
     initializer :load_environment_config, :before => :load_environment_hook, :group => :all do
-      environment = paths["config/environments"].existent.first
-      require environment if environment
+      paths["config/environments"].existent.each do |environment|
+        require environment
+      end
     end
 
     initializer :append_assets_path, :group => :all do |app|
@@ -619,14 +627,14 @@ module Rails
       end
     end
 
-  protected
+    protected
 
     def initialize_generators
       require "rails/generators"
     end
 
     def routes?
-      defined?(@routes) && @routes
+      @routes
     end
 
     def has_migrations?
@@ -644,8 +652,7 @@ 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