From 3afdfc35e8aec7e6379e093dd1278cb3de54f21b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 16 May 2010 00:34:54 +0200
Subject: Expose remaining hooks to minimize the need for a Railtie based on
 feedback from plugin developers.

---
 railties/lib/rails/application.rb           |  1 -
 railties/lib/rails/application/finisher.rb  |  1 +
 railties/lib/rails/railtie/configuration.rb | 12 ++++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 9e18dccf69..a3b3a56bc8 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -69,7 +69,6 @@ module Rails
         raise "You cannot have more than one Rails::Application" if Rails.application
         super
         Rails.application = base.instance
-
         ActiveSupport.run_load_hooks(:before_configuration, base.instance)
       end
 
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index 9d04f1ce38..fbab4d5515 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -37,6 +37,7 @@ module Rails
 
       initializer :eager_load! do
         if config.cache_classes && !$rails_rake_task
+          ActiveSupport.run_load_hooks(:before_eager_load, self)
           railties.all(&:eager_load!)
         end
       end
diff --git a/railties/lib/rails/railtie/configuration.rb b/railties/lib/rails/railtie/configuration.rb
index f57d82a3d8..c4a315708b 100644
--- a/railties/lib/rails/railtie/configuration.rb
+++ b/railties/lib/rails/railtie/configuration.rb
@@ -68,6 +68,18 @@ module Rails
         end
       end
 
+      def before_configuration(&block)
+        ActiveSupport.on_load(:before_configuration, :yield => true, &block)
+      end
+
+      def before_eager_load(&block)
+        ActiveSupport.on_load(:before_eager_load, :yield => true, &block)
+      end
+
+      def before_initialize(&block)
+        ActiveSupport.on_load(:before_initialize, :yield => true, &block)
+      end
+
       def after_initialize(&block)
         ActiveSupport.on_load(:after_initialize, :yield => true, &block)
       end
-- 
cgit v1.2.3