diff options
author | Piotr Sarnacki <drogus@gmail.com> | 2010-09-28 23:42:29 +0200 |
---|---|---|
committer | Piotr Sarnacki <drogus@gmail.com> | 2010-09-30 09:47:06 +0200 |
commit | 57aa79e6bedeffcff899688546ef0a508948b4a5 (patch) | |
tree | 165273db58a501e846f3b241d00cad72bde49127 /railties/lib/rails/application.rb | |
parent | ec5d846ac6137e60d81257041e4fde82c0480b32 (diff) | |
download | rails-57aa79e6bedeffcff899688546ef0a508948b4a5.tar.gz rails-57aa79e6bedeffcff899688546ef0a508948b4a5.tar.bz2 rails-57aa79e6bedeffcff899688546ef0a508948b4a5.zip |
Move routes_reloader to a class: RoutesReloader
Diffstat (limited to 'railties/lib/rails/application.rb')
-rw-r--r-- | railties/lib/rails/application.rb | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 2db131261c..8170be2f65 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -1,6 +1,7 @@ require 'active_support/core_ext/hash/reverse_merge' require 'active_support/file_update_checker' require 'fileutils' +require 'rails/routes_reloader' require 'rails/plugin' require 'rails/engine' @@ -81,28 +82,7 @@ module Rails end def routes_reloader - @routes_reloader ||= ActiveSupport::FileUpdateChecker.new([]){ reload_routes! } - end - - def reload_routes! - routes_to_reload.each do |_routes, draw_block| - _routes = self.routes - _routes.disable_clear_and_finalize = true - _routes.clear! - _routes.draw(&draw_block) if draw_block - end - routes_reloader.paths.each { |path| load(path) } - routes_to_reload.each do |_routes, draw_block| - ActiveSupport.on_load(:action_controller) { _routes.finalize! } - end - ensure - routes_to_reload.each do |_routes, draw_block| - _routes.disable_clear_and_finalize = false - end - end - - def routes_to_reload - @routes_to_reload ||= {} + @routes_reloader ||= Rails::RoutesReloader.new end def initialize! |