Start moving the initializers into the application object

1 files changed, 31 insertions, 7 deletions

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 6139e20e95..783d45aa65 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -1,5 +1,10 @@
 module Rails
   class Application
+    extend Initializable
+
+    def self.inherited(child)
+      child.initializers = initializers.dup
+    end
 
     def self.config
       @config ||= Configuration.new
@@ -9,21 +14,40 @@ module Rails
       @config = config
     end
 
-    def config
-      self.class.config
-    end
-
-    def routes
+    def self.routes
       ActionController::Routing::Routes
     end
 
-    def middleware
+    def self.middleware
       config.middleware
     end
 
-    def call(env)
+    def self.call(env)
       @app ||= middleware.build(routes)
       @app.call(env)
     end
+
+    def self.new
+      initializers.run
+      self
+    end
+
+    initializer :initialize_rails do
+      Rails.initializers.run
+    end
+
+    # Set the <tt>$LOAD_PATH</tt> based on the value of
+    # Configuration#load_paths. Duplicates are removed.
+    initializer :set_load_path do
+      config.paths.add_to_load_path
+      $LOAD_PATH.uniq!
+    end
+
+    # Bail if boot.rb is outdated
+    initializer :freak_out_if_boot_rb_is_outdated do
+      unless defined?(Rails::BOOTSTRAP_VERSION)
+        abort %{Your config/boot.rb is outdated: Run "rake rails:update".}
+      end
+    end
   end
 end