aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-06-29 17:39:50 +0200
committerJosé Valim <jose.valim@gmail.com>2012-06-29 17:44:10 +0200
commit5e7d6bba79393de0279917f93b82f3b7b176f4b5 (patch)
tree1e9c6c8c183ba326efa33087d9b590c9196acec3 /railties/lib/rails/application
parent50b6110106a6e467f5e5f6303700522cebc60a9c (diff)
downloadrails-5e7d6bba79393de0279917f93b82f3b7b176f4b5.tar.gz
rails-5e7d6bba79393de0279917f93b82f3b7b176f4b5.tar.bz2
rails-5e7d6bba79393de0279917f93b82f3b7b176f4b5.zip
Revert "Allow loading external route files from the router"
This reverts commit 6acebb38bc0637bc05c19d87f8767f16ce79189b. Usage of this feature did not reveal any improvement in existing apps. Conflicts: actionpack/lib/action_dispatch/routing/mapper.rb guides/source/routing.textile railties/lib/rails/engine.rb railties/lib/rails/paths.rb railties/test/paths_test.rb
Diffstat (limited to 'railties/lib/rails/application')
-rw-r--r--railties/lib/rails/application/routes_reloader.rb13
1 files changed, 4 insertions, 9 deletions
diff --git a/railties/lib/rails/application/routes_reloader.rb b/railties/lib/rails/application/routes_reloader.rb
index 19f616ec50..6f9a200aa9 100644
--- a/railties/lib/rails/application/routes_reloader.rb
+++ b/railties/lib/rails/application/routes_reloader.rb
@@ -3,13 +3,12 @@ require "active_support/core_ext/module/delegation"
module Rails
class Application
class RoutesReloader
- attr_reader :route_sets, :paths, :external_routes
+ attr_reader :route_sets, :paths
delegate :execute_if_updated, :execute, :updated?, :to => :updater
def initialize
- @paths = []
- @route_sets = []
- @external_routes = []
+ @paths = []
+ @route_sets = []
end
def reload!
@@ -24,11 +23,7 @@ module Rails
def updater
@updater ||= begin
- dirs = @external_routes.each_with_object({}) do |dir, hash|
- hash[dir.to_s] = %w(rb)
- end
-
- updater = ActiveSupport::FileUpdateChecker.new(paths, dirs) { reload! }
+ updater = ActiveSupport::FileUpdateChecker.new(paths) { reload! }
updater.execute
updater
end