diff options
author | José Valim <jose.valim@gmail.com> | 2011-10-29 09:03:45 -0700 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-10-29 09:03:45 -0700 |
commit | e886f97669d5aa072af7bb625f5e16635e187124 (patch) | |
tree | 8f74f7e745ca159c0689832dd01386416b8cb2ba /railties/lib/rails | |
parent | e22a4c6f28296684171d8b033aab57d8380a2c74 (diff) | |
parent | 010622bb989cb9fa3aac600a7fa7bcb894bb081a (diff) | |
download | rails-e886f97669d5aa072af7bb625f5e16635e187124.tar.gz rails-e886f97669d5aa072af7bb625f5e16635e187124.tar.bz2 rails-e886f97669d5aa072af7bb625f5e16635e187124.zip |
Merge pull request #3337 from htanata/fix_rake_routes_for_controller_only_route
Remove trailing "#" on rake routes for controller only routes
Diffstat (limited to 'railties/lib/rails')
-rw-r--r-- | railties/lib/rails/application/route_inspector.rb | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/railties/lib/rails/application/route_inspector.rb b/railties/lib/rails/application/route_inspector.rb index 8c6911e6bb..8252f21aa7 100644 --- a/railties/lib/rails/application/route_inspector.rb +++ b/railties/lib/rails/application/route_inspector.rb @@ -10,20 +10,21 @@ module Rails 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 |