actionpack 2.2.3 → 2.3.2

data/test/controller/rescue_test.rb

@@ -1,7 +1,5 @@
 require 'abstract_unit'
 
-uses_mocha 'rescue' do
-
 class RescueController < ActionController::Base
   class NotAuthorized < StandardError
   end
@@ -67,6 +65,11 @@ class RescueController < ActionController::Base
     render :text => 'no way'
   end
 
+  before_filter(:only => :before_filter_raises) { raise 'umm nice' }
+
+  def before_filter_raises
+  end
+
   def raises
     render :text => 'already rendered'
     raise "don't panic!"
@@ -154,6 +157,16 @@ class RescueControllerTest < ActionController::TestCase
     end
   end
 
+  def test_rescue_exceptions_raised_by_filters
+    with_rails_root FIXTURE_PUBLIC do
+      with_all_requests_local false do
+        get :before_filter_raises
+      end
+    end
+
+    assert_response :internal_server_error
+  end
+
   def test_rescue_action_locally_if_all_requests_local
     @controller.expects(:local_request?).never
     @controller.expects(:rescue_action_locally).with(@exception)
@@ -184,6 +197,24 @@ class RescueControllerTest < ActionController::TestCase
     end
   end
 
+  def test_rescue_action_in_public_with_localized_error_file
+    # Change locale
+    old_locale = I18n.locale
+    I18n.locale = :da
+
+    with_rails_root FIXTURE_PUBLIC do
+      with_all_requests_local false do
+        get :raises
+      end
+    end
+
+    assert_response :internal_server_error
+    body = File.read("#{FIXTURE_PUBLIC}/public/500.da.html")
+    assert_equal body, @response.body
+  ensure
+    I18n.locale = old_locale
+  end
+
   def test_rescue_action_in_public_with_error_file
     with_rails_root FIXTURE_PUBLIC do
       with_all_requests_local false do
@@ -291,24 +322,6 @@ class RescueControllerTest < ActionController::TestCase
     assert_equal 'template_error',    templates[ActionView::TemplateError.name]
   end
 
-  def test_clean_backtrace
-    with_rails_root nil do
-      # No action if RAILS_ROOT isn't set.
-      cleaned = @controller.send(:clean_backtrace, @exception)
-      assert_equal @exception.backtrace, cleaned
-    end
-
-    with_rails_root Dir.pwd do
-      # RAILS_ROOT is removed from backtrace.
-      cleaned = @controller.send(:clean_backtrace, @exception)
-      expected = @exception.backtrace.map { |line| line.sub(RAILS_ROOT, '') }
-      assert_equal expected, cleaned
-
-      # No action if backtrace is nil.
-      assert_nil @controller.send(:clean_backtrace, Exception.new)
-    end
-  end
-
   def test_not_implemented
     with_all_requests_local false do
       with_rails_public_path(".") do
@@ -385,10 +398,21 @@ class RescueControllerTest < ActionController::TestCase
   end
 
   def test_rescue_dispatcher_exceptions
-    RescueController.process_with_exception(@request, @response, ActionController::RoutingError.new("Route not found"))
+    env = @request.env
+    env["action_controller.rescue.request"] = @request
+    env["action_controller.rescue.response"] = @response
+
+    RescueController.call_with_exception(env, ActionController::RoutingError.new("Route not found"))
     assert_equal "no way", @response.body
   end
 
+  def test_rescue_dispatcher_exceptions_without_request_set
+    @request.env['REQUEST_URI'] = '/no_way'
+    response = RescueController.call_with_exception(@request.env, ActionController::RoutingError.new("Route not found"))
+    assert_kind_of ActionController::Response, response
+    assert_equal "no way", response.body
+  end
+
   protected
     def with_all_requests_local(local = true)
       old_local, ActionController::Base.consider_all_requests_local =
@@ -510,4 +534,3 @@ class ControllerInheritanceRescueControllerTest < ActionController::TestCase
     assert_response :created
   end
 end
-end # uses_mocha

data/test/controller/resources_test.rb

@@ -29,7 +29,7 @@ module Backoffice
   end
 end
 
-class ResourcesTest < Test::Unit::TestCase
+class ResourcesTest < ActionController::TestCase
   # The assertions in these tests are incompatible with the hash method
   # optimisation.  This could indicate user level problems
   def setup
@@ -99,7 +99,7 @@ class ResourcesTest < Test::Unit::TestCase
     expected_options = {:controller => 'messages', :action => 'show', :id => '1.1.1'}
 
     with_restful_routing :messages do
-      assert_raises(ActionController::RoutingError) do
+      assert_raise(ActionController::RoutingError) do
         assert_recognizes(expected_options, :path => 'messages/1.1.1', :method => :get)
       end
     end
@@ -175,6 +175,24 @@ class ResourcesTest < Test::Unit::TestCase
     end
   end
 
+  def test_with_collection_actions_and_name_prefix_and_member_action_with_same_name
+    actions = { 'a' => :get }
+
+    with_restful_routing :messages, :path_prefix => '/threads/:thread_id', :name_prefix => "thread_", :collection => actions, :member => actions do
+      assert_restful_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
+        actions.each do |action, method|
+          assert_recognizes(options.merge(:action => action), :path => "/threads/1/messages/#{action}", :method => method)
+        end
+      end
+
+      assert_restful_named_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
+        actions.keys.each do |action|
+          assert_named_route "/threads/1/messages/#{action}", "#{action}_thread_messages_path", :action => action
+        end
+      end
+    end
+  end
+
   def test_with_collection_action_and_name_prefix_and_formatted
     actions = { 'a' => :get, 'b' => :put, 'c' => :post, 'd' => :delete }
 
@@ -187,7 +205,7 @@ class ResourcesTest < Test::Unit::TestCase
 
       assert_restful_named_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
         actions.keys.each do |action|
-          assert_named_route "/threads/1/messages/#{action}.xml", "formatted_#{action}_thread_messages_path", :action => action, :format => 'xml'
+          assert_named_route "/threads/1/messages/#{action}.xml", "#{action}_thread_messages_path", :action => action, :format => 'xml'
         end
       end
     end
@@ -209,6 +227,14 @@ class ResourcesTest < Test::Unit::TestCase
     end
   end
 
+  def test_with_member_action_and_requirement
+    expected_options = {:controller => 'messages', :action => 'mark', :id => '1.1.1'}
+  
+    with_restful_routing(:messages, :requirements => {:id => /[0-9]\.[0-9]\.[0-9]/}, :member => { :mark => :get }) do
+      assert_recognizes(expected_options, :path => 'messages/1.1.1/mark', :method => :get)
+    end
+  end
+
   def test_member_when_override_paths_for_default_restful_actions_with
     [:put, :post].each do |method|
       with_restful_routing :messages, :member => { :mark => method }, :path_names => {:new => 'nuevo'} do
@@ -316,7 +342,7 @@ class ResourcesTest < Test::Unit::TestCase
       end
 
       assert_restful_named_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
-        assert_named_route preview_path, :formatted_preview_new_thread_message_path, preview_options
+        assert_named_route preview_path, :preview_new_thread_message_path, preview_options
       end
     end
   end
@@ -325,7 +351,7 @@ class ResourcesTest < Test::Unit::TestCase
     with_restful_routing :messages do
       assert_restful_routes_for :messages do |options|
         assert_recognizes(options.merge(:action => "new"), :path => "/messages/new", :method => :get)
-        assert_raises(ActionController::MethodNotAllowed) do
+        assert_raise(ActionController::MethodNotAllowed) do
           ActionController::Routing::Routes.recognize_path("/messages/new", :method => :post)
         end
       end
@@ -406,6 +432,34 @@ class ResourcesTest < Test::Unit::TestCase
     end
   end
 
+  def test_shallow_nested_restful_routes_with_namespaces
+    with_routing do |set|
+      set.draw do |map|
+        map.namespace :backoffice do |map|
+          map.namespace :admin do |map|
+            map.resources :products, :shallow => true do |map|
+              map.resources :images
+            end
+          end
+        end
+      end
+
+      assert_simply_restful_for :products,
+        :controller => 'backoffice/admin/products',
+        :namespace => 'backoffice/admin/',
+        :name_prefix => 'backoffice_admin_',
+        :path_prefix => 'backoffice/admin/',
+        :shallow => true
+      assert_simply_restful_for :images,
+        :controller => 'backoffice/admin/images',
+        :namespace => 'backoffice/admin/',
+        :name_prefix => 'backoffice_admin_product_',
+        :path_prefix => 'backoffice/admin/products/1/',
+        :shallow => true,
+        :options => { :product_id => '1' }
+    end
+  end
+
   def test_restful_routes_dont_generate_duplicates
     with_restful_routing :messages do
       routes = ActionController::Routing::Routes.routes
@@ -583,11 +637,11 @@ class ResourcesTest < Test::Unit::TestCase
       options = { :controller => controller_name.to_s }
       collection_path = "/#{controller_name}"
 
-      assert_raises(ActionController::MethodNotAllowed) do
+      assert_raise(ActionController::MethodNotAllowed) do
         assert_recognizes(options.merge(:action => 'update'), :path => collection_path, :method => :put)
       end
 
-      assert_raises(ActionController::MethodNotAllowed) do
+      assert_raise(ActionController::MethodNotAllowed) do
         assert_recognizes(options.merge(:action => 'destroy'), :path => collection_path, :method => :delete)
       end
     end
@@ -596,7 +650,7 @@ class ResourcesTest < Test::Unit::TestCase
   def test_should_not_allow_invalid_head_method_for_member_routes
     with_routing do |set|
       set.draw do |map|
-        assert_raises(ArgumentError) do
+        assert_raise(ArgumentError) do
           map.resources :messages, :member => {:something => :head}
         end
       end
@@ -606,7 +660,7 @@ class ResourcesTest < Test::Unit::TestCase
   def test_should_not_allow_invalid_http_methods_for_member_routes
     with_routing do |set|
       set.draw do |map|
-        assert_raises(ArgumentError) do
+        assert_raise(ArgumentError) do
           map.resources :messages, :member => {:something => :invalid}
         end
       end
@@ -750,9 +804,17 @@ class ResourcesTest < Test::Unit::TestCase
   end
 
   def test_with_path_segment
-    with_restful_routing :messages, :as => 'reviews' do
-      assert_simply_restful_for :messages, :as => 'reviews'
+    with_restful_routing :messages do
+      assert_simply_restful_for :messages
+      assert_recognizes({:controller => "messages", :action => "index"}, "/messages")
+      assert_recognizes({:controller => "messages", :action => "index"}, "/messages/")
     end
+
+     with_restful_routing :messages, :as => 'reviews' do
+       assert_simply_restful_for :messages, :as => 'reviews'
+      assert_recognizes({:controller => "messages", :action => "index"}, "/reviews")
+      assert_recognizes({:controller => "messages", :action => "index"}, "/reviews/")
+     end
   end
 
   def test_multiple_with_path_segment_and_controller
@@ -942,19 +1004,6 @@ class ResourcesTest < Test::Unit::TestCase
     end
   end
 
-  def test_nested_resource_inherits_only_show_action
-    with_routing do |set|
-      set.draw do |map|
-        map.resources :products, :only => :show do |product|
-          product.resources :images
-        end
-      end
-
-      assert_resource_allowed_routes('images', { :product_id => '1' },                    { :id => '2' }, :show, [:index, :new, :create, :edit, :update, :destroy], 'products/1/images')
-      assert_resource_allowed_routes('images', { :product_id => '1', :format => 'xml' },  { :id => '2' }, :show, [:index, :new, :create, :edit, :update, :destroy], 'products/1/images')
-    end
-  end
-
   def test_nested_resource_has_only_show_and_member_action
     with_routing do |set|
       set.draw do |map|
@@ -971,7 +1020,7 @@ class ResourcesTest < Test::Unit::TestCase
     end
   end
 
-  def test_nested_resource_ignores_only_option
+  def test_nested_resource_does_not_inherit_only_option
     with_routing do |set|
       set.draw do |map|
         map.resources :products, :only => :show do |product|
@@ -984,7 +1033,20 @@ class ResourcesTest < Test::Unit::TestCase
     end
   end
 
-  def test_nested_resource_ignores_except_option
+  def test_nested_resource_does_not_inherit_only_option_by_default
+    with_routing do |set|
+      set.draw do |map|
+        map.resources :products, :only => :show do |product|
+          product.resources :images
+        end
+      end
+
+      assert_resource_allowed_routes('images', { :product_id => '1' },                    { :id => '2' }, [:index, :new, :create, :show, :edit, :update, :destory], [], 'products/1/images')
+      assert_resource_allowed_routes('images', { :product_id => '1', :format => 'xml' },  { :id => '2' }, [:index, :new, :create, :show, :edit, :update, :destroy], [], 'products/1/images')
+    end
+  end
+
+  def test_nested_resource_does_not_inherit_except_option
     with_routing do |set|
       set.draw do |map|
         map.resources :products, :except => :show do |product|
@@ -997,6 +1059,19 @@ class ResourcesTest < Test::Unit::TestCase
     end
   end
 
+  def test_nested_resource_does_not_inherit_except_option_by_default
+    with_routing do |set|
+      set.draw do |map|
+        map.resources :products, :except => :show do |product|
+          product.resources :images
+        end
+      end
+
+      assert_resource_allowed_routes('images', { :product_id => '1' },                    { :id => '2' }, [:index, :new, :create, :show, :edit, :update, :destroy], [], 'products/1/images')
+      assert_resource_allowed_routes('images', { :product_id => '1', :format => 'xml' },  { :id => '2' }, [:index, :new, :create, :show, :edit, :update, :destroy], [], 'products/1/images')
+    end
+  end
+
   def test_default_singleton_restful_route_uses_get
     with_routing do |set|
       set.draw do |map|
@@ -1053,7 +1128,7 @@ class ResourcesTest < Test::Unit::TestCase
 
       path                       = "#{options[:as] || controller_name}"
       collection_path            = "/#{options[:path_prefix]}#{path}"
-      shallow_path               = "/#{options[:path_prefix] unless options[:shallow]}#{path}"
+      shallow_path               = "/#{options[:shallow] ? options[:namespace] : options[:path_prefix]}#{path}"
       member_path                = "#{shallow_path}/1"
       new_path                   = "#{collection_path}/#{new_action}"
       edit_member_path           = "#{member_path}/#{edit_action}"
@@ -1117,10 +1192,10 @@ class ResourcesTest < Test::Unit::TestCase
       options[:options].delete :action
 
       path = "#{options[:as] || controller_name}"
-      shallow_path = "/#{options[:path_prefix] unless options[:shallow]}#{path}"
+      shallow_path = "/#{options[:shallow] ? options[:namespace] : options[:path_prefix]}#{path}"
       full_path = "/#{options[:path_prefix]}#{path}"
       name_prefix = options[:name_prefix]
-      shallow_prefix = "#{options[:name_prefix] unless options[:shallow]}"
+      shallow_prefix = options[:shallow] ? options[:namespace].try(:gsub, /\//, '_') : options[:name_prefix]
 
       new_action  = "new"
       edit_action = "edit"
@@ -1130,14 +1205,14 @@ class ResourcesTest < Test::Unit::TestCase
       end
 
       assert_named_route "#{full_path}", "#{name_prefix}#{controller_name}_path", options[:options]
-      assert_named_route "#{full_path}.xml", "formatted_#{name_prefix}#{controller_name}_path", options[:options].merge(:format => 'xml')
+      assert_named_route "#{full_path}.xml", "#{name_prefix}#{controller_name}_path", options[:options].merge(:format => 'xml')
       assert_named_route "#{shallow_path}/1", "#{shallow_prefix}#{singular_name}_path", options[:shallow_options].merge(:id => '1')
-      assert_named_route "#{shallow_path}/1.xml", "formatted_#{shallow_prefix}#{singular_name}_path", options[:shallow_options].merge(:id => '1', :format => 'xml')
+      assert_named_route "#{shallow_path}/1.xml", "#{shallow_prefix}#{singular_name}_path", options[:shallow_options].merge(:id => '1', :format => 'xml')
 
       assert_named_route "#{full_path}/#{new_action}", "new_#{name_prefix}#{singular_name}_path", options[:options]
-      assert_named_route "#{full_path}/#{new_action}.xml", "formatted_new_#{name_prefix}#{singular_name}_path", options[:options].merge(:format => 'xml')
+      assert_named_route "#{full_path}/#{new_action}.xml", "new_#{name_prefix}#{singular_name}_path", options[:options].merge(:format => 'xml')
       assert_named_route "#{shallow_path}/1/#{edit_action}", "edit_#{shallow_prefix}#{singular_name}_path", options[:shallow_options].merge(:id => '1')
-      assert_named_route "#{shallow_path}/1/#{edit_action}.xml", "formatted_edit_#{shallow_prefix}#{singular_name}_path", options[:shallow_options].merge(:id => '1', :format => 'xml')
+      assert_named_route "#{shallow_path}/1/#{edit_action}.xml", "edit_#{shallow_prefix}#{singular_name}_path", options[:shallow_options].merge(:id => '1', :format => 'xml')
 
       yield options[:options] if block_given?
     end
@@ -1189,12 +1264,12 @@ class ResourcesTest < Test::Unit::TestCase
       name_prefix = options[:name_prefix]
 
       assert_named_route "#{full_path}",          "#{name_prefix}#{singleton_name}_path",                options[:options]
-      assert_named_route "#{full_path}.xml",      "formatted_#{name_prefix}#{singleton_name}_path",      options[:options].merge(:format => 'xml')
+      assert_named_route "#{full_path}.xml",      "#{name_prefix}#{singleton_name}_path",      options[:options].merge(:format => 'xml')
 
       assert_named_route "#{full_path}/new",      "new_#{name_prefix}#{singleton_name}_path",            options[:options]
-      assert_named_route "#{full_path}/new.xml",  "formatted_new_#{name_prefix}#{singleton_name}_path",  options[:options].merge(:format => 'xml')
+      assert_named_route "#{full_path}/new.xml",  "new_#{name_prefix}#{singleton_name}_path",  options[:options].merge(:format => 'xml')
       assert_named_route "#{full_path}/edit",     "edit_#{name_prefix}#{singleton_name}_path",           options[:options]
-      assert_named_route "#{full_path}/edit.xml", "formatted_edit_#{name_prefix}#{singleton_name}_path", options[:options].merge(:format => 'xml')
+      assert_named_route "#{full_path}/edit.xml", "edit_#{name_prefix}#{singleton_name}_path", options[:options].merge(:format => 'xml')
     end
 
     def assert_named_route(expected, route, options)
@@ -1250,7 +1325,7 @@ class ResourcesTest < Test::Unit::TestCase
     end
 
     def assert_not_recognizes(expected_options, path)
-      assert_raise ActionController::RoutingError, ActionController::MethodNotAllowed, Test::Unit::AssertionFailedError do
+      assert_raise ActionController::RoutingError, ActionController::MethodNotAllowed, Assertion do
         assert_recognizes(expected_options, path)
       end
     end

data/test/controller/routing_test.rb

@@ -1,6 +1,5 @@
 require 'abstract_unit'
 require 'controller/fake_controllers'
-require 'action_controller/routing'
 
 class MilestonesController < ActionController::Base
   def index() head :ok end
@@ -220,7 +219,7 @@ class DynamicSegmentTest < Test::Unit::TestCase
     a_value = nil
 
     # Local jump because of return inside eval.
-    assert_raises(LocalJumpError) { eval(segment.extraction_code) }
+    assert_raise(LocalJumpError) { eval(segment.extraction_code) }
   end
 
   def test_extraction_code_should_return_on_mismatch
@@ -230,7 +229,7 @@ class DynamicSegmentTest < Test::Unit::TestCase
     a_value = nil
 
     # Local jump because of return inside eval.
-    assert_raises(LocalJumpError) { eval(segment.extraction_code) }
+    assert_raise(LocalJumpError) { eval(segment.extraction_code) }
   end
 
   def test_extraction_code_should_accept_value_and_set_local
@@ -495,7 +494,7 @@ class RouteBuilderTest < Test::Unit::TestCase
     defaults = {:action => 'buy', :person => nil, :car => nil}
     requirements = {:person => /\w+/, :car => /^\w+$/}
 
-    assert_raises ArgumentError do
+    assert_raise ArgumentError do
       route_requirements = builder.assign_route_options(segments, defaults, requirements)
     end
 
@@ -716,1650 +715,1656 @@ class RoutingTest < Test::Unit::TestCase
   end
 end
 
-uses_mocha 'LegacyRouteSet, Route, RouteSet and RouteLoading' do
-  class MockController
-    attr_accessor :routes
+class MockController
+  attr_accessor :routes
 
-    def initialize(routes)
-      self.routes = routes
-    end
+  def initialize(routes)
+    self.routes = routes
+  end
 
-    def url_for(options)
-      only_path = options.delete(:only_path)
+  def url_for(options)
+    only_path = options.delete(:only_path)
 
-      port        = options.delete(:port) || 80
-      port_string = port == 80 ? '' : ":#{port}"
+    port        = options.delete(:port) || 80
+    port_string = port == 80 ? '' : ":#{port}"
 
-      protocol = options.delete(:protocol) || "http"
-      host     = options.delete(:host) || "named.route.test"
-      anchor   = "##{options.delete(:anchor)}" if options.key?(:anchor)
+    protocol = options.delete(:protocol) || "http"
+    host     = options.delete(:host) || "test.host"
+    anchor   = "##{options.delete(:anchor)}" if options.key?(:anchor)
 
-      path = routes.generate(options)
+    path = routes.generate(options)
 
-      only_path ? "#{path}#{anchor}" : "#{protocol}://#{host}#{port_string}#{path}#{anchor}"
-    end
+    only_path ? "#{path}#{anchor}" : "#{protocol}://#{host}#{port_string}#{path}#{anchor}"
+  end
 
-    def request
-      @request ||= MockRequest.new(:host => "named.route.test", :method => :get)
-    end
+  def request
+    @request ||= ActionController::TestRequest.new
   end
+end
 
-  class MockRequest
-    attr_accessor :path, :path_parameters, :host, :subdomains, :domain, :method
+class LegacyRouteSetTests < Test::Unit::TestCase
+  attr_reader :rs
 
-    def initialize(values={})
-      values.each { |key, value| send("#{key}=", value) }
-      if values[:host]
-        subdomain, self.domain = values[:host].split(/\./, 2)
-        self.subdomains = [subdomain]
+  def setup
+    # These tests assume optimisation is on, so re-enable it.
+    ActionController::Base.optimise_named_routes = true
+
+    @rs = ::ActionController::Routing::RouteSet.new
+
+    ActionController::Routing.use_controllers! %w(content admin/user admin/news_feed)
+  end
+  
+  def teardown
+    @rs.clear!
+  end
+
+  def test_default_setup
+    @rs.draw {|m| m.connect ':controller/:action/:id' }
+    assert_equal({:controller => "content", :action => 'index'}, rs.recognize_path("/content"))
+    assert_equal({:controller => "content", :action => 'list'}, rs.recognize_path("/content/list"))
+    assert_equal({:controller => "content", :action => 'show', :id => '10'}, rs.recognize_path("/content/show/10"))
+
+    assert_equal({:controller => "admin/user", :action => 'show', :id => '10'}, rs.recognize_path("/admin/user/show/10"))
+
+    assert_equal '/admin/user/show/10', rs.generate(:controller => 'admin/user', :action => 'show', :id => 10)
+
+    assert_equal '/admin/user/show', rs.generate({:action => 'show'}, {:controller => 'admin/user', :action => 'list', :id => '10'})
+    assert_equal '/admin/user/list/10', rs.generate({}, {:controller => 'admin/user', :action => 'list', :id => '10'})
+
+    assert_equal '/admin/stuff', rs.generate({:controller => 'stuff'}, {:controller => 'admin/user', :action => 'list', :id => '10'})
+    assert_equal '/stuff', rs.generate({:controller => '/stuff'}, {:controller => 'admin/user', :action => 'list', :id => '10'})
+  end
+
+  def test_ignores_leading_slash
+    @rs.clear!
+    @rs.draw {|m| m.connect '/:controller/:action/:id'}
+    test_default_setup
+  end
+
+  def test_time_recognition
+    # We create many routes to make situation more realistic
+    @rs = ::ActionController::Routing::RouteSet.new
+    @rs.draw { |map|
+      map.frontpage '', :controller => 'search', :action => 'new'
+      map.resources :videos do |video|
+        video.resources :comments
+        video.resource  :file,      :controller => 'video_file'
+        video.resource  :share,     :controller => 'video_shares'
+        video.resource  :abuse,     :controller => 'video_abuses'
+      end
+      map.resources :abuses, :controller => 'video_abuses'
+      map.resources :video_uploads
+      map.resources :video_visits
+
+      map.resources :users do |user|
+        user.resource  :settings
+        user.resources :videos
+      end
+      map.resources :channels do |channel|
+        channel.resources :videos, :controller => 'channel_videos'
+      end
+      map.resource  :session
+      map.resource  :lost_password
+      map.search    'search', :controller => 'search'
+      map.resources :pages
+      map.connect ':controller/:action/:id'
+    }
+    n = 1000
+    if RunTimeTests
+      GC.start
+      rectime = Benchmark.realtime do
+        n.times do
+          rs.recognize_path("/videos/1234567", {:method => :get})
+          rs.recognize_path("/videos/1234567/abuse", {:method => :get})
+          rs.recognize_path("/users/1234567/settings", {:method => :get})
+          rs.recognize_path("/channels/1234567", {:method => :get})
+          rs.recognize_path("/session/new", {:method => :get})
+          rs.recognize_path("/admin/user/show/10", {:method => :get})
+        end
       end
+      puts "\n\nRecognition (#{rs.routes.size} routes):"
+      per_url = rectime / (n * 6)
+      puts "#{per_url * 1000} ms/url"
+      puts "#{1 / per_url} url/s\n\n"
+    end
+  end
+
+  def test_time_generation
+    n = 5000
+    if RunTimeTests
+      GC.start
+      pairs = [
+        [{:controller => 'content', :action => 'index'}, {:controller => 'content', :action => 'show'}],
+        [{:controller => 'content'}, {:controller => 'content', :action => 'index'}],
+        [{:controller => 'content', :action => 'list'}, {:controller => 'content', :action => 'index'}],
+        [{:controller => 'content', :action => 'show', :id => '10'}, {:controller => 'content', :action => 'list'}],
+        [{:controller => 'admin/user', :action => 'index'}, {:controller => 'admin/user', :action => 'show'}],
+        [{:controller => 'admin/user'}, {:controller => 'admin/user', :action => 'index'}],
+        [{:controller => 'admin/user', :action => 'list'}, {:controller => 'admin/user', :action => 'index'}],
+        [{:controller => 'admin/user', :action => 'show', :id => '10'}, {:controller => 'admin/user', :action => 'list'}],
+      ]
+      p = nil
+      gentime = Benchmark.realtime do
+        n.times do
+        pairs.each {|(a, b)| rs.generate(a, b)}
+        end
+      end
+
+      puts "\n\nGeneration (RouteSet): (#{(n * 8)} urls)"
+      per_url = gentime / (n * 8)
+      puts "#{per_url * 1000} ms/url"
+      puts "#{1 / per_url} url/s\n\n"
     end
+  end
 
-    def protocol
-      "http://"
+  def test_route_with_colon_first
+    rs.draw do |map|
+      map.connect '/:controller/:action/:id', :action => 'index', :id => nil
+      map.connect ':url', :controller => 'tiny_url', :action => 'translate'
     end
+  end
 
-    def host_with_port
-      (subdomains * '.') + '.' +  domain
+  def test_route_with_regexp_for_controller
+    rs.draw do |map|
+      map.connect ':controller/:admintoken/:action/:id', :controller => /admin\/.+/
+      map.connect ':controller/:action/:id'
     end
+    assert_equal({:controller => "admin/user", :admintoken => "foo", :action => "index"},
+        rs.recognize_path("/admin/user/foo"))
+    assert_equal({:controller => "content", :action => "foo"}, rs.recognize_path("/content/foo"))
+    assert_equal '/admin/user/foo', rs.generate(:controller => "admin/user", :admintoken => "foo", :action => "index")
+    assert_equal '/content/foo', rs.generate(:controller => "content", :action => "foo")
   end
 
-  class LegacyRouteSetTests < Test::Unit::TestCase
-    attr_reader :rs
+  def test_route_with_regexp_and_captures_for_controller
+    rs.draw do |map|
+      map.connect ':controller/:action/:id', :controller => /admin\/(accounts|users)/
+    end
+    assert_equal({:controller => "admin/accounts", :action => "index"}, rs.recognize_path("/admin/accounts"))
+    assert_equal({:controller => "admin/users", :action => "index"}, rs.recognize_path("/admin/users"))
+    assert_raise(ActionController::RoutingError) { rs.recognize_path("/admin/products") }
+  end
 
-    def setup
-      # These tests assume optimisation is on, so re-enable it.
-      ActionController::Base.optimise_named_routes = true
+  def test_route_with_regexp_and_dot
+    rs.draw do |map|
+      map.connect ':controller/:action/:file',
+                        :controller => /admin|user/,
+                        :action => /upload|download/,
+                        :defaults => {:file => nil},
+                        :requirements => {:file => %r{[^/]+(\.[^/]+)?}}
+    end
+    # Without a file extension
+    assert_equal '/user/download/file',
+      rs.generate(:controller => "user", :action => "download", :file => "file")
+    assert_equal(
+      {:controller => "user", :action => "download", :file => "file"},
+      rs.recognize_path("/user/download/file"))
 
-      @rs = ::ActionController::Routing::RouteSet.new
-      @rs.draw {|m| m.connect ':controller/:action/:id' }
+    # Now, let's try a file with an extension, really a dot (.)
+    assert_equal '/user/download/file.jpg',
+      rs.generate(
+        :controller => "user", :action => "download", :file => "file.jpg")
+    assert_equal(
+      {:controller => "user", :action => "download", :file => "file.jpg"},
+      rs.recognize_path("/user/download/file.jpg"))
+  end
 
-      ActionController::Routing.use_controllers! %w(content admin/user admin/news_feed)
-    end
+  def test_basic_named_route
+    rs.add_named_route :home, '', :controller => 'content', :action => 'list'
+    x = setup_for_named_route
+    assert_equal("http://test.host/",
+                 x.send(:home_url))
+  end
 
-    def test_default_setup
-      assert_equal({:controller => "content", :action => 'index'}, rs.recognize_path("/content"))
-      assert_equal({:controller => "content", :action => 'list'}, rs.recognize_path("/content/list"))
-      assert_equal({:controller => "content", :action => 'show', :id => '10'}, rs.recognize_path("/content/show/10"))
+  def test_basic_named_route_with_relative_url_root
+    rs.add_named_route :home, '', :controller => 'content', :action => 'list'
+    x = setup_for_named_route
+    ActionController::Base.relative_url_root = "/foo"
+    assert_equal("http://test.host/foo/",
+                 x.send(:home_url))
+    assert_equal "/foo/", x.send(:home_path)
+    ActionController::Base.relative_url_root = nil
+  end
 
-      assert_equal({:controller => "admin/user", :action => 'show', :id => '10'}, rs.recognize_path("/admin/user/show/10"))
+  def test_named_route_with_option
+    rs.add_named_route :page, 'page/:title', :controller => 'content', :action => 'show_page'
+    x = setup_for_named_route
+    assert_equal("http://test.host/page/new%20stuff",
+                 x.send(:page_url, :title => 'new stuff'))
+  end
 
-      assert_equal '/admin/user/show/10', rs.generate(:controller => 'admin/user', :action => 'show', :id => 10)
+  def test_named_route_with_default
+    rs.add_named_route :page, 'page/:title', :controller => 'content', :action => 'show_page', :title => 'AboutPage'
+    x = setup_for_named_route
+    assert_equal("http://test.host/page/AboutRails",
+                 x.send(:page_url, :title => "AboutRails"))
 
-      assert_equal '/admin/user/show', rs.generate({:action => 'show'}, {:controller => 'admin/user', :action => 'list', :id => '10'})
-      assert_equal '/admin/user/list/10', rs.generate({}, {:controller => 'admin/user', :action => 'list', :id => '10'})
+  end
 
-      assert_equal '/admin/stuff', rs.generate({:controller => 'stuff'}, {:controller => 'admin/user', :action => 'list', :id => '10'})
-      assert_equal '/stuff', rs.generate({:controller => '/stuff'}, {:controller => 'admin/user', :action => 'list', :id => '10'})
-    end
+  def test_named_route_with_name_prefix
+    rs.add_named_route :page, 'page', :controller => 'content', :action => 'show_page', :name_prefix => 'my_'
+    x = setup_for_named_route
+    assert_equal("http://test.host/page",
+                 x.send(:my_page_url))
+  end
 
-    def test_ignores_leading_slash
-      @rs.draw {|m| m.connect '/:controller/:action/:id'}
-      test_default_setup
-    end
+  def test_named_route_with_path_prefix
+    rs.add_named_route :page, 'page', :controller => 'content', :action => 'show_page', :path_prefix => 'my'
+    x = setup_for_named_route
+    assert_equal("http://test.host/my/page",
+                 x.send(:page_url))
+  end
 
-    def test_time_recognition
-      # We create many routes to make situation more realistic
-      @rs = ::ActionController::Routing::RouteSet.new
-      @rs.draw { |map|
-        map.frontpage '', :controller => 'search', :action => 'new'
-        map.resources :videos do |video|
-          video.resources :comments
-          video.resource  :file,      :controller => 'video_file'
-          video.resource  :share,     :controller => 'video_shares'
-          video.resource  :abuse,     :controller => 'video_abuses'
-        end
-        map.resources :abuses, :controller => 'video_abuses'
-        map.resources :video_uploads
-        map.resources :video_visits
+  def test_named_route_with_blank_path_prefix
+    rs.add_named_route :page, 'page', :controller => 'content', :action => 'show_page', :path_prefix => ''
+    x = setup_for_named_route
+    assert_equal("http://test.host/page",
+                 x.send(:page_url))
+  end
 
-        map.resources :users do |user|
-          user.resource  :settings
-          user.resources :videos
-        end
-        map.resources :channels do |channel|
-          channel.resources :videos, :controller => 'channel_videos'
-        end
-        map.resource  :session
-        map.resource  :lost_password
-        map.search    'search', :controller => 'search'
-        map.resources :pages
-        map.connect ':controller/:action/:id'
-      }
-      n = 1000
-      if RunTimeTests
-        GC.start
-        rectime = Benchmark.realtime do
-          n.times do
-            rs.recognize_path("/videos/1234567", {:method => :get})
-            rs.recognize_path("/videos/1234567/abuse", {:method => :get})
-            rs.recognize_path("/users/1234567/settings", {:method => :get})
-            rs.recognize_path("/channels/1234567", {:method => :get})
-            rs.recognize_path("/session/new", {:method => :get})
-            rs.recognize_path("/admin/user/show/10", {:method => :get})
-          end
-        end
-        puts "\n\nRecognition (#{rs.routes.size} routes):"
-        per_url = rectime / (n * 6)
-        puts "#{per_url * 1000} ms/url"
-        puts "#{1 / per_url} url/s\n\n"
-      end
-    end
+  def test_named_route_with_nested_controller
+    rs.add_named_route :users, 'admin/user', :controller => 'admin/user', :action => 'index'
+    x = setup_for_named_route
+    assert_equal("http://test.host/admin/user",
+                 x.send(:users_url))
+  end
 
-    def test_time_generation
-      n = 5000
-      if RunTimeTests
-        GC.start
-        pairs = [
-          [{:controller => 'content', :action => 'index'}, {:controller => 'content', :action => 'show'}],
-          [{:controller => 'content'}, {:controller => 'content', :action => 'index'}],
-          [{:controller => 'content', :action => 'list'}, {:controller => 'content', :action => 'index'}],
-          [{:controller => 'content', :action => 'show', :id => '10'}, {:controller => 'content', :action => 'list'}],
-          [{:controller => 'admin/user', :action => 'index'}, {:controller => 'admin/user', :action => 'show'}],
-          [{:controller => 'admin/user'}, {:controller => 'admin/user', :action => 'index'}],
-          [{:controller => 'admin/user', :action => 'list'}, {:controller => 'admin/user', :action => 'index'}],
-          [{:controller => 'admin/user', :action => 'show', :id => '10'}, {:controller => 'admin/user', :action => 'list'}],
-        ]
-        p = nil
-        gentime = Benchmark.realtime do
-          n.times do
-          pairs.each {|(a, b)| rs.generate(a, b)}
-          end
-        end
+  def test_optimised_named_route_call_never_uses_url_for
+    rs.add_named_route :users, 'admin/user', :controller => '/admin/user', :action => 'index'
+    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_path)
+    x.send(:user_url, 2, :foo=>"bar")
+    x.send(:user_path, 3, :bar=>"foo")
+  end
 
-        puts "\n\nGeneration (RouteSet): (#{(n * 8)} urls)"
-        per_url = gentime / (n * 8)
-        puts "#{per_url * 1000} ms/url"
-        puts "#{1 / per_url} url/s\n\n"
-      end
-    end
+  def test_optimised_named_route_with_host
+    rs.add_named_route :pages, 'pages', :controller => 'content', :action => 'show_page', :host => 'foo.com'
+    x = setup_for_named_route
+    x.expects(:url_for).with(:host => 'foo.com', :only_path => false, :controller => 'content', :action => 'show_page', :use_route => :pages).once
+    x.send(:pages_url)
+  end
 
-    def test_route_with_colon_first
-      rs.draw do |map|
-        map.connect '/:controller/:action/:id', :action => 'index', :id => nil
-        map.connect ':url', :controller => 'tiny_url', :action => 'translate'
-      end
+  def setup_for_named_route
+    klass = Class.new(MockController)
+    rs.install_helpers(klass)
+    klass.new(rs)
+  end
+
+  def test_named_route_without_hash
+    rs.draw do |map|
+      map.normal ':controller/:action/:id'
     end
+  end
 
-    def test_route_with_regexp_for_controller
-      rs.draw do |map|
-        map.connect ':controller/:admintoken/:action/:id', :controller => /admin\/.+/
-        map.connect ':controller/:action/:id'
-      end
-      assert_equal({:controller => "admin/user", :admintoken => "foo", :action => "index"},
-          rs.recognize_path("/admin/user/foo"))
-      assert_equal({:controller => "content", :action => "foo"}, rs.recognize_path("/content/foo"))
-      assert_equal '/admin/user/foo', rs.generate(:controller => "admin/user", :admintoken => "foo", :action => "index")
-      assert_equal '/content/foo', rs.generate(:controller => "content", :action => "foo")
+  def test_named_route_root
+    rs.draw do |map|
+      map.root :controller => "hello"
     end
+    x = setup_for_named_route
+    assert_equal("http://test.host/", x.send(:root_url))
+    assert_equal("/", x.send(:root_path))
+  end
 
-    def test_route_with_regexp_and_captures_for_controller
-      rs.draw do |map|
-        map.connect ':controller/:action/:id', :controller => /admin\/(accounts|users)/
-      end
-      assert_equal({:controller => "admin/accounts", :action => "index"}, rs.recognize_path("/admin/accounts"))
-      assert_equal({:controller => "admin/users", :action => "index"}, rs.recognize_path("/admin/users"))
-      assert_raises(ActionController::RoutingError) { rs.recognize_path("/admin/products") }
+  def test_named_route_with_regexps
+    rs.draw do |map|
+      map.article 'page/:year/:month/:day/:title', :controller => 'page', :action => 'show',
+        :year => /\d+/, :month => /\d+/, :day => /\d+/
+      map.connect ':controller/:action/:id'
     end
+    x = setup_for_named_route
+    # assert_equal(
+    #   {:controller => 'page', :action => 'show', :title => 'hi', :use_route => :article, :only_path => false},
+    #   x.send(:article_url, :title => 'hi')
+    # )
+    assert_equal(
+      "http://test.host/page/2005/6/10/hi",
+      x.send(:article_url, :title => 'hi', :day => 10, :year => 2005, :month => 6)
+    )
+  end
 
+  def test_changing_controller
+    @rs.draw {|m| m.connect ':controller/:action/:id' }
 
-    def test_route_with_regexp_and_dot
-      rs.draw do |map|
-        map.connect ':controller/:action/:file',
-                          :controller => /admin|user/,
-                          :action => /upload|download/,
-                          :defaults => {:file => nil},
-                          :requirements => {:file => %r{[^/]+(\.[^/]+)?}}
-      end
-      # Without a file extension
-      assert_equal '/user/download/file',
-        rs.generate(:controller => "user", :action => "download", :file => "file")
-      assert_equal(
-        {:controller => "user", :action => "download", :file => "file"},
-        rs.recognize_path("/user/download/file"))
+    assert_equal '/admin/stuff/show/10', rs.generate(
+      {:controller => 'stuff', :action => 'show', :id => 10},
+      {:controller => 'admin/user', :action => 'index'}
+    )
+  end
 
-      # Now, let's try a file with an extension, really a dot (.)
-      assert_equal '/user/download/file.jpg',
-        rs.generate(
-          :controller => "user", :action => "download", :file => "file.jpg")
-      assert_equal(
-        {:controller => "user", :action => "download", :file => "file.jpg"},
-        rs.recognize_path("/user/download/file.jpg"))
+  def test_paths_escaped
+    rs.draw do |map|
+      map.path 'file/*path', :controller => 'content', :action => 'show_file'
+      map.connect ':controller/:action/:id'
     end
 
-    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/",
-                   x.send(:home_url))
-    end
+    # No + to space in URI escaping, only for query params.
+    results = rs.recognize_path "/file/hello+world/how+are+you%3F"
+    assert results, "Recognition should have succeeded"
+    assert_equal ['hello+world', 'how+are+you?'], results[:path]
 
-    def test_basic_named_route_with_relative_url_root
-      rs.add_named_route :home, '', :controller => 'content', :action => 'list'
-      x = setup_for_named_route
-      ActionController::Base.relative_url_root = "/foo"
-      assert_equal("http://named.route.test/foo/",
-                   x.send(:home_url))
-      assert_equal "/foo/", x.send(:home_path)
-      ActionController::Base.relative_url_root = nil
-    end
+    # Use %20 for space instead.
+    results = rs.recognize_path "/file/hello%20world/how%20are%20you%3F"
+    assert results, "Recognition should have succeeded"
+    assert_equal ['hello world', 'how are you?'], results[:path]
 
-    def test_named_route_with_option
-      rs.add_named_route :page, 'page/:title', :controller => 'content', :action => 'show_page'
-      x = setup_for_named_route
-      assert_equal("http://named.route.test/page/new%20stuff",
-                   x.send(:page_url, :title => 'new stuff'))
-    end
+    results = rs.recognize_path "/file"
+    assert results, "Recognition should have succeeded"
+    assert_equal [], results[:path]
+  end
 
-    def test_named_route_with_default
-      rs.add_named_route :page, 'page/:title', :controller => 'content', :action => 'show_page', :title => 'AboutPage'
-      x = setup_for_named_route
-      assert_equal("http://named.route.test/page/AboutRails",
-                   x.send(:page_url, :title => "AboutRails"))
+  def test_paths_slashes_unescaped_with_ordered_parameters
+    rs.add_named_route :path, '/file/*path', :controller => 'content'
 
-    end
+    # No / to %2F in URI, only for query params.
+    x = setup_for_named_route
+    assert_equal("/file/hello/world", x.send(:path_path, 'hello/world'))
+  end
 
-    def test_named_route_with_name_prefix
-      rs.add_named_route :page, 'page', :controller => 'content', :action => 'show_page', :name_prefix => 'my_'
-      x = setup_for_named_route
-      assert_equal("http://named.route.test/page",
-                   x.send(:my_page_url))
+  def test_non_controllers_cannot_be_matched
+    rs.draw do |map|
+      map.connect ':controller/:action/:id'
     end
+    assert_raise(ActionController::RoutingError) { rs.recognize_path("/not_a/show/10") }
+  end
 
-    def test_named_route_with_path_prefix
-      rs.add_named_route :page, 'page', :controller => 'content', :action => 'show_page', :path_prefix => 'my'
-      x = setup_for_named_route
-      assert_equal("http://named.route.test/my/page",
-                   x.send(:page_url))
+  def test_paths_do_not_accept_defaults
+    assert_raise(ActionController::RoutingError) do
+      rs.draw do |map|
+        map.path 'file/*path', :controller => 'content', :action => 'show_file', :path => %w(fake default)
+        map.connect ':controller/:action/:id'
+      end
     end
 
-    def test_named_route_with_nested_controller
-      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))
+    rs.draw do |map|
+      map.path 'file/*path', :controller => 'content', :action => 'show_file', :path => []
+      map.connect ':controller/:action/:id'
     end
+  end
 
-    def test_optimised_named_route_call_never_uses_url_for
-      rs.add_named_route :users, 'admin/user', :controller => '/admin/user', :action => 'index'
-      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_path)
-      x.send(:user_url, 2, :foo=>"bar")
-      x.send(:user_path, 3, :bar=>"foo")
+  def test_should_list_options_diff_when_routing_requirements_dont_match
+    rs.draw do |map|
+      map.post 'post/:id', :controller=> 'post', :action=> 'show', :requirements => {:id => /\d+/}
     end
+    exception = assert_raise(ActionController::RoutingError) { rs.generate(:controller => 'post', :action => 'show', :bad_param => "foo", :use_route => "post") }
+    assert_match /^post_url failed to generate/, exception.message
+    from_match = exception.message.match(/from \{[^\}]+\}/).to_s
+    assert_match /:bad_param=>"foo"/,   from_match
+    assert_match /:action=>"show"/,     from_match
+    assert_match /:controller=>"post"/, from_match
 
-    def test_optimised_named_route_with_host
-      rs.add_named_route :pages, 'pages', :controller => 'content', :action => 'show_page', :host => 'foo.com'
-      x = setup_for_named_route
-      x.expects(:url_for).with(:host => 'foo.com', :only_path => false, :controller => 'content', :action => 'show_page', :use_route => :pages).once
-      x.send(:pages_url)
-    end
+    expected_match = exception.message.match(/expected: \{[^\}]+\}/).to_s
+    assert_no_match /:bad_param=>"foo"/,   expected_match
+    assert_match    /:action=>"show"/,     expected_match
+    assert_match    /:controller=>"post"/, expected_match
 
-    def setup_for_named_route
-      klass = Class.new(MockController)
-      rs.install_helpers(klass)
-      klass.new(rs)
-    end
+    diff_match = exception.message.match(/diff: \{[^\}]+\}/).to_s
+    assert_match    /:bad_param=>"foo"/,   diff_match
+    assert_no_match /:action=>"show"/,     diff_match
+    assert_no_match /:controller=>"post"/, diff_match
+  end
 
-    def test_named_route_without_hash
-      rs.draw do |map|
-        map.normal ':controller/:action/:id'
-      end
+  # this specifies the case where your formerly would get a very confusing error message with an empty diff
+  def test_should_have_better_error_message_when_options_diff_is_empty
+    rs.draw do |map|
+      map.content '/content/:query', :controller => 'content', :action => 'show'
     end
 
-    def test_named_route_root
-      rs.draw do |map|
-        map.root :controller => "hello"
-      end
-      x = setup_for_named_route
-      assert_equal("http://named.route.test/", x.send(:root_url))
-      assert_equal("/", x.send(:root_path))
-    end
+    exception = assert_raise(ActionController::RoutingError) { rs.generate(:controller => 'content', :action => 'show', :use_route => "content") }
+    assert_match %r[:action=>"show"], exception.message
+    assert_match %r[:controller=>"content"], exception.message
+    assert_match %r[you may have ambiguous routes, or you may need to supply additional parameters for this route], exception.message
+    assert_match %r[content_url has the following required parameters: \["content", :query\] - are they all satisfied?], exception.message
+  end
 
-    def test_named_route_with_regexps
-      rs.draw do |map|
-        map.article 'page/:year/:month/:day/:title', :controller => 'page', :action => 'show',
-          :year => /\d+/, :month => /\d+/, :day => /\d+/
-        map.connect ':controller/:action/:id'
-      end
-      x = setup_for_named_route
-      # assert_equal(
-      #   {:controller => 'page', :action => 'show', :title => 'hi', :use_route => :article, :only_path => false},
-      #   x.send(:article_url, :title => 'hi')
-      # )
-      assert_equal(
-        "http://named.route.test/page/2005/6/10/hi",
-        x.send(:article_url, :title => 'hi', :day => 10, :year => 2005, :month => 6)
-      )
+  def test_dynamic_path_allowed
+    rs.draw do |map|
+      map.connect '*path', :controller => 'content', :action => 'show_file'
     end
 
-    def test_changing_controller
-      assert_equal '/admin/stuff/show/10', rs.generate(
-        {:controller => 'stuff', :action => 'show', :id => 10},
-        {:controller => 'admin/user', :action => 'index'}
-      )
+    assert_equal '/pages/boo', rs.generate(:controller => 'content', :action => 'show_file', :path => %w(pages boo))
+  end
+
+  def test_dynamic_recall_paths_allowed
+    rs.draw do |map|
+      map.connect '*path', :controller => 'content', :action => 'show_file'
     end
 
-    def test_paths_escaped
-      rs.draw do |map|
-        map.path 'file/*path', :controller => 'content', :action => 'show_file'
-        map.connect ':controller/:action/:id'
-      end
+    recall_path = ActionController::Routing::PathSegment::Result.new(%w(pages boo))
+    assert_equal '/pages/boo', rs.generate({}, :controller => 'content', :action => 'show_file', :path => recall_path)
+  end
 
-      # No + to space in URI escaping, only for query params.
-      results = rs.recognize_path "/file/hello+world/how+are+you%3F"
-      assert results, "Recognition should have succeeded"
-      assert_equal ['hello+world', 'how+are+you?'], results[:path]
+  def test_backwards
+    rs.draw do |map|
+      map.connect 'page/:id/:action', :controller => 'pages', :action => 'show'
+      map.connect ':controller/:action/:id'
+    end
 
-      # Use %20 for space instead.
-      results = rs.recognize_path "/file/hello%20world/how%20are%20you%3F"
-      assert results, "Recognition should have succeeded"
-      assert_equal ['hello world', 'how are you?'], results[:path]
+    assert_equal '/page/20', rs.generate({:id => 20}, {:controller => 'pages', :action => 'show'})
+    assert_equal '/page/20', rs.generate(:controller => 'pages', :id => 20, :action => 'show')
+    assert_equal '/pages/boo', rs.generate(:controller => 'pages', :action => 'boo')
+  end
 
-      results = rs.recognize_path "/file"
-      assert results, "Recognition should have succeeded"
-      assert_equal [], results[:path]
+  def test_route_with_fixnum_default
+    rs.draw do |map|
+      map.connect 'page/:id', :controller => 'content', :action => 'show_page', :id => 1
+      map.connect ':controller/:action/:id'
     end
 
-    def test_paths_slashes_unescaped_with_ordered_parameters
-      rs.add_named_route :path, '/file/*path', :controller => 'content'
+    assert_equal '/page', rs.generate(:controller => 'content', :action => 'show_page')
+    assert_equal '/page', rs.generate(:controller => 'content', :action => 'show_page', :id => 1)
+    assert_equal '/page', rs.generate(:controller => 'content', :action => 'show_page', :id => '1')
+    assert_equal '/page/10', rs.generate(:controller => 'content', :action => 'show_page', :id => 10)
 
-      # No / to %2F in URI, only for query params.
-      x = setup_for_named_route
-      assert_equal("/file/hello/world", x.send(:path_path, 'hello/world'))
-    end
+    assert_equal({:controller => "content", :action => 'show_page', :id => '1'}, rs.recognize_path("/page"))
+    assert_equal({:controller => "content", :action => 'show_page', :id => '1'}, rs.recognize_path("/page/1"))
+    assert_equal({:controller => "content", :action => 'show_page', :id => '10'}, rs.recognize_path("/page/10"))
+  end
 
-    def test_non_controllers_cannot_be_matched
-      rs.draw do |map|
-        map.connect ':controller/:action/:id'
-      end
-      assert_raises(ActionController::RoutingError) { rs.recognize_path("/not_a/show/10") }
+  # For newer revision
+  def test_route_with_text_default
+    rs.draw do |map|
+      map.connect 'page/:id', :controller => 'content', :action => 'show_page', :id => 1
+      map.connect ':controller/:action/:id'
     end
 
-    def test_paths_do_not_accept_defaults
-      assert_raises(ActionController::RoutingError) do
-        rs.draw do |map|
-          map.path 'file/*path', :controller => 'content', :action => 'show_file', :path => %w(fake default)
-          map.connect ':controller/:action/:id'
-        end
-      end
+    assert_equal '/page/foo', rs.generate(:controller => 'content', :action => 'show_page', :id => 'foo')
+    assert_equal({:controller => "content", :action => 'show_page', :id => 'foo'}, rs.recognize_path("/page/foo"))
 
-      rs.draw do |map|
-        map.path 'file/*path', :controller => 'content', :action => 'show_file', :path => []
-        map.connect ':controller/:action/:id'
-      end
-    end
+    token = "\321\202\320\265\320\272\321\201\321\202" # 'text' in russian
+    token.force_encoding("UTF-8") if token.respond_to?(:force_encoding)
+    escaped_token = CGI::escape(token)
 
-    def test_should_list_options_diff_when_routing_requirements_dont_match
-      rs.draw do |map|
-        map.post 'post/:id', :controller=> 'post', :action=> 'show', :requirements => {:id => /\d+/}
-      end
-      exception = assert_raise(ActionController::RoutingError) { rs.generate(:controller => 'post', :action => 'show', :bad_param => "foo", :use_route => "post") }
-      assert_match /^post_url failed to generate/, exception.message
-      from_match = exception.message.match(/from \{[^\}]+\}/).to_s
-      assert_match /:bad_param=>"foo"/,   from_match
-      assert_match /:action=>"show"/,     from_match
-      assert_match /:controller=>"post"/, from_match
-
-      expected_match = exception.message.match(/expected: \{[^\}]+\}/).to_s
-      assert_no_match /:bad_param=>"foo"/,   expected_match
-      assert_match    /:action=>"show"/,     expected_match
-      assert_match    /:controller=>"post"/, expected_match
-
-      diff_match = exception.message.match(/diff: \{[^\}]+\}/).to_s
-      assert_match    /:bad_param=>"foo"/,   diff_match
-      assert_no_match /:action=>"show"/,     diff_match
-      assert_no_match /:controller=>"post"/, diff_match
-    end
-
-    # this specifies the case where your formerly would get a very confusing error message with an empty diff
-    def test_should_have_better_error_message_when_options_diff_is_empty
-      rs.draw do |map|
-        map.content '/content/:query', :controller => 'content', :action => 'show'
-      end
+    assert_equal '/page/' + escaped_token, rs.generate(:controller => 'content', :action => 'show_page', :id => token)
+    assert_equal({:controller => "content", :action => 'show_page', :id => token}, rs.recognize_path("/page/#{escaped_token}"))
+  end
 
-      exception = assert_raise(ActionController::RoutingError) { rs.generate(:controller => 'content', :action => 'show', :use_route => "content") }
-      assert_match %r[:action=>"show"], exception.message
-      assert_match %r[:controller=>"content"], exception.message
-      assert_match %r[you may have ambiguous routes, or you may need to supply additional parameters for this route], exception.message
-      assert_match %r[content_url has the following required parameters: \["content", :query\] - are they all satisfied?], exception.message
-    end
+  def test_action_expiry
+    @rs.draw {|m| m.connect ':controller/:action/:id' }
+    assert_equal '/content', rs.generate({:controller => 'content'}, {:controller => 'content', :action => 'show'})
+  end
 
-    def test_dynamic_path_allowed
-      rs.draw do |map|
-        map.connect '*path', :controller => 'content', :action => 'show_file'
-      end
+  def test_recognition_with_uppercase_controller_name
+    @rs.draw {|m| m.connect ':controller/:action/:id' }
+    assert_equal({:controller => "content", :action => 'index'}, rs.recognize_path("/Content"))
+    assert_equal({:controller => "content", :action => 'list'}, rs.recognize_path("/ConTent/list"))
+    assert_equal({:controller => "content", :action => 'show', :id => '10'}, rs.recognize_path("/CONTENT/show/10"))
+
+    # these used to work, before the routes rewrite, but support for this was pulled in the new version...
+    #assert_equal({'controller' => "admin/news_feed", 'action' => 'index'}, rs.recognize_path("Admin/NewsFeed"))
+    #assert_equal({'controller' => "admin/news_feed", 'action' => 'index'}, rs.recognize_path("Admin/News_Feed"))
+  end
 
-      assert_equal '/pages/boo', rs.generate(:controller => 'content', :action => 'show_file', :path => %w(pages boo))
+  def test_requirement_should_prevent_optional_id
+    rs.draw do |map|
+      map.post 'post/:id', :controller=> 'post', :action=> 'show', :requirements => {:id => /\d+/}
     end
 
-    def test_dynamic_recall_paths_allowed
-      rs.draw do |map|
-        map.connect '*path', :controller => 'content', :action => 'show_file'
-      end
+    assert_equal '/post/10', rs.generate(:controller => 'post', :action => 'show', :id => 10)
 
-      recall_path = ActionController::Routing::PathSegment::Result.new(%w(pages boo))
-      assert_equal '/pages/boo', rs.generate({}, :controller => 'content', :action => 'show_file', :path => recall_path)
+    assert_raise ActionController::RoutingError do
+      rs.generate(:controller => 'post', :action => 'show')
     end
+  end
 
-    def test_backwards
-      rs.draw do |map|
-        map.connect 'page/:id/:action', :controller => 'pages', :action => 'show'
-        map.connect ':controller/:action/:id'
-      end
-
-      assert_equal '/page/20', rs.generate({:id => 20}, {:controller => 'pages', :action => 'show'})
-      assert_equal '/page/20', rs.generate(:controller => 'pages', :id => 20, :action => 'show')
-      assert_equal '/pages/boo', rs.generate(:controller => 'pages', :action => 'boo')
+  def test_both_requirement_and_optional
+    rs.draw do |map|
+      map.blog('test/:year', :controller => 'post', :action => 'show',
+        :defaults => { :year => nil },
+        :requirements => { :year => /\d{4}/ }
+      )
+      map.connect ':controller/:action/:id'
     end
 
-    def test_route_with_fixnum_default
-      rs.draw do |map|
-        map.connect 'page/:id', :controller => 'content', :action => 'show_page', :id => 1
-        map.connect ':controller/:action/:id'
-      end
+    assert_equal '/test', rs.generate(:controller => 'post', :action => 'show')
+    assert_equal '/test', rs.generate(:controller => 'post', :action => 'show', :year => nil)
 
-      assert_equal '/page', rs.generate(:controller => 'content', :action => 'show_page')
-      assert_equal '/page', rs.generate(:controller => 'content', :action => 'show_page', :id => 1)
-      assert_equal '/page', rs.generate(:controller => 'content', :action => 'show_page', :id => '1')
-      assert_equal '/page/10', rs.generate(:controller => 'content', :action => 'show_page', :id => 10)
+    x = setup_for_named_route
+    assert_equal("http://test.host/test",
+                 x.send(:blog_url))
+  end
 
-      assert_equal({:controller => "content", :action => 'show_page', :id => '1'}, rs.recognize_path("/page"))
-      assert_equal({:controller => "content", :action => 'show_page', :id => '1'}, rs.recognize_path("/page/1"))
-      assert_equal({:controller => "content", :action => 'show_page', :id => '10'}, rs.recognize_path("/page/10"))
+  def test_set_to_nil_forgets
+    rs.draw do |map|
+      map.connect 'pages/:year/:month/:day', :controller => 'content', :action => 'list_pages', :month => nil, :day => nil
+      map.connect ':controller/:action/:id'
     end
 
-    # For newer revision
-    def test_route_with_text_default
-      rs.draw do |map|
-        map.connect 'page/:id', :controller => 'content', :action => 'show_page', :id => 1
-        map.connect ':controller/:action/:id'
-      end
+    assert_equal '/pages/2005',
+      rs.generate(:controller => 'content', :action => 'list_pages', :year => 2005)
+    assert_equal '/pages/2005/6',
+      rs.generate(:controller => 'content', :action => 'list_pages', :year => 2005, :month => 6)
+    assert_equal '/pages/2005/6/12',
+      rs.generate(:controller => 'content', :action => 'list_pages', :year => 2005, :month => 6, :day => 12)
 
-      assert_equal '/page/foo', rs.generate(:controller => 'content', :action => 'show_page', :id => 'foo')
-      assert_equal({:controller => "content", :action => 'show_page', :id => 'foo'}, rs.recognize_path("/page/foo"))
+    assert_equal '/pages/2005/6/4',
+      rs.generate({:day => 4}, {:controller => 'content', :action => 'list_pages', :year => '2005', :month => '6', :day => '12'})
 
-      token = "\321\202\320\265\320\272\321\201\321\202" # 'text' in russian
-      token.force_encoding("UTF-8") if token.respond_to?(:force_encoding)
-      escaped_token = CGI::escape(token)
+    assert_equal '/pages/2005/6',
+      rs.generate({:day => nil}, {:controller => 'content', :action => 'list_pages', :year => '2005', :month => '6', :day => '12'})
 
-      assert_equal '/page/' + escaped_token, rs.generate(:controller => 'content', :action => 'show_page', :id => token)
-      assert_equal({:controller => "content", :action => 'show_page', :id => token}, rs.recognize_path("/page/#{escaped_token}"))
-    end
+    assert_equal '/pages/2005',
+      rs.generate({:day => nil, :month => nil}, {:controller => 'content', :action => 'list_pages', :year => '2005', :month => '6', :day => '12'})
+  end
 
-    def test_action_expiry
-      assert_equal '/content', rs.generate({:controller => 'content'}, {:controller => 'content', :action => 'show'})
+  def test_url_with_no_action_specified
+    rs.draw do |map|
+      map.connect '', :controller => 'content'
+      map.connect ':controller/:action/:id'
     end
 
-    def test_recognition_with_uppercase_controller_name
-      assert_equal({:controller => "content", :action => 'index'}, rs.recognize_path("/Content"))
-      assert_equal({:controller => "content", :action => 'list'}, rs.recognize_path("/ConTent/list"))
-      assert_equal({:controller => "content", :action => 'show', :id => '10'}, rs.recognize_path("/CONTENT/show/10"))
+    assert_equal '/', rs.generate(:controller => 'content', :action => 'index')
+    assert_equal '/', rs.generate(:controller => 'content')
+  end
 
-      # these used to work, before the routes rewrite, but support for this was pulled in the new version...
-      #assert_equal({'controller' => "admin/news_feed", 'action' => 'index'}, rs.recognize_path("Admin/NewsFeed"))
-      #assert_equal({'controller' => "admin/news_feed", 'action' => 'index'}, rs.recognize_path("Admin/News_Feed"))
+  def test_named_url_with_no_action_specified
+    rs.draw do |map|
+      map.home '', :controller => 'content'
+      map.connect ':controller/:action/:id'
     end
 
-    def test_requirement_should_prevent_optional_id
-      rs.draw do |map|
-        map.post 'post/:id', :controller=> 'post', :action=> 'show', :requirements => {:id => /\d+/}
-      end
-
-      assert_equal '/post/10', rs.generate(:controller => 'post', :action => 'show', :id => 10)
+    assert_equal '/', rs.generate(:controller => 'content', :action => 'index')
+    assert_equal '/', rs.generate(:controller => 'content')
 
-      assert_raises ActionController::RoutingError do
-        rs.generate(:controller => 'post', :action => 'show')
-      end
-    end
+    x = setup_for_named_route
+    assert_equal("http://test.host/",
+                 x.send(:home_url))
+  end
 
-    def test_both_requirement_and_optional
+  def test_url_generated_when_forgetting_action
+    [{:controller => 'content', :action => 'index'}, {:controller => 'content'}].each do |hash|
       rs.draw do |map|
-        map.blog('test/:year', :controller => 'post', :action => 'show',
-          :defaults => { :year => nil },
-          :requirements => { :year => /\d{4}/ }
-        )
+        map.home '', hash
         map.connect ':controller/:action/:id'
       end
+      assert_equal '/', rs.generate({:action => nil}, {:controller => 'content', :action => 'hello'})
+      assert_equal '/', rs.generate({:controller => 'content'})
+      assert_equal '/content/hi', rs.generate({:controller => 'content', :action => 'hi'})
+    end
+  end
 
-      assert_equal '/test', rs.generate(:controller => 'post', :action => 'show')
-      assert_equal '/test', rs.generate(:controller => 'post', :action => 'show', :year => nil)
-
-      x = setup_for_named_route
-      assert_equal("http://named.route.test/test",
-                   x.send(:blog_url))
+  def test_named_route_method
+    rs.draw do |map|
+      map.categories 'categories', :controller => 'content', :action => 'categories'
+      map.connect ':controller/:action/:id'
     end
 
-    def test_set_to_nil_forgets
-      rs.draw do |map|
-        map.connect 'pages/:year/:month/:day', :controller => 'content', :action => 'list_pages', :month => nil, :day => nil
-        map.connect ':controller/:action/:id'
-      end
+    assert_equal '/categories', rs.generate(:controller => 'content', :action => 'categories')
+    assert_equal '/content/hi', rs.generate({:controller => 'content', :action => 'hi'})
+  end
 
-      assert_equal '/pages/2005',
-        rs.generate(:controller => 'content', :action => 'list_pages', :year => 2005)
-      assert_equal '/pages/2005/6',
-        rs.generate(:controller => 'content', :action => 'list_pages', :year => 2005, :month => 6)
-      assert_equal '/pages/2005/6/12',
-        rs.generate(:controller => 'content', :action => 'list_pages', :year => 2005, :month => 6, :day => 12)
+  def test_named_routes_array
+    test_named_route_method
+    assert_equal [:categories], rs.named_routes.names
+  end
+
+  def test_nil_defaults
+    rs.draw do |map|
+      map.connect 'journal',
+        :controller => 'content',
+        :action => 'list_journal',
+        :date => nil, :user_id => nil
+      map.connect ':controller/:action/:id'
+    end
 
-      assert_equal '/pages/2005/6/4',
-        rs.generate({:day => 4}, {:controller => 'content', :action => 'list_pages', :year => '2005', :month => '6', :day => '12'})
+    assert_equal '/journal', rs.generate(:controller => 'content', :action => 'list_journal', :date => nil, :user_id => nil)
+  end
 
-      assert_equal '/pages/2005/6',
-        rs.generate({:day => nil}, {:controller => 'content', :action => 'list_pages', :year => '2005', :month => '6', :day => '12'})
+  def setup_request_method_routes_for(method)
+    @request = ActionController::TestRequest.new
+    @request.env["REQUEST_METHOD"] = method
+    @request.request_uri = "/match"
 
-      assert_equal '/pages/2005',
-        rs.generate({:day => nil, :month => nil}, {:controller => 'content', :action => 'list_pages', :year => '2005', :month => '6', :day => '12'})
+    rs.draw do |r|
+      r.connect '/match', :controller => 'books', :action => 'get', :conditions => { :method => :get }
+      r.connect '/match', :controller => 'books', :action => 'post', :conditions => { :method => :post }
+      r.connect '/match', :controller => 'books', :action => 'put', :conditions => { :method => :put }
+      r.connect '/match', :controller => 'books', :action => 'delete', :conditions => { :method => :delete }
     end
+  end
 
-    def test_url_with_no_action_specified
-      rs.draw do |map|
-        map.connect '', :controller => 'content'
-        map.connect ':controller/:action/:id'
+  %w(GET POST PUT DELETE).each do |request_method|
+    define_method("test_request_method_recognized_with_#{request_method}") do
+      begin
+        Object.const_set(:BooksController, Class.new(ActionController::Base))
+
+        setup_request_method_routes_for(request_method)
+
+        assert_nothing_raised { rs.recognize(@request) }
+        assert_equal request_method.downcase, @request.path_parameters[:action]
+      ensure
+        Object.send(:remove_const, :BooksController) rescue nil
       end
+    end
+  end
 
-      assert_equal '/', rs.generate(:controller => 'content', :action => 'index')
-      assert_equal '/', rs.generate(:controller => 'content')
+  def test_recognize_array_of_methods
+    Object.const_set(:BooksController, Class.new(ActionController::Base))
+    rs.draw do |r|
+      r.connect '/match', :controller => 'books', :action => 'get_or_post', :conditions => { :method => [:get, :post] }
+      r.connect '/match', :controller => 'books', :action => 'not_get_or_post'
     end
 
-    def test_named_url_with_no_action_specified
-      rs.draw do |map|
-        map.home '', :controller => 'content'
-        map.connect ':controller/:action/:id'
-      end
+    @request = ActionController::TestRequest.new
+    @request.env["REQUEST_METHOD"] = 'POST'
+    @request.request_uri = "/match"
+    assert_nothing_raised { rs.recognize(@request) }
+    assert_equal 'get_or_post', @request.path_parameters[:action]
+
+    # have to recreate or else the RouteSet uses a cached version:
+    @request = ActionController::TestRequest.new
+    @request.env["REQUEST_METHOD"] = 'PUT'
+    @request.request_uri = "/match"
+    assert_nothing_raised { rs.recognize(@request) }
+    assert_equal 'not_get_or_post', @request.path_parameters[:action]
+  ensure
+    Object.send(:remove_const, :BooksController) rescue nil
+  end
 
-      assert_equal '/', rs.generate(:controller => 'content', :action => 'index')
-      assert_equal '/', rs.generate(:controller => 'content')
+  def test_subpath_recognized
+    Object.const_set(:SubpathBooksController, Class.new(ActionController::Base))
 
-      x = setup_for_named_route
-      assert_equal("http://named.route.test/",
-                   x.send(:home_url))
+    rs.draw do |r|
+      r.connect '/books/:id/edit', :controller => 'subpath_books', :action => 'edit'
+      r.connect '/items/:id/:action', :controller => 'subpath_books'
+      r.connect '/posts/new/:action', :controller => 'subpath_books'
+      r.connect '/posts/:id', :controller => 'subpath_books', :action => "show"
     end
 
-    def test_url_generated_when_forgetting_action
-      [{:controller => 'content', :action => 'index'}, {:controller => 'content'}].each do |hash|
-        rs.draw do |map|
-          map.home '', hash
-          map.connect ':controller/:action/:id'
-        end
-        assert_equal '/', rs.generate({:action => nil}, {:controller => 'content', :action => 'hello'})
-        assert_equal '/', rs.generate({:controller => 'content'})
-        assert_equal '/content/hi', rs.generate({:controller => 'content', :action => 'hi'})
-      end
-    end
+    hash = rs.recognize_path "/books/17/edit"
+    assert_not_nil hash
+    assert_equal %w(subpath_books 17 edit), [hash[:controller], hash[:id], hash[:action]]
 
-    def test_named_route_method
-      rs.draw do |map|
-        map.categories 'categories', :controller => 'content', :action => 'categories'
-        map.connect ':controller/:action/:id'
-      end
+    hash = rs.recognize_path "/items/3/complete"
+    assert_not_nil hash
+    assert_equal %w(subpath_books 3 complete), [hash[:controller], hash[:id], hash[:action]]
 
-      assert_equal '/categories', rs.generate(:controller => 'content', :action => 'categories')
-      assert_equal '/content/hi', rs.generate({:controller => 'content', :action => 'hi'})
-    end
+    hash = rs.recognize_path "/posts/new/preview"
+    assert_not_nil hash
+    assert_equal %w(subpath_books preview), [hash[:controller], hash[:action]]
+
+    hash = rs.recognize_path "/posts/7"
+    assert_not_nil hash
+    assert_equal %w(subpath_books show 7), [hash[:controller], hash[:action], hash[:id]]
+  ensure
+    Object.send(:remove_const, :SubpathBooksController) rescue nil
+  end
+
+  def test_subpath_generated
+    Object.const_set(:SubpathBooksController, Class.new(ActionController::Base))
 
-    def test_named_routes_array
-      test_named_route_method
-      assert_equal [:categories], rs.named_routes.names
+    rs.draw do |r|
+      r.connect '/books/:id/edit', :controller => 'subpath_books', :action => 'edit'
+      r.connect '/items/:id/:action', :controller => 'subpath_books'
+      r.connect '/posts/new/:action', :controller => 'subpath_books'
     end
 
-    def test_nil_defaults
-      rs.draw do |map|
-        map.connect 'journal',
-          :controller => 'content',
-          :action => 'list_journal',
-          :date => nil, :user_id => nil
-        map.connect ':controller/:action/:id'
-      end
+    assert_equal "/books/7/edit", rs.generate(:controller => "subpath_books", :id => 7, :action => "edit")
+    assert_equal "/items/15/complete", rs.generate(:controller => "subpath_books", :id => 15, :action => "complete")
+    assert_equal "/posts/new/preview", rs.generate(:controller => "subpath_books", :action => "preview")
+  ensure
+    Object.send(:remove_const, :SubpathBooksController) rescue nil
+  end
 
-      assert_equal '/journal', rs.generate(:controller => 'content', :action => 'list_journal', :date => nil, :user_id => nil)
+  def test_failed_requirements_raises_exception_with_violated_requirements
+    rs.draw do |r|
+      r.foo_with_requirement 'foos/:id', :controller=>'foos', :requirements=>{:id=>/\d+/}
     end
 
-    def setup_request_method_routes_for(method)
-      @request = ActionController::TestRequest.new
-      @request.env["REQUEST_METHOD"] = method
-      @request.request_uri = "/match"
+    x = setup_for_named_route
+    assert_raise(ActionController::RoutingError) do
+      x.send(:foo_with_requirement_url, "I am Against the requirements")
+    end
+  end
 
-      rs.draw do |r|
-        r.connect '/match', :controller => 'books', :action => 'get', :conditions => { :method => :get }
-        r.connect '/match', :controller => 'books', :action => 'post', :conditions => { :method => :post }
-        r.connect '/match', :controller => 'books', :action => 'put', :conditions => { :method => :put }
-        r.connect '/match', :controller => 'books', :action => 'delete', :conditions => { :method => :delete }
-      end
+  def test_routes_changed_correctly_after_clear
+    ActionController::Base.optimise_named_routes = true
+    rs = ::ActionController::Routing::RouteSet.new
+    rs.draw do |r|
+      r.connect 'ca', :controller => 'ca', :action => "aa"
+      r.connect 'cb', :controller => 'cb', :action => "ab"
+      r.connect 'cc', :controller => 'cc', :action => "ac"
+      r.connect ':controller/:action/:id'
+      r.connect ':controller/:action/:id.:format'
     end
 
-    %w(GET POST PUT DELETE).each do |request_method|
-      define_method("test_request_method_recognized_with_#{request_method}") do
-        begin
-          Object.const_set(:BooksController, Class.new(ActionController::Base))
+    hash = rs.recognize_path "/cc"
 
-          setup_request_method_routes_for(request_method)
+    assert_not_nil hash
+    assert_equal %w(cc ac), [hash[:controller], hash[:action]]
 
-          assert_nothing_raised { rs.recognize(@request) }
-          assert_equal request_method.downcase, @request.path_parameters[:action]
-        ensure
-          Object.send(:remove_const, :BooksController) rescue nil
-        end
-      end
+    rs.draw do |r|
+      r.connect 'cb', :controller => 'cb', :action => "ab"
+      r.connect 'cc', :controller => 'cc', :action => "ac"
+      r.connect ':controller/:action/:id'
+      r.connect ':controller/:action/:id.:format'
     end
 
-    def test_recognize_array_of_methods
-      Object.const_set(:BooksController, Class.new(ActionController::Base))
-      rs.draw do |r|
-        r.connect '/match', :controller => 'books', :action => 'get_or_post', :conditions => { :method => [:get, :post] }
-        r.connect '/match', :controller => 'books', :action => 'not_get_or_post'
-      end
+    hash = rs.recognize_path "/cc"
 
-      @request = ActionController::TestRequest.new
-      @request.env["REQUEST_METHOD"] = 'POST'
-      @request.request_uri = "/match"
-      assert_nothing_raised { rs.recognize(@request) }
-      assert_equal 'get_or_post', @request.path_parameters[:action]
-
-      # have to recreate or else the RouteSet uses a cached version:
-      @request = ActionController::TestRequest.new
-      @request.env["REQUEST_METHOD"] = 'PUT'
-      @request.request_uri = "/match"
-      assert_nothing_raised { rs.recognize(@request) }
-      assert_equal 'not_get_or_post', @request.path_parameters[:action]
-    ensure
-      Object.send(:remove_const, :BooksController) rescue nil
-    end
-
-    def test_subpath_recognized
-      Object.const_set(:SubpathBooksController, Class.new(ActionController::Base))
-
-      rs.draw do |r|
-        r.connect '/books/:id/edit', :controller => 'subpath_books', :action => 'edit'
-        r.connect '/items/:id/:action', :controller => 'subpath_books'
-        r.connect '/posts/new/:action', :controller => 'subpath_books'
-        r.connect '/posts/:id', :controller => 'subpath_books', :action => "show"
-      end
+    assert_not_nil hash
+    assert_equal %w(cc ac), [hash[:controller], hash[:action]]
 
-      hash = rs.recognize_path "/books/17/edit"
-      assert_not_nil hash
-      assert_equal %w(subpath_books 17 edit), [hash[:controller], hash[:id], hash[:action]]
+  end
+end
 
-      hash = rs.recognize_path "/items/3/complete"
-      assert_not_nil hash
-      assert_equal %w(subpath_books 3 complete), [hash[:controller], hash[:id], hash[:action]]
+class RouteTest < Test::Unit::TestCase
+  def setup
+    @route = ROUTING::Route.new
+  end
 
-      hash = rs.recognize_path "/posts/new/preview"
-      assert_not_nil hash
-      assert_equal %w(subpath_books preview), [hash[:controller], hash[:action]]
+  def slash_segment(is_optional = false)
+    ROUTING::DividerSegment.new('/', :optional => is_optional)
+  end
 
-      hash = rs.recognize_path "/posts/7"
-      assert_not_nil hash
-      assert_equal %w(subpath_books show 7), [hash[:controller], hash[:action], hash[:id]]
-    ensure
-      Object.send(:remove_const, :SubpathBooksController) rescue nil
+  def default_route
+    unless defined?(@default_route)
+      segments = []
+      segments << ROUTING::StaticSegment.new('/', :raw => true)
+      segments << ROUTING::DynamicSegment.new(:controller)
+      segments << slash_segment(:optional)
+      segments << ROUTING::DynamicSegment.new(:action, :default => 'index', :optional => true)
+      segments << slash_segment(:optional)
+      segments << ROUTING::DynamicSegment.new(:id, :optional => true)
+      segments << slash_segment(:optional)
+      @default_route = ROUTING::Route.new(segments).freeze
     end
+    @default_route
+  end
 
-    def test_subpath_generated
-      Object.const_set(:SubpathBooksController, Class.new(ActionController::Base))
+  def test_default_route_recognition
+    expected = {:controller => 'accounts', :action => 'show', :id => '10'}
+    assert_equal expected, default_route.recognize('/accounts/show/10')
+    assert_equal expected, default_route.recognize('/accounts/show/10/')
 
-      rs.draw do |r|
-        r.connect '/books/:id/edit', :controller => 'subpath_books', :action => 'edit'
-        r.connect '/items/:id/:action', :controller => 'subpath_books'
-        r.connect '/posts/new/:action', :controller => 'subpath_books'
-      end
+    expected[:id] = 'jamis'
+    assert_equal expected, default_route.recognize('/accounts/show/jamis/')
 
-      assert_equal "/books/7/edit", rs.generate(:controller => "subpath_books", :id => 7, :action => "edit")
-      assert_equal "/items/15/complete", rs.generate(:controller => "subpath_books", :id => 15, :action => "complete")
-      assert_equal "/posts/new/preview", rs.generate(:controller => "subpath_books", :action => "preview")
-    ensure
-      Object.send(:remove_const, :SubpathBooksController) rescue nil
-    end
+    expected.delete :id
+    assert_equal expected, default_route.recognize('/accounts/show')
+    assert_equal expected, default_route.recognize('/accounts/show/')
 
-    def test_failed_requirements_raises_exception_with_violated_requirements
-      rs.draw do |r|
-        r.foo_with_requirement 'foos/:id', :controller=>'foos', :requirements=>{:id=>/\d+/}
-      end
+    expected[:action] = 'index'
+    assert_equal expected, default_route.recognize('/accounts/')
+    assert_equal expected, default_route.recognize('/accounts')
 
-      x = setup_for_named_route
-      assert_raises(ActionController::RoutingError) do
-        x.send(:foo_with_requirement_url, "I am Against the requirements")
-      end
-    end
+    assert_equal nil, default_route.recognize('/')
+    assert_equal nil, default_route.recognize('/accounts/how/goood/it/is/to/be/free')
+  end
 
-    def test_routes_changed_correctly_after_clear
-      ActionController::Base.optimise_named_routes = true
-      rs = ::ActionController::Routing::RouteSet.new
-      rs.draw do |r|
-        r.connect 'ca', :controller => 'ca', :action => "aa"
-        r.connect 'cb', :controller => 'cb', :action => "ab"
-        r.connect 'cc', :controller => 'cc', :action => "ac"
-        r.connect ':controller/:action/:id'
-        r.connect ':controller/:action/:id.:format'
-      end
+  def test_default_route_should_omit_default_action
+    o = {:controller => 'accounts', :action => 'index'}
+    assert_equal '/accounts', default_route.generate(o, o, {})
+  end
 
-      hash = rs.recognize_path "/cc"
+  def test_default_route_should_include_default_action_when_id_present
+    o = {:controller => 'accounts', :action => 'index', :id => '20'}
+    assert_equal '/accounts/index/20', default_route.generate(o, o, {})
+  end
 
-      assert_not_nil hash
-      assert_equal %w(cc ac), [hash[:controller], hash[:action]]
+  def test_default_route_should_work_with_action_but_no_id
+    o = {:controller => 'accounts', :action => 'list_all'}
+    assert_equal '/accounts/list_all', default_route.generate(o, o, {})
+  end
 
-      rs.draw do |r|
-        r.connect 'cb', :controller => 'cb', :action => "ab"
-        r.connect 'cc', :controller => 'cc', :action => "ac"
-        r.connect ':controller/:action/:id'
-        r.connect ':controller/:action/:id.:format'
-      end
+  def test_default_route_should_uri_escape_pluses
+    expected = { :controller => 'accounts', :action => 'show', :id => 'hello world' }
+    assert_equal expected, default_route.recognize('/accounts/show/hello world')
+    assert_equal expected, default_route.recognize('/accounts/show/hello%20world')
+    assert_equal '/accounts/show/hello%20world', default_route.generate(expected, expected, {})
 
-      hash = rs.recognize_path "/cc"
+    expected[:id] = 'hello+world'
+    assert_equal expected, default_route.recognize('/accounts/show/hello+world')
+    assert_equal expected, default_route.recognize('/accounts/show/hello%2Bworld')
+    assert_equal '/accounts/show/hello+world', default_route.generate(expected, expected, {})
+  end
 
-      assert_not_nil hash
-      assert_equal %w(cc ac), [hash[:controller], hash[:action]]
+  def test_matches_controller_and_action
+    # requirement_for should only be called for the action and controller _once_
+    @route.expects(:requirement_for).with(:controller).times(1).returns('pages')
+    @route.expects(:requirement_for).with(:action).times(1).returns('show')
 
-    end
+    @route.requirements = {:controller => 'pages', :action => 'show'}
+    assert @route.matches_controller_and_action?('pages', 'show')
+    assert !@route.matches_controller_and_action?('not_pages', 'show')
+    assert !@route.matches_controller_and_action?('pages', 'not_show')
   end
 
-  class RouteTest < Test::Unit::TestCase
-    def setup
-      @route = ROUTING::Route.new
-    end
+  def test_parameter_shell
+    page_url = ROUTING::Route.new
+    page_url.requirements = {:controller => 'pages', :action => 'show', :id => /\d+/}
+    assert_equal({:controller => 'pages', :action => 'show'}, page_url.parameter_shell)
+  end
 
-    def slash_segment(is_optional = false)
-      ROUTING::DividerSegment.new('/', :optional => is_optional)
-    end
+  def test_defaults
+    route = ROUTING::RouteBuilder.new.build '/users/:id.:format', :controller => "users", :action => "show", :format => "html"
+    assert_equal(
+      { :controller => "users", :action => "show", :format => "html" },
+      route.defaults)
+  end
 
-    def default_route
-      unless defined?(@default_route)
-        segments = []
-        segments << ROUTING::StaticSegment.new('/', :raw => true)
-        segments << ROUTING::DynamicSegment.new(:controller)
-        segments << slash_segment(:optional)
-        segments << ROUTING::DynamicSegment.new(:action, :default => 'index', :optional => true)
-        segments << slash_segment(:optional)
-        segments << ROUTING::DynamicSegment.new(:id, :optional => true)
-        segments << slash_segment(:optional)
-        @default_route = ROUTING::Route.new(segments).freeze
-      end
-      @default_route
+  def test_builder_complains_without_controller
+    assert_raise(ArgumentError) do
+      ROUTING::RouteBuilder.new.build '/contact', :contoller => "contact", :action => "index"
     end
+  end
 
-    def test_default_route_recognition
-      expected = {:controller => 'accounts', :action => 'show', :id => '10'}
-      assert_equal expected, default_route.recognize('/accounts/show/10')
-      assert_equal expected, default_route.recognize('/accounts/show/10/')
-
-      expected[:id] = 'jamis'
-      assert_equal expected, default_route.recognize('/accounts/show/jamis/')
-
-      expected.delete :id
-      assert_equal expected, default_route.recognize('/accounts/show')
-      assert_equal expected, default_route.recognize('/accounts/show/')
-
-      expected[:action] = 'index'
-      assert_equal expected, default_route.recognize('/accounts/')
-      assert_equal expected, default_route.recognize('/accounts')
+  def test_significant_keys_for_default_route
+    keys = default_route.significant_keys.sort_by {|k| k.to_s }
+    assert_equal [:action, :controller, :id], keys
+  end
 
-      assert_equal nil, default_route.recognize('/')
-      assert_equal nil, default_route.recognize('/accounts/how/goood/it/is/to/be/free')
-    end
+  def test_significant_keys
+    segments = []
+    segments << ROUTING::StaticSegment.new('/', :raw => true)
+    segments << ROUTING::StaticSegment.new('user')
+    segments << ROUTING::StaticSegment.new('/', :raw => true, :optional => true)
+    segments << ROUTING::DynamicSegment.new(:user)
+    segments << ROUTING::StaticSegment.new('/', :raw => true, :optional => true)
 
-    def test_default_route_should_omit_default_action
-      o = {:controller => 'accounts', :action => 'index'}
-      assert_equal '/accounts', default_route.generate(o, o, {})
-    end
+    requirements = {:controller => 'users', :action => 'show'}
 
-    def test_default_route_should_include_default_action_when_id_present
-      o = {:controller => 'accounts', :action => 'index', :id => '20'}
-      assert_equal '/accounts/index/20', default_route.generate(o, o, {})
-    end
+    user_url = ROUTING::Route.new(segments, requirements)
+    keys = user_url.significant_keys.sort_by { |k| k.to_s }
+    assert_equal [:action, :controller, :user], keys
+  end
 
-    def test_default_route_should_work_with_action_but_no_id
-      o = {:controller => 'accounts', :action => 'list_all'}
-      assert_equal '/accounts/list_all', default_route.generate(o, o, {})
-    end
+  def test_build_empty_query_string
+    assert_equal '', @route.build_query_string({})
+  end
 
-    def test_default_route_should_uri_escape_pluses
-      expected = { :controller => 'accounts', :action => 'show', :id => 'hello world' }
-      assert_equal expected, default_route.recognize('/accounts/show/hello world')
-      assert_equal expected, default_route.recognize('/accounts/show/hello%20world')
-      assert_equal '/accounts/show/hello%20world', default_route.generate(expected, expected, {})
+  def test_build_query_string_with_nil_value
+    assert_equal '', @route.build_query_string({:x => nil})
+  end
 
-      expected[:id] = 'hello+world'
-      assert_equal expected, default_route.recognize('/accounts/show/hello+world')
-      assert_equal expected, default_route.recognize('/accounts/show/hello%2Bworld')
-      assert_equal '/accounts/show/hello+world', default_route.generate(expected, expected, {})
-    end
+  def test_simple_build_query_string
+    assert_equal '?x=1&y=2', order_query_string(@route.build_query_string(:x => '1', :y => '2'))
+  end
 
-    def test_matches_controller_and_action
-      # requirement_for should only be called for the action and controller _once_
-      @route.expects(:requirement_for).with(:controller).times(1).returns('pages')
-      @route.expects(:requirement_for).with(:action).times(1).returns('show')
+  def test_convert_ints_build_query_string
+    assert_equal '?x=1&y=2', order_query_string(@route.build_query_string(:x => 1, :y => 2))
+  end
 
-      @route.requirements = {:controller => 'pages', :action => 'show'}
-      assert @route.matches_controller_and_action?('pages', 'show')
-      assert !@route.matches_controller_and_action?('not_pages', 'show')
-      assert !@route.matches_controller_and_action?('pages', 'not_show')
-    end
+  def test_escape_spaces_build_query_string
+    assert_equal '?x=hello+world&y=goodbye+world', order_query_string(@route.build_query_string(:x => 'hello world', :y => 'goodbye world'))
+  end
 
-    def test_parameter_shell
-      page_url = ROUTING::Route.new
-      page_url.requirements = {:controller => 'pages', :action => 'show', :id => /\d+/}
-      assert_equal({:controller => 'pages', :action => 'show'}, page_url.parameter_shell)
-    end
+  def test_expand_array_build_query_string
+    assert_equal '?x%5B%5D=1&x%5B%5D=2', order_query_string(@route.build_query_string(:x => [1, 2]))
+  end
 
-    def test_defaults
-      route = ROUTING::RouteBuilder.new.build '/users/:id.:format', :controller => "users", :action => "show", :format => "html"
-      assert_equal(
-        { :controller => "users", :action => "show", :format => "html" },
-        route.defaults)
-    end
+  def test_escape_spaces_build_query_string_selected_keys
+    assert_equal '?x=hello+world', order_query_string(@route.build_query_string({:x => 'hello world', :y => 'goodbye world'}, [:x]))
+  end
 
-    def test_builder_complains_without_controller
-      assert_raises(ArgumentError) do
-        ROUTING::RouteBuilder.new.build '/contact', :contoller => "contact", :action => "index"
-      end
+  private
+    def order_query_string(qs)
+      '?' + qs[1..-1].split('&').sort.join('&')
     end
+end
 
-    def test_significant_keys_for_default_route
-      keys = default_route.significant_keys.sort_by {|k| k.to_s }
-      assert_equal [:action, :controller, :id], keys
-    end
+class RouteSetTest < Test::Unit::TestCase
+  def set
+    @set ||= ROUTING::RouteSet.new
+  end
 
-    def test_significant_keys
-      segments = []
-      segments << ROUTING::StaticSegment.new('/', :raw => true)
-      segments << ROUTING::StaticSegment.new('user')
-      segments << ROUTING::StaticSegment.new('/', :raw => true, :optional => true)
-      segments << ROUTING::DynamicSegment.new(:user)
-      segments << ROUTING::StaticSegment.new('/', :raw => true, :optional => true)
+  def request
+    @request ||= ActionController::TestRequest.new
+  end
 
-      requirements = {:controller => 'users', :action => 'show'}
+  def test_generate_extras
+    set.draw { |m| m.connect ':controller/:action/:id' }
+    path, extras = set.generate_extras(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
+    assert_equal "/foo/bar/15", path
+    assert_equal %w(that this), extras.map(&:to_s).sort
+  end
 
-      user_url = ROUTING::Route.new(segments, requirements)
-      keys = user_url.significant_keys.sort_by { |k| k.to_s }
-      assert_equal [:action, :controller, :user], keys
-    end
+  def test_extra_keys
+    set.draw { |m| m.connect ':controller/:action/:id' }
+    extras = set.extra_keys(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
+    assert_equal %w(that this), extras.map(&:to_s).sort
+  end
 
-    def test_build_empty_query_string
-      assert_equal '', @route.build_query_string({})
+  def test_generate_extras_not_first
+    set.draw do |map|
+      map.connect ':controller/:action/:id.:format'
+      map.connect ':controller/:action/:id'
     end
+    path, extras = set.generate_extras(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
+    assert_equal "/foo/bar/15", path
+    assert_equal %w(that this), extras.map(&:to_s).sort
+  end
 
-    def test_build_query_string_with_nil_value
-      assert_equal '', @route.build_query_string({:x => nil})
+  def test_generate_not_first
+    set.draw do |map|
+      map.connect ':controller/:action/:id.:format'
+      map.connect ':controller/:action/:id'
     end
+    assert_equal "/foo/bar/15?this=hello", set.generate(:controller => "foo", :action => "bar", :id => 15, :this => "hello")
+  end
 
-    def test_simple_build_query_string
-      assert_equal '?x=1&y=2', order_query_string(@route.build_query_string(:x => '1', :y => '2'))
+  def test_extra_keys_not_first
+    set.draw do |map|
+      map.connect ':controller/:action/:id.:format'
+      map.connect ':controller/:action/:id'
     end
+    extras = set.extra_keys(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
+    assert_equal %w(that this), extras.map(&:to_s).sort
+  end
 
-    def test_convert_ints_build_query_string
-      assert_equal '?x=1&y=2', order_query_string(@route.build_query_string(:x => 1, :y => 2))
+  def test_draw
+    assert_equal 0, set.routes.size
+    set.draw do |map|
+      map.connect '/hello/world', :controller => 'a', :action => 'b'
     end
+    assert_equal 1, set.routes.size
+  end
 
-    def test_escape_spaces_build_query_string
-      assert_equal '?x=hello+world&y=goodbye+world', order_query_string(@route.build_query_string(:x => 'hello world', :y => 'goodbye world'))
+  def test_named_draw
+    assert_equal 0, set.routes.size
+    set.draw do |map|
+      map.hello '/hello/world', :controller => 'a', :action => 'b'
     end
+    assert_equal 1, set.routes.size
+    assert_equal set.routes.first, set.named_routes[:hello]
+  end
 
-    def test_expand_array_build_query_string
-      assert_equal '?x%5B%5D=1&x%5B%5D=2', order_query_string(@route.build_query_string(:x => [1, 2]))
+  def test_later_named_routes_take_precedence
+    set.draw do |map|
+      map.hello '/hello/world', :controller => 'a', :action => 'b'
+      map.hello '/hello', :controller => 'a', :action => 'b'
     end
+    assert_equal set.routes.last, set.named_routes[:hello]
+  end
 
-    def test_escape_spaces_build_query_string_selected_keys
-      assert_equal '?x=hello+world', order_query_string(@route.build_query_string({:x => 'hello world', :y => 'goodbye world'}, [:x]))
+  def setup_named_route_test
+    set.draw do |map|
+      map.show '/people/:id', :controller => 'people', :action => 'show'
+      map.index '/people', :controller => 'people', :action => 'index'
+      map.multi '/people/go/:foo/:bar/joe/:id', :controller => 'people', :action => 'multi'
+      map.users '/admin/users', :controller => 'admin/users', :action => 'index'
     end
 
-    private
-      def order_query_string(qs)
-        '?' + qs[1..-1].split('&').sort.join('&')
-      end
+    klass = Class.new(MockController)
+    set.install_helpers(klass)
+    klass.new(set)
   end
 
-  class RouteSetTest < Test::Unit::TestCase
-    def set
-      @set ||= ROUTING::RouteSet.new
-    end
+  def test_named_route_hash_access_method
+    controller = setup_named_route_test
 
-    def request
-      @request ||= MockRequest.new(:host => "named.routes.test", :method => :get)
-    end
+    assert_equal(
+      { :controller => 'people', :action => 'show', :id => 5, :use_route => :show, :only_path => false },
+      controller.send(:hash_for_show_url, :id => 5))
 
-    def test_generate_extras
-      set.draw { |m| m.connect ':controller/:action/:id' }
-      path, extras = set.generate_extras(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
-      assert_equal "/foo/bar/15", path
-      assert_equal %w(that this), extras.map(&:to_s).sort
-    end
+    assert_equal(
+      { :controller => 'people', :action => 'index', :use_route => :index, :only_path => false },
+      controller.send(:hash_for_index_url))
 
-    def test_extra_keys
-      set.draw { |m| m.connect ':controller/:action/:id' }
-      extras = set.extra_keys(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
-      assert_equal %w(that this), extras.map(&:to_s).sort
-    end
+    assert_equal(
+      { :controller => 'people', :action => 'show', :id => 5, :use_route => :show, :only_path => true },
+      controller.send(:hash_for_show_path, :id => 5)
+    )
+  end
 
-    def test_generate_extras_not_first
-      set.draw do |map|
-        map.connect ':controller/:action/:id.:format'
-        map.connect ':controller/:action/:id'
-      end
-      path, extras = set.generate_extras(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
-      assert_equal "/foo/bar/15", path
-      assert_equal %w(that this), extras.map(&:to_s).sort
-    end
-
-    def test_generate_not_first
-      set.draw do |map|
-        map.connect ':controller/:action/:id.:format'
-        map.connect ':controller/:action/:id'
-      end
-      assert_equal "/foo/bar/15?this=hello", set.generate(:controller => "foo", :action => "bar", :id => 15, :this => "hello")
-    end
-
-    def test_extra_keys_not_first
-      set.draw do |map|
-        map.connect ':controller/:action/:id.:format'
-        map.connect ':controller/:action/:id'
-      end
-      extras = set.extra_keys(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
-      assert_equal %w(that this), extras.map(&:to_s).sort
-    end
-
-    def test_draw
-      assert_equal 0, set.routes.size
-      set.draw do |map|
-        map.connect '/hello/world', :controller => 'a', :action => 'b'
-      end
-      assert_equal 1, set.routes.size
-    end
+  def test_named_route_url_method
+    controller = setup_named_route_test
 
-    def test_named_draw
-      assert_equal 0, set.routes.size
-      set.draw do |map|
-        map.hello '/hello/world', :controller => 'a', :action => 'b'
-      end
-      assert_equal 1, set.routes.size
-      assert_equal set.routes.first, set.named_routes[:hello]
-    end
+    assert_equal "http://test.host/people/5", controller.send(:show_url, :id => 5)
+    assert_equal "/people/5", controller.send(:show_path, :id => 5)
 
-    def test_later_named_routes_take_precedence
-      set.draw do |map|
-        map.hello '/hello/world', :controller => 'a', :action => 'b'
-        map.hello '/hello', :controller => 'a', :action => 'b'
-      end
-      assert_equal set.routes.last, set.named_routes[:hello]
-    end
+    assert_equal "http://test.host/people", controller.send(:index_url)
+    assert_equal "/people", controller.send(:index_path)
 
-    def setup_named_route_test
-      set.draw do |map|
-        map.show '/people/:id', :controller => 'people', :action => 'show'
-        map.index '/people', :controller => 'people', :action => 'index'
-        map.multi '/people/go/:foo/:bar/joe/:id', :controller => 'people', :action => 'multi'
-        map.users '/admin/users', :controller => 'admin/users', :action => 'index'
-      end
+    assert_equal "http://test.host/admin/users", controller.send(:users_url)
+    assert_equal '/admin/users', controller.send(:users_path)
+    assert_equal '/admin/users', set.generate(controller.send(:hash_for_users_url), {:controller => 'users', :action => 'index'})
+  end
 
-      klass = Class.new(MockController)
-      set.install_helpers(klass)
-      klass.new(set)
-    end
+  def test_named_route_url_method_with_anchor
+    controller = setup_named_route_test
 
-    def test_named_route_hash_access_method
-      controller = setup_named_route_test
+    assert_equal "http://test.host/people/5#location", controller.send(:show_url, :id => 5, :anchor => 'location')
+    assert_equal "/people/5#location", controller.send(:show_path, :id => 5, :anchor => 'location')
 
-      assert_equal(
-        { :controller => 'people', :action => 'show', :id => 5, :use_route => :show, :only_path => false },
-        controller.send(:hash_for_show_url, :id => 5))
+    assert_equal "http://test.host/people#location", controller.send(:index_url, :anchor => 'location')
+    assert_equal "/people#location", controller.send(:index_path, :anchor => 'location')
 
-      assert_equal(
-        { :controller => 'people', :action => 'index', :use_route => :index, :only_path => false },
-        controller.send(:hash_for_index_url))
+    assert_equal "http://test.host/admin/users#location", controller.send(:users_url, :anchor => 'location')
+    assert_equal '/admin/users#location', controller.send(:users_path, :anchor => 'location')
 
-      assert_equal(
-        { :controller => 'people', :action => 'show', :id => 5, :use_route => :show, :only_path => true },
-        controller.send(:hash_for_show_path, :id => 5)
-      )
-    end
+    assert_equal "http://test.host/people/go/7/hello/joe/5#location",
+      controller.send(:multi_url, 7, "hello", 5, :anchor => 'location')
 
-    def test_named_route_url_method
-      controller = setup_named_route_test
+    assert_equal "http://test.host/people/go/7/hello/joe/5?baz=bar#location",
+      controller.send(:multi_url, 7, "hello", 5, :baz => "bar", :anchor => 'location')
 
-      assert_equal "http://named.route.test/people/5", controller.send(:show_url, :id => 5)
-      assert_equal "/people/5", controller.send(:show_path, :id => 5)
+    assert_equal "http://test.host/people?baz=bar#location",
+      controller.send(:index_url, :baz => "bar", :anchor => 'location')
+  end
 
-      assert_equal "http://named.route.test/people", controller.send(:index_url)
-      assert_equal "/people", controller.send(:index_path)
+  def test_named_route_url_method_with_port
+    controller = setup_named_route_test
+    assert_equal "http://test.host:8080/people/5", controller.send(:show_url, 5, :port=>8080)
+  end
 
-      assert_equal "http://named.route.test/admin/users", controller.send(:users_url)
-      assert_equal '/admin/users', controller.send(:users_path)
-      assert_equal '/admin/users', set.generate(controller.send(:hash_for_users_url), {:controller => 'users', :action => 'index'})
-    end
+  def test_named_route_url_method_with_host
+    controller = setup_named_route_test
+    assert_equal "http://some.example.com/people/5", controller.send(:show_url, 5, :host=>"some.example.com")
+  end
 
-    def test_named_route_url_method_with_anchor
-      controller = setup_named_route_test
+  def test_named_route_url_method_with_protocol
+    controller = setup_named_route_test
+    assert_equal "https://test.host/people/5", controller.send(:show_url, 5, :protocol => "https")
+  end
 
-      assert_equal "http://named.route.test/people/5#location", controller.send(:show_url, :id => 5, :anchor => 'location')
-      assert_equal "/people/5#location", controller.send(:show_path, :id => 5, :anchor => 'location')
+  def test_named_route_url_method_with_ordered_parameters
+    controller = setup_named_route_test
+    assert_equal "http://test.host/people/go/7/hello/joe/5",
+      controller.send(:multi_url, 7, "hello", 5)
+  end
 
-      assert_equal "http://named.route.test/people#location", controller.send(:index_url, :anchor => 'location')
-      assert_equal "/people#location", controller.send(:index_path, :anchor => 'location')
+  def test_named_route_url_method_with_ordered_parameters_and_hash
+    controller = setup_named_route_test
+    assert_equal "http://test.host/people/go/7/hello/joe/5?baz=bar",
+      controller.send(:multi_url, 7, "hello", 5, :baz => "bar")
+  end
 
-      assert_equal "http://named.route.test/admin/users#location", controller.send(:users_url, :anchor => 'location')
-      assert_equal '/admin/users#location', controller.send(:users_path, :anchor => 'location')
+  def test_named_route_url_method_with_ordered_parameters_and_empty_hash
+    controller = setup_named_route_test
+    assert_equal "http://test.host/people/go/7/hello/joe/5",
+      controller.send(:multi_url, 7, "hello", 5, {})
+  end
 
-      assert_equal "http://named.route.test/people/go/7/hello/joe/5#location",
-        controller.send(:multi_url, 7, "hello", 5, :anchor => 'location')
+  def test_named_route_url_method_with_no_positional_arguments
+    controller = setup_named_route_test
+    assert_equal "http://test.host/people?baz=bar",
+      controller.send(:index_url, :baz => "bar")
+  end
 
-      assert_equal "http://named.route.test/people/go/7/hello/joe/5?baz=bar#location",
-        controller.send(:multi_url, 7, "hello", 5, :baz => "bar", :anchor => 'location')
+  def test_draw_default_route
+    ActionController::Routing.with_controllers(['users']) do
+      set.draw do |map|
+        map.connect '/:controller/:action/:id'
+      end
 
-      assert_equal "http://named.route.test/people?baz=bar#location",
-        controller.send(:index_url, :baz => "bar", :anchor => 'location')
-    end
+      assert_equal 1, set.routes.size
+      route = set.routes.first
 
-    def test_named_route_url_method_with_port
-      controller = setup_named_route_test
-      assert_equal "http://named.route.test:8080/people/5", controller.send(:show_url, 5, :port=>8080)
-    end
+      assert route.segments.last.optional?
 
-    def test_named_route_url_method_with_host
-      controller = setup_named_route_test
-      assert_equal "http://some.example.com/people/5", controller.send(:show_url, 5, :host=>"some.example.com")
-    end
+      assert_equal '/users/show/10', set.generate(:controller => 'users', :action => 'show', :id => 10)
+      assert_equal '/users/index/10', set.generate(:controller => 'users', :id => 10)
 
-    def test_named_route_url_method_with_protocol
-      controller = setup_named_route_test
-      assert_equal "https://named.route.test/people/5", controller.send(:show_url, 5, :protocol => "https")
+      assert_equal({:controller => 'users', :action => 'index', :id => '10'}, set.recognize_path('/users/index/10'))
+      assert_equal({:controller => 'users', :action => 'index', :id => '10'}, set.recognize_path('/users/index/10/'))
     end
+  end
 
-    def test_named_route_url_method_with_ordered_parameters
-      controller = setup_named_route_test
-      assert_equal "http://named.route.test/people/go/7/hello/joe/5",
-        controller.send(:multi_url, 7, "hello", 5)
+  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_named_route_url_method_with_ordered_parameters_and_hash
-      controller = setup_named_route_test
-      assert_equal "http://named.route.test/people/go/7/hello/joe/5?baz=bar",
-        controller.send(:multi_url, 7, "hello", 5, :baz => "bar")
-    end
+  def test_route_with_parameter_shell
+    ActionController::Routing.with_controllers(['users', 'pages']) do
+      set.draw do |map|
+        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+/
+        map.connect '/:controller/:action/:id'
+      end
 
-    def test_named_route_url_method_with_ordered_parameters_and_empty_hash
-      controller = setup_named_route_test
-      assert_equal "http://named.route.test/people/go/7/hello/joe/5",
-        controller.send(:multi_url, 7, "hello", 5, {})
-    end
+      assert_equal({:controller => 'pages', :action => 'index'}, set.recognize_path('/pages'))
+      assert_equal({:controller => 'pages', :action => 'index'}, set.recognize_path('/pages/index'))
+      assert_equal({:controller => 'pages', :action => 'list'}, set.recognize_path('/pages/list'))
 
-    def test_named_route_url_method_with_no_positional_arguments
-      controller = setup_named_route_test
-      assert_equal "http://named.route.test/people?baz=bar",
-        controller.send(:index_url, :baz => "bar")
+      assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/pages/show/10'))
+      assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/page/10'))
     end
+  end
 
-    def test_draw_default_route
-      ActionController::Routing.with_controllers(['users']) do
-        set.draw do |map|
-          map.connect '/:controller/:action/:id'
-        end
-
-        assert_equal 1, set.routes.size
-        route = set.routes.first
-
-        assert route.segments.last.optional?
-
-        assert_equal '/users/show/10', set.generate(:controller => 'users', :action => 'show', :id => 10)
-        assert_equal '/users/index/10', set.generate(:controller => 'users', :id => 10)
-
-        assert_equal({:controller => 'users', :action => 'index', :id => '10'}, set.recognize_path('/users/index/10'))
-        assert_equal({:controller => 'users', :action => 'index', :id => '10'}, set.recognize_path('/users/index/10/'))
+  def test_route_requirements_with_anchor_chars_are_invalid
+    assert_raise ArgumentError do
+      set.draw do |map|
+        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /^\d+/
       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('/'))
+    assert_raise ArgumentError do
+      set.draw do |map|
+        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\A\d+/
       end
     end
-
-    def test_route_with_parameter_shell
-      ActionController::Routing.with_controllers(['users', 'pages']) do
-        set.draw do |map|
-          map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+/
-          map.connect '/:controller/:action/:id'
-        end
-
-        assert_equal({:controller => 'pages', :action => 'index'}, set.recognize_path('/pages'))
-        assert_equal({:controller => 'pages', :action => 'index'}, set.recognize_path('/pages/index'))
-        assert_equal({:controller => 'pages', :action => 'list'}, set.recognize_path('/pages/list'))
-
-        assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/pages/show/10'))
-        assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/page/10'))
+    assert_raise ArgumentError do
+      set.draw do |map|
+        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+$/
       end
     end
-
-    def test_route_requirements_with_anchor_chars_are_invalid
-      assert_raises ArgumentError do
-        set.draw do |map|
-          map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /^\d+/
-        end
-      end
-      assert_raises ArgumentError do
-        set.draw do |map|
-          map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\A\d+/
-        end
-      end
-      assert_raises ArgumentError do
-        set.draw do |map|
-          map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+$/
-        end
+    assert_raise ArgumentError do
+      set.draw do |map|
+        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+\Z/
       end
-      assert_raises ArgumentError do
-        set.draw do |map|
-          map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+\Z/
-        end
+    end
+    assert_raise ArgumentError do
+      set.draw do |map|
+        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+\z/
       end
-      assert_raises ArgumentError do
-        set.draw do |map|
-          map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+\z/
-        end
+    end
+    assert_nothing_raised do
+      set.draw do |map|
+        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+/, :name => /^(david|jamis)/
       end
-      assert_nothing_raised do
-        set.draw do |map|
-          map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+/, :name => /^(david|jamis)/
-        end
-        assert_raises ActionController::RoutingError do
-          set.generate :controller => 'pages', :action => 'show', :id => 10
-        end
+      assert_raise ActionController::RoutingError do
+        set.generate :controller => 'pages', :action => 'show', :id => 10
       end
     end
+  end
 
-    def test_route_requirements_with_invalid_http_method_is_invalid
-      assert_raises ArgumentError do
-        set.draw do |map|
-          map.connect 'valid/route', :controller => 'pages', :action => 'show', :conditions => {:method => :invalid}
-        end
+  def test_route_requirements_with_invalid_http_method_is_invalid
+    assert_raise ArgumentError do
+      set.draw do |map|
+        map.connect 'valid/route', :controller => 'pages', :action => 'show', :conditions => {:method => :invalid}
       end
     end
+  end
 
-    def test_route_requirements_with_head_method_condition_is_invalid
-      assert_raises ArgumentError do
-        set.draw do |map|
-          map.connect 'valid/route', :controller => 'pages', :action => 'show', :conditions => {:method => :head}
-        end
+  def test_route_requirements_with_options_method_condition_is_valid
+    assert_nothing_raised do
+      set.draw do |map|
+        map.connect 'valid/route', :controller => 'pages', :action => 'show', :conditions => {:method => :options}
       end
     end
+  end
 
-    def test_non_path_route_requirements_match_all
+  def test_route_requirements_with_head_method_condition_is_invalid
+    assert_raise ArgumentError do
       set.draw do |map|
-        map.connect 'page/37s', :controller => 'pages', :action => 'show', :name => /(jamis|david)/
-      end
-      assert_equal '/page/37s', set.generate(:controller => 'pages', :action => 'show', :name => 'jamis')
-      assert_raises ActionController::RoutingError do
-        set.generate(:controller => 'pages', :action => 'show', :name => 'not_jamis')
-      end
-      assert_raises ActionController::RoutingError do
-        set.generate(:controller => 'pages', :action => 'show', :name => 'nor_jamis_and_david')
+        map.connect 'valid/route', :controller => 'pages', :action => 'show', :conditions => {:method => :head}
       end
     end
+  end
 
-    def test_recognize_with_encoded_id_and_regex
-      set.draw do |map|
-        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /[a-zA-Z0-9\+]+/
-      end
+  def test_non_path_route_requirements_match_all
+    set.draw do |map|
+      map.connect 'page/37s', :controller => 'pages', :action => 'show', :name => /(jamis|david)/
+    end
+    assert_equal '/page/37s', set.generate(:controller => 'pages', :action => 'show', :name => 'jamis')
+    assert_raise ActionController::RoutingError do
+      set.generate(:controller => 'pages', :action => 'show', :name => 'not_jamis')
+    end
+    assert_raise ActionController::RoutingError do
+      set.generate(:controller => 'pages', :action => 'show', :name => 'nor_jamis_and_david')
+    end
+  end
 
-      assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/page/10'))
-      assert_equal({:controller => 'pages', :action => 'show', :id => 'hello+world'}, set.recognize_path('/page/hello+world'))
+  def test_recognize_with_encoded_id_and_regex
+    set.draw do |map|
+      map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /[a-zA-Z0-9\+]+/
     end
 
-    def test_recognize_with_conditions
-      Object.const_set(:PeopleController, Class.new)
+    assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/page/10'))
+    assert_equal({:controller => 'pages', :action => 'show', :id => 'hello+world'}, set.recognize_path('/page/hello+world'))
+  end
 
-      set.draw do |map|
-        map.with_options(:controller => "people") do |people|
-          people.people  "/people",     :action => "index",   :conditions => { :method => :get }
-          people.connect "/people",     :action => "create",  :conditions => { :method => :post }
-          people.person  "/people/:id", :action => "show",    :conditions => { :method => :get }
-          people.connect "/people/:id", :action => "update",  :conditions => { :method => :put }
-          people.connect "/people/:id", :action => "destroy", :conditions => { :method => :delete }
-        end
+  def test_recognize_with_conditions
+    Object.const_set(:PeopleController, Class.new)
+
+    set.draw do |map|
+      map.with_options(:controller => "people") do |people|
+        people.people  "/people",     :action => "index",   :conditions => { :method => :get }
+        people.connect "/people",     :action => "create",  :conditions => { :method => :post }
+        people.person  "/people/:id", :action => "show",    :conditions => { :method => :get }
+        people.connect "/people/:id", :action => "update",  :conditions => { :method => :put }
+        people.connect "/people/:id", :action => "destroy", :conditions => { :method => :delete }
       end
+    end
 
-      request.path = "/people"
-      request.method = :get
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("index", request.path_parameters[:action])
+    request.path = "/people"
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("index", request.path_parameters[:action])
+    request.recycle!
 
-      request.method = :post
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("create", request.path_parameters[:action])
+    request.env["REQUEST_METHOD"] = "POST"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("create", request.path_parameters[:action])
+    request.recycle!
 
-      request.method = :put
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("update", request.path_parameters[:action])
+    request.env["REQUEST_METHOD"] = "PUT"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("update", request.path_parameters[:action])
+    request.recycle!
 
-      begin
-        request.method = :bacon
-        set.recognize(request)
-        flunk 'Should have raised NotImplemented'
-      rescue ActionController::NotImplemented => e
-        assert_equal [:get, :post, :put, :delete], e.allowed_methods
-      end
+    assert_raise(ActionController::UnknownHttpMethod) {
+      request.env["REQUEST_METHOD"] = "BACON"
+      set.recognize(request)
+    }
+    request.recycle!
 
-      request.path = "/people/5"
-      request.method = :get
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("show", request.path_parameters[:action])
-      assert_equal("5", request.path_parameters[:id])
+    request.path = "/people/5"
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("show", request.path_parameters[:action])
+    assert_equal("5", request.path_parameters[:id])
+    request.recycle!
 
-      request.method = :put
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("update", request.path_parameters[:action])
-      assert_equal("5", request.path_parameters[:id])
+    request.env["REQUEST_METHOD"] = "PUT"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("update", request.path_parameters[:action])
+    assert_equal("5", request.path_parameters[:id])
+    request.recycle!
 
-      request.method = :delete
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("destroy", request.path_parameters[:action])
-      assert_equal("5", request.path_parameters[:id])
+    request.env["REQUEST_METHOD"] = "DELETE"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("destroy", request.path_parameters[:action])
+    assert_equal("5", request.path_parameters[:id])
+    request.recycle!
 
-      begin
-        request.method = :post
-        set.recognize(request)
-        flunk 'Should have raised MethodNotAllowed'
-      rescue ActionController::MethodNotAllowed => e
-        assert_equal [:get, :put, :delete], e.allowed_methods
-      end
-
-    ensure
-      Object.send(:remove_const, :PeopleController)
+    begin
+      request.env["REQUEST_METHOD"] = "POST"
+      set.recognize(request)
+      flunk 'Should have raised MethodNotAllowed'
+    rescue ActionController::MethodNotAllowed => e
+      assert_equal [:get, :put, :delete], e.allowed_methods
     end
+    request.recycle!
 
-    def test_recognize_with_alias_in_conditions
-      Object.const_set(:PeopleController, Class.new)
-
-      set.draw do |map|
-        map.people "/people", :controller => 'people', :action => "index",
-          :conditions => { :method => :get }
-        map.root   :people
-      end
+  ensure
+    Object.send(:remove_const, :PeopleController)
+  end
 
-      request.path = "/people"
-      request.method = :get
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("people", request.path_parameters[:controller])
-      assert_equal("index", request.path_parameters[:action])
+  def test_recognize_with_alias_in_conditions
+    Object.const_set(:PeopleController, Class.new)
 
-      request.path = "/"
-      request.method = :get
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("people", request.path_parameters[:controller])
-      assert_equal("index", request.path_parameters[:action])
-    ensure
-      Object.send(:remove_const, :PeopleController)
+    set.draw do |map|
+      map.people "/people", :controller => 'people', :action => "index",
+        :conditions => { :method => :get }
+      map.root   :people
     end
 
-    def test_typo_recognition
-      Object.const_set(:ArticlesController, Class.new)
+    request.path = "/people"
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("people", request.path_parameters[:controller])
+    assert_equal("index", request.path_parameters[:action])
 
-      set.draw do |map|
-        map.connect 'articles/:year/:month/:day/:title',
-               :controller => 'articles', :action => 'permalink',
-               :year => /\d{4}/, :day => /\d{1,2}/, :month => /\d{1,2}/
-      end
+    request.path = "/"
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("people", request.path_parameters[:controller])
+    assert_equal("index", request.path_parameters[:action])
+  ensure
+    Object.send(:remove_const, :PeopleController)
+  end
 
-      request.path = "/articles/2005/11/05/a-very-interesting-article"
-      request.method = :get
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("permalink", request.path_parameters[:action])
-      assert_equal("2005", request.path_parameters[:year])
-      assert_equal("11", request.path_parameters[:month])
-      assert_equal("05", request.path_parameters[:day])
-      assert_equal("a-very-interesting-article", request.path_parameters[:title])
+  def test_typo_recognition
+    Object.const_set(:ArticlesController, Class.new)
 
-    ensure
-      Object.send(:remove_const, :ArticlesController)
+    set.draw do |map|
+      map.connect 'articles/:year/:month/:day/:title',
+             :controller => 'articles', :action => 'permalink',
+             :year => /\d{4}/, :day => /\d{1,2}/, :month => /\d{1,2}/
     end
 
-    def test_routing_traversal_does_not_load_extra_classes
-      assert !Object.const_defined?("Profiler__"), "Profiler should not be loaded"
-      set.draw do |map|
-        map.connect '/profile', :controller => 'profile'
-      end
+    request.path = "/articles/2005/11/05/a-very-interesting-article"
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("permalink", request.path_parameters[:action])
+    assert_equal("2005", request.path_parameters[:year])
+    assert_equal("11", request.path_parameters[:month])
+    assert_equal("05", request.path_parameters[:day])
+    assert_equal("a-very-interesting-article", request.path_parameters[:title])
 
-      request.path = '/profile'
-
-      set.recognize(request) rescue nil
+  ensure
+    Object.send(:remove_const, :ArticlesController)
+  end
 
-      assert !Object.const_defined?("Profiler__"), "Profiler should not be loaded"
+  def test_routing_traversal_does_not_load_extra_classes
+    assert !Object.const_defined?("Profiler__"), "Profiler should not be loaded"
+    set.draw do |map|
+      map.connect '/profile', :controller => 'profile'
     end
 
-    def test_recognize_with_conditions_and_format
-      Object.const_set(:PeopleController, Class.new)
+    request.path = '/profile'
 
-      set.draw do |map|
-        map.with_options(:controller => "people") do |people|
-          people.person  "/people/:id", :action => "show",    :conditions => { :method => :get }
-          people.connect "/people/:id", :action => "update",  :conditions => { :method => :put }
-          people.connect "/people/:id.:_format", :action => "show", :conditions => { :method => :get }
-        end
-      end
+    set.recognize(request) rescue nil
 
-      request.path = "/people/5"
-      request.method = :get
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("show", request.path_parameters[:action])
-      assert_equal("5", request.path_parameters[:id])
+    assert !Object.const_defined?("Profiler__"), "Profiler should not be loaded"
+  end
 
-      request.method = :put
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("update", request.path_parameters[:action])
+  def test_recognize_with_conditions_and_format
+    Object.const_set(:PeopleController, Class.new)
 
-      request.path = "/people/5.png"
-      request.method = :get
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("show", request.path_parameters[:action])
-      assert_equal("5", request.path_parameters[:id])
-      assert_equal("png", request.path_parameters[:_format])
-    ensure
-      Object.send(:remove_const, :PeopleController)
+    set.draw do |map|
+      map.with_options(:controller => "people") do |people|
+        people.person  "/people/:id", :action => "show",    :conditions => { :method => :get }
+        people.connect "/people/:id", :action => "update",  :conditions => { :method => :put }
+        people.connect "/people/:id.:_format", :action => "show", :conditions => { :method => :get }
+      end
     end
 
-    def test_generate_with_default_action
-      set.draw do |map|
-        map.connect "/people", :controller => "people"
-        map.connect "/people/list", :controller => "people", :action => "list"
-      end
+    request.path = "/people/5"
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("show", request.path_parameters[:action])
+    assert_equal("5", request.path_parameters[:id])
+    request.recycle!
+
+    request.env["REQUEST_METHOD"] = "PUT"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("update", request.path_parameters[:action])
+    request.recycle!
+
+    request.path = "/people/5.png"
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("show", request.path_parameters[:action])
+    assert_equal("5", request.path_parameters[:id])
+    assert_equal("png", request.path_parameters[:_format])
+  ensure
+    Object.send(:remove_const, :PeopleController)
+  end
 
-      url = set.generate(:controller => "people", :action => "list")
-      assert_equal "/people/list", url
+  def test_generate_with_default_action
+    set.draw do |map|
+      map.connect "/people", :controller => "people"
+      map.connect "/people/list", :controller => "people", :action => "list"
     end
 
-    def test_root_map
-      Object.const_set(:PeopleController, Class.new)
+    url = set.generate(:controller => "people", :action => "list")
+    assert_equal "/people/list", url
+  end
 
-      set.draw { |map| map.root :controller => "people" }
+  def test_root_map
+    Object.const_set(:PeopleController, Class.new)
 
-      request.path = ""
-      request.method = :get
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("people", request.path_parameters[:controller])
-      assert_equal("index", request.path_parameters[:action])
-    ensure
-      Object.send(:remove_const, :PeopleController)
-    end
+    set.draw { |map| map.root :controller => "people" }
 
-    def test_namespace
-      Object.const_set(:Api, Module.new { |m| m.const_set(:ProductsController, Class.new) })
+    request.path = ""
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("people", request.path_parameters[:controller])
+    assert_equal("index", request.path_parameters[:action])
+  ensure
+    Object.send(:remove_const, :PeopleController)
+  end
 
-      set.draw do |map|
+  def test_namespace
+    Object.const_set(:Api, Module.new { |m| m.const_set(:ProductsController, Class.new) })
 
-        map.namespace 'api' do |api|
-          api.route 'inventory', :controller => "products", :action => 'inventory'
-        end
+    set.draw do |map|
 
+      map.namespace 'api' do |api|
+        api.route 'inventory', :controller => "products", :action => 'inventory'
       end
 
-      request.path = "/api/inventory"
-      request.method = :get
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("api/products", request.path_parameters[:controller])
-      assert_equal("inventory", request.path_parameters[:action])
-    ensure
-      Object.send(:remove_const, :Api)
     end
 
-    def test_namespaced_root_map
-      Object.const_set(:Api, Module.new { |m| m.const_set(:ProductsController, Class.new) })
+    request.path = "/api/inventory"
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("api/products", request.path_parameters[:controller])
+    assert_equal("inventory", request.path_parameters[:action])
+  ensure
+    Object.send(:remove_const, :Api)
+  end
 
-      set.draw do |map|
+  def test_namespaced_root_map
+    Object.const_set(:Api, Module.new { |m| m.const_set(:ProductsController, Class.new) })
 
-        map.namespace 'api' do |api|
-          api.root :controller => "products"
-        end
+    set.draw do |map|
 
+      map.namespace 'api' do |api|
+        api.root :controller => "products"
       end
 
-      request.path = "/api"
-      request.method = :get
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("api/products", request.path_parameters[:controller])
-      assert_equal("index", request.path_parameters[:action])
-    ensure
-      Object.send(:remove_const, :Api)
     end
 
-    def test_namespace_with_path_prefix
-      Object.const_set(:Api, Module.new { |m| m.const_set(:ProductsController, Class.new) })
-
-      set.draw do |map|
+    request.path = "/api"
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("api/products", request.path_parameters[:controller])
+    assert_equal("index", request.path_parameters[:action])
+  ensure
+    Object.send(:remove_const, :Api)
+  end
 
-        map.namespace 'api', :path_prefix => 'prefix' do |api|
-          api.route 'inventory', :controller => "products", :action => 'inventory'
-        end
+  def test_namespace_with_path_prefix
+    Object.const_set(:Api, Module.new { |m| m.const_set(:ProductsController, Class.new) })
 
+    set.draw do |map|
+      map.namespace 'api', :path_prefix => 'prefix' do |api|
+        api.route 'inventory', :controller => "products", :action => 'inventory'
       end
-
-      request.path = "/prefix/inventory"
-      request.method = :get
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("api/products", request.path_parameters[:controller])
-      assert_equal("inventory", request.path_parameters[:action])
-    ensure
-      Object.send(:remove_const, :Api)
     end
 
-    def test_generate_finds_best_fit
-      set.draw do |map|
-        map.connect "/people", :controller => "people", :action => "index"
-        map.connect "/ws/people", :controller => "people", :action => "index", :ws => true
-      end
+    request.path = "/prefix/inventory"
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("api/products", request.path_parameters[:controller])
+    assert_equal("inventory", request.path_parameters[:action])
+  ensure
+    Object.send(:remove_const, :Api)
+  end
 
-      url = set.generate(:controller => "people", :action => "index", :ws => true)
-      assert_equal "/ws/people", url
-    end
+  def test_namespace_with_blank_path_prefix
+    Object.const_set(:Api, Module.new { |m| m.const_set(:ProductsController, Class.new) })
 
-    def test_generate_changes_controller_module
-      set.draw { |map| map.connect ':controller/:action/:id' }
-      current = { :controller => "bling/bloop", :action => "bap", :id => 9 }
-      url = set.generate({:controller => "foo/bar", :action => "baz", :id => 7}, current)
-      assert_equal "/foo/bar/baz/7", url
+    set.draw do |map|
+      map.namespace 'api', :path_prefix => '' do |api|
+        api.route 'inventory', :controller => "products", :action => 'inventory'
+      end
     end
 
-    def test_id_is_not_impossibly_sticky
-      set.draw do |map|
-        map.connect 'foo/:number', :controller => "people", :action => "index"
-        map.connect ':controller/:action/:id'
-      end
+    request.path = "/inventory"
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("api/products", request.path_parameters[:controller])
+    assert_equal("inventory", request.path_parameters[:action])
+  ensure
+    Object.send(:remove_const, :Api)
+  end
 
-      url = set.generate({:controller => "people", :action => "index", :number => 3},
-        {:controller => "people", :action => "index", :id => "21"})
-      assert_equal "/foo/3", url
+  def test_generate_finds_best_fit
+    set.draw do |map|
+      map.connect "/people", :controller => "people", :action => "index"
+      map.connect "/ws/people", :controller => "people", :action => "index", :ws => true
     end
 
-    def test_id_is_sticky_when_it_ought_to_be
-      set.draw do |map|
-        map.connect ':controller/:id/:action'
-      end
+    url = set.generate(:controller => "people", :action => "index", :ws => true)
+    assert_equal "/ws/people", url
+  end
+
+  def test_generate_changes_controller_module
+    set.draw { |map| map.connect ':controller/:action/:id' }
+    current = { :controller => "bling/bloop", :action => "bap", :id => 9 }
+    url = set.generate({:controller => "foo/bar", :action => "baz", :id => 7}, current)
+    assert_equal "/foo/bar/baz/7", url
+  end
 
-      url = set.generate({:action => "destroy"}, {:controller => "people", :action => "show", :id => "7"})
-      assert_equal "/people/7/destroy", url
+  def test_id_is_not_impossibly_sticky
+    set.draw do |map|
+      map.connect 'foo/:number', :controller => "people", :action => "index"
+      map.connect ':controller/:action/:id'
     end
 
-    def test_use_static_path_when_possible
-      set.draw do |map|
-        map.connect 'about', :controller => "welcome", :action => "about"
-        map.connect ':controller/:action/:id'
-      end
+    url = set.generate({:controller => "people", :action => "index", :number => 3},
+      {:controller => "people", :action => "index", :id => "21"})
+    assert_equal "/foo/3", url
+  end
 
-      url = set.generate({:controller => "welcome", :action => "about"},
-        {:controller => "welcome", :action => "get", :id => "7"})
-      assert_equal "/about", url
+  def test_id_is_sticky_when_it_ought_to_be
+    set.draw do |map|
+      map.connect ':controller/:id/:action'
     end
 
-    def test_generate
-      set.draw { |map| map.connect ':controller/:action/:id' }
+    url = set.generate({:action => "destroy"}, {:controller => "people", :action => "show", :id => "7"})
+    assert_equal "/people/7/destroy", url
+  end
 
-      args = { :controller => "foo", :action => "bar", :id => "7", :x => "y" }
-      assert_equal "/foo/bar/7?x=y", set.generate(args)
-      assert_equal ["/foo/bar/7", [:x]], set.generate_extras(args)
-      assert_equal [:x], set.extra_keys(args)
+  def test_use_static_path_when_possible
+    set.draw do |map|
+      map.connect 'about', :controller => "welcome", :action => "about"
+      map.connect ':controller/:action/:id'
     end
 
-    def test_generate_with_path_prefix
-      set.draw { |map| map.connect ':controller/:action/:id', :path_prefix => 'my' }
+    url = set.generate({:controller => "welcome", :action => "about"},
+      {:controller => "welcome", :action => "get", :id => "7"})
+    assert_equal "/about", url
+  end
 
-      args = { :controller => "foo", :action => "bar", :id => "7", :x => "y" }
-      assert_equal "/my/foo/bar/7?x=y", set.generate(args)
-    end
+  def test_generate
+    set.draw { |map| map.connect ':controller/:action/:id' }
 
-    def test_named_routes_are_never_relative_to_modules
-      set.draw do |map|
-        map.connect "/connection/manage/:action", :controller => 'connection/manage'
-        map.connect "/connection/connection", :controller => "connection/connection"
-        map.family_connection "/connection", :controller => "connection"
-      end
+    args = { :controller => "foo", :action => "bar", :id => "7", :x => "y" }
+    assert_equal "/foo/bar/7?x=y", set.generate(args)
+    assert_equal ["/foo/bar/7", [:x]], set.generate_extras(args)
+    assert_equal [:x], set.extra_keys(args)
+  end
 
-      url = set.generate({:controller => "connection"}, {:controller => 'connection/manage'})
-      assert_equal "/connection/connection", url
+  def test_generate_with_path_prefix
+    set.draw { |map| map.connect ':controller/:action/:id', :path_prefix => 'my' }
 
-      url = set.generate({:use_route => :family_connection, :controller => "connection"}, {:controller => 'connection/manage'})
-      assert_equal "/connection", url
-    end
+    args = { :controller => "foo", :action => "bar", :id => "7", :x => "y" }
+    assert_equal "/my/foo/bar/7?x=y", set.generate(args)
+  end
 
-    def test_action_left_off_when_id_is_recalled
-      set.draw do |map|
-        map.connect ':controller/:action/:id'
-      end
-      assert_equal '/post', set.generate(
-        {:controller => 'post', :action => 'index'},
-        {:controller => 'post', :action => 'show', :id => '10'}
-      )
+  def test_generate_with_blank_path_prefix
+    set.draw { |map| map.connect ':controller/:action/:id', :path_prefix => '' }
+
+    args = { :controller => "foo", :action => "bar", :id => "7", :x => "y" }
+    assert_equal "/foo/bar/7?x=y", set.generate(args)
+  end
+
+  def test_named_routes_are_never_relative_to_modules
+    set.draw do |map|
+      map.connect "/connection/manage/:action", :controller => 'connection/manage'
+      map.connect "/connection/connection", :controller => "connection/connection"
+      map.family_connection "/connection", :controller => "connection"
     end
 
-    def test_query_params_will_be_shown_when_recalled
-      set.draw do |map|
-        map.connect 'show_post/:parameter', :controller => 'post', :action => 'show'
-        map.connect ':controller/:action/:id'
-      end
-      assert_equal '/post/edit?parameter=1', set.generate(
-        {:action => 'edit', :parameter => 1},
-        {:controller => 'post', :action => 'show', :parameter => 1}
-      )
+    url = set.generate({:controller => "connection"}, {:controller => 'connection/manage'})
+    assert_equal "/connection/connection", url
+
+    url = set.generate({:use_route => :family_connection, :controller => "connection"}, {:controller => 'connection/manage'})
+    assert_equal "/connection", url
+  end
+
+  def test_action_left_off_when_id_is_recalled
+    set.draw do |map|
+      map.connect ':controller/:action/:id'
     end
+    assert_equal '/post', set.generate(
+      {:controller => 'post', :action => 'index'},
+      {:controller => 'post', :action => 'show', :id => '10'}
+    )
+  end
 
-    def test_expiry_determination_should_consider_values_with_to_param
-      set.draw { |map| map.connect 'projects/:project_id/:controller/:action' }
-      assert_equal '/projects/1/post/show', set.generate(
-        {:action => 'show', :project_id => 1},
-        {:controller => 'post', :action => 'show', :project_id => '1'})
+  def test_query_params_will_be_shown_when_recalled
+    set.draw do |map|
+      map.connect 'show_post/:parameter', :controller => 'post', :action => 'show'
+      map.connect ':controller/:action/:id'
     end
+    assert_equal '/post/edit?parameter=1', set.generate(
+      {:action => 'edit', :parameter => 1},
+      {:controller => 'post', :action => 'show', :parameter => 1}
+    )
+  end
 
-    def test_generate_all
-      set.draw do |map|
-        map.connect 'show_post/:id', :controller => 'post', :action => 'show'
-        map.connect ':controller/:action/:id'
-      end
-      all = set.generate(
-        {:action => 'show', :id => 10, :generate_all => true},
-        {:controller => 'post', :action => 'show'}
-      )
-      assert_equal 2, all.length
-      assert_equal '/show_post/10', all.first
-      assert_equal '/post/show/10', all.last
+  def test_format_is_not_inherit
+    set.draw do |map|
+      map.connect '/posts.:format', :controller => 'posts'
     end
 
-    def test_named_route_in_nested_resource
-      set.draw do |map|
-        map.resources :projects do |project|
-          project.milestones 'milestones', :controller => 'milestones', :action => 'index'
-        end
-      end
+    assert_equal '/posts', set.generate(
+      {:controller => 'posts'},
+      {:controller => 'posts', :action => 'index', :format => 'xml'}
+    )
 
-      request.path = "/projects/1/milestones"
-      request.method = :get
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("milestones", request.path_parameters[:controller])
-      assert_equal("index", request.path_parameters[:action])
-    end
+    assert_equal '/posts.xml', set.generate(
+      {:controller => 'posts', :format => 'xml'},
+      {:controller => 'posts', :action => 'index', :format => 'xml'}
+    )
+  end
 
-    def test_setting_root_in_namespace_using_symbol
-      assert_nothing_raised do
-        set.draw do |map|
-          map.namespace :admin do |admin|
-            admin.root :controller => 'home'
-          end
-        end
-      end
+  def test_expiry_determination_should_consider_values_with_to_param
+    set.draw { |map| map.connect 'projects/:project_id/:controller/:action' }
+    assert_equal '/projects/1/post/show', set.generate(
+      {:action => 'show', :project_id => 1},
+      {:controller => 'post', :action => 'show', :project_id => '1'})
+  end
+
+  def test_generate_all
+    set.draw do |map|
+      map.connect 'show_post/:id', :controller => 'post', :action => 'show'
+      map.connect ':controller/:action/:id'
     end
+    all = set.generate(
+      {:action => 'show', :id => 10, :generate_all => true},
+      {:controller => 'post', :action => 'show'}
+    )
+    assert_equal 2, all.length
+    assert_equal '/show_post/10', all.first
+    assert_equal '/post/show/10', all.last
+  end
 
-    def test_setting_root_in_namespace_using_string
-      assert_nothing_raised do
-        set.draw do |map|
-          map.namespace 'admin' do |admin|
-            admin.root :controller => 'home'
-          end
-        end
+  def test_named_route_in_nested_resource
+    set.draw do |map|
+      map.resources :projects do |project|
+        project.milestones 'milestones', :controller => 'milestones', :action => 'index'
       end
     end
 
-    def test_route_requirements_with_unsupported_regexp_options_must_error
-      assert_raises ArgumentError do
-        set.draw do |map|
-          map.connect 'page/:name', :controller => 'pages',
-            :action => 'show',
-            :requirements => {:name => /(david|jamis)/m}
+    request.path = "/projects/1/milestones"
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("milestones", request.path_parameters[:controller])
+    assert_equal("index", request.path_parameters[:action])
+  end
+
+  def test_setting_root_in_namespace_using_symbol
+    assert_nothing_raised do
+      set.draw do |map|
+        map.namespace :admin do |admin|
+          admin.root :controller => 'home'
         end
       end
     end
+  end
 
-    def test_route_requirements_with_supported_options_must_not_error
-      assert_nothing_raised do
-        set.draw do |map|
-          map.connect 'page/:name', :controller => 'pages',
-            :action => 'show',
-            :requirements => {:name => /(david|jamis)/i}
-        end
-      end
-      assert_nothing_raised do
-        set.draw do |map|
-          map.connect 'page/:name', :controller => 'pages',
-            :action => 'show',
-            :requirements => {:name => / # Desperately overcommented regexp
-                                        ( #Either
-                                         david #The Creator
-                                        | #Or
-                                          jamis #The Deployer
-                                        )/x}
+  def test_setting_root_in_namespace_using_string
+    assert_nothing_raised do
+      set.draw do |map|
+        map.namespace 'admin' do |admin|
+          admin.root :controller => 'home'
         end
       end
     end
+  end
 
-    def test_route_requirement_recognize_with_ignore_case
+  def test_route_requirements_with_unsupported_regexp_options_must_error
+    assert_raise ArgumentError do
       set.draw do |map|
         map.connect 'page/:name', :controller => 'pages',
           :action => 'show',
-          :requirements => {:name => /(david|jamis)/i}
+          :requirements => {:name => /(david|jamis)/m}
       end
-      assert_equal({:controller => 'pages', :action => 'show', :name => 'jamis'}, set.recognize_path('/page/jamis'))
-      assert_raises ActionController::RoutingError do
-        set.recognize_path('/page/davidjamis')
-      end
-      assert_equal({:controller => 'pages', :action => 'show', :name => 'DAVID'}, set.recognize_path('/page/DAVID'))
     end
+  end
 
-    def test_route_requirement_generate_with_ignore_case
+  def test_route_requirements_with_supported_options_must_not_error
+    assert_nothing_raised do
       set.draw do |map|
         map.connect 'page/:name', :controller => 'pages',
           :action => 'show',
           :requirements => {:name => /(david|jamis)/i}
       end
-      url = set.generate({:controller => 'pages', :action => 'show', :name => 'david'})
-      assert_equal "/page/david", url
-      assert_raises ActionController::RoutingError do
-        url = set.generate({:controller => 'pages', :action => 'show', :name => 'davidjamis'})
-      end
-      url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
-      assert_equal "/page/JAMIS", url
     end
-
-    def test_route_requirement_recognize_with_extended_syntax
+    assert_nothing_raised do
       set.draw do |map|
         map.connect 'page/:name', :controller => 'pages',
           :action => 'show',
@@ -2370,130 +2375,183 @@ uses_mocha 'LegacyRouteSet, Route, RouteSet and RouteLoading' do
                                         jamis #The Deployer
                                       )/x}
       end
-      assert_equal({:controller => 'pages', :action => 'show', :name => 'jamis'}, set.recognize_path('/page/jamis'))
-      assert_equal({:controller => 'pages', :action => 'show', :name => 'david'}, set.recognize_path('/page/david'))
-      assert_raises ActionController::RoutingError do
-        set.recognize_path('/page/david #The Creator')
-      end
-      assert_raises ActionController::RoutingError do
-        set.recognize_path('/page/David')
-      end
     end
+  end
 
-    def test_route_requirement_generate_with_extended_syntax
-      set.draw do |map|
-        map.connect 'page/:name', :controller => 'pages',
-          :action => 'show',
-          :requirements => {:name => / # Desperately overcommented regexp
-                                      ( #Either
-                                       david #The Creator
-                                      | #Or
-                                        jamis #The Deployer
-                                      )/x}
-      end
-      url = set.generate({:controller => 'pages', :action => 'show', :name => 'david'})
-      assert_equal "/page/david", url
-      assert_raises ActionController::RoutingError do
-        url = set.generate({:controller => 'pages', :action => 'show', :name => 'davidjamis'})
-      end
-      assert_raises ActionController::RoutingError do
-        url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
-      end
+  def test_route_requirement_recognize_with_ignore_case
+    set.draw do |map|
+      map.connect 'page/:name', :controller => 'pages',
+        :action => 'show',
+        :requirements => {:name => /(david|jamis)/i}
+    end
+    assert_equal({:controller => 'pages', :action => 'show', :name => 'jamis'}, set.recognize_path('/page/jamis'))
+    assert_raise ActionController::RoutingError do
+      set.recognize_path('/page/davidjamis')
     end
+    assert_equal({:controller => 'pages', :action => 'show', :name => 'DAVID'}, set.recognize_path('/page/DAVID'))
+  end
 
-    def test_route_requirement_generate_with_xi_modifiers
-      set.draw do |map|
-        map.connect 'page/:name', :controller => 'pages',
-          :action => 'show',
-          :requirements => {:name => / # Desperately overcommented regexp
-                                      ( #Either
-                                       david #The Creator
-                                      | #Or
-                                        jamis #The Deployer
-                                      )/xi}
-      end
-      url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
-      assert_equal "/page/JAMIS", url
+  def test_route_requirement_generate_with_ignore_case
+    set.draw do |map|
+      map.connect 'page/:name', :controller => 'pages',
+        :action => 'show',
+        :requirements => {:name => /(david|jamis)/i}
     end
+    url = set.generate({:controller => 'pages', :action => 'show', :name => 'david'})
+    assert_equal "/page/david", url
+    assert_raise ActionController::RoutingError do
+      url = set.generate({:controller => 'pages', :action => 'show', :name => 'davidjamis'})
+    end
+    url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
+    assert_equal "/page/JAMIS", url
+  end
 
-    def test_route_requirement_recognize_with_xi_modifiers
-      set.draw do |map|
-        map.connect 'page/:name', :controller => 'pages',
-          :action => 'show',
-          :requirements => {:name => / # Desperately overcommented regexp
-                                      ( #Either
-                                       david #The Creator
-                                      | #Or
-                                        jamis #The Deployer
-                                      )/xi}
-      end
-      assert_equal({:controller => 'pages', :action => 'show', :name => 'JAMIS'}, set.recognize_path('/page/JAMIS'))
+  def test_route_requirement_recognize_with_extended_syntax
+    set.draw do |map|
+      map.connect 'page/:name', :controller => 'pages',
+        :action => 'show',
+        :requirements => {:name => / # Desperately overcommented regexp
+                                    ( #Either
+                                     david #The Creator
+                                    | #Or
+                                      jamis #The Deployer
+                                    )/x}
+    end
+    assert_equal({:controller => 'pages', :action => 'show', :name => 'jamis'}, set.recognize_path('/page/jamis'))
+    assert_equal({:controller => 'pages', :action => 'show', :name => 'david'}, set.recognize_path('/page/david'))
+    assert_raise ActionController::RoutingError do
+      set.recognize_path('/page/david #The Creator')
+    end
+    assert_raise ActionController::RoutingError do
+      set.recognize_path('/page/David')
     end
   end
 
-  class RouteLoadingTest < Test::Unit::TestCase
-    def setup
-      routes.instance_variable_set '@routes_last_modified', nil
-      silence_warnings { Object.const_set :RAILS_ROOT, '.' }
-      ActionController::Routing::Routes.configuration_file = File.join(RAILS_ROOT, 'config', 'routes.rb')
+  def test_route_requirement_generate_with_extended_syntax
+    set.draw do |map|
+      map.connect 'page/:name', :controller => 'pages',
+        :action => 'show',
+        :requirements => {:name => / # Desperately overcommented regexp
+                                    ( #Either
+                                     david #The Creator
+                                    | #Or
+                                      jamis #The Deployer
+                                    )/x}
+    end
+    url = set.generate({:controller => 'pages', :action => 'show', :name => 'david'})
+    assert_equal "/page/david", url
+    assert_raise ActionController::RoutingError do
+      url = set.generate({:controller => 'pages', :action => 'show', :name => 'davidjamis'})
+    end
+    assert_raise ActionController::RoutingError do
+      url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
+    end
+  end
 
-      @stat = stub_everything
+  def test_route_requirement_generate_with_xi_modifiers
+    set.draw do |map|
+      map.connect 'page/:name', :controller => 'pages',
+        :action => 'show',
+        :requirements => {:name => / # Desperately overcommented regexp
+                                    ( #Either
+                                     david #The Creator
+                                    | #Or
+                                      jamis #The Deployer
+                                    )/xi}
     end
+    url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
+    assert_equal "/page/JAMIS", url
+  end
 
-    def teardown
-      ActionController::Routing::Routes.configuration_file = nil
-      Object.send :remove_const, :RAILS_ROOT
+  def test_route_requirement_recognize_with_xi_modifiers
+    set.draw do |map|
+      map.connect 'page/:name', :controller => 'pages',
+        :action => 'show',
+        :requirements => {:name => / # Desperately overcommented regexp
+                                    ( #Either
+                                     david #The Creator
+                                    | #Or
+                                      jamis #The Deployer
+                                    )/xi}
     end
+    assert_equal({:controller => 'pages', :action => 'show', :name => 'JAMIS'}, set.recognize_path('/page/JAMIS'))
+  end
+end
 
-    def test_load
-      File.expects(:stat).returns(@stat)
-      routes.expects(:load).with(regexp_matches(/routes\.rb$/))
+class RouteLoadingTest < Test::Unit::TestCase
+  def setup
+    routes.instance_variable_set '@routes_last_modified', nil
+    silence_warnings { Object.const_set :RAILS_ROOT, '.' }
+    routes.add_configuration_file(File.join(RAILS_ROOT, 'config', 'routes.rb'))
 
-      routes.reload
-    end
+    @stat = stub_everything
+  end
 
-    def test_no_reload_when_not_modified
-      @stat.expects(:mtime).times(2).returns(1)
-      File.expects(:stat).times(2).returns(@stat)
-      routes.expects(:load).with(regexp_matches(/routes\.rb$/)).at_most_once
+  def teardown
+    ActionController::Routing::Routes.configuration_files.clear
+    Object.send :remove_const, :RAILS_ROOT
+  end
 
-      2.times { routes.reload }
-    end
+  def test_load
+    File.expects(:stat).returns(@stat)
+    routes.expects(:load).with(regexp_matches(/routes\.rb$/))
 
-    def test_reload_when_modified
-      @stat.expects(:mtime).at_least(2).returns(1, 2)
-      File.expects(:stat).at_least(2).returns(@stat)
-      routes.expects(:load).with(regexp_matches(/routes\.rb$/)).times(2)
+    routes.reload
+  end
 
-      2.times { routes.reload }
-    end
+  def test_no_reload_when_not_modified
+    @stat.expects(:mtime).times(2).returns(1)
+    File.expects(:stat).times(2).returns(@stat)
+    routes.expects(:load).with(regexp_matches(/routes\.rb$/)).at_most_once
 
-    def test_bang_forces_reload
-      @stat.expects(:mtime).at_least(2).returns(1)
-      File.expects(:stat).at_least(2).returns(@stat)
-      routes.expects(:load).with(regexp_matches(/routes\.rb$/)).times(2)
+    2.times { routes.reload }
+  end
 
-      2.times { routes.reload! }
-    end
+  def test_reload_when_modified
+    @stat.expects(:mtime).at_least(2).returns(1, 2)
+    File.expects(:stat).at_least(2).returns(@stat)
+    routes.expects(:load).with(regexp_matches(/routes\.rb$/)).times(2)
 
-    def test_adding_inflections_forces_reload
-      ActiveSupport::Inflector::Inflections.instance.expects(:uncountable).with('equipment')
-      routes.expects(:reload!)
+    2.times { routes.reload }
+  end
 
-      ActiveSupport::Inflector.inflections { |inflect| inflect.uncountable('equipment') }
-    end
+  def test_bang_forces_reload
+    @stat.expects(:mtime).at_least(2).returns(1)
+    File.expects(:stat).at_least(2).returns(@stat)
+    routes.expects(:load).with(regexp_matches(/routes\.rb$/)).times(2)
 
-    def test_load_with_configuration
-      routes.configuration_file = "foobarbaz"
-      File.expects(:stat).returns(@stat)
-      routes.expects(:load).with("foobarbaz")
+    2.times { routes.reload! }
+  end
 
-      routes.reload
-    end
+  def test_adding_inflections_forces_reload
+    ActiveSupport::Inflector::Inflections.instance.expects(:uncountable).with('equipment')
+    routes.expects(:reload!)
 
-    private
-      def routes
-        ActionController::Routing::Routes
-      end
+    ActiveSupport::Inflector.inflections { |inflect| inflect.uncountable('equipment') }
   end
+
+  def test_load_with_configuration
+    routes.configuration_files.clear
+    routes.add_configuration_file("foobarbaz")
+    File.expects(:stat).returns(@stat)
+    routes.expects(:load).with("foobarbaz")
+
+    routes.reload
+  end
+  
+  def test_load_multiple_configurations
+    routes.add_configuration_file("engines.rb")
+    
+    File.expects(:stat).at_least_once.returns(@stat)
+
+    routes.expects(:load).with('./config/routes.rb')
+    routes.expects(:load).with('engines.rb')
+
+    routes.reload
+  end
+
+  private
+    def routes
+      ActionController::Routing::Routes
+    end
 end