From 7b0c592e38e4b1d370e04d856d245f825dfa9cfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 2 Oct 2010 17:45:26 +0200
Subject: reload_routes! is part of the public API and should not be removed.

---
 railties/lib/rails/application.rb                 | 4 ++++
 railties/lib/rails/application/routes_reloader.rb | 6 ++++--
 railties/test/application/routing_test.rb         | 9 ++++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'railties')

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|
-- 
cgit v1.2.3