diff options
author | José Valim <jose.valim@gmail.com> | 2010-10-02 17:45:26 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-10-02 17:45:26 +0200 |
commit | 7b0c592e38e4b1d370e04d856d245f825dfa9cfe (patch) | |
tree | 0b17024cdbf02adc55bb053254a36a9b6cf2a40c /railties | |
parent | 609849a0f10ce37d96444f0359ce325b01d916ca (diff) | |
download | rails-7b0c592e38e4b1d370e04d856d245f825dfa9cfe.tar.gz rails-7b0c592e38e4b1d370e04d856d245f825dfa9cfe.tar.bz2 rails-7b0c592e38e4b1d370e04d856d245f825dfa9cfe.zip |
reload_routes! is part of the public API and should not be removed.
Diffstat (limited to 'railties')
-rw-r--r-- | railties/lib/rails/application.rb | 4 | ||||
-rw-r--r-- | railties/lib/rails/application/routes_reloader.rb | 6 | ||||
-rw-r--r-- | railties/test/application/routing_test.rb | 9 |
3 files changed, 16 insertions, 3 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index aafbbc29ee..4d04184b20 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -81,6 +81,10 @@ module Rails super end + def reload_routes! + routes_reloader.reload! + end + def routes_reloader @routes_reloader ||= RoutesReloader.new end diff --git a/railties/lib/rails/application/routes_reloader.rb b/railties/lib/rails/application/routes_reloader.rb index 23b72a0ec6..6da903c1ac 100644 --- a/railties/lib/rails/application/routes_reloader.rb +++ b/railties/lib/rails/application/routes_reloader.rb @@ -8,7 +8,7 @@ module Rails def blocks @blocks ||= {} end - private + def reload! clear! load_blocks @@ -18,6 +18,8 @@ module Rails revert end + protected + def clear! routers.each do |routes| routes.disable_clear_and_finalize = true @@ -32,7 +34,7 @@ module Rails end def load_paths - paths.each { |path| load(path) } + paths.each { |path| load(path) } end def finalize! diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb index e42f5720a9..62589c998d 100644 --- a/railties/test/application/routing_test.rb +++ b/railties/test/application/routing_test.rb @@ -209,7 +209,7 @@ module ApplicationTests end app_file 'config/routes.rb', <<-RUBY - AppTemplate::Application.routes.draw do |map| + AppTemplate::Application.routes.draw do match 'foo', :to => ::InitializeRackApp end RUBY @@ -218,6 +218,13 @@ module ApplicationTests assert_equal "InitializeRackApp", last_response.body end + test 'reload_routes! is part of Rails.application API' do + app("development") + assert_nothing_raised do + Rails.application.reload_routes! + end + end + test 'resource routing with irregular inflection' do app_file 'config/initializers/inflection.rb', <<-RUBY ActiveSupport::Inflector.inflections do |inflect| |