routes-task.diff

From ac01dfb12e217928ac5f2b53e093b202d842af4f Mon Sep 17 00:00:00 2001
From: Andrew White <[email protected]>
Date: Sat, 28 Aug 2010 00:28:46 +0100
Subject: [PATCH] Read the route name directly from the route instead of looking it up in the named routes hash

---
 railties/lib/rails/tasks/routes.rake |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/railties/lib/rails/tasks/routes.rake b/railties/lib/rails/tasks/routes.rake
index 306c88c..2cee847 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
-- 
1.7.1