diff options
| -rw-r--r-- | actionpack/lib/action_controller/routing.rb | 7 | ||||
| -rw-r--r-- | actionpack/test/controller/routing_test.rb | 9 |
2 files changed, 14 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index 7b9bbc3b5a..ab15e66e5c 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -556,8 +556,11 @@ module ActionController end def match_extraction(next_capture) - hangon = (default ? "|| #{default.inspect}" : "if match[#{next_capture}]") - "params[:#{key}] = match[#{next_capture}].downcase #{hangon}" + if default + "params[:#{key}] = match[#{next_capture}] ? match[#{next_capture}].downcase : '#{default}'" + else + "params[:#{key}] = match[#{next_capture}].downcase if match[#{next_capture}]" + end end end diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb index 05d2a70f1c..3ce011c178 100644 --- a/actionpack/test/controller/routing_test.rb +++ b/actionpack/test/controller/routing_test.rb @@ -1286,6 +1286,15 @@ class RouteSetTest < Test::Unit::TestCase end end + def test_draw_default_route_with_default_controller + ActionController::Routing.with_controllers(['users']) do + set.draw do |map| + map.connect '/:controller/:action/:id', :controller => 'users' + end + assert_equal({:controller => 'users', :action => 'index'}, set.recognize_path('/')) + end + end + def test_route_with_parameter_shell ActionController::Routing.with_controllers(['users', 'pages']) do set.draw do |map| |