Merge pull request rails#3337 from htanata/fix_rake_routes_for_controller_only_route

Remove trailing "#" on rake routes for controller only routes

Author: josevalim

railties/lib/rails/application/route_inspector.rb

@@ -10,20 +10,21 @@ def format all_routes, filter = nil
         end
 
         routes = all_routes.collect do |route|
+          route_reqs = route.requirements
 
-          reqs = route.requirements.dup
           rack_app = route.app unless route.app.class.name.to_s =~ /^ActionDispatch::Routing/
 
-          endpoint = rack_app ? rack_app.inspect : "#{reqs[:controller]}##{reqs[:action]}"
-          constraints = reqs.except(:controller, :action)
+          controller = route_reqs[:controller] || ':controller'
+          action     = route_reqs[:action]     || ':action'
 
-          reqs = endpoint == '#' ? '' : endpoint
+          endpoint = rack_app ? rack_app.inspect : "#{controller}##{action}"
+          constraints = route_reqs.except(:controller, :action)
 
-          unless constraints.empty?
-            reqs = reqs.empty? ? constraints.inspect : "#{reqs} #{constraints.inspect}"
-          end
+          reqs = endpoint
+          reqs += " #{constraints.inspect}" unless constraints.empty?
 
           verb = route.verb.source.gsub(/[$^]/, '')
+
           {:name => route.name.to_s, :verb => verb, :path => route.path.spec.to_s, :reqs => reqs}
         end
 

railties/test/application/route_inspect_test.rb

@@ -49,20 +49,28 @@ def test_inspect_routes_shows_root_route
       assert_equal ["root  / pages#main"], output
     end
 
+    def test_inspect_routes_shows_dynamic_action_route
+      @set.draw do
+        match 'api/:action' => 'api'
+      end
+      output = @inspector.format @set.routes
+      assert_equal ["  /api/:action(.:format) api#:action"], output
+    end
+
     def test_inspect_routes_shows_controller_and_action_only_route
       @set.draw do
         match ':controller/:action'
       end
       output = @inspector.format @set.routes
-      assert_equal ["  /:controller/:action(.:format) "], output
+      assert_equal ["  /:controller/:action(.:format) :controller#:action"], output
     end
 
     def test_inspect_routes_shows_controller_and_action_route_with_constraints
       @set.draw do
         match ':controller(/:action(/:id))', :id => /\d+/
       end
       output = @inspector.format @set.routes
-      assert_equal ["  /:controller(/:action(/:id))(.:format) {:id=>/\\d+/}"], output
+      assert_equal ["  /:controller(/:action(/:id))(.:format) :controller#:action {:id=>/\\d+/}"], output
     end
 
     def test_rake_routes_shows_route_with_defaults