Ensure namespaced controllers in engines work.

2 files changed, 11 insertions, 0 deletions

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index cc878ac8f2..6f724963b2 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -73,6 +73,16 @@ module Rails
       end
     end
 
+    initializer :add_routing_namespaces do |app|
+      config.paths.app.controllers.to_a.each do |load_path|
+        load_path = File.expand_path(load_path)
+        Dir["#{load_path}/*/*_controller.rb"].collect do |path|
+          namespace = File.dirname(path).sub(/#{load_path}\/?/, '')
+          app.routes.controller_namespaces << namespace unless namespace.empty?
+        end
+      end
+    end
+
     initializer :add_locales do
       config.i18n.load_path.unshift(*config.paths.config.locales.to_a)
     end
diff --git a/railties/lib/rails/tasks/routes.rake b/railties/lib/rails/tasks/routes.rake
index 2395d73b2f..e8da72db4d 100644
--- a/railties/lib/rails/tasks/routes.rake
+++ b/railties/lib/rails/tasks/routes.rake
@@ -1,5 +1,6 @@
 desc 'Print out all defined routes in match order, with names. Target specific controller with CONTROLLER=x.'
 task :routes => :environment do
+  Rails::Application.reload_routes!
   all_routes = ENV['CONTROLLER'] ? ActionController::Routing::Routes.routes.select { |route| route.defaults[:controller] == ENV['CONTROLLER'] } : ActionController::Routing::Routes.routes
   routes = all_routes.collect do |route|
     name = ActionController::Routing::Routes.named_routes.routes.index(route).to_s