kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Accept Symbol for contoller name [#2855 state:resolved]

Browse source 
Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
This commit is contained in:
Yehuda Katz + Carl Lerche 2009-07-01 11:16:18 -07:00
parent eea7b5db1d
commit 0515256fd3
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionpack/lib/action_controller/routing/route_set.rb
View file

@ -436,7 +436,7 @@ module ActionController
def recognize(request) def recognize(request)
params = recognize_path(request.path, extract_request_environment(request)) params = recognize_path(request.path, extract_request_environment(request))
request.path_parameters = params.with_indifferent_access request.path_parameters = params.with_indifferent_access
"#{params[:controller].camelize}Controller".constantize "#{params[:controller].to_s.camelize}Controller".constantize
end end
def recognize_path(path, environment={}) def recognize_path(path, environment={})

11
actionpack/test/controller/routing_test.rb
View file

@ -1667,6 +1667,17 @@ class RouteSetTest < Test::Unit::TestCase
assert_equal 1, set.routes.size assert_equal 1, set.routes.size
end end
def test_draw_symbol_controller_name
assert_equal 0, set.routes.size
set.draw do |map|
map.connect '/users/index', :controller => :users, :action => :index
end
@request = ActionController::TestRequest.new
@request.request_uri = '/users/index'
assert_nothing_raised { set.recognize(@request) }
assert_equal 1, set.routes.size
end
def test_named_draw def test_named_draw
assert_equal 0, set.routes.size assert_equal 0, set.routes.size
set.draw do |map| set.draw do |map|