diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/routing_optimisation.rb | 8 | ||||
| -rw-r--r-- | actionpack/test/controller/routing_test.rb | 12 |
2 files changed, 11 insertions, 9 deletions
diff --git a/actionpack/lib/action_controller/routing_optimisation.rb b/actionpack/lib/action_controller/routing_optimisation.rb index 7cf85c9b9a..fdd5a81c19 100644 --- a/actionpack/lib/action_controller/routing_optimisation.rb +++ b/actionpack/lib/action_controller/routing_optimisation.rb @@ -41,8 +41,10 @@ module ActionController end end + # Temporarily disabled :url optimisation pending proper solution to + # Issues around request.host etc. def applicable? - true + kind != :url end end @@ -76,7 +78,7 @@ module ActionController # The last entry in route.segments appears to # *always* be a # 'divider segment' for '/' but we have assertions to ensure that # we don't include the trailing slashes, so skip them. - ((route.segments.size == 1 && kind == :path) ? route.segments : route.segments[0..-2]).each do |segment| + (route.segments.size == 1 ? route.segments : route.segments[0..-2]).each do |segment| if segment.is_a?(DynamicSegment) elements << segment.interpolation_chunk("args[#{idx}].to_param") idx += 1 @@ -105,7 +107,7 @@ module ActionController # To avoid generating http://localhost/?host=foo.example.com we # can't use this optimisation on routes without any segments def applicable? - route.segment_keys.size > 0 + super && route.segment_keys.size > 0 end end diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb index c7b7f40e0d..bd66e11fd1 100644 --- a/actionpack/test/controller/routing_test.rb +++ b/actionpack/test/controller/routing_test.rb @@ -169,7 +169,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase def test_basic_named_route rs.add_named_route :home, '', :controller => 'content', :action => 'list' x = setup_for_named_route - assert_equal("http://named.route.test", + assert_equal("http://named.route.test/", x.send(:home_url)) end @@ -189,7 +189,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase end def test_named_route_with_nested_controller - rs.add_named_route :users, '/admin/user', :controller => '/admin/user', :action => 'index' + rs.add_named_route :users, 'admin/user', :controller => 'admin/user', :action => 'index' x = setup_for_named_route assert_equal("http://named.route.test/admin/user", x.send(:users_url)) @@ -201,9 +201,9 @@ class LegacyRouteSetTests < Test::Unit::TestCase rs.add_named_route :user, 'admin/user/:id', :controller=>'/admin/user', :action=>'show' x = setup_for_named_route x.expects(:url_for).never - x.send(:users_url) + # x.send(:users_url) x.send(:users_path) - x.send(:user_url, 2, :foo=>"bar") + # x.send(:user_url, 2, :foo=>"bar") x.send(:user_path, 3, :bar=>"foo") end end @@ -225,7 +225,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase map.root :controller => "hello" end x = setup_for_named_route - assert_equal("http://named.route.test", x.send(:root_url)) + assert_equal("http://named.route.test/", x.send(:root_url)) assert_equal("/", x.send(:root_path)) end @@ -485,7 +485,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase assert_equal '/', rs.generate(:controller => 'content') x = setup_for_named_route - assert_equal("http://named.route.test", + assert_equal("http://named.route.test/", x.send(:home_url)) end |