1 files changed, 23 insertions, 6 deletions
diff --git a/railties/lib/rails/application/routes_reloader.rb b/railties/lib/rails/application/routes_reloader.rb
index 1d1f5e1b06..7f9190b01a 100644
--- a/railties/lib/rails/application/routes_reloader.rb
+++ b/railties/lib/rails/application/routes_reloader.rb
@@ -1,11 +1,15 @@
+require "active_support/core_ext/module/delegation"
+
 module Rails
   class Application
-    class RoutesReloader < ::ActiveSupport::FileUpdateChecker
-      attr_reader :route_sets
+    class RoutesReloader
+      attr_reader :route_sets, :paths, :external_routes
+      delegate :execute_if_updated, :execute, :updated?, :to => :updater
 
       def initialize
-        super([]) { reload! }
-        @route_sets = []
+        @paths           = []
+        @route_sets      = []
+        @external_routes = []
       end
 
       def reload!
@@ -16,7 +20,20 @@ module Rails
         revert
       end
 
-    protected
+    private
+
+      def updater
+        @updater ||= begin
+          dirs = @external_routes.inject({}) do |hash, dir|
+            hash.merge(dir.to_s => ["rb"])
+          end
+
+          updater = ActiveSupport::FileUpdateChecker.new(paths, dirs) { reload! }
+
+          updater.execute
+          updater
+        end
+      end
 
       def clear!
         route_sets.each do |routes|
@@ -31,7 +48,7 @@ module Rails
 
       def finalize!
         route_sets.each do |routes|
-          ActiveSupport.on_load(:action_controller) { routes.finalize! }
+          routes.finalize!
         end
       end