Skip to content

Commit

Permalink
Give the builtin controllers their own routes.rb now that the legacy …
Browse files Browse the repository at this point in the history
…catch-all is gone
  • Loading branch information
dhh committed Dec 21, 2009
1 parent fee07b9 commit 36624b2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 0 deletions.
3 changes: 3 additions & 0 deletions railties/builtin/routes.rb
@@ -0,0 +1,3 @@
ActionController::Routing::Routes.draw do |map|
match '/rails/info/properties' => "rails::info#properties"
end
1 change: 1 addition & 0 deletions railties/lib/rails/application.rb
Expand Up @@ -418,6 +418,7 @@ def call(env)
initializer :initialize_routing do initializer :initialize_routing do
next unless configuration.frameworks.include?(:action_controller) next unless configuration.frameworks.include?(:action_controller)
route_configuration_files << configuration.routes_configuration_file route_configuration_files << configuration.routes_configuration_file
route_configuration_files << configuration.builtin_routes_configuration_file
reload_routes! reload_routes!
end end
# #
Expand Down
4 changes: 4 additions & 0 deletions railties/lib/rails/configuration.rb
Expand Up @@ -158,6 +158,10 @@ def routes_configuration_file
@routes_configuration_file ||= File.join(root, 'config', 'routes.rb') @routes_configuration_file ||= File.join(root, 'config', 'routes.rb')
end end


def builtin_routes_configuration_file
@builtin_routes_configuration_file ||= File.join(RAILTIES_PATH, 'builtin', 'routes.rb')
end

def controller_paths def controller_paths
@controller_paths ||= begin @controller_paths ||= begin
paths = [File.join(root, 'app', 'controllers')] paths = [File.join(root, 'app', 'controllers')]
Expand Down

0 comments on commit 36624b2

Please sign in to comment.