From d7396b5ca9c066cb16158c02b976dab01f522344 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 14 Apr 2009 17:06:32 -0500
Subject: Move reloader middleware in ActionDispatch

---
 actionpack/lib/action_controller/dispatch/dispatcher.rb |  4 ++--
 actionpack/lib/action_controller/reloader.rb            | 14 --------------
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 actionpack/lib/action_controller/reloader.rb

(limited to 'actionpack/lib/action_controller')

diff --git a/actionpack/lib/action_controller/dispatch/dispatcher.rb b/actionpack/lib/action_controller/dispatch/dispatcher.rb
index 8ed7de4788..bb9d8bd063 100644
--- a/actionpack/lib/action_controller/dispatch/dispatcher.rb
+++ b/actionpack/lib/action_controller/dispatch/dispatcher.rb
@@ -5,8 +5,8 @@ module ActionController
     class << self
       def define_dispatcher_callbacks(cache_classes)
         unless cache_classes
-          unless self.middleware.include?(Reloader)
-            self.middleware.insert_after(ActionDispatch::Failsafe, Reloader)
+          unless self.middleware.include?(ActionDispatch::Reloader)
+            self.middleware.insert_after(ActionDispatch::Failsafe, ActionDispatch::Reloader)
           end
 
           ActionView::Helpers::AssetTagHelper.cache_asset_timestamps = false
diff --git a/actionpack/lib/action_controller/reloader.rb b/actionpack/lib/action_controller/reloader.rb
deleted file mode 100644
index 46789309cd..0000000000
--- a/actionpack/lib/action_controller/reloader.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-module ActionController
-  class Reloader
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      Dispatcher.reload_application
-      @app.call(env)
-    ensure
-      Dispatcher.cleanup_application
-    end
-  end
-end
-- 
cgit v1.2.3