Refactor Dispatcher callbacks to remove unnecessary Dependencies checks in production environment.

3 files changed, 23 insertions, 11 deletions

diff --git a/railties/lib/console_app.rb b/railties/lib/console_app.rb
index c7673642ec..88e7962b43 100644
--- a/railties/lib/console_app.rb
+++ b/railties/lib/console_app.rb
@@ -24,7 +24,7 @@ end
 def reload!
   puts "Reloading..."
   dispatcher = ActionController::Dispatcher.new($stdout)
-  dispatcher.cleanup_application(true)
-  dispatcher.prepare_application(true)
+  dispatcher.cleanup_application
+  dispatcher.reload_application
   true
 end
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 18af73fc89..b5bf9266f5 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -135,6 +135,9 @@ module Rails
 
       load_application_initializers
 
+      # Prepare dispatcher callbacks and run 'prepare' callbacks
+      prepare_dispatcher
+
       # the framework is now fully initialized
       after_initialize
 
@@ -442,6 +445,12 @@ module Rails
       end
     end
 
+    def prepare_dispatcher
+      require 'dispatcher' unless defined?(::Dispatcher)
+      Dispatcher.define_dispatcher_callbacks(configuration.cache_classes)
+      Dispatcher.new(RAILS_DEFAULT_LOGGER).send :run_callbacks, :prepare_dispatch
+    end
+
   end
 
   # The Configuration class holds all the parameters for the Initializer and
diff --git a/railties/test/console_app_test.rb b/railties/test/console_app_test.rb
index 7615d95498..6cfc907b80 100644
--- a/railties/test/console_app_test.rb
+++ b/railties/test/console_app_test.rb
@@ -13,17 +13,20 @@ require 'console_app'
 Test::Unit.run = false
 
 class ConsoleAppTest < Test::Unit::TestCase
-  def test_reload_should_fire_preparation_callbacks    
-    a = b = c = nil
+  uses_mocha 'console reload test' do
+    def test_reload_should_fire_preparation_callbacks
+      a = b = c = nil
 
-    Dispatcher.to_prepare { a = b = c = 1 }
-    Dispatcher.to_prepare { b = c = 2 }
-    Dispatcher.to_prepare { c = 3 } 
+      Dispatcher.to_prepare { a = b = c = 1 }
+      Dispatcher.to_prepare { b = c = 2 }
+      Dispatcher.to_prepare { c = 3 }
+      ActionController::Routing::Routes.expects(:reload)
 
-    reload!
+      reload!
 
-    assert_equal 1, a
-    assert_equal 2, b
-    assert_equal 3, c
+      assert_equal 1, a
+      assert_equal 2, b
+      assert_equal 3, c
+    end
   end
 end