From 5c2b6c55a08564bd6ee36a25c8155e90f002306a Mon Sep 17 00:00:00 2001 From: Andrew White Date: Sat, 28 Aug 2010 00:28:46 +0100 Subject: Read the route name directly from the route instead of looking it up in the named routes hash Signed-off-by: Jeremy Kemper --- railties/lib/rails/tasks/routes.rake | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'railties/lib/rails') 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 -- cgit v1.2.3