Skip to content

Commit

Permalink
Ensure we are not calling length on nil.
Browse files Browse the repository at this point in the history
  • Loading branch information
josevalim committed Aug 29, 2010
1 parent 68a949b commit 82b700a
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions railties/lib/rails/tasks/routes.rake
@@ -1,8 +1,7 @@
desc 'Print out all defined routes in match order, with names. Target specific controller with CONTROLLER=x.' desc 'Print out all defined routes in match order, with names. Target specific controller with CONTROLLER=x.'
task :routes => :environment do task :routes => :environment do
Rails.application.reload_routes! Rails.application.reload_routes!

all_routes = Rails.application.routes.routes
all_routes = Rails.application.routes.routes


if ENV['CONTROLLER'] if ENV['CONTROLLER']
all_routes = all_routes.select{ |route| route.defaults[:controller] == ENV['CONTROLLER'] } all_routes = all_routes.select{ |route| route.defaults[:controller] == ENV['CONTROLLER'] }
Expand All @@ -19,9 +18,9 @@ task :routes => :environment do


routes.reject! { |r| r[:path] =~ %r{/rails/info/properties} } # Skip the route if it's internal info route routes.reject! { |r| r[:path] =~ %r{/rails/info/properties} } # Skip the route if it's internal info route


name_width = routes.map{ |r| r[:name] }.map(&:length).max name_width = routes.map{ |r| r[:name].length if r[:name] }.max
verb_width = routes.map{ |r| r[:verb] }.map(&:length).max verb_width = routes.map{ |r| r[:verb].length if r[:verb] }.max
path_width = routes.map{ |r| r[:path] }.map(&:length).max path_width = routes.map{ |r| r[:path].length if r[:path] }.max


routes.each do |r| routes.each do |r|
puts "#{r[:name].rjust(name_width)} #{r[:verb].ljust(verb_width)} #{r[:path].ljust(path_width)} #{r[:reqs]}" puts "#{r[:name].rjust(name_width)} #{r[:verb].ljust(verb_width)} #{r[:path].ljust(path_width)} #{r[:reqs]}"

This comment has been minimized.

Copy link
@ncook

ncook Aug 30, 2010

Surely the references to r[:name], r[:verb] and r[;path] need to be protected here too. rjust is not a method on nil.

This comment has been minimized.

Copy link
@spastorino

spastorino Aug 31, 2010

Contributor

ncook that was fixed by Sam Ruby in a later commit

This comment has been minimized.

Copy link
@ncook

ncook Aug 31, 2010

Sorry - I did not image it could have been fixed so quickly - I should have checked.

Expand Down

0 comments on commit 82b700a

Please sign in to comment.