aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2010-08-28 00:28:46 +0100
committerJeremy Kemper <jeremy@bitsweat.net>2010-08-27 17:05:14 -0700
commit5c2b6c55a08564bd6ee36a25c8155e90f002306a (patch)
treed29bfb723d6bc0728a7ea00d5148e93e0c9d8f91 /railties/lib/rails
parentdda515fc2654199d3aaeb960a0ba1b7a395dfa48 (diff)
downloadrails-5c2b6c55a08564bd6ee36a25c8155e90f002306a.tar.gz
rails-5c2b6c55a08564bd6ee36a25c8155e90f002306a.tar.bz2
rails-5c2b6c55a08564bd6ee36a25c8155e90f002306a.zip
Read the route name directly from the route instead of looking it up in the named routes hash
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/tasks/routes.rake8
1 files changed, 1 insertions, 7 deletions
diff --git a/railties/lib/rails/tasks/routes.rake b/railties/lib/rails/tasks/routes.rake
index 306c88c261..2cee84767d 100644
--- a/railties/lib/rails/tasks/routes.rake
+++ b/railties/lib/rails/tasks/routes.rake
@@ -3,24 +3,18 @@ task :routes => :environment do
Rails.application.reload_routes!
all_routes = Rails.application.routes.routes
- named_routes = Rails.application.routes.named_routes.routes
if ENV['CONTROLLER']
all_routes = all_routes.select{ |route| route.defaults[:controller] == ENV['CONTROLLER'] }
end
routes = all_routes.collect do |route|
- # TODO: The :index method is deprecated in 1.9 in favor of :key
- # but we don't have :key in 1.8.7. We can remove this check when
- # stop supporting 1.8.x
- key = Hash.method_defined?('key') ? 'key' : 'index'
- name = named_routes.send(key, route).to_s
reqs = route.requirements.dup
reqs[:to] = route.app unless route.app.class.name.to_s =~ /^ActionDispatch::Routing/
reqs = reqs.empty? ? "" : reqs.inspect
- {:name => name, :verb => route.verb.to_s, :path => route.path, :reqs => reqs}
+ {:name => route.name, :verb => route.verb.to_s, :path => route.path, :reqs => reqs}
end
routes.reject! { |r| r[:path] =~ %r{/rails/info/properties} } # Skip the route if it's internal info route