diff options
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/routes.rb | 8 | ||||
| -rw-r--r-- | railties/lib/rails/tasks/routes.rake | 32 |
3 files changed, 28 insertions, 14 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 465851c0e6..c3418e0d80 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -16,9 +16,9 @@ module Rails def initialize(*) super + self.encoding = "utf-8" @allow_concurrency = false @consider_all_requests_local = false - @encoding = "utf-8" @filter_parameters = [] @dependency_loading = true @serve_static_assets = true diff --git a/railties/lib/rails/generators/rails/app/templates/config/routes.rb b/railties/lib/rails/generators/rails/app/templates/config/routes.rb index d42cf3bfdf..3e35d81a69 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/routes.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/routes.rb @@ -16,12 +16,12 @@ # Sample resource route with options: # resources :products do # member do - # get :short - # post :toggle + # get 'short' + # post 'toggle' # end # # collection do - # get :sold + # get 'sold' # end # end @@ -35,7 +35,7 @@ # resources :products do # resources :comments # resources :sales do - # get :recent, :on => :collection + # get 'recent', :on => :collection # end # end diff --git a/railties/lib/rails/tasks/routes.rake b/railties/lib/rails/tasks/routes.rake index a99232c4be..c0a2fe38bd 100644 --- a/railties/lib/rails/tasks/routes.rake +++ b/railties/lib/rails/tasks/routes.rake @@ -1,21 +1,35 @@ desc 'Print out all defined routes in match order, with names. Target specific controller with CONTROLLER=x.' task :routes => :environment do Rails.application.reload_routes! - all_routes = ENV['CONTROLLER'] ? Rails.application.routes.routes.select { |route| route.defaults[:controller] == ENV['CONTROLLER'] } : Rails.application.routes.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_method = Hash.method_defined?('key') ? 'key' : 'index' - name = Rails.application.routes.named_routes.routes.send(key_method, route).to_s - reqs = route.requirements.empty? ? "" : route.requirements.inspect + 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.is_a?(ActionDispatch::Routing::RouteSet::Dispatcher) + reqs = reqs.empty? ? "" : reqs.inspect + {:name => name, :verb => route.verb.to_s, :path => route.path, :reqs => reqs} end - routes.reject!{ |r| r[:path] == "/rails/info/properties" } # skip the route if it's internal info route - name_width = routes.collect {|r| r[:name]}.collect {|n| n.length}.max - verb_width = routes.collect {|r| r[:verb]}.collect {|v| v.length}.max - path_width = routes.collect {|r| r[:path]}.collect {|s| s.length}.max + + routes.reject! { |r| r[:path] == "/rails/info/properties" } # Skip the route if it's internal info route + + name_width = routes.map{ |r| r[:name] }.map(&:length).max + verb_width = routes.map{ |r| r[:verb] }.map(&:length).max + path_width = routes.map{ |r| r[:path] }.map(&:length).max + routes.each do |r| puts "#{r[:name].rjust(name_width)} #{r[:verb].ljust(verb_width)} #{r[:path].ljust(path_width)} #{r[:reqs]}" end -end +end
\ No newline at end of file |