Move Dispatcher setup to Railties and add instrumentation hook.

4 files changed, 36 insertions, 57 deletions

diff --git a/actionpack/lib/action_controller/deprecated/dispatcher.rb b/actionpack/lib/action_controller/deprecated/dispatcher.rb
new file mode 100644
index 0000000000..3da3c8ce7d
--- /dev/null
+++ b/actionpack/lib/action_controller/deprecated/dispatcher.rb
@@ -0,0 +1,31 @@
+module ActionController
+  class Dispatcher
+    cattr_accessor :prepare_each_request
+    self.prepare_each_request = false
+
+    class << self
+      def before_dispatch(*args, &block)
+        ActiveSupport::Deprecation.warn "ActionController::Dispatcher.before_dispatch is deprecated. " <<
+          "Please use ActionDispatch::Callbacks.before instead.", caller
+        ActionDispatch::Callbacks.before(*args, &block)
+      end
+
+      def after_dispatch(*args, &block)
+        ActiveSupport::Deprecation.warn "ActionController::Dispatcher.after_dispatch is deprecated. " <<
+          "Please use ActionDispatch::Callbacks.after instead.", caller
+        ActionDispatch::Callbacks.after(*args, &block)
+      end
+
+      def to_prepare(*args, &block)
+        ActiveSupport::Deprecation.warn "ActionController::Dispatcher.to_prepare is deprecated. " <<
+          "Please use ActionDispatch::Callbacks.to_prepare instead.", caller
+        ActionDispatch::Callbacks.after(*args, &block)
+      end
+
+      def new
+        ActiveSupport::Deprecation.warn "ActionController::Dispatcher.new is deprecated, use Rails.application instead."
+        Rails.application
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_controller/dispatch/dispatcher.rb b/actionpack/lib/action_controller/dispatch/dispatcher.rb
deleted file mode 100644
index cf02757cf6..0000000000
--- a/actionpack/lib/action_controller/dispatch/dispatcher.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-require 'active_support/core_ext/module/delegation'
-
-module ActionController
-  # Dispatches requests to the appropriate controller and takes care of
-  # reloading the app after each request when Dependencies.load? is true.
-  class Dispatcher
-    cattr_accessor :prepare_each_request
-    self.prepare_each_request = false
-
-    class << self
-      def define_dispatcher_callbacks(cache_classes)
-        unless cache_classes
-          # Run prepare callbacks before every request in development mode
-          self.prepare_each_request = true
-
-          ActionDispatch::Callbacks.after_dispatch do
-            # Cleanup the application before processing the current request.
-            ActiveRecord::Base.reset_subclasses if defined?(ActiveRecord)
-            ActiveSupport::Dependencies.clear
-            ActiveRecord::Base.clear_reloadable_connections! if defined?(ActiveRecord)
-          end
-
-          ActionView::Helpers::AssetTagHelper.cache_asset_timestamps = false
-        end
-
-        if defined?(ActiveRecord)
-          to_prepare(:activerecord_instantiate_observers) do
-            ActiveRecord::Base.instantiate_observers
-          end
-        end
-
-        if Base.logger && Base.logger.respond_to?(:flush)
-          after_dispatch do
-            Base.logger.flush
-          end
-        end
-
-        to_prepare do
-          I18n.reload!
-        end
-      end
-
-      delegate :to_prepare, :before_dispatch, :around_dispatch, :after_dispatch,
-        :to => ActionDispatch::Callbacks
-
-      def new
-        # DEPRECATE Rails application fallback
-        Rails.application
-      end
-    end
-  end
-end
diff --git a/actionpack/lib/action_controller/metal/instrumentation.rb b/actionpack/lib/action_controller/metal/instrumentation.rb
index e0c75c9e44..4549f6c451 100644
--- a/actionpack/lib/action_controller/metal/instrumentation.rb
+++ b/actionpack/lib/action_controller/metal/instrumentation.rb
@@ -66,7 +66,7 @@ module ActionController
 
     module ClassMethods
       # A hook which allows other frameworks to log what happened during
-      # controller process action. This method should return an awway
+      # controller process action. This method should return an array
       # with the messages to be added.
       # :api: plugin
       def log_process_action(controller) #:nodoc:
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index d4886ecefd..741101a210 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -69,12 +69,12 @@ module ActionController
       app.config.middleware.insert_before(:"ActionDispatch::ParamsParser", middleware)
     end
 
-    # # Prepare dispatcher callbacks and run 'prepare' callbacks
+    # Prepare dispatcher callbacks and run 'prepare' callbacks
     initializer "action_controller.prepare_dispatcher" do |app|
       # TODO: This used to say unless defined?(Dispatcher). Find out why and fix.
+      # Notice that at this point, ActionDispatch::Callbacks were already loaded.
       require 'rails/dispatcher'
-
-      Dispatcher.define_dispatcher_callbacks(app.config.cache_classes)
+      ActionController::Dispatcher.prepare_each_request = true unless app.config.cache_classes
 
       unless app.config.cache_classes
         # Setup dev mode route reloading
@@ -85,7 +85,7 @@ module ActionController
             app.reload_routes!
           end
         end
-        ActionDispatch::Callbacks.before_dispatch { |callbacks| reload_routes.call }
+        ActionDispatch::Callbacks.before { |callbacks| reload_routes.call }
       end
     end