Removed deprecated RouteSet API, still many tests fail

34 files changed, 567 insertions, 606 deletions

diff --git a/actionpack/lib/action_dispatch/routing.rb b/actionpack/lib/action_dispatch/routing.rb
index b2b0f4c08e..8810227a59 100644
--- a/actionpack/lib/action_dispatch/routing.rb
+++ b/actionpack/lib/action_dispatch/routing.rb
@@ -264,7 +264,6 @@ module ActionDispatch
   # Target specific controllers by prefixing the command with <tt>CONTROLLER=x</tt>.
   #
   module Routing
-    autoload :DeprecatedMapper, 'action_dispatch/routing/deprecated_mapper'
     autoload :Mapper, 'action_dispatch/routing/mapper'
     autoload :Route, 'action_dispatch/routing/route'
     autoload :RouteSet, 'action_dispatch/routing/route_set'
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 900900ee24..cee3fd880c 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -443,11 +443,6 @@ module ActionDispatch
           options = args.extract_options!
           options = options.dup
 
-          if name_prefix = options.delete(:name_prefix)
-            options[:as] ||= name_prefix
-            ActiveSupport::Deprecation.warn ":name_prefix was deprecated in the new router syntax. Use :as instead.", caller
-          end
-
           options[:path] = args.first if args.first.is_a?(String)
           recover = {}
 
@@ -770,7 +765,7 @@ module ActionDispatch
           end
 
           resource_scope(Resource.new(resources.pop, options)) do
-            yield if block_given?
+            instance_eval(&block) if block_given?
 
             collection_scope do
               get  :index if parent_resource.actions.include?(:index)
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 107e44287d..956bd2e719 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -1,7 +1,6 @@
 require 'rack/mount'
 require 'forwardable'
 require 'active_support/core_ext/object/to_query'
-require 'action_dispatch/routing/deprecated_mapper'
 
 module ActionDispatch
   module Routing
@@ -211,7 +210,6 @@ module ActionDispatch
         self.routes = []
         self.named_routes = NamedRouteCollection.new
         self.resources_path_names = self.class.default_resources_path_names.dup
-        self.controller_namespaces = Set.new
         self.default_url_options = {}
 
         self.request_class = request_class
@@ -227,14 +225,10 @@ module ActionDispatch
         clear! unless @disable_clear_and_finalize
 
         mapper = Mapper.new(self)
-        if block.arity == 1
-          mapper.instance_exec(DeprecatedMapper.new(self), &block)
+        if default_scope
+          mapper.with_default_scope(default_scope, &block)
         else
-          if default_scope
-            mapper.with_default_scope(default_scope, &block)
-          else
-            mapper.instance_exec(&block)
-          end
+          mapper.instance_exec(&block)
         end
 
         finalize! unless @disable_clear_and_finalize
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 869842fc9c..7080a87f42 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -49,14 +49,6 @@ require 'pp' # require 'pp' early to prevent hidden_methods from not picking up
 module Rails
 end
 
-# Monkey patch the old routes initialization to be silenced.
-class ActionDispatch::Routing::DeprecatedMapper
-  def initialize_with_silencer(*args)
-    ActiveSupport::Deprecation.silence { initialize_without_silencer(*args) }
-  end
-  alias_method_chain :initialize, :silencer
-end
-
 ActiveSupport::Dependencies.hook!
 
 # Show backtraces for deprecated behavior for quicker cleanup.
@@ -128,14 +120,12 @@ module ActiveSupport
     # Hold off drawing routes until all the possible controller classes
     # have been loaded.
     setup_once do
-      SharedTestRoutes.draw do |map|
-        # FIXME: match ':controller(/:action(/:id))'
-        map.connect ':controller/:action/:id'
+      SharedTestRoutes.draw do
+        match ':controller(/:action)'
       end
 
-      ActionController::IntegrationTest.app.routes.draw do |map|
-        # FIXME: match ':controller(/:action(/:id))'
-        map.connect ':controller/:action/:id'
+      ActionController::IntegrationTest.app.routes.draw do
+        match ':controller(/:action)'
       end
     end
   end
diff --git a/actionpack/test/activerecord/active_record_store_test.rb b/actionpack/test/activerecord/active_record_store_test.rb
index bdd1a0a15c..dd43fa4810 100644
--- a/actionpack/test/activerecord/active_record_store_test.rb
+++ b/actionpack/test/activerecord/active_record_store_test.rb
@@ -198,7 +198,7 @@ class ActiveRecordStoreTest < ActionController::IntegrationTest
 
     def with_test_route_set(options = {})
       with_routing do |set|
-        set.draw do |map|
+        set.draw do
           match ':action', :to => 'active_record_store_test/test'
         end
 
diff --git a/actionpack/test/activerecord/polymorphic_routes_test.rb b/actionpack/test/activerecord/polymorphic_routes_test.rb
index 448aaa5eee..f9e47d5118 100644
--- a/actionpack/test/activerecord/polymorphic_routes_test.rb
+++ b/actionpack/test/activerecord/polymorphic_routes_test.rb
@@ -451,18 +451,18 @@ class PolymorphicRoutesTest < ActionController::TestCase
 
   def with_test_routes(options = {})
     with_routing do |set|
-      set.draw do |map|
-        map.resources :projects do |projects|
-          projects.resources :tasks
-          projects.resource :bid do |bid|
-            bid.resources :tasks
+      set.draw do
+        resources :projects do
+          resources :tasks
+          resource :bid do
+            resources :tasks
           end
         end
-        map.resources :taxes do |taxes|
-          taxes.resources :faxes
-          taxes.resource :bid
+        resources :taxes do
+          resources :faxes
+          resource :bid
         end
-        map.resources :series
+        resources :series
       end
 
       self.class.send(:include, @routes.url_helpers)
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index 53cdd358b4..c805742359 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -222,7 +222,7 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
   # test the redirection to a named route
   def test_assert_redirect_to_named_route
     with_routing do |set|
-      set.draw do |map|
+      set.draw do
         match 'route_one', :to => 'action_pack_assertions#nothing', :as => :route_one
         match ':controller/:action'
       end
@@ -236,7 +236,7 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
 
   def test_assert_redirect_to_named_route_failure
     with_routing do |set|
-      set.draw do |map|
+      set.draw do
         match 'route_one', :to => 'action_pack_assertions#nothing', :as => :route_one
         match 'route_two', :to => 'action_pack_assertions#nothing', :id => 'two', :as => :route_two
         match ':controller/:action'
@@ -258,10 +258,9 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
     @controller = Admin::InnerModuleController.new
 
     with_routing do |set|
-      set.draw do |map|
+      set.draw do
         match 'admin/inner_module', :to => 'admin/inner_module#index', :as => :admin_inner_module
-        # match ':controller/:action'
-        map.connect ':controller/:action/:id'
+        match ':controller/:action'
       end
       process :redirect_to_index
       # redirection is <{"action"=>"index", "controller"=>"admin/admin/inner_module"}>
@@ -273,10 +272,9 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
     @controller = Admin::InnerModuleController.new
 
     with_routing do |set|
-      set.draw do |map|
+      set.draw do
         match '/action_pack_assertions/:id', :to => 'action_pack_assertions#index', :as => :top_level
-        # match ':controller/:action'
-        map.connect ':controller/:action/:id'
+        match ':controller/:action'
       end
       process :redirect_to_top_level_named_route
       # assert_redirected_to "http://test.host/action_pack_assertions/foo" would pass because of exact match early return
@@ -288,11 +286,10 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
     @controller = Admin::InnerModuleController.new
 
     with_routing do |set|
-      set.draw do |map|
+      set.draw do
         # this controller exists in the admin namespace as well which is the only difference from previous test
         match '/user/:id', :to => 'user#index', :as => :top_level
-        # match ':controller/:action'
-        map.connect ':controller/:action/:id'
+        match ':controller/:action'
       end
       process :redirect_to_top_level_named_route
       # assert_redirected_to top_level_url('foo') would pass because of exact match early return
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb
index 5ec59acf8d..9c22a4e7e0 100644
--- a/actionpack/test/controller/base_test.rb
+++ b/actionpack/test/controller/base_test.rb
@@ -294,7 +294,7 @@ class EmptyUrlOptionsTest < ActionController::TestCase
     @controller.request = @request
 
     with_routing do |set|
-      set.draw do |map|
+      set.draw do
         resources :things
       end
 
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index c161bea945..84b796ba72 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -76,7 +76,7 @@ class PageCachingTest < ActionController::TestCase
 
   def test_page_caching_resources_saves_to_correct_path_with_extension_even_if_default_route
     with_routing do |set|
-      set.draw do |map|
+      set.draw do
         match 'posts.:format', :to => 'posts#index', :as => :formatted_posts
         match '/', :to => 'posts#index', :as => :main
       end
@@ -452,7 +452,7 @@ class ActionCacheTest < ActionController::TestCase
 
   def test_xml_version_of_resource_is_treated_as_different_cache
     with_routing do |set|
-      set.draw do |map|
+      set.draw do
         match ':controller(/:action(.:format))'
       end
 
diff --git a/actionpack/test/controller/flash_test.rb b/actionpack/test/controller/flash_test.rb
index 4be09f8c83..6c411d8997 100644
--- a/actionpack/test/controller/flash_test.rb
+++ b/actionpack/test/controller/flash_test.rb
@@ -255,7 +255,7 @@ class FlashIntegrationTest < ActionController::IntegrationTest
 
     def with_test_route_set
       with_routing do |set|
-        set.draw do |map|
+        set.draw do
           match ':action', :to => FlashIntegrationTest::TestController
         end
 
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 5ee8e2b6ae..343cffdf7f 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -427,7 +427,7 @@ class IntegrationProcessTest < ActionController::IntegrationTest
           include set.url_helpers
         end
 
-        set.draw do |map|
+        set.draw do
           match ':action', :to => controller
           get 'get/:action', :to => controller
         end
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index 6364b7140d..8c0af0dc30 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -876,7 +876,7 @@ class RespondWithControllerTest < ActionController::TestCase
   private
     def with_test_route_set
       with_routing do |set|
-        set.draw do |map|
+        set.draw do
           resources :customers
           resources :quiz_stores do
             resources :customers
diff --git a/actionpack/test/controller/new_base/render_action_test.rb b/actionpack/test/controller/new_base/render_action_test.rb
index d92e9c4bf2..aa44e0b282 100644
--- a/actionpack/test/controller/new_base/render_action_test.rb
+++ b/actionpack/test/controller/new_base/render_action_test.rb
@@ -83,6 +83,9 @@ module RenderAction
   end
 
   class RenderLayoutTest < Rack::TestCase
+    def setup
+    end
+
     describe "Both <controller_path>.html.erb and application.html.erb are missing"
 
     test "rendering with layout => true" do
diff --git a/actionpack/test/controller/redirect_test.rb b/actionpack/test/controller/redirect_test.rb
index 441bc47908..c30921a928 100644
--- a/actionpack/test/controller/redirect_test.rb
+++ b/actionpack/test/controller/redirect_test.rb
@@ -232,7 +232,7 @@ class RedirectTest < ActionController::TestCase
 
   def test_redirect_to_record
     with_routing do |set|
-      set.draw do |map|
+      set.draw do
         resources :workshops
         match ':controller/:action'
       end
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 9037a13343..ab12c0bf17 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -1120,7 +1120,7 @@ class RenderTest < ActionController::TestCase
 
   def test_head_with_location_object
     with_routing do |set|
-      set.draw do |map|
+      set.draw do
         resources :customers
         match ':controller/:action'
       end
diff --git a/actionpack/test/controller/render_xml_test.rb b/actionpack/test/controller/render_xml_test.rb
index 4bf867fa41..ec4dc848ff 100644
--- a/actionpack/test/controller/render_xml_test.rb
+++ b/actionpack/test/controller/render_xml_test.rb
@@ -70,10 +70,9 @@ class RenderXmlTest < ActionController::TestCase
 
   def test_rendering_with_object_location_should_set_header_with_url_for
     with_routing do |set|
-      set.draw do |map|
+      set.draw do
         resources :customers
-        # match ':controller/:action'
-        map.connect ':controller/:action/:id'
+        match ':controller/:action'
       end
 
       get :render_with_object_location
diff --git a/actionpack/test/controller/rescue_test.rb b/actionpack/test/controller/rescue_test.rb
index f476db3792..04eedf3295 100644
--- a/actionpack/test/controller/rescue_test.rb
+++ b/actionpack/test/controller/rescue_test.rb
@@ -371,7 +371,7 @@ class RescueTest < ActionController::IntegrationTest
   private
     def with_test_routing
       with_routing do |set|
-        set.draw do |map|
+        set.draw do
           match 'foo', :to => ::RescueTest::TestController.action(:foo)
           match 'invalid', :to => ::RescueTest::TestController.action(:invalid)
           match 'b00m', :to => ::RescueTest::TestController.action(:b00m)
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index 4505cdabae..86d854c962 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -1,5 +1,6 @@
 require 'abstract_unit'
 require 'active_support/core_ext/object/try'
+require 'active_support/core_ext/object/with_options'
 
 class ResourcesController < ActionController::Base
   def index() render :nothing => true end
@@ -32,36 +33,6 @@ module Backoffice
 end
 
 class ResourcesTest < ActionController::TestCase
-  def test_should_arrange_actions
-    resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, {
-      :collection => { :rss => :get, :reorder => :post, :csv => :post },
-      :member     => { :rss => :get, :atom => :get, :upload => :post, :fix => :post },
-      :new        => { :preview => :get, :draft => :get }}, {})
-
-    assert_resource_methods [:rss],                   resource, :collection, :get
-    assert_resource_methods [:csv, :reorder],         resource, :collection, :post
-    assert_resource_methods [:edit, :rss, :atom],     resource, :member,     :get
-    assert_resource_methods [:upload, :fix],          resource, :member,     :post
-    assert_resource_methods [:new, :preview, :draft], resource, :new,        :get
-  end
-
-  def test_should_resource_controller_name_equal_resource_name_by_default
-    resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, {}, {})
-    assert_equal 'messages', resource.controller
-  end
-
-  def test_should_resource_controller_name_equal_controller_option
-    resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, {:controller => 'posts'}, {})
-    assert_equal 'posts', resource.controller
-  end
-
-  def test_should_all_singleton_paths_be_the_same
-    [ :path, :nesting_path_prefix, :member_path ].each do |method|
-      resource = ActionDispatch::Routing::DeprecatedMapper::SingletonResource.new(:messages, {:path_prefix => 'admin'}, {})
-      assert_equal 'admin/messages', resource.send(method)
-    end
-  end
-
   def test_default_restful_routes
     with_restful_routing :messages do
       assert_simply_restful_for :messages
@@ -69,9 +40,9 @@ class ResourcesTest < ActionController::TestCase
   end
 
   def test_override_paths_for_member_and_collection_methods
-    collection_methods = { 'rss' => :get, 'reorder' => :post, 'csv' => :post }
-    member_methods    = { 'rss' => :get, :atom => :get, :upload => :post, :fix => :post }
-    path_names = {:new => 'nuevo', 'rss' => 'canal', :fix => 'corrigir' }
+    collection_methods = { :rss => :get, :reorder => :post, :csv => :post }
+    member_methods    = { :rss => :get, :atom => :get, :upload => :post, :fix => :post }
+    path_names = {:new => 'nuevo', :rss => 'canal', :fix => 'corrigir' }
 
     with_restful_routing :messages,
         :collection => collection_methods,
@@ -89,7 +60,7 @@ class ResourcesTest < ActionController::TestCase
         end
 
         collection_methods.each do |action, method|
-          assert_recognizes(options.merge(:action => action),
+          assert_recognizes(options.merge(:action => action.to_s),
             :path => "/messages/#{path_names[action] || action}",
             :method => method)
         end
@@ -112,12 +83,6 @@ class ResourcesTest < ActionController::TestCase
     end
   end
 
-  def test_override_paths_for_default_restful_actions
-    resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, {
-      :path_names => {:new => 'nuevo', :edit => 'editar'}}, {})
-    assert_equal resource.new_path, "#{resource.path}/nuevo"
-  end
-
   def test_multiple_default_restful_routes
     with_restful_routing :messages, :comments do
       assert_simply_restful_for :messages
@@ -131,7 +96,7 @@ class ResourcesTest < ActionController::TestCase
     end
   end
 
-  def test_irregular_id_with_no_requirements_should_raise_error
+  def test_irregular_id_with_no_constraints_should_raise_error
     expected_options = {:controller => 'messages', :action => 'show', :id => '1.1.1'}
 
     with_restful_routing :messages do
@@ -141,25 +106,25 @@ class ResourcesTest < ActionController::TestCase
     end
   end
 
-  def test_irregular_id_with_requirements_should_pass
+  def test_irregular_id_with_constraints_should_pass
     expected_options = {:controller => 'messages', :action => 'show', :id => '1.1.1'}
 
-    with_restful_routing(:messages, :requirements => {:id => /[0-9]\.[0-9]\.[0-9]/}) do
+    with_restful_routing(:messages, :constraints => {:id => /[0-9]\.[0-9]\.[0-9]/}) do
       assert_recognizes(expected_options, :path => 'messages/1.1.1', :method => :get)
     end
   end
 
-  def test_with_path_prefix_requirements
+  def test_with_path_prefix_constraints
     expected_options = {:controller => 'messages', :action => 'show', :thread_id => '1.1.1', :id => '1'}
-    with_restful_routing :messages, :path_prefix => '/thread/:thread_id', :requirements => {:thread_id => /[0-9]\.[0-9]\.[0-9]/} do
+    with_restful_routing :messages, :path_prefix => '/thread/:thread_id', :constraints => {:thread_id => /[0-9]\.[0-9]\.[0-9]/} do
       assert_recognizes(expected_options, :path => 'thread/1.1.1/messages/1', :method => :get)
     end
   end
 
-  def test_irregular_id_requirements_should_get_passed_to_member_actions
+  def test_irregular_id_constraints_should_get_passed_to_member_actions
     expected_options = {:controller => 'messages', :action => 'custom', :id => '1.1.1'}
 
-    with_restful_routing(:messages, :member => {:custom => :get}, :requirements => {:id => /[0-9]\.[0-9]\.[0-9]/}) do
+    with_restful_routing(:messages, :member => {:custom => :get}, :constraints => {:id => /[0-9]\.[0-9]\.[0-9]/}) do
       assert_recognizes(expected_options, :path => 'messages/1.1.1/custom', :method => :get)
     end
   end
@@ -274,7 +239,7 @@ class ResourcesTest < ActionController::TestCase
   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
+    with_restful_routing(:messages, :constraints => {: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
@@ -411,10 +376,10 @@ class ResourcesTest < ActionController::TestCase
 
   def test_nested_restful_routes
     with_routing do |set|
-      set.draw do |map|
-        map.resources :threads do |map|
-          map.resources :messages do |map|
-            map.resources :comments
+      set.draw do
+       resources :threads do
+         resources :messages do
+           resources :comments
           end
         end
       end
@@ -433,10 +398,10 @@ class ResourcesTest < ActionController::TestCase
 
   def test_nested_restful_routes_with_overwritten_defaults
     with_routing do |set|
-      set.draw do |map|
-        map.resources :threads do |map|
-          map.resources :messages, :name_prefix => nil do |map|
-            map.resources :comments, :name_prefix => nil
+      set.draw do
+       resources :threads do
+         resources :messages, :name_prefix => nil do
+           resources :comments, :name_prefix => nil
           end
         end
       end
@@ -453,10 +418,10 @@ class ResourcesTest < ActionController::TestCase
 
   def test_shallow_nested_restful_routes
     with_routing do |set|
-      set.draw do |map|
-        map.resources :threads, :shallow => true do |map|
-          map.resources :messages do |map|
-            map.resources :comments
+      set.draw do
+       resources :threads, :shallow => true do
+         resources :messages do
+           resources :comments
           end
         end
       end
@@ -478,11 +443,11 @@ class ResourcesTest < ActionController::TestCase
 
   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
+      set.draw do
+       namespace :backoffice do
+         namespace :admin do
+           resources :products, :shallow => true do
+             resources :images
             end
           end
         end
@@ -531,9 +496,9 @@ class ResourcesTest < ActionController::TestCase
 
   def test_should_create_nested_singleton_resource_routes
     with_routing do |set|
-      set.draw do |map|
-        map.resource :admin, :controller => 'admin' do |admin|
-          admin.resource :account
+      set.draw do
+       resource :admin, :controller => 'admin' do
+          resource :account
         end
       end
 
@@ -544,8 +509,8 @@ class ResourcesTest < ActionController::TestCase
 
   def test_resource_has_many_should_become_nested_resources
     with_routing do |set|
-      set.draw do |map|
-        map.resources :messages, :has_many => [ :comments, :authors ]
+      set.draw do
+       resources :messages, :has_many => [ :comments, :authors ]
       end
 
       assert_simply_restful_for :messages
@@ -556,8 +521,8 @@ class ResourcesTest < ActionController::TestCase
 
   def test_resources_has_many_hash_should_become_nested_resources
     with_routing do |set|
-      set.draw do |map|
-        map.resources :threads, :has_many => { :messages => [ :comments, { :authors => :threads } ] }
+      set.draw do
+       resources :threads, :has_many => { :messages => [ :comments, { :authors => :threads } ] }
       end
 
       assert_simply_restful_for :threads
@@ -570,8 +535,8 @@ class ResourcesTest < ActionController::TestCase
 
   def test_shallow_resource_has_many_should_become_shallow_nested_resources
     with_routing do |set|
-      set.draw do |map|
-        map.resources :messages, :has_many => [ :comments, :authors ], :shallow => true
+      set.draw do
+       resources :messages, :has_many => [ :comments, :authors ], :shallow => true
       end
 
       assert_simply_restful_for :messages, :shallow => true
@@ -582,8 +547,8 @@ class ResourcesTest < ActionController::TestCase
 
   def test_resource_has_one_should_become_nested_resources
     with_routing do |set|
-      set.draw do |map|
-        map.resources :messages, :has_one => :logo
+      set.draw do
+       resources :messages, :has_one => :logo
       end
 
       assert_simply_restful_for :messages
@@ -593,8 +558,8 @@ class ResourcesTest < ActionController::TestCase
 
   def test_shallow_resource_has_one_should_become_shallow_nested_resources
     with_routing do |set|
-      set.draw do |map|
-        map.resources :messages, :has_one => :logo, :shallow => true
+      set.draw do
+       resources :messages, :has_one => :logo, :shallow => true
       end
 
       assert_simply_restful_for :messages, :shallow => true
@@ -638,9 +603,9 @@ class ResourcesTest < ActionController::TestCase
 
   def test_should_nest_resources_in_singleton_resource
     with_routing do |set|
-      set.draw do |map|
-        map.resource :account do |account|
-          account.resources :messages
+      set.draw do
+       resource :account do
+          resources :messages
         end
       end
 
@@ -651,9 +616,9 @@ class ResourcesTest < ActionController::TestCase
 
   def test_should_nest_resources_in_singleton_resource_with_path_prefix
     with_routing do |set|
-      set.draw do |map|
-        map.resource(:account, :path_prefix => ':site_id') do |account|
-          account.resources :messages
+      set.draw do
+       resource(:account, :path_prefix => ':site_id') do
+          resources :messages
         end
       end
 
@@ -664,9 +629,9 @@ class ResourcesTest < ActionController::TestCase
 
   def test_should_nest_singleton_resource_in_resources
     with_routing do |set|
-      set.draw do |map|
-        map.resources :threads do |thread|
-          thread.resource :admin, :controller => 'admin'
+      set.draw do
+       resources :threads do
+          resource :admin, :controller => 'admin'
         end
       end
 
@@ -694,8 +659,8 @@ class ResourcesTest < ActionController::TestCase
   def test_should_not_allow_invalid_head_method_for_member_routes
     with_routing do |set|
       assert_raise(ArgumentError) do
-        set.draw do |map|
-          map.resources :messages, :member => {:something => :head}
+        set.draw do
+         resources :messages, :member => {:something => :head}
         end
       end
     end
@@ -704,8 +669,8 @@ class ResourcesTest < ActionController::TestCase
   def test_should_not_allow_invalid_http_methods_for_member_routes
     with_routing do |set|
       assert_raise(ArgumentError) do
-        set.draw do |map|
-          map.resources :messages, :member => {:something => :invalid}
+        set.draw do
+         resources :messages, :member => {:something => :invalid}
         end
       end
     end
@@ -713,9 +678,9 @@ class ResourcesTest < ActionController::TestCase
 
   def test_resource_action_separator
     with_routing do |set|
-      set.draw do |map|
-        map.resources :messages, :collection => {:search => :get}, :new => {:preview => :any}, :name_prefix => 'thread_', :path_prefix => '/threads/:thread_id'
-        map.resource :account, :member => {:login => :get}, :new => {:preview => :any}, :name_prefix => 'admin_', :path_prefix => '/admin'
+      set.draw do
+       resources :messages, :collection => {:search => :get}, :new => {:preview => :any}, :name_prefix => 'thread_', :path_prefix => '/threads/:thread_id'
+       resource :account, :member => {:login => :get}, :new => {:preview => :any}, :name_prefix => 'admin_', :path_prefix => '/admin'
       end
 
       action_separator = ActionController::Base.resource_action_separator
@@ -733,8 +698,8 @@ class ResourcesTest < ActionController::TestCase
 
   def test_new_style_named_routes_for_resource
     with_routing do |set|
-      set.draw do |map|
-        map.resources :messages, :collection => {:search => :get}, :new => {:preview => :any}, :name_prefix => 'thread_', :path_prefix => '/threads/:thread_id'
+      set.draw do
+       resources :messages, :collection => {:search => :get}, :new => {:preview => :any}, :name_prefix => 'thread_', :path_prefix => '/threads/:thread_id'
       end
       assert_simply_restful_for :messages, :name_prefix => 'thread_', :path_prefix => 'threads/1/', :options => { :thread_id => '1' }
       assert_named_route "/threads/1/messages/search", "search_thread_messages_path", {}
@@ -745,8 +710,8 @@ class ResourcesTest < ActionController::TestCase
 
   def test_new_style_named_routes_for_singleton_resource
     with_routing do |set|
-      set.draw do |map|
-        map.resource :account, :member => {:login => :get}, :new => {:preview => :any}, :name_prefix => 'admin_', :path_prefix => '/admin'
+      set.draw do
+       resource :account, :member => {:login => :get}, :new => {:preview => :any}, :name_prefix => 'admin_', :path_prefix => '/admin'
       end
       assert_singleton_restful_for :account, :name_prefix => 'admin_', :path_prefix => 'admin/'
       assert_named_route "/admin/account/login", "login_admin_account_path", {}
@@ -757,9 +722,9 @@ class ResourcesTest < ActionController::TestCase
 
   def test_resources_in_namespace
     with_routing do |set|
-      set.draw do |map|
-        map.namespace :backoffice do |backoffice|
-          backoffice.resources :products
+      set.draw do
+       namespace :backoffice do
+          resources :products
         end
       end
 
@@ -769,9 +734,9 @@ class ResourcesTest < ActionController::TestCase
 
   def test_resource_has_many_in_namespace
     with_routing do |set|
-      set.draw do |map|
-        map.namespace :backoffice do |backoffice|
-          backoffice.resources :products, :has_many => :tags
+      set.draw do
+       namespace :backoffice do
+          resources :products, :has_many => :tags
         end
       end
 
@@ -782,9 +747,9 @@ class ResourcesTest < ActionController::TestCase
 
   def test_resource_has_one_in_namespace
     with_routing do |set|
-      set.draw do |map|
-        map.namespace :backoffice do |backoffice|
-          backoffice.resources :products, :has_one => :manufacturer
+      set.draw do
+       namespace :backoffice do
+          resources :products, :has_one => :manufacturer
         end
       end
 
@@ -795,10 +760,10 @@ class ResourcesTest < ActionController::TestCase
 
   def test_resources_in_nested_namespace
     with_routing do |set|
-      set.draw do |map|
-        map.namespace :backoffice do |backoffice|
-          backoffice.namespace :admin do |admin|
-            admin.resources :products
+      set.draw do
+       namespace :backoffice do
+          backoffice.namespace :admin do
+            resources :products
           end
         end
       end
@@ -809,8 +774,8 @@ class ResourcesTest < ActionController::TestCase
 
   def test_resources_using_namespace
     with_routing do |set|
-      set.draw do |map|
-        map.resources :products, :namespace => "backoffice/"
+      set.draw do
+       resources :products, :namespace => "backoffice/"
       end
 
       assert_simply_restful_for :products, :controller => "backoffice/products"
@@ -819,9 +784,9 @@ class ResourcesTest < ActionController::TestCase
 
   def test_nested_resources_using_namespace
     with_routing do |set|
-      set.draw do |map|
-        map.namespace :backoffice do |backoffice|
-          backoffice.resources :products do |products|
+      set.draw do
+       namespace :backoffice do
+          resources :products do
             products.resources :images
           end
         end
@@ -833,10 +798,10 @@ class ResourcesTest < ActionController::TestCase
 
   def test_nested_resources_in_nested_namespace
     with_routing do |set|
-      set.draw do |map|
-        map.namespace :backoffice do |backoffice|
-          backoffice.namespace :admin do |admin|
-            admin.resources :products do |products|
+      set.draw do
+       namespace :backoffice do
+          backoffice.namespace :admin do
+            resources :products do
               products.resources :images
             end
           end
@@ -863,12 +828,12 @@ class ResourcesTest < ActionController::TestCase
 
   def test_multiple_with_path_segment_and_controller
     with_routing do |set|
-      set.draw do |map|
-        map.resources :products do |products|
+      set.draw do
+       resources :products do
           products.resources :product_reviews, :as => 'reviews', :controller => 'messages'
         end
-        map.resources :tutors do |tutors|
-          tutors.resources :tutor_reviews, :as => 'reviews', :controller => 'comments'
+       resources :tutors do
+          resources :tutor_reviews, :as => 'reviews', :controller => 'comments'
         end
       end
 
@@ -877,17 +842,22 @@ class ResourcesTest < ActionController::TestCase
     end
   end
 
-  def test_with_path_segment_path_prefix_requirements
+  def test_with_path_segment_path_prefix_constraints
     expected_options = {:controller => 'messages', :action => 'show', :thread_id => '1.1.1', :id => '1'}
-    with_restful_routing :messages, :as => 'comments',:path_prefix => '/thread/:thread_id', :requirements => { :thread_id => /[0-9]\.[0-9]\.[0-9]/ } do
+    with_routing do |set|
+      set.draw do
+        scope '/thread/:thread_id', :constraints => { :thread_id => /[0-9]\.[0-9]\.[0-9]/ } do
+          resources :messages, :as => 'comments'
+        end
+      end
       assert_recognizes(expected_options, :path => 'thread/1.1.1/comments/1', :method => :get)
     end
   end
 
   def test_resource_has_only_show_action
     with_routing do |set|
-      set.draw do |map|
-        map.resources :products, :only => :show
+      set.draw do
+       resources :products, :only => :show
       end
 
       assert_resource_allowed_routes('products', {},                    { :id => '1' }, :show, [:index, :new, :create, :edit, :update, :destroy])
@@ -897,8 +867,8 @@ class ResourcesTest < ActionController::TestCase
 
   def test_singleton_resource_has_only_show_action
     with_routing do |set|
-      set.draw do |map|
-        map.resource :account, :only => :show
+      set.draw do
+       resource :account, :only => :show
       end
 
       assert_singleton_resource_allowed_routes('accounts', {},                    :show, [:index, :new, :create, :edit, :update, :destroy])
@@ -908,8 +878,8 @@ class ResourcesTest < ActionController::TestCase
 
   def test_resource_does_not_have_destroy_action
     with_routing do |set|
-      set.draw do |map|
-        map.resources :products, :except => :destroy
+      set.draw do
+       resources :products, :except => :destroy
       end
 
       assert_resource_allowed_routes('products', {},                    { :id => '1' }, [:index, :new, :create, :show, :edit, :update], :destroy)
@@ -919,8 +889,8 @@ class ResourcesTest < ActionController::TestCase
 
   def test_singleton_resource_does_not_have_destroy_action
     with_routing do |set|
-      set.draw do |map|
-        map.resource :account, :except => :destroy
+      set.draw do
+       resource :account, :except => :destroy
       end
 
       assert_singleton_resource_allowed_routes('accounts', {},                    [:new, :create, :show, :edit, :update], :destroy)
@@ -930,8 +900,8 @@ class ResourcesTest < ActionController::TestCase
 
   def test_resource_has_only_create_action_and_named_route
     with_routing do |set|
-      set.draw do |map|
-        map.resources :products, :only => :create
+      set.draw do
+       resources :products, :only => :create
       end
 
       assert_resource_allowed_routes('products', {},                    { :id => '1' }, :create, [:index, :new, :show, :edit, :update, :destroy])
@@ -943,8 +913,8 @@ class ResourcesTest < ActionController::TestCase
 
   def test_resource_has_only_update_action_and_named_route
     with_routing do |set|
-      set.draw do |map|
-        map.resources :products, :only => :update
+      set.draw do
+       resources :products, :only => :update
       end
 
       assert_resource_allowed_routes('products', {},                    { :id => '1' }, :update, [:index, :new, :create, :show, :edit, :destroy])
@@ -956,8 +926,8 @@ class ResourcesTest < ActionController::TestCase
 
   def test_resource_has_only_destroy_action_and_named_route
     with_routing do |set|
-      set.draw do |map|
-        map.resources :products, :only => :destroy
+      set.draw do
+       resources :products, :only => :destroy
       end
 
       assert_resource_allowed_routes('products', {},                    { :id => '1' }, :destroy, [:index, :new, :create, :show, :edit, :update])
@@ -969,8 +939,8 @@ class ResourcesTest < ActionController::TestCase
 
   def test_singleton_resource_has_only_create_action_and_named_route
     with_routing do |set|
-      set.draw do |map|
-        map.resource :account, :only => :create
+      set.draw do
+       resource :account, :only => :create
       end
 
       assert_singleton_resource_allowed_routes('accounts', {},                    :create, [:new, :show, :edit, :update, :destroy])
@@ -982,8 +952,8 @@ class ResourcesTest < ActionController::TestCase
 
   def test_singleton_resource_has_only_update_action_and_named_route
     with_routing do |set|
-      set.draw do |map|
-        map.resource :account, :only => :update
+      set.draw do
+       resource :account, :only => :update
       end
 
       assert_singleton_resource_allowed_routes('accounts', {},                    :update, [:new, :create, :show, :edit, :destroy])
@@ -995,8 +965,8 @@ class ResourcesTest < ActionController::TestCase
 
   def test_singleton_resource_has_only_destroy_action_and_named_route
     with_routing do |set|
-      set.draw do |map|
-        map.resource :account, :only => :destroy
+      set.draw do
+       resource :account, :only => :destroy
       end
 
       assert_singleton_resource_allowed_routes('accounts', {},                    :destroy, [:new, :create, :show, :edit, :update])
@@ -1008,8 +978,8 @@ class ResourcesTest < ActionController::TestCase
 
   def test_resource_has_only_collection_action
     with_routing do |set|
-      set.draw do |map|
-        map.resources :products, :except => :all, :collection => { :sale => :get }
+      set.draw do
+       resources :products, :except => :all, :collection => { :sale => :get }
       end
 
       assert_resource_allowed_routes('products', {},                    { :id => '1' }, [], [:index, :new, :create, :show, :edit, :update, :destroy])
@@ -1022,8 +992,8 @@ class ResourcesTest < ActionController::TestCase
 
   def test_resource_has_only_member_action
     with_routing do |set|
-      set.draw do |map|
-        map.resources :products, :except => :all, :member => { :preview => :get }
+      set.draw do
+       resources :products, :except => :all, :member => { :preview => :get }
       end
 
       assert_resource_allowed_routes('products', {},                    { :id => '1' }, [], [:index, :new, :create, :show, :edit, :update, :destroy])
@@ -1036,8 +1006,8 @@ class ResourcesTest < ActionController::TestCase
 
   def test_singleton_resource_has_only_member_action
     with_routing do |set|
-      set.draw do |map|
-        map.resource :account, :except => :all, :member => { :signup => :get }
+      set.draw do
+       resource :account, :except => :all, :member => { :signup => :get }
       end
 
       assert_singleton_resource_allowed_routes('accounts', {},                    [], [:new, :create, :show, :edit, :update, :destroy])
@@ -1050,9 +1020,9 @@ class ResourcesTest < ActionController::TestCase
 
   def test_nested_resource_has_only_show_and_member_action
     with_routing do |set|
-      set.draw do |map|
-        map.resources :products, :only => [:index, :show] do |product|
-          product.resources :images, :member => { :thumbnail => :get }, :only => :show
+      set.draw do
+       resources :products, :only => [:index, :show] do
+          resources :images, :member => { :thumbnail => :get }, :only => :show
         end
       end
 
@@ -1066,9 +1036,9 @@ class ResourcesTest < ActionController::TestCase
 
   def test_nested_resource_does_not_inherit_only_option
     with_routing do |set|
-      set.draw do |map|
-        map.resources :products, :only => :show do |product|
-          product.resources :images, :except => :destroy
+      set.draw do
+       resources :products, :only => :show do
+          resources :images, :except => :destroy
         end
       end
 
@@ -1079,9 +1049,9 @@ class ResourcesTest < ActionController::TestCase
 
   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
+      set.draw do
+       resources :products, :only => :show do
+          resources :images
         end
       end
 
@@ -1092,9 +1062,9 @@ class ResourcesTest < ActionController::TestCase
 
   def test_nested_resource_does_not_inherit_except_option
     with_routing do |set|
-      set.draw do |map|
-        map.resources :products, :except => :show do |product|
-          product.resources :images, :only => :destroy
+      set.draw do
+       resources :products, :except => :show do
+          resources :images, :only => :destroy
         end
       end
 
@@ -1105,9 +1075,9 @@ class ResourcesTest < ActionController::TestCase
 
   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
+      set.draw do
+       resources :products, :except => :show do
+          resources :images
         end
       end
 
@@ -1118,8 +1088,8 @@ class ResourcesTest < ActionController::TestCase
 
   def test_default_singleton_restful_route_uses_get
     with_routing do |set|
-      set.draw do |map|
-        map.resource :product
+      set.draw do
+       resource :product
       end
 
       assert_routing '/product', :controller => 'products', :action => 'show'
@@ -1135,15 +1105,41 @@ class ResourcesTest < ActionController::TestCase
 
   protected
     def with_restful_routing(*args)
+      options = args.extract_options!
+      collection_methods = options.delete(:collection)
+      member_methods = options.delete(:member)
+      path_prefix = options.delete(:path_prefix)
+      args.push(options)
+
       with_routing do |set|
-        set.draw { |map| map.resources(*args) }
+        set.draw do
+          scope(path_prefix || '') do
+            resources(*args) do
+              if collection_methods
+                collection do
+                  collection_methods.each do |name, method|
+                    send(method, name)
+                  end
+                end
+              end
+
+              if member_methods
+                member do
+                  member_methods.each do |name, method|
+                    send(method, name)
+                  end
+                end
+              end
+            end
+          end
+        end
         yield
       end
     end
 
     def with_singleton_resources(*args)
       with_routing do |set|
-        set.draw { |map| map.resource(*args) }
+        set.draw {resource(*args) }
         yield
       end
     end
@@ -1385,7 +1381,7 @@ class ResourcesTest < ActionController::TestCase
     end
 
     def distinct_routes? (r1, r2)
-      if r1.conditions == r2.conditions and r1.requirements == r2.requirements then
+      if r1.conditions == r2.conditions and r1.constraints == r2.constraints then
         if r1.segments.collect(&:to_s) == r2.segments.collect(&:to_s) then
           return false
         end
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index a8c74a6064..eab20cc594 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -15,8 +15,8 @@ ROUTING = ActionController::Routing
 class UriReservedCharactersRoutingTest < Test::Unit::TestCase
   def setup
     @set = ActionController::Routing::RouteSet.new
-    @set.draw do |map|
-      map.connect ':controller/:action/:variable/*additional'
+    @set.draw do
+      match ':controller/:action/:variable/*additional'
     end
 
     safe, unsafe = %w(: @ & = + $ , ;), %w(^ ? # [ ])
@@ -78,7 +78,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_default_setup
-    @rs.draw {|m| m.connect ':controller/:action/:id' }
+    @rs.draw { match ':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"))
@@ -96,51 +96,51 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   def test_ignores_leading_slash
     @rs.clear!
-    @rs.draw {|m| m.connect '/:controller/:action/:id'}
+    @rs.draw { match '/: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'
+    @rs.draw {
+      match '' => "search#new", :as => "frontpage"
+      resources :videos do
+        resources :comments
+        resource  :file,      :controller => 'video_file'
+        resource  :share,     :controller => 'video_shares'
+        resource  :abuse,     :controller => 'video_abuses'
       end
-      map.resources :abuses, :controller => 'video_abuses'
-      map.resources :video_uploads
-      map.resources :video_visits
+      resources :abuses, :controller => 'video_abuses'
+      resources :video_uploads
+      resources :video_visits
 
-      map.resources :users do |user|
-        user.resource  :settings
-        user.resources :videos
+      resources :users do
+        resource  :settings
+        resources :videos
       end
-      map.resources :channels do |channel|
-        channel.resources :videos, :controller => 'channel_videos'
+      resources :channels do
+        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'
+      resource  :session
+      resource  :lost_password
+      match 'search' => 'search#index', :as => 'search'
+      resources :pages
+      match ':controller/:action/:id'
     }
   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'
+    rs.draw do
+      match '/:controller/:action/:id', :action => 'index', :id => nil
+      match ':url', :controller => 'tiny_url', :action => 'translate'
     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'
+    rs.draw do
+      match ':controller/:admintoken/:action/:id', :controller => /admin\/.+/
+      match ':controller/:action/:id'
     end
     assert_equal({:controller => "admin/user", :admintoken => "foo", :action => "index"},
         rs.recognize_path("/admin/user/foo"))
@@ -150,8 +150,8 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_route_with_regexp_and_captures_for_controller
-    rs.draw do |map|
-      map.connect ':controller/:action/:id', :controller => /admin\/(accounts|users)/
+    rs.draw do
+      match ':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"))
@@ -159,12 +159,12 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   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{[^/]+(\.[^/]+)?}}
+    rs.draw do
+      match ':controller/:action/:file',
+                :controller => /admin|user/,
+                :action => /upload|download/,
+                :defaults => {:file => nil},
+                :constraints => {:file => %r{[^/]+(\.[^/]+)?}}
     end
     # Without a file extension
     assert_equal '/user/download/file',
@@ -183,8 +183,8 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_basic_named_route
-    rs.draw do |map|
-      map.home '', :controller => 'content', :action => 'list'
+    rs.draw do
+      match '' => 'content#list', :as => 'home'
     end
     x = setup_for_named_route
     assert_equal("http://test.host/",
@@ -192,8 +192,8 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_named_route_with_option
-    rs.draw do |map|
-      map.page 'page/:title', :controller => 'content', :action => 'show_page'
+    rs.draw do
+      match 'page/:title' => 'content#show_page', :as => 'page'
     end
     x = setup_for_named_route
     assert_equal("http://test.host/page/new%20stuff",
@@ -201,8 +201,8 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_named_route_with_default
-    rs.draw do |map|
-      map.page 'page/:title', :controller => 'content', :action => 'show_page', :title => 'AboutPage'
+    rs.draw do
+      match 'page/:title' => 'content#show_page', :title => 'AboutPage', :as => 'page'
     end
     x = setup_for_named_route
     assert_equal("http://test.host/page/AboutRails",
@@ -210,18 +210,9 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   end
 
-  def test_named_route_with_name_prefix
-    rs.draw do |map|
-      map.page 'page', :controller => 'content', :action => 'show_page', :name_prefix => 'my_'
-    end
-    x = setup_for_named_route
-    assert_equal("http://test.host/page",
-                 x.send(:my_page_url))
-  end
-
   def test_named_route_with_path_prefix
-    rs.draw do |map|
-      map.page 'page', :controller => 'content', :action => 'show_page', :path_prefix => 'my'
+    rs.draw do
+      match 'page' => 'content#show_page', :as => 'page', :path_prefix => 'my'
     end
     x = setup_for_named_route
     assert_equal("http://test.host/my/page",
@@ -229,8 +220,8 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_named_route_with_blank_path_prefix
-    rs.draw do |map|
-      map.page 'page', :controller => 'content', :action => 'show_page', :path_prefix => ''
+    rs.draw do
+      match 'page' => 'content#show_page', :as => 'page', :path_prefix => ''
     end
     x = setup_for_named_route
     assert_equal("http://test.host/page",
@@ -238,8 +229,8 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_named_route_with_nested_controller
-    rs.draw do |map|
-      map.users 'admin/user', :controller => 'admin/user', :action => 'index'
+    rs.draw do
+      match 'admin/user' => 'admin/user#index'
     end
     x = setup_for_named_route
     assert_equal("http://test.host/admin/user",
@@ -247,8 +238,8 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_optimised_named_route_with_host
-    rs.draw do |map|
-      map.pages 'pages', :controller => 'content', :action => 'show_page', :host => 'foo.com'
+    rs.draw do
+      match 'page' => 'content#show_page', :as => 'page', :host => 'foo.com'
     end
     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
@@ -260,14 +251,14 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_named_route_without_hash
-    rs.draw do |map|
-      map.normal ':controller/:action/:id'
+    rs.draw do
+      match ':controller/:action/:id', :as => 'normal'
     end
   end
 
   def test_named_route_root
-    rs.draw do |map|
-      map.root :controller => "hello"
+    rs.draw do
+      root :to => "hello#index"
     end
     x = setup_for_named_route
     assert_equal("http://test.host/", x.send(:root_url))
@@ -275,10 +266,10 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_named_route_with_regexps
-    rs.draw do |map|
-      map.article 'page/:year/:month/:day/:title', :controller => 'page', :action => 'show',
+    rs.draw do
+      match 'page/:year/:month/:day/:title' => 'page#show', :as => 'article',
         :year => /\d+/, :month => /\d+/, :day => /\d+/
-      map.connect ':controller/:action/:id'
+      match ':controller/:action/:id'
     end
     x = setup_for_named_route
     # assert_equal(
@@ -292,7 +283,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_changing_controller
-    @rs.draw {|m| m.connect ':controller/:action/:id' }
+    @rs.draw { match ':controller/:action/:id' }
 
     assert_equal '/admin/stuff/show/10', rs.generate(
       {:controller => 'stuff', :action => 'show', :id => 10},
@@ -301,9 +292,9 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_paths_escaped
-    rs.draw do |map|
-      map.path 'file/*path', :controller => 'content', :action => 'show_file'
-      map.connect ':controller/:action/:id'
+    rs.draw do
+      match 'file/*path' => 'content#show_file', :as => 'path'
+      match ':controller/:action/:id'
     end
 
     # No + to space in URI escaping, only for query params.
@@ -318,8 +309,8 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_paths_slashes_unescaped_with_ordered_parameters
-    rs.draw do |map|
-      map.path '/file/*path', :controller => 'content'
+    rs.draw do
+      match '/file/*path' => 'content#index', :as => 'path'
     end
 
     # No / to %2F in URI, only for query params.
@@ -328,53 +319,53 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_non_controllers_cannot_be_matched
-    rs.draw do |map|
-      map.connect ':controller/:action/:id'
+    rs.draw do
+      match ':controller/:action/:id'
     end
     assert_raise(ActionController::RoutingError) { rs.recognize_path("/not_a/show/10") }
   end
 
   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'
+      rs.draw do
+        match 'file/*path' => 'content#show_file', :path => %w(fake default), :as => 'path'
+        match ':controller/:action/:id'
       end
     end
 
-    rs.draw do |map|
-      map.path 'file/*path', :controller => 'content', :action => 'show_file', :path => []
-      map.connect ':controller/:action/:id'
+    rs.draw do
+      match 'file/*path', :to => 'content#show_file', :path => [], :as => 'path'
+      match ':controller/:action/:id'
     end
   end
 
-  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+/}
+  def test_should_list_options_diff_when_routing_constraints_dont_match
+    rs.draw do
+      math 'post/:id' => 'post#show', :constraints => {:id => /\d+/}, :as => 'post'
     end
     assert_raise(ActionController::RoutingError) { rs.generate(:controller => 'post', :action => 'show', :bad_param => "foo", :use_route => "post") }
   end
 
   def test_dynamic_path_allowed
-    rs.draw do |map|
-      map.connect '*path', :controller => 'content', :action => 'show_file'
+    rs.draw do
+      match '*path' => 'content#show_file'
     end
 
     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'
+    rs.draw do
+      match '*path' => 'content#show_file'
     end
 
     assert_equal '/pages/boo', rs.generate({}, :controller => 'content', :action => 'show_file', :path => %w(pages boo))
   end
 
   def test_backwards
-    rs.draw do |map|
-      map.connect 'page/:id/:action', :controller => 'pages', :action => 'show'
-      map.connect ':controller/:action/:id'
+    rs.draw do
+      match 'page/:id/:action' => 'pages#show'
+      match ':controller/:action/:id'
     end
 
     assert_equal '/page/20', rs.generate({:id => 20}, {:controller => 'pages', :action => 'show'})
@@ -383,9 +374,9 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   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'
+    rs.draw do
+      match 'page/:id' => 'content#show_page', :id => 1
+      match ':controller/:action/:id'
     end
 
     assert_equal '/page', rs.generate(:controller => 'content', :action => 'show_page')
@@ -400,9 +391,9 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   # 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'
+    rs.draw do
+      match 'page/:id' => 'content#show_page', :id => 1
+      match ':controller/:action/:id'
     end
 
     assert_equal '/page/foo', rs.generate(:controller => 'content', :action => 'show_page', :id => 'foo')
@@ -417,13 +408,13 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_action_expiry
-    @rs.draw {|m| m.connect ':controller/:action/:id' }
+    @rs.draw { match ':controller/:action/:id' }
     assert_equal '/content', rs.generate({:controller => 'content'}, {:controller => 'content', :action => 'show'})
   end
 
   def test_requirement_should_prevent_optional_id
-    rs.draw do |map|
-      map.post 'post/:id', :controller=> 'post', :action=> 'show', :requirements => {:id => /\d+/}
+    rs.draw do
+      match 'post/:id' => 'post#show', :constraints => {:id => /\d+/}, :as => 'post'
     end
 
     assert_equal '/post/10', rs.generate(:controller => 'post', :action => 'show', :id => 10)
@@ -434,12 +425,12 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_both_requirement_and_optional
-    rs.draw do |map|
-      map.blog('test/:year', :controller => 'post', :action => 'show',
+    rs.draw do
+      match('test/:year' => 'post#show', :as => 'blog',
         :defaults => { :year => nil },
-        :requirements => { :year => /\d{4}/ }
+        :constraints => { :year => /\d{4}/ }
       )
-      map.connect ':controller/:action/:id'
+      match ':controller/:action/:id'
     end
 
     assert_equal '/test', rs.generate(:controller => 'post', :action => 'show')
@@ -451,9 +442,9 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   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'
+    rs.draw do
+      match 'pages/:year/:month/:day' => 'content#list_pages', :month => nil, :day => nil
+      match ':controller/:action/:id'
     end
 
     assert_equal '/pages/2005',
@@ -474,9 +465,9 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_url_with_no_action_specified
-    rs.draw do |map|
-      map.connect '', :controller => 'content'
-      map.connect ':controller/:action/:id'
+    rs.draw do
+      match '' => 'content'
+      match ':controller/:action/:id'
     end
 
     assert_equal '/', rs.generate(:controller => 'content', :action => 'index')
@@ -484,9 +475,9 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_named_url_with_no_action_specified
-    rs.draw do |map|
-      map.home '', :controller => 'content'
-      map.connect ':controller/:action/:id'
+    rs.draw do
+      match '', :controller => 'content', :as => 'home'
+      match ':controller/:action/:id'
     end
 
     assert_equal '/', rs.generate(:controller => 'content', :action => 'index')
@@ -499,9 +490,9 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   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'
+      rs.draw do
+        match '', hash.merge(:as => 'home')
+        match ':controller/:action/:id'
       end
       assert_equal '/', rs.generate({:action => nil}, {:controller => 'content', :action => 'hello'})
       assert_equal '/', rs.generate({:controller => 'content'})
@@ -510,9 +501,9 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_named_route_method
-    rs.draw do |map|
-      map.categories 'categories', :controller => 'content', :action => 'categories'
-      map.connect ':controller/:action/:id'
+    rs.draw do
+      match 'categories' => 'content#categories', :as => 'categories'
+      match ':controller/:action/:id'
     end
 
     assert_equal '/categories', rs.generate(:controller => 'content', :action => 'categories')
@@ -525,23 +516,21 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_nil_defaults
-    rs.draw do |map|
-      map.connect 'journal',
-        :controller => 'content',
-        :action => 'list_journal',
+    rs.draw do
+      match 'journal' => 'content#list_journal',
         :date => nil, :user_id => nil
-      map.connect ':controller/:action/:id'
+      match ':controller/:action/:id'
     end
 
     assert_equal '/journal', rs.generate(:controller => 'content', :action => 'list_journal', :date => nil, :user_id => nil)
   end
 
   def setup_request_method_routes_for(method)
-    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 }
+    rs.draw do
+      match '/match' => 'books#get', :conditions => { :method => :get }
+      match '/match' => 'books#post', :conditions => { :method => :post }
+      match '/match' => 'books#put', :conditions => { :method => :put }
+      match '/match' => 'books#delete', :conditions => { :method => :delete }
     end
   end
 
@@ -554,9 +543,9 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_recognize_array_of_methods
-    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'
+    rs.draw do
+      match '/match' => 'books#get_or_post', :conditions => { :method => [:get, :post] }
+      match '/match' => 'books#not_get_or_post'
     end
 
     params = rs.recognize_path("/match", :method => :post)
@@ -567,11 +556,11 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_subpath_recognized
-    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"
+    rs.draw do
+      match '/books/:id/edit'    => 'subpath_books#edit'
+      match '/items/:id/:action' => 'subpath_books'
+      match '/posts/new/:action' => 'subpath_books'
+      match '/posts/:id'         => 'subpath_books#show'
     end
 
     hash = rs.recognize_path "/books/17/edit"
@@ -592,10 +581,10 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_subpath_generated
-    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'
+    rs.draw do
+      match '/books/:id/edit'    => 'subpath_books#edit'
+      match '/items/:id/:action' => 'subpath_books'
+      match '/posts/new/:action' => 'subpath_books'
     end
 
     assert_equal "/books/7/edit", rs.generate(:controller => "subpath_books", :id => 7, :action => "edit")
@@ -603,25 +592,25 @@ class LegacyRouteSetTests < Test::Unit::TestCase
     assert_equal "/posts/new/preview", rs.generate(:controller => "subpath_books", :action => "preview")
   end
 
-  def test_failed_requirements_raises_exception_with_violated_requirements
-    rs.draw do |r|
-      r.foo_with_requirement 'foos/:id', :controller=>'foos', :requirements=>{:id=>/\d+/}
+  def test_failed_constraints_raises_exception_with_violated_constraints
+    rs.draw do
+      match 'foos/:id' => 'foos', :as => 'foo_with_requirement', :constraints=>{:id=>/\d+/}
     end
 
     x = setup_for_named_route
     assert_raise(ActionController::RoutingError) do
-      x.send(:foo_with_requirement_url, "I am Against the requirements")
+      x.send(:foo_with_requirement_url, "I am Against the constraints")
     end
   end
 
   def test_routes_changed_correctly_after_clear
     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'
+    rs.draw do
+      match 'ca' => 'ca#aa'
+      match 'cb' => 'cb#ab'
+      match 'cc' => 'cc#ac'
+      match ':controller/:action/:id'
+      match ':controller/:action/:id.:format'
     end
 
     hash = rs.recognize_path "/cc"
@@ -629,11 +618,11 @@ class LegacyRouteSetTests < Test::Unit::TestCase
     assert_not_nil hash
     assert_equal %w(cc ac), [hash[:controller], hash[:action]]
 
-    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'
+    rs.draw do
+      match 'cb' => 'cb#ab'
+      match 'cc' => 'cc#ac'
+      match ':controller/:action/:id'
+      match ':controller/:action/:id.:format'
     end
 
     hash = rs.recognize_path "/cc"
@@ -656,30 +645,30 @@ class RouteSetTest < ActiveSupport::TestCase
   def default_route_set
     @default_route_set ||= begin
       set = ROUTING::RouteSet.new
-      set.draw do |map|
-        map.connect '/:controller/:action/:id/'
+      set.draw do
+        match '/:controller/:action/:id/'
       end
       set
     end
   end
 
   def test_generate_extras
-    set.draw { |m| m.connect ':controller/:action/:id' }
+    set.draw { match ':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 { |e| e.to_s }.sort
   end
 
   def test_extra_keys
-    set.draw { |m| m.connect ':controller/:action/:id' }
+    set.draw { match ':controller/:action/:id' }
     extras = set.extra_keys(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
     assert_equal %w(that this), extras.map { |e| e.to_s }.sort
   end
 
   def test_generate_extras_not_first
-    set.draw do |map|
-      map.connect ':controller/:action/:id.:format'
-      map.connect ':controller/:action/:id'
+    set.draw do
+      match ':controller/:action/:id.:format'
+      match ':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
@@ -687,17 +676,17 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_generate_not_first
-    set.draw do |map|
-      map.connect ':controller/:action/:id.:format'
-      map.connect ':controller/:action/:id'
+    set.draw do
+      match ':controller/:action/:id.:format'
+      match ':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'
+    set.draw do
+      match ':controller/:action/:id.:format'
+      match ':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 { |e| e.to_s }.sort
@@ -705,16 +694,16 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_draw
     assert_equal 0, set.routes.size
-    set.draw do |map|
-      map.connect '/hello/world', :controller => 'a', :action => 'b'
+    set.draw do
+      match '/hello/world' => 'a#b'
     end
     assert_equal 1, set.routes.size
   end
 
   def test_draw_symbol_controller_name
     assert_equal 0, set.routes.size
-    set.draw do |map|
-      map.connect '/users/index', :controller => :users, :action => :index
+    set.draw do
+      match '/users/index' => 'users#index'
     end
     params = set.recognize_path('/users/index', :method => :get)
     assert_equal 1, set.routes.size
@@ -722,23 +711,23 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_named_draw
     assert_equal 0, set.routes.size
-    set.draw do |map|
-      map.hello '/hello/world', :controller => 'a', :action => 'b'
+    set.draw do
+      match '/hello/world' => 'a#b', :as => 'hello'
     end
     assert_equal 1, set.routes.size
     assert_equal set.routes.first, set.named_routes[:hello]
   end
 
   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'
+    set.draw do
+      match '/hello/world' => 'a#b', :as => 'hello'
+      match '/hello'       => 'a#b', :as => 'hello'
     end
     assert_equal set.routes.last, set.named_routes[:hello]
   end
 
   def setup_named_route_test
-    set.draw do |map|
+    set.draw do
       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'
@@ -841,8 +830,8 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_draw_default_route
-    set.draw do |map|
-      map.connect '/:controller/:action/:id'
+    set.draw do
+      match '/:controller/:action/:id'
     end
 
     assert_equal 1, set.routes.size
@@ -855,16 +844,16 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_draw_default_route_with_default_controller
-    set.draw do |map|
-      map.connect '/:controller/:action/:id', :controller => 'users'
+    set.draw do
+      match '/:controller/:action/:id' => 'users'
     end
     assert_equal({:controller => 'users', :action => 'index'}, set.recognize_path('/'))
   end
 
   def test_route_with_parameter_shell
-    set.draw do |map|
-      map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+/
-      map.connect '/:controller/:action/:id'
+    set.draw do
+      match 'page/:id' => 'pages#show', :id => /\d+/
+      match '/:controller/:action/:id'
     end
 
     assert_equal({:controller => 'pages', :action => 'index'}, set.recognize_path('/pages'))
@@ -875,61 +864,61 @@ class RouteSetTest < ActiveSupport::TestCase
     assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/page/10'))
   end
 
-  def test_route_requirements_with_anchor_chars_are_invalid
+  def test_route_constraints_with_anchor_chars_are_invalid
     assert_raise ArgumentError do
-      set.draw do |map|
-        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /^\d+/
+      set.draw do
+        match 'page/:id' => 'pages#show', :id => /^\d+/
       end
     end
     assert_raise ArgumentError do
-      set.draw do |map|
-        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\A\d+/
+      set.draw do
+        match 'page/:id' => 'pages#show', :id => /\A\d+/
       end
     end
     assert_raise ArgumentError do
-      set.draw do |map|
-        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+$/
+      set.draw do
+        match 'page/:id' => 'pages#show', :id => /\d+$/
       end
     end
     assert_raise ArgumentError do
-      set.draw do |map|
-        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+\Z/
+      set.draw do
+        match 'page/:id' => 'pages#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/
+      set.draw do
+        match 'page/:id' => 'pages#show', :id => /\d+\z/
       end
     end
   end
 
-  def test_route_requirements_with_invalid_http_method_is_invalid
+  def test_route_constraints_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}
+      set.draw do
+        match 'valid/route' => 'pages#show', :conditions => {:method => :invalid}
       end
     end
   end
 
-  def test_route_requirements_with_options_method_condition_is_valid
+  def test_route_constraints_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}
+      set.draw do
+        match 'valid/route' => 'pages#show', :conditions => {:method => :options}
       end
     end
   end
 
-  def test_route_requirements_with_head_method_condition_is_invalid
+  def test_route_constraints_with_head_method_condition_is_invalid
     assert_raise ArgumentError do
-      set.draw do |map|
-        map.connect 'valid/route', :controller => 'pages', :action => 'show', :conditions => {:method => :head}
+      set.draw do
+        match 'valid/route' => 'pages#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\+]+/
+    set.draw do
+      match 'page/:id' => 'pages#show', :id => /[a-zA-Z0-9\+]+/
     end
 
     assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/page/10'))
@@ -937,8 +926,8 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_recognize_with_conditions
-    set.draw do |map|
-      map.with_options(:controller => "people") do |people|
+    set.draw do
+      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 }
@@ -978,10 +967,10 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_recognize_with_alias_in_conditions
-    set.draw do |map|
-      map.people "/people", :controller => 'people', :action => "index",
+    set.draw do
+      match "/people" => 'people#index', :as => 'people',
         :conditions => { :method => :get }
-      map.root   :people
+      root   :people
     end
 
     params = set.recognize_path("/people", :method => :get)
@@ -994,9 +983,8 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_typo_recognition
-    set.draw do |map|
-      map.connect 'articles/:year/:month/:day/:title',
-             :controller => 'articles', :action => 'permalink',
+    set.draw do
+      match 'articles/:year/:month/:day/:title' => 'articles#permalink',
              :year => /\d{4}/, :day => /\d{1,2}/, :month => /\d{1,2}/
     end
 
@@ -1010,8 +998,8 @@ class RouteSetTest < ActiveSupport::TestCase
 
   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'
+    set.draw do
+      match '/profile' => 'profile'
     end
 
     params = set.recognize_path("/profile") rescue nil
@@ -1020,7 +1008,7 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_recognize_with_conditions_and_format
-    set.draw do |map|
+    set.draw do
       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 }
@@ -1042,9 +1030,9 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_generate_with_default_action
-    set.draw do |map|
-      map.connect "/people", :controller => "people"
-      map.connect "/people/list", :controller => "people", :action => "list"
+    set.draw do
+      match "/people", :controller => "people"
+      match "/people/list", :controller => "people", :action => "list"
     end
 
     url = set.generate(:controller => "people", :action => "list")
@@ -1052,7 +1040,7 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_root_map
-    set.draw { |map| map.root :controller => "people" }
+    set.draw { root :to => 'people' }
 
     params = set.recognize_path("", :method => :get)
     assert_equal("people", params[:controller])
@@ -1060,10 +1048,10 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_namespace
-    set.draw do |map|
+    set.draw do
 
-      map.namespace 'api' do |api|
-        api.route 'inventory', :controller => "products", :action => 'inventory'
+      namespace 'api' do
+        match 'inventory' => 'products#inventory'
       end
 
     end
@@ -1074,10 +1062,10 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_namespaced_root_map
-    set.draw do |map|
+    set.draw do
 
-      map.namespace 'api' do |api|
-        api.root :controller => "products"
+      namespace 'api' do
+        root :to => 'products'
       end
 
     end
@@ -1088,9 +1076,9 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_namespace_with_path_prefix
-    set.draw do |map|
-      map.namespace 'api', :path_prefix => 'prefix' do |api|
-        api.route 'inventory', :controller => "products", :action => 'inventory'
+    set.draw do
+      namespace 'api', :path_prefix => 'prefix' do
+        match 'inventory' => 'products#inventory'
       end
     end
 
@@ -1100,9 +1088,9 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_namespace_with_blank_path_prefix
-    set.draw do |map|
-      map.namespace 'api', :path_prefix => '' do |api|
-        api.route 'inventory', :controller => "products", :action => 'inventory'
+    set.draw do
+      namespace 'api', :path_prefix => '' do |api|
+        match 'inventory' => 'products#inventory'
       end
     end
 
@@ -1112,16 +1100,16 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_generate_changes_controller_module
-    set.draw { |map| map.connect ':controller/:action/:id' }
+    set.draw { match ':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
 
   # def test_id_is_not_impossibly_sticky
-  #   set.draw do |map|
-  #     map.connect 'foo/:number', :controller => "people", :action => "index"
-  #     map.connect ':controller/:action/:id'
+  #   set.draw do
+  #     match 'foo/:number' => 'people#index'
+  #     match ':controller/:action/:id'
   #   end
   #
   #   url = set.generate({:controller => "people", :action => "index", :number => 3},
@@ -1130,8 +1118,8 @@ class RouteSetTest < ActiveSupport::TestCase
   # end
 
   def test_id_is_sticky_when_it_ought_to_be
-    set.draw do |map|
-      map.connect ':controller/:id/:action'
+    set.draw do
+      match ':controller/:id/:action'
     end
 
     url = set.generate({:action => "destroy"}, {:controller => "people", :action => "show", :id => "7"})
@@ -1139,9 +1127,9 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_use_static_path_when_possible
-    set.draw do |map|
-      map.connect 'about', :controller => "welcome", :action => "about"
-      map.connect ':controller/:action/:id'
+    set.draw do
+      match 'about' => "welcome#about"
+      match ':controller/:action/:id'
     end
 
     url = set.generate({:controller => "welcome", :action => "about"},
@@ -1150,7 +1138,7 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_generate
-    set.draw { |map| map.connect ':controller/:action/:id' }
+    set.draw { match ':controller/:action/:id' }
 
     args = { :controller => "foo", :action => "bar", :id => "7", :x => "y" }
     assert_equal "/foo/bar/7?x=y", set.generate(args)
@@ -1159,24 +1147,24 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_generate_with_path_prefix
-    set.draw { |map| map.connect ':controller/:action/:id', :path_prefix => 'my' }
+    set.draw { match ':controller/:action/:id', :path_prefix => 'my' }
 
     args = { :controller => "foo", :action => "bar", :id => "7", :x => "y" }
     assert_equal "/my/foo/bar/7?x=y", set.generate(args)
   end
 
   def test_generate_with_blank_path_prefix
-    set.draw { |map| map.connect ':controller/:action/:id', :path_prefix => '' }
+    set.draw { match ':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"
+    set.draw do
+      match "/connection/manage/:action" => 'connection/manage'
+      match "/connection/connection" => "connection/connection"
+      match '/connection' => 'connection', :as => 'family_connection'
     end
 
     url = set.generate({:controller => "connection"}, {:controller => 'connection/manage'})
@@ -1187,8 +1175,8 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_action_left_off_when_id_is_recalled
-    set.draw do |map|
-      map.connect ':controller/:action/:id'
+    set.draw do
+      match ':controller/:action/:id'
     end
     assert_equal '/books', set.generate(
       {:controller => 'books', :action => 'index'},
@@ -1197,9 +1185,9 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_query_params_will_be_shown_when_recalled
-    set.draw do |map|
-      map.connect 'show_weblog/:parameter', :controller => 'weblog', :action => 'show'
-      map.connect ':controller/:action/:id'
+    set.draw do
+      match 'show_weblog/:parameter' => 'weblog#show'
+      match ':controller/:action/:id'
     end
     assert_equal '/weblog/edit?parameter=1', set.generate(
       {:action => 'edit', :parameter => 1},
@@ -1208,8 +1196,8 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_format_is_not_inherit
-    set.draw do |map|
-      map.connect '/posts.:format', :controller => 'posts'
+    set.draw do
+      match '/posts.:format' => 'posts'
     end
 
     assert_equal '/posts', set.generate(
@@ -1224,16 +1212,16 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_expiry_determination_should_consider_values_with_to_param
-    set.draw { |map| map.connect 'projects/:project_id/:controller/:action' }
+    set.draw { match 'projects/:project_id/:controller/:action' }
     assert_equal '/projects/1/weblog/show', set.generate(
       {:action => 'show', :project_id => 1},
       {:controller => 'weblog', :action => 'show', :project_id => '1'})
   end
 
   def test_named_route_in_nested_resource
-    set.draw do |map|
-      map.resources :projects do |project|
-        project.milestones 'milestones', :controller => 'milestones', :action => 'index'
+    set.draw do
+      resources :projects do
+        match 'milestones' => 'milestones#index', :as => 'milestones'
       end
     end
 
@@ -1244,9 +1232,9 @@ class RouteSetTest < ActiveSupport::TestCase
 
   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'
+      set.draw do
+        namespace :admin do
+          root :to => 'home'
         end
       end
     end
@@ -1254,37 +1242,34 @@ class RouteSetTest < ActiveSupport::TestCase
 
   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'
+      set.draw do
+        namespace 'admin' do
+          root :to => 'home'
         end
       end
     end
   end
 
-  def test_route_requirements_with_unsupported_regexp_options_must_error
+  def test_route_constraints_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)/m}
+      set.draw do
+        match 'page/:name' => 'pages#show',
+          :constraints => {:name => /(david|jamis)/m}
       end
     end
   end
 
-  def test_route_requirements_with_supported_options_must_not_error
+  def test_route_constraints_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}
+      set.draw do
+        map.connect 'page/:name' => 'pages#show',
+          :constraints => {: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
+      set.draw do
+        match 'page/:name' => 'pages#show',
+          :constraints => {:name => / # Desperately overcommented regexp
                                       ( #Either
                                        david #The Creator
                                       | #Or
@@ -1295,10 +1280,9 @@ class RouteSetTest < ActiveSupport::TestCase
   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}
+    set.draw do
+      match 'page/:name' => 'pages#show',
+        :constraints => {:name => /(david|jamis)/i}
     end
     assert_equal({:controller => 'pages', :action => 'show', :name => 'jamis'}, set.recognize_path('/page/jamis'))
     assert_raise ActionController::RoutingError do
@@ -1308,10 +1292,9 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   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}
+    set.draw do
+      match 'page/:name' => 'pages#show',
+        :constraints => {:name => /(david|jamis)/i}
     end
 
     url = set.generate({:controller => 'pages', :action => 'show', :name => 'david'})
@@ -1324,10 +1307,9 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   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
+    set.draw do
+      match 'page/:name' => 'pages#show',
+        :constraints => {:name => / # Desperately overcommented regexp
                                     ( #Either
                                      david #The Creator
                                     | #Or
@@ -1345,10 +1327,9 @@ class RouteSetTest < ActiveSupport::TestCase
   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
+    set.draw do
+      match 'page/:name' => 'pages#show',
+        :constraints => {:name => / # Desperately overcommented regexp
                                     ( #Either
                                      david #The Creator
                                     | #Or
@@ -1367,10 +1348,9 @@ class RouteSetTest < ActiveSupport::TestCase
   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
+    set.draw do
+      map.connect 'page/:name' => 'pages#show',
+        :constraints => {:name => / # Desperately overcommented regexp
                                     ( #Either
                                      david #The Creator
                                     | #Or
@@ -1383,10 +1363,9 @@ class RouteSetTest < ActiveSupport::TestCase
   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
+    set.draw do
+      map.connect 'page/:name' => 'pages#show',
+        :constraints => {:name => / # Desperately overcommented regexp
                                     ( #Either
                                      david #The Creator
                                     | #Or
@@ -1397,18 +1376,18 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_routes_with_symbols
-    set.draw do |map|
-      map.connect 'unnamed', :controller => :pages, :action => :show, :name => :as_symbol
-      map.named   'named',   :controller => :pages, :action => :show, :name => :as_symbol
+    set.draw do
+      match 'unnamed', :controller => :pages, :action => :show, :name => :as_symbol
+      match 'named'  , :controller => :pages, :action => :show, :name => :as_symbol, :as => :named
     end
     assert_equal({:controller => 'pages', :action => 'show', :name => :as_symbol}, set.recognize_path('/unnamed'))
     assert_equal({:controller => 'pages', :action => 'show', :name => :as_symbol}, set.recognize_path('/named'))
   end
 
   def test_regexp_chunk_should_add_question_mark_for_optionals
-    set.draw do |map|
-      map.connect '/', :controller => 'foo'
-      map.connect '/hello', :controller => 'bar'
+    set.draw do
+      match '/' => 'foo#index'
+      match '/hello' => 'bar#index'
     end
 
     assert_equal '/', set.generate(:controller => 'foo')
@@ -1419,8 +1398,8 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_assign_route_options_with_anchor_chars
-    set.draw do |map|
-      map.connect '/cars/:action/:person/:car/', :controller => 'cars'
+    set.draw do
+      match '/cars/:action/:person/:car/', :controller => 'cars'
     end
 
     assert_equal '/cars/buy/1/2', set.generate(:controller => 'cars', :action => 'buy', :person => '1', :car => '2')
@@ -1429,8 +1408,8 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_segmentation_of_dot_path
-    set.draw do |map|
-      map.connect '/books/:action.rss', :controller => 'books'
+    set.draw do
+      match '/books/:action.rss', :controller => 'books'
     end
 
     assert_equal '/books/list.rss', set.generate(:controller => 'books', :action => 'list')
@@ -1439,8 +1418,8 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_segmentation_of_dynamic_dot_path
-    set.draw do |map|
-      map.connect '/books/:action.:format', :controller => 'books'
+    set.draw do
+      match '/books/:action.:format', :controller => 'books'
     end
 
     assert_equal '/books/list.rss', set.generate(:controller => 'books', :action => 'list', :format => 'rss')
@@ -1459,7 +1438,7 @@ class RouteSetTest < ActiveSupport::TestCase
       ':controller/:action/:id', '/:controller/:action/:id/'
     ].each do |path|
       @set = nil
-      set.draw { |map| map.connect(path) }
+      set.draw { match(path) }
 
       assert_equal '/content', set.generate(:controller => 'content', :action => 'index')
       assert_equal '/content/list', set.generate(:controller => 'content', :action => 'list')
@@ -1544,32 +1523,32 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_generate_with_default_params
-    set.draw do |map|
-      map.connect 'dummy/page/:page', :controller => 'dummy'
-      map.connect 'dummy/dots/page.:page', :controller => 'dummy', :action => 'dots'
-      map.connect 'ibocorp/:page', :controller => 'ibocorp',
-                                   :requirements => { :page => /\d+/ },
-                                   :defaults => { :page => 1 }
+    set.draw do
+      match 'dummy/page/:page', :controller => 'dummy'
+      match 'dummy/dots/page.:page', :controller => 'dummy', :action => 'dots'
+      match 'ibocorp/:page', :controller => 'ibocorp',
+                             :constraints => { :page => /\d+/ },
+                             :defaults => { :page => 1 }
 
-      map.connect ':controller/:action/:id'
+      match ':controller/:action/:id'
     end
 
     assert_equal '/ibocorp', set.generate({:controller => 'ibocorp', :page => 1})
   end
 
   def test_generate_with_optional_params_recalls_last_request
-    set.draw do |map|
-      map.connect "blog/", :controller => "blog", :action => "index"
+    set.draw do
+      match "blog/", :controller => "blog", :action => "index"
 
-      map.connect "blog/:year/:month/:day",
-                  :controller => "blog",
-                  :action => "show_date",
-                  :requirements => { :year => /(19|20)\d\d/, :month => /[01]?\d/, :day => /[0-3]?\d/ },
-                  :day => nil, :month => nil
+      match "blog/:year/:month/:day",
+            :controller => "blog",
+            :action => "show_date",
+            :constraints => { :year => /(19|20)\d\d/, :month => /[01]?\d/, :day => /[0-3]?\d/ },
+            :day => nil, :month => nil
 
-      map.connect "blog/show/:id", :controller => "blog", :action => "show", :id => /\d+/
-      map.connect "blog/:controller/:action/:id"
-      map.connect "*anything", :controller => "blog", :action => "unknown_request"
+      match "blog/show/:id", :controller => "blog", :action => "show", :id => /\d+/
+      match "blog/:controller/:action/:id"
+      match "*anything", :controller => "blog", :action => "unknown_request"
     end
 
     assert_equal({:controller => "blog", :action => "index"}, set.recognize_path("/blog"))
@@ -1606,25 +1585,25 @@ end
 class RackMountIntegrationTests < ActiveSupport::TestCase
   Model = Struct.new(:to_param)
 
-  Mapping = lambda { |map|
-    map.namespace :admin do |admin|
-      admin.resources :users
+  Mapping = lambda {
+    namespace :admin do
+      resources :users
     end
 
-    map.namespace 'api' do |api|
-      api.root :controller => 'users'
+    namespace 'api' do
+      root :controller => 'users'
     end
 
     map.connect 'blog/:year/:month/:day',
                 :controller => 'posts',
                 :action => 'show_date',
-                :requirements => { :year => /(19|20)\d\d/, :month => /[01]?\d/, :day => /[0-3]?\d/},
+                :constraints => { :year => /(19|20)\d\d/, :month => /[01]?\d/, :day => /[0-3]?\d/},
                 :day => nil,
                 :month => nil
 
     map.blog('archive/:year', :controller => 'archive', :action => 'index',
       :defaults => { :year => nil },
-      :requirements => { :year => /\d{4}/ }
+      :constraints => { :year => /\d{4}/ }
     )
 
     map.resources :people
@@ -1640,7 +1619,7 @@ class RackMountIntegrationTests < ActiveSupport::TestCase
     map.connect 'ignorecase/geocode/:postalcode', :controller => 'geocode',
                   :action => 'show', :postalcode => /hx\d\d-\d[a-z]{2}/i
     map.geocode 'extended/geocode/:postalcode', :controller => 'geocode',
-                  :action => 'show',:requirements => {
+                  :action => 'show',:constraints => {
                   :postalcode => /# Postcode format
                                   \d{5} #Prefix
                                   (-\d{4})? #Suffix
@@ -1667,9 +1646,9 @@ class RackMountIntegrationTests < ActiveSupport::TestCase
     @routes.clear!
 
     assert_raise(ActionController::RoutingError) do
-      @routes.draw do |map|
-        map.path 'file/*path', :controller => 'content', :action => 'show_file', :path => %w(fake default)
-        map.connect ':controller/:action/:id'
+      @routes.draw do
+        match 'file/*path' => 'content#show_file', :path => %w(fake default), :as => :path
+        match ':controller/:action/:id'
       end
     end
   end
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index e959b41219..0dd49cef70 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -135,6 +135,11 @@ XML
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
     @request.env['PATH_INFO'] = nil
+    @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
+      r.draw do
+        match ':controller(/:action(/:id))'
+      end
+    end
   end
 
   def test_raw_post_handling
@@ -454,7 +459,7 @@ XML
 
   def test_assert_routing_with_method
     with_routing do |set|
-      set.draw { |map| map.resources(:content) }
+      set.draw { resources(:content) }
       assert_routing({ :method => 'post', :path => 'content' }, { :controller => 'content', :action => 'create' })
     end
   end
@@ -465,7 +470,7 @@ XML
 
   def test_assert_routing_with_glob
     with_routing do |set|
-      set.draw { |map| match('*path' => "pages#show") }
+      set.draw { match('*path' => "pages#show") }
       assert_routing('/company/about', { :controller => 'pages', :action => 'show', :path => 'company/about' })
     end
   end
@@ -487,7 +492,7 @@ XML
 
   def test_array_path_parameter_handled_properly
     with_routing do |set|
-      set.draw do |map|
+      set.draw do
         match 'file/*path', :to => 'test_test/test#test_params'
         match ':controller/:action'
       end
@@ -702,7 +707,7 @@ class NamedRoutesControllerTest < ActionController::TestCase
 
   def test_should_be_able_to_use_named_routes_before_a_request_is_done
     with_routing do |set|
-      set.draw { |map| resources :contents }
+      set.draw { resources :contents }
       assert_equal 'http://test.host/contents/new', new_content_url
       assert_equal 'http://test.host/contents/1', content_url(:id => 1)
     end
diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb
index 71a4a43477..5552a0b0f9 100644
--- a/actionpack/test/controller/url_for_test.rb
+++ b/actionpack/test/controller/url_for_test.rb
@@ -130,7 +130,7 @@ module AbstractController
 
       def test_named_routes
         with_routing do |set|
-          set.draw do |map|
+          set.draw do
             match 'this/is/verbose', :to => 'home#index', :as => :no_args
             match 'home/sweet/home/:user', :to => 'home#index', :as => :home
           end
@@ -151,7 +151,7 @@ module AbstractController
 
       def test_relative_url_root_is_respected_for_named_routes
         with_routing do |set|
-          set.draw do |map|
+          set.draw do
             match '/home/sweet/home/:user', :to => 'home#index', :as => :home
           end
 
@@ -165,7 +165,7 @@ module AbstractController
 
       def test_only_path
         with_routing do |set|
-          set.draw do |map|
+          set.draw do
             match 'home/sweet/home/:user', :to => 'home#index', :as => :home
             match ':controller/:action/:id'
           end
@@ -233,7 +233,7 @@ module AbstractController
 
       def test_named_routes_with_nil_keys
         with_routing do |set|
-          set.draw do |map|
+          set.draw do
             match 'posts.:format', :to => 'posts#index', :as => :posts
             match '/', :to => 'posts#index', :as => :main
           end
diff --git a/actionpack/test/controller/url_rewriter_test.rb b/actionpack/test/controller/url_rewriter_test.rb
index a8d7b75372..89de4c1da4 100644
--- a/actionpack/test/controller/url_rewriter_test.rb
+++ b/actionpack/test/controller/url_rewriter_test.rb
@@ -19,6 +19,11 @@ class UrlRewriterTests < ActionController::TestCase
     @request = ActionController::TestRequest.new
     @params = {}
     @rewriter = Rewriter.new(@request) #.new(@request, @params)
+    @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
+      r.draw do
+        match ':controller(/:action(/:id))'
+      end
+    end
   end
 
   def test_port
diff --git a/actionpack/test/controller/webservice_test.rb b/actionpack/test/controller/webservice_test.rb
index 2e6cf48406..cd021c3b20 100644
--- a/actionpack/test/controller/webservice_test.rb
+++ b/actionpack/test/controller/webservice_test.rb
@@ -254,7 +254,7 @@ class WebServiceTest < ActionController::IntegrationTest
 
     def with_test_route_set
       with_routing do |set|
-        set.draw do |map|
+        set.draw do
           match '/', :to => 'web_service_test/test#assign_parameters'
         end
         yield
diff --git a/actionpack/test/dispatch/request/json_params_parsing_test.rb b/actionpack/test/dispatch/request/json_params_parsing_test.rb
index 0faa99a912..b6dee77203 100644
--- a/actionpack/test/dispatch/request/json_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/json_params_parsing_test.rb
@@ -56,7 +56,7 @@ class JsonParamsParsingTest < ActionController::IntegrationTest
 
     def with_test_routing
       with_routing do |set|
-        set.draw do |map|
+        set.draw do
           match ':action', :to => ::JsonParamsParsingTest::TestController
         end
         yield
diff --git a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
index e3ec5cf182..e701185b61 100644
--- a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
@@ -156,7 +156,7 @@ class MultipartParamsParsingTest < ActionController::IntegrationTest
 
     def with_test_routing
       with_routing do |set|
-        set.draw do |map|
+        set.draw do
           match ':action', :to => 'multipart_params_parsing_test/test'
         end
         yield
diff --git a/actionpack/test/dispatch/request/query_string_parsing_test.rb b/actionpack/test/dispatch/request/query_string_parsing_test.rb
index 071d80c5b0..8d67df433c 100644
--- a/actionpack/test/dispatch/request/query_string_parsing_test.rb
+++ b/actionpack/test/dispatch/request/query_string_parsing_test.rb
@@ -108,7 +108,7 @@ class QueryStringParsingTest < ActionController::IntegrationTest
   private
     def assert_parses(expected, actual)
       with_routing do |set|
-        set.draw do |map|
+        set.draw do
           match ':action', :to => ::QueryStringParsingTest::TestController
         end
 
diff --git a/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb b/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb
index 0bcef81534..b179f08f4e 100644
--- a/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb
@@ -129,7 +129,7 @@ class UrlEncodedParamsParsingTest < ActionController::IntegrationTest
   private
     def with_test_routing
       with_routing do |set|
-        set.draw do |map|
+        set.draw do
           match ':action', :to => ::UrlEncodedParamsParsingTest::TestController
         end
         yield
diff --git a/actionpack/test/dispatch/request/xml_params_parsing_test.rb b/actionpack/test/dispatch/request/xml_params_parsing_test.rb
index d44c642420..9d0695bf64 100644
--- a/actionpack/test/dispatch/request/xml_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/xml_params_parsing_test.rb
@@ -96,7 +96,7 @@ class XmlParamsParsingTest < ActionController::IntegrationTest
   private
     def with_test_routing
       with_routing do |set|
-        set.draw do |map|
+        set.draw do
           match ':action', :to => ::XmlParamsParsingTest::TestController
         end
         yield
diff --git a/actionpack/test/dispatch/session/cookie_store_test.rb b/actionpack/test/dispatch/session/cookie_store_test.rb
index d60362fb10..496fa69093 100644
--- a/actionpack/test/dispatch/session/cookie_store_test.rb
+++ b/actionpack/test/dispatch/session/cookie_store_test.rb
@@ -298,7 +298,7 @@ class CookieStoreTest < ActionController::IntegrationTest
 
     def with_test_route_set(options = {})
       with_routing do |set|
-        set.draw do |map|
+        set.draw do
           match ':action', :to => ::CookieStoreTest::TestController
         end
 
diff --git a/actionpack/test/dispatch/session/mem_cache_store_test.rb b/actionpack/test/dispatch/session/mem_cache_store_test.rb
index 6b21678d25..ab10d5fd3a 100644
--- a/actionpack/test/dispatch/session/mem_cache_store_test.rb
+++ b/actionpack/test/dispatch/session/mem_cache_store_test.rb
@@ -174,7 +174,7 @@ class MemCacheStoreTest < ActionController::IntegrationTest
   private
     def with_test_route_set
       with_routing do |set|
-        set.draw do |map|
+        set.draw do
           match ':action', :to => ::MemCacheStoreTest::TestController
         end
 
diff --git a/actionpack/test/template/atom_feed_helper_test.rb b/actionpack/test/template/atom_feed_helper_test.rb
index fb43a8f960..9f0a975255 100644
--- a/actionpack/test/template/atom_feed_helper_test.rb
+++ b/actionpack/test/template/atom_feed_helper_test.rb
@@ -314,7 +314,7 @@ class AtomFeedTest < ActionController::TestCase
   private
     def with_restful_routing(resources)
       with_routing do |set|
-        set.draw do |map|
+        set.draw do
           resources(resources)
         end
         yield
diff --git a/actionpack/test/template/test_case_test.rb b/actionpack/test/template/test_case_test.rb
index a0c46f8a59..eaa0c54f5a 100644
--- a/actionpack/test/template/test_case_test.rb
+++ b/actionpack/test/template/test_case_test.rb
@@ -172,7 +172,7 @@ module ActionView
 
     test "is able to use named routes" do
       with_routing do |set|
-        set.draw { |map| resources :contents }
+        set.draw { resources :contents }
         assert_equal 'http://test.host/contents/new', new_content_url
         assert_equal 'http://test.host/contents/1',   content_url(:id => 1)
       end
@@ -180,7 +180,7 @@ module ActionView
 
     test "named routes can be used from helper included in view" do
       with_routing do |set|
-        set.draw { |map| resources :contents }
+        set.draw { resources :contents }
         _helpers.module_eval do
           def render_from_helper
             new_content_url
diff --git a/actionpack/test/template/test_test.rb b/actionpack/test/template/test_test.rb
index 20c96824d6..3d0bbba435 100644
--- a/actionpack/test/template/test_test.rb
+++ b/actionpack/test/template/test_test.rb
@@ -47,7 +47,7 @@ class PeopleHelperTest < ActionView::TestCase
   private
     def with_test_route_set
       with_routing do |set|
-        set.draw do |map|
+        set.draw do
           match 'people', :to => 'people#index', :as => :people
         end
         yield
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index b76813c554..db8fd82aeb 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -394,7 +394,7 @@ end
 
 class UrlHelperControllerTest < ActionController::TestCase
   class UrlHelperController < ActionController::Base
-    test_routes do |map|
+    test_routes do
       match 'url_helper_controller_test/url_helper/show/:id',
         :to => 'url_helper_controller_test/url_helper#show',
         :as => :show
@@ -407,8 +407,7 @@ class UrlHelperControllerTest < ActionController::TestCase
         :to => 'url_helper_controller_test/url_helper#show_named_route',
         :as => :show_named_route
 
-      map.connect ":controller/:action/:id"
-      # match "/:controller(/:action(/:id))"
+      match "/:controller(/:action(/:id))"
 
       match 'url_helper_controller_test/url_helper/normalize_recall_params',
         :to => UrlHelperController.action(:normalize_recall),