From 66375434b6c7e03a396bbeda3f7029dea2a59f23 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 7 Dec 2009 17:22:09 -0600
Subject: [PATCH 01/21] Pass symbol in as route name when match is used with a
 symbol

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 400039353c..d9724161a9 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -349,7 +349,7 @@ module ActionDispatch
         options = args.extract_options!
 
         if args.length > 1
-          args.each { |path| match(path, options) }
+          args.each { |path| match(path, options.reverse_merge(:as => path.to_sym)) }
           return self
         end
 

From 40ad54e3811913c2bc60c7ee292fa48862f12001 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 7 Dec 2009 18:28:02 -0600
Subject: [PATCH 02/21] Allow scope to take :path and :controller options

---
 .../lib/action_dispatch/routing/mapper.rb     | 34 ++++++++++++-------
 actionpack/test/dispatch/routing_test.rb      |  2 +-
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index d9724161a9..fab8a227bf 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -216,6 +216,27 @@ module ActionDispatch
         def scope(*args)
           options = args.extract_options!
 
+          case args.first
+          when String
+            options[:path] = args.first
+          when Symbol
+            options[:controller] = args.first
+          end
+
+          if path = options.delete(:path)
+            path_set = true
+            path, @scope[:path] = @scope[:path], "#{@scope[:path]}#{Rack::Mount::Utils.normalize_path(path)}"
+          else
+            path_set = false
+          end
+
+          if controller = options.delete(:controller)
+            controller_set = true
+            controller, @scope[:controller] = @scope[:controller], controller
+          else
+            controller_set = false
+          end
+
           constraints = options.delete(:constraints) || {}
           unless constraints.is_a?(Hash)
             block, constraints = constraints, {}
@@ -225,19 +246,6 @@ module ActionDispatch
 
           options, @scope[:options] = @scope[:options], (@scope[:options] || {}).merge(options)
 
-          path_set = controller_set = false
-
-          case args.first
-          when String
-            path_set = true
-            path = args.first
-            path, @scope[:path] = @scope[:path], "#{@scope[:path]}#{Rack::Mount::Utils.normalize_path(path)}"
-          when Symbol
-            controller_set = true
-            controller = args.first
-            controller, @scope[:controller] = @scope[:controller], controller
-          end
-
           yield
 
           self
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index b8bcdc2808..85616b5a59 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -94,7 +94,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       controller :articles do
         scope 'articles' do
-          scope ':title', :title => /[a-z]+/, :as => :with_title do
+          scope :path => ':title', :title => /[a-z]+/, :as => :with_title do
             match ':id', :to => :with_id
           end
         end

From e8489b43e2746d9b3605eef86731232fa823ce69 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 7 Dec 2009 19:24:33 -0600
Subject: [PATCH 03/21] Allow name_prefix to be pass into scope

---
 .../lib/action_dispatch/routing/mapper.rb     | 60 +++++++------------
 actionpack/test/dispatch/routing_test.rb      | 12 ++--
 2 files changed, 24 insertions(+), 48 deletions(-)

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index fab8a227bf..abcaa529ae 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -4,16 +4,12 @@ module ActionDispatch
       module Resources
         class Resource #:nodoc:
           attr_reader :plural, :singular
-          attr_reader :path_prefix, :name_prefix
 
           def initialize(entities, options = {})
             entities = entities.to_s
 
             @plural   = entities.pluralize
             @singular = entities.singularize
-
-            @path_prefix = options[:path_prefix]
-            @name_prefix = options[:name_prefix]
           end
 
           def name
@@ -25,41 +21,17 @@ module ActionDispatch
           end
 
           def member_name
-            if name_prefix
-              "#{name_prefix}_#{singular}"
-            else
-              singular
-            end
+            singular
           end
 
           def collection_name
-            if name_prefix
-              "#{name_prefix}_#{plural}"
-            else
-              plural
-            end
-          end
-
-          def new_name
-            if name_prefix
-              "new_#{name_prefix}_#{singular}"
-            else
-              "new_#{singular}"
-            end
-          end
-
-          def edit_name
-            if name_prefix
-              "edit_#{name_prefix}_#{singular}"
-            else
-              "edit_#{singular}"
-            end
+            plural
           end
         end
 
         class SingletonResource < Resource #:nodoc:
           def initialize(entity, options = {})
-            super(entity)
+            super
           end
 
           def name
@@ -76,8 +48,7 @@ module ActionDispatch
             return self
           end
 
-          name_prefix = @scope[:options][:name_prefix] if @scope[:options]
-          resource = SingletonResource.new(resources.pop, :name_prefix => name_prefix)
+          resource = SingletonResource.new(resources.pop)
 
           if @scope[:scope_level] == :resources
             parent_resource = @scope[:scope_level_options][:name]
@@ -99,8 +70,8 @@ module ActionDispatch
                 post "", :to => :create
                 put "", :to => :update
                 delete "", :to => :destroy
-                get "new", :to => :new, :as => resource.new_name
-                get "edit", :to => :edit, :as => resource.edit_name
+                get "new", :to => :new, :as => "new_#{resource.singular}"
+                get "edit", :to => :edit, :as => "edit_#{resource.singular}"
               end
             end
           end
@@ -117,8 +88,7 @@ module ActionDispatch
             return self
           end
 
-          name_prefix = @scope[:options][:name_prefix] if @scope[:options]
-          resource = Resource.new(resources.pop, :name_prefix => name_prefix)
+          resource = Resource.new(resources.pop)
 
           if @scope[:scope_level] == :resources
             parent_resource = @scope[:scope_level_options][:name]
@@ -139,14 +109,14 @@ module ActionDispatch
                 collection do
                   get "", :to => :index, :as => resource.collection_name
                   post "", :to => :create
-                  get "new", :to => :new, :as => resource.new_name
+                  get "new", :to => :new, :as => "new_#{resource.singular}"
                 end
 
                 member do
                   get "", :to => :show, :as => resource.member_name
                   put "", :to => :update
                   delete "", :to => :destroy
-                  get "edit", :to => :edit, :as => resource.edit_name
+                  get "edit", :to => :edit, :as => "edit_#{resource.singular}"
                 end
               end
             end
@@ -230,6 +200,13 @@ module ActionDispatch
             path_set = false
           end
 
+          if name_prefix = options.delete(:name_prefix)
+            name_prefix_set = true
+            name_prefix, @scope[:name_prefix] = @scope[:name_prefix], (@scope[:name_prefix] ? "#{@scope[:name_prefix]}_#{name_prefix}" : name_prefix)
+          else
+            name_prefix_set = false
+          end
+
           if controller = options.delete(:controller)
             controller_set = true
             controller, @scope[:controller] = @scope[:controller], controller
@@ -251,6 +228,7 @@ module ActionDispatch
           self
         ensure
           @scope[:path] = path if path_set
+          @scope[:name_prefix] = name_prefix if name_prefix_set
           @scope[:controller] = controller if controller_set
           @scope[:options] = options
           @scope[:blocks] = blocks
@@ -404,7 +382,9 @@ module ActionDispatch
         validate_defaults!(app, defaults, segment_keys)
         app = Constraints.new(app, blocks)
 
-        @set.add_route(app, conditions, requirements, defaults, options[:as])
+        name = @scope[:name_prefix] ? "#{@scope[:name_prefix]}_#{options[:as]}" : options[:as]
+
+        @set.add_route(app, conditions, requirements, defaults, name)
 
         self
       end
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 85616b5a59..86cf2ce335 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -93,7 +93,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       end
 
       controller :articles do
-        scope 'articles' do
+        scope 'articles', :name_prefix => 'article' do
           scope :path => ':title', :title => /[a-z]+/, :as => :with_title do
             match ':id', :to => :with_id
           end
@@ -255,9 +255,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       get '/projects/1/companies/1/avatar'
       assert_equal 'avatars#show', @response.body
-      pending do
-        assert_equal '/projects/1/companies/1/avatar', project_company_avatar_path(:project_id => '1', :company_id => '1')
-      end
+      assert_equal '/projects/1/companies/1/avatar', project_company_avatar_path(:project_id => '1', :company_id => '1')
     end
   end
 
@@ -337,9 +335,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       get '/projects/1/posts/1/subscription'
       assert_equal 'subscriptions#show', @response.body
-      pending do
-        assert_equal '/projects/1/posts/1/subscription', project_post_subscription_path(:project_id => '1', :post_id => '1')
-      end
+      assert_equal '/projects/1/posts/1/subscription', project_post_subscription_path(:project_id => '1', :post_id => '1')
 
       get '/projects/1/posts/1/comments'
       assert_equal 'comments#index', @response.body
@@ -407,7 +403,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       assert_raise(ActionController::RoutingError) { get '/articles/123/1' }
 
-      assert_equal '/articles/rails/1', with_title_path(:title => 'rails', :id => 1)
+      assert_equal '/articles/rails/1', article_with_title_path(:title => 'rails', :id => 1)
     end
   end
 

From 5835447b6fbc956f22011fc33bcc882db144c7c1 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 7 Dec 2009 19:31:29 -0600
Subject: [PATCH 04/21] named_prefix doesn't join with "_"

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 8 ++++----
 actionpack/test/dispatch/routing_test.rb         | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index abcaa529ae..7eb648cedf 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -63,7 +63,7 @@ module ActionDispatch
 
           controller(resource.controller) do
             namespace(resource.name) do
-              with_scope_level(:resource, :name => resource.singular, :name_prefix => resource.member_name) do
+              with_scope_level(:resource, :name => resource.singular, :name_prefix => "#{resource.member_name}_") do
                 yield if block_given?
 
                 get "", :to => :show, :as => resource.member_name
@@ -103,7 +103,7 @@ module ActionDispatch
 
           controller(resource.controller) do
             namespace(resource.name) do
-              with_scope_level(:resources, :name => resource.singular, :name_prefix => resource.member_name) do
+              with_scope_level(:resources, :name => resource.singular, :name_prefix => "#{resource.member_name}_") do
                 yield if block_given?
 
                 collection do
@@ -202,7 +202,7 @@ module ActionDispatch
 
           if name_prefix = options.delete(:name_prefix)
             name_prefix_set = true
-            name_prefix, @scope[:name_prefix] = @scope[:name_prefix], (@scope[:name_prefix] ? "#{@scope[:name_prefix]}_#{name_prefix}" : name_prefix)
+            name_prefix, @scope[:name_prefix] = @scope[:name_prefix], (@scope[:name_prefix] ? "#{@scope[:name_prefix]}#{name_prefix}" : name_prefix)
           else
             name_prefix_set = false
           end
@@ -382,7 +382,7 @@ module ActionDispatch
         validate_defaults!(app, defaults, segment_keys)
         app = Constraints.new(app, blocks)
 
-        name = @scope[:name_prefix] ? "#{@scope[:name_prefix]}_#{options[:as]}" : options[:as]
+        name = @scope[:name_prefix] ? "#{@scope[:name_prefix]}#{options[:as]}" : options[:as]
 
         @set.add_route(app, conditions, requirements, defaults, name)
 
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 86cf2ce335..0a35868d7c 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -93,7 +93,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       end
 
       controller :articles do
-        scope 'articles', :name_prefix => 'article' do
+        scope 'articles', :name_prefix => 'article_' do
           scope :path => ':title', :title => /[a-z]+/, :as => :with_title do
             match ':id', :to => :with_id
           end

From e600b41c7f2029b1fb4b75b90acc3379acf95d2b Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 7 Dec 2009 19:47:47 -0600
Subject: [PATCH 05/21] Cleanup resource scoping by passing down the parent
 resource object in the scope

---
 .../lib/action_dispatch/routing/mapper.rb     | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 7eb648cedf..9ca4e16802 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -27,6 +27,14 @@ module ActionDispatch
           def collection_name
             plural
           end
+
+          def id_segment
+            ":#{singular}_id"
+          end
+
+          def member_name_prefix
+            "#{member_name}_"
+          end
         end
 
         class SingletonResource < Resource #:nodoc:
@@ -51,10 +59,8 @@ module ActionDispatch
           resource = SingletonResource.new(resources.pop)
 
           if @scope[:scope_level] == :resources
-            parent_resource = @scope[:scope_level_options][:name]
-            parent_named_prefix = @scope[:scope_level_options][:name_prefix]
             with_scope_level(:member) do
-              scope(":#{parent_resource}_id", :name_prefix => parent_named_prefix) do
+              scope(parent_resource.id_segment, :name_prefix => parent_resource.member_name_prefix) do
                 resource(resource.name, options, &block)
               end
             end
@@ -63,7 +69,7 @@ module ActionDispatch
 
           controller(resource.controller) do
             namespace(resource.name) do
-              with_scope_level(:resource, :name => resource.singular, :name_prefix => "#{resource.member_name}_") do
+              with_scope_level(:resource, resource) do
                 yield if block_given?
 
                 get "", :to => :show, :as => resource.member_name
@@ -91,10 +97,8 @@ module ActionDispatch
           resource = Resource.new(resources.pop)
 
           if @scope[:scope_level] == :resources
-            parent_resource = @scope[:scope_level_options][:name]
-            parent_named_prefix = @scope[:scope_level_options][:name_prefix]
             with_scope_level(:member) do
-              scope(":#{parent_resource}_id", :name_prefix => parent_named_prefix) do
+              scope(parent_resource.id_segment, :name_prefix => parent_resource.member_name_prefix) do
                 resources(resource.name, options, &block)
               end
             end
@@ -103,7 +107,7 @@ module ActionDispatch
 
           controller(resource.controller) do
             namespace(resource.name) do
-              with_scope_level(:resources, :name => resource.singular, :name_prefix => "#{resource.member_name}_") do
+              with_scope_level(:resources, resource) do
                 yield if block_given?
 
                 collection do
@@ -165,14 +169,19 @@ module ActionDispatch
           super
         end
 
+        protected
+          def parent_resource
+            @scope[:scope_level_resource]
+          end
+
         private
-          def with_scope_level(kind, options = {})
+          def with_scope_level(kind, resource = parent_resource)
             old, @scope[:scope_level] = @scope[:scope_level], kind
-            old_options, @scope[:scope_level_options] = @scope[:scope_level_options], options
+            old_resource, @scope[:scope_level_resource] = @scope[:scope_level_resource], resource
             yield
           ensure
             @scope[:scope_level] = old
-            @scope[:scope_level_options] = old_options
+            @scope[:scope_level_resource] = old_resource
           end
       end
 

From e86a82c52c2c5edb8c95f9fd882b491dd1f550f4 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 7 Dec 2009 19:50:13 -0600
Subject: [PATCH 06/21] Move name_prefix merging into Scoping concern

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 9ca4e16802..8dbf33d5f9 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -258,7 +258,13 @@ module ActionDispatch
 
         def match(*args)
           options = args.extract_options!
+
           options = (@scope[:options] || {}).merge(options)
+
+          if @scope[:name_prefix]
+            options[:as] = "#{@scope[:name_prefix]}#{options[:as]}"
+          end
+
           args.push(options)
           super(*args)
         end
@@ -391,9 +397,7 @@ module ActionDispatch
         validate_defaults!(app, defaults, segment_keys)
         app = Constraints.new(app, blocks)
 
-        name = @scope[:name_prefix] ? "#{@scope[:name_prefix]}#{options[:as]}" : options[:as]
-
-        @set.add_route(app, conditions, requirements, defaults, name)
+        @set.add_route(app, conditions, requirements, defaults, options[:as])
 
         self
       end

From 81d7227c9b8f4a74a74cf3b2cb183ce130b3f679 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 7 Dec 2009 19:59:23 -0600
Subject: [PATCH 07/21] Move base mapper methods into Base module so plugins
 can easily extend the mapper

---
 .../lib/action_dispatch/routing/mapper.rb     | 492 +++++++++---------
 1 file changed, 247 insertions(+), 245 deletions(-)

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 8dbf33d5f9..1a742f61e6 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1,6 +1,249 @@
 module ActionDispatch
   module Routing
     class Mapper
+      class Constraints
+        def new(app, constraints = [])
+          if constraints.any?
+            super(app, constraints)
+          else
+            app
+          end
+        end
+
+        def initialize(app, constraints = [])
+          @app, @constraints = app, constraints
+        end
+
+        def call(env)
+          req = Rack::Request.new(env)
+
+          @constraints.each { |constraint|
+            if constraint.respond_to?(:matches?) && !constraint.matches?(req)
+              return [417, {}, []]
+            elsif constraint.respond_to?(:call) && !constraint.call(req)
+              return [417, {}, []]
+            end
+          }
+
+          @app.call(env)
+        end
+      end
+
+      module Base
+        def initialize(set)
+          @set = set
+        end
+
+        def root(options = {})
+          match '/', options.merge(:as => :root)
+        end
+
+        def match(*args)
+          options = args.extract_options!
+
+          if args.length > 1
+            args.each { |path| match(path, options.reverse_merge(:as => path.to_sym)) }
+            return self
+          end
+
+          if args.first.is_a?(Symbol)
+            return match(args.first.to_s, options.merge(:to => args.first.to_sym))
+          end
+
+          path = args.first
+
+          conditions, defaults = {}, {}
+
+          path = nil if path == ""
+          path = Rack::Mount::Utils.normalize_path(path) if path
+          path = "#{@scope[:path]}#{path}" if @scope[:path]
+
+          raise ArgumentError, "path is required" unless path
+
+          constraints = options[:constraints] || {}
+          unless constraints.is_a?(Hash)
+            block, constraints = constraints, {}
+          end
+          blocks = ((@scope[:blocks] || []) + [block]).compact
+          constraints = (@scope[:constraints] || {}).merge(constraints)
+          options.each { |k, v| constraints[k] = v if v.is_a?(Regexp) }
+
+          conditions[:path_info] = path
+          requirements = constraints.dup
+
+          path_regexp = Rack::Mount::Strexp.compile(path, constraints, SEPARATORS)
+          segment_keys = Rack::Mount::RegexpWithNamedGroups.new(path_regexp).names
+          constraints.reject! { |k, v| segment_keys.include?(k.to_s) }
+          conditions.merge!(constraints)
+
+          requirements[:controller] ||= @set.controller_constraints
+
+          if via = options[:via]
+            via = Array(via).map { |m| m.to_s.upcase }
+            conditions[:request_method] = Regexp.union(*via)
+          end
+
+          defaults[:controller] ||= @scope[:controller].to_s if @scope[:controller]
+
+          app = initialize_app_endpoint(options, defaults)
+          validate_defaults!(app, defaults, segment_keys)
+          app = Constraints.new(app, blocks)
+
+          @set.add_route(app, conditions, requirements, defaults, options[:as])
+
+          self
+        end
+
+        private
+          def initialize_app_endpoint(options, defaults)
+            app = nil
+
+            if options[:to].respond_to?(:call)
+              app = options[:to]
+              defaults.delete(:controller)
+              defaults.delete(:action)
+            elsif options[:to].is_a?(String)
+              defaults[:controller], defaults[:action] = options[:to].split('#')
+            elsif options[:to].is_a?(Symbol)
+              defaults[:action] = options[:to].to_s
+            end
+
+            app || Routing::RouteSet::Dispatcher.new(:defaults => defaults)
+          end
+
+          def validate_defaults!(app, defaults, segment_keys)
+            return unless app.is_a?(Routing::RouteSet::Dispatcher)
+
+            unless defaults.include?(:controller) || segment_keys.include?("controller")
+              raise ArgumentError, "missing :controller"
+            end
+
+            unless defaults.include?(:action) || segment_keys.include?("action")
+              raise ArgumentError, "missing :action"
+            end
+          end
+      end
+
+      module HttpHelpers
+        def get(*args, &block)
+          map_method(:get, *args, &block)
+        end
+
+        def post(*args, &block)
+          map_method(:post, *args, &block)
+        end
+
+        def put(*args, &block)
+          map_method(:put, *args, &block)
+        end
+
+        def delete(*args, &block)
+          map_method(:delete, *args, &block)
+        end
+
+        def redirect(path, options = {})
+          status = options[:status] || 301
+          lambda { |env|
+            req = Rack::Request.new(env)
+            url = req.scheme + '://' + req.host + path
+            [status, {'Location' => url, 'Content-Type' => 'text/html'}, ['Moved Permanently']]
+          }
+        end
+
+        private
+          def map_method(method, *args, &block)
+            options = args.extract_options!
+            options[:via] = method
+            args.push(options)
+            match(*args, &block)
+            self
+          end
+      end
+
+      module Scoping
+        def initialize(*args)
+          @scope = {}
+          super
+        end
+
+        def scope(*args)
+          options = args.extract_options!
+
+          case args.first
+          when String
+            options[:path] = args.first
+          when Symbol
+            options[:controller] = args.first
+          end
+
+          if path = options.delete(:path)
+            path_set = true
+            path, @scope[:path] = @scope[:path], "#{@scope[:path]}#{Rack::Mount::Utils.normalize_path(path)}"
+          else
+            path_set = false
+          end
+
+          if name_prefix = options.delete(:name_prefix)
+            name_prefix_set = true
+            name_prefix, @scope[:name_prefix] = @scope[:name_prefix], (@scope[:name_prefix] ? "#{@scope[:name_prefix]}#{name_prefix}" : name_prefix)
+          else
+            name_prefix_set = false
+          end
+
+          if controller = options.delete(:controller)
+            controller_set = true
+            controller, @scope[:controller] = @scope[:controller], controller
+          else
+            controller_set = false
+          end
+
+          constraints = options.delete(:constraints) || {}
+          unless constraints.is_a?(Hash)
+            block, constraints = constraints, {}
+          end
+          constraints, @scope[:constraints] = @scope[:constraints], (@scope[:constraints] || {}).merge(constraints)
+          blocks, @scope[:blocks] = @scope[:blocks], (@scope[:blocks] || []) + [block]
+
+          options, @scope[:options] = @scope[:options], (@scope[:options] || {}).merge(options)
+
+          yield
+
+          self
+        ensure
+          @scope[:path] = path if path_set
+          @scope[:name_prefix] = name_prefix if name_prefix_set
+          @scope[:controller] = controller if controller_set
+          @scope[:options] = options
+          @scope[:blocks] = blocks
+          @scope[:constraints] = constraints
+        end
+
+        def controller(controller)
+          scope(controller.to_sym) { yield }
+        end
+
+        def namespace(path)
+          scope(path.to_s) { yield }
+        end
+
+        def constraints(constraints = {})
+          scope(:constraints => constraints) { yield }
+        end
+
+        def match(*args)
+          options = args.extract_options!
+
+          options = (@scope[:options] || {}).merge(options)
+
+          if @scope[:name_prefix]
+            options[:as] = "#{@scope[:name_prefix]}#{options[:as]}"
+          end
+
+          args.push(options)
+          super(*args)
+        end
+      end
+
       module Resources
         class Resource #:nodoc:
           attr_reader :plural, :singular
@@ -185,251 +428,10 @@ module ActionDispatch
           end
       end
 
-      module Scoping
-        def self.extended(object)
-          object.instance_eval do
-            @scope = {}
-          end
-        end
-
-        def scope(*args)
-          options = args.extract_options!
-
-          case args.first
-          when String
-            options[:path] = args.first
-          when Symbol
-            options[:controller] = args.first
-          end
-
-          if path = options.delete(:path)
-            path_set = true
-            path, @scope[:path] = @scope[:path], "#{@scope[:path]}#{Rack::Mount::Utils.normalize_path(path)}"
-          else
-            path_set = false
-          end
-
-          if name_prefix = options.delete(:name_prefix)
-            name_prefix_set = true
-            name_prefix, @scope[:name_prefix] = @scope[:name_prefix], (@scope[:name_prefix] ? "#{@scope[:name_prefix]}#{name_prefix}" : name_prefix)
-          else
-            name_prefix_set = false
-          end
-
-          if controller = options.delete(:controller)
-            controller_set = true
-            controller, @scope[:controller] = @scope[:controller], controller
-          else
-            controller_set = false
-          end
-
-          constraints = options.delete(:constraints) || {}
-          unless constraints.is_a?(Hash)
-            block, constraints = constraints, {}
-          end
-          constraints, @scope[:constraints] = @scope[:constraints], (@scope[:constraints] || {}).merge(constraints)
-          blocks, @scope[:blocks] = @scope[:blocks], (@scope[:blocks] || []) + [block]
-
-          options, @scope[:options] = @scope[:options], (@scope[:options] || {}).merge(options)
-
-          yield
-
-          self
-        ensure
-          @scope[:path] = path if path_set
-          @scope[:name_prefix] = name_prefix if name_prefix_set
-          @scope[:controller] = controller if controller_set
-          @scope[:options] = options
-          @scope[:blocks] = blocks
-          @scope[:constraints] = constraints
-        end
-
-        def controller(controller)
-          scope(controller.to_sym) { yield }
-        end
-
-        def namespace(path)
-          scope(path.to_s) { yield }
-        end
-
-        def constraints(constraints = {})
-          scope(:constraints => constraints) { yield }
-        end
-
-        def match(*args)
-          options = args.extract_options!
-
-          options = (@scope[:options] || {}).merge(options)
-
-          if @scope[:name_prefix]
-            options[:as] = "#{@scope[:name_prefix]}#{options[:as]}"
-          end
-
-          args.push(options)
-          super(*args)
-        end
-      end
-
-      module HttpHelpers
-        def get(*args, &block)
-          map_method(:get, *args, &block)
-        end
-
-        def post(*args, &block)
-          map_method(:post, *args, &block)
-        end
-
-        def put(*args, &block)
-          map_method(:put, *args, &block)
-        end
-
-        def delete(*args, &block)
-          map_method(:delete, *args, &block)
-        end
-
-        def redirect(path, options = {})
-          status = options[:status] || 301
-          lambda { |env|
-            req = Rack::Request.new(env)
-            url = req.scheme + '://' + req.host + path
-            [status, {'Location' => url, 'Content-Type' => 'text/html'}, ['Moved Permanently']]
-          }
-        end
-
-        private
-          def map_method(method, *args, &block)
-            options = args.extract_options!
-            options[:via] = method
-            args.push(options)
-            match(*args, &block)
-            self
-          end
-      end
-
-      class Constraints
-        def new(app, constraints = [])
-          if constraints.any?
-            super(app, constraints)
-          else
-            app
-          end
-        end
-
-        def initialize(app, constraints = [])
-          @app, @constraints = app, constraints
-        end
-
-        def call(env)
-          req = Rack::Request.new(env)
-
-          @constraints.each { |constraint|
-            if constraint.respond_to?(:matches?) && !constraint.matches?(req)
-              return [417, {}, []]
-            elsif constraint.respond_to?(:call) && !constraint.call(req)
-              return [417, {}, []]
-            end
-          }
-
-          @app.call(env)
-        end
-      end
-
-      def initialize(set)
-        @set = set
-
-        extend HttpHelpers
-        extend Scoping
-        extend Resources
-      end
-
-      def root(options = {})
-        match '/', options.merge(:as => :root)
-      end
-
-      def match(*args)
-        options = args.extract_options!
-
-        if args.length > 1
-          args.each { |path| match(path, options.reverse_merge(:as => path.to_sym)) }
-          return self
-        end
-
-        if args.first.is_a?(Symbol)
-          return match(args.first.to_s, options.merge(:to => args.first.to_sym))
-        end
-
-        path = args.first
-
-        conditions, defaults = {}, {}
-
-        path = nil if path == ""
-        path = Rack::Mount::Utils.normalize_path(path) if path
-        path = "#{@scope[:path]}#{path}" if @scope[:path]
-
-        raise ArgumentError, "path is required" unless path
-
-        constraints = options[:constraints] || {}
-        unless constraints.is_a?(Hash)
-          block, constraints = constraints, {}
-        end
-        blocks = ((@scope[:blocks] || []) + [block]).compact
-        constraints = (@scope[:constraints] || {}).merge(constraints)
-        options.each { |k, v| constraints[k] = v if v.is_a?(Regexp) }
-
-        conditions[:path_info] = path
-        requirements = constraints.dup
-
-        path_regexp = Rack::Mount::Strexp.compile(path, constraints, SEPARATORS)
-        segment_keys = Rack::Mount::RegexpWithNamedGroups.new(path_regexp).names
-        constraints.reject! { |k, v| segment_keys.include?(k.to_s) }
-        conditions.merge!(constraints)
-
-        requirements[:controller] ||= @set.controller_constraints
-
-        if via = options[:via]
-          via = Array(via).map { |m| m.to_s.upcase }
-          conditions[:request_method] = Regexp.union(*via)
-        end
-
-        defaults[:controller] ||= @scope[:controller].to_s if @scope[:controller]
-
-        app = initialize_app_endpoint(options, defaults)
-        validate_defaults!(app, defaults, segment_keys)
-        app = Constraints.new(app, blocks)
-
-        @set.add_route(app, conditions, requirements, defaults, options[:as])
-
-        self
-      end
-
-      private
-        def initialize_app_endpoint(options, defaults)
-          app = nil
-
-          if options[:to].respond_to?(:call)
-            app = options[:to]
-            defaults.delete(:controller)
-            defaults.delete(:action)
-          elsif options[:to].is_a?(String)
-            defaults[:controller], defaults[:action] = options[:to].split('#')
-          elsif options[:to].is_a?(Symbol)
-            defaults[:action] = options[:to].to_s
-          end
-
-          app || Routing::RouteSet::Dispatcher.new(:defaults => defaults)
-        end
-
-        def validate_defaults!(app, defaults, segment_keys)
-          return unless app.is_a?(Routing::RouteSet::Dispatcher)
-
-          unless defaults.include?(:controller) || segment_keys.include?("controller")
-            raise ArgumentError, "missing :controller"
-          end
-
-          unless defaults.include?(:action) || segment_keys.include?("action")
-            raise ArgumentError, "missing :action"
-          end
-        end
+      include Base
+      include HttpHelpers
+      include Scoping
+      include Resources
     end
   end
 end

From 0c34e3f41ae79bb675c74b697ef92bad59b25f7f Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 7 Dec 2009 20:11:57 -0600
Subject: [PATCH 08/21] Ignore name_prefix unless there is an explicit name

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 1a742f61e6..86470c2017 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -235,7 +235,7 @@ module ActionDispatch
 
           options = (@scope[:options] || {}).merge(options)
 
-          if @scope[:name_prefix]
+          if @scope[:name_prefix] && options[:as]
             options[:as] = "#{@scope[:name_prefix]}#{options[:as]}"
           end
 

From 1fc58a889d72e9a36167b41fc3cd055c1f58774e Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 7 Dec 2009 20:57:01 -0600
Subject: [PATCH 09/21] Fixed named prefix scope in resource member and
 collection actions

---
 .../lib/action_dispatch/routing/mapper.rb     | 60 +++++++++++--------
 actionpack/test/dispatch/routing_test.rb      | 22 ++-----
 2 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 86470c2017..7647bdeb5d 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -41,15 +41,6 @@ module ActionDispatch
         def match(*args)
           options = args.extract_options!
 
-          if args.length > 1
-            args.each { |path| match(path, options.reverse_merge(:as => path.to_sym)) }
-            return self
-          end
-
-          if args.first.is_a?(Symbol)
-            return match(args.first.to_s, options.merge(:to => args.first.to_sym))
-          end
-
           path = args.first
 
           conditions, defaults = {}, {}
@@ -185,7 +176,7 @@ module ActionDispatch
 
           if name_prefix = options.delete(:name_prefix)
             name_prefix_set = true
-            name_prefix, @scope[:name_prefix] = @scope[:name_prefix], (@scope[:name_prefix] ? "#{@scope[:name_prefix]}#{name_prefix}" : name_prefix)
+            name_prefix, @scope[:name_prefix] = @scope[:name_prefix], (@scope[:name_prefix] ? "#{@scope[:name_prefix]}_#{name_prefix}" : name_prefix)
           else
             name_prefix_set = false
           end
@@ -235,8 +226,10 @@ module ActionDispatch
 
           options = (@scope[:options] || {}).merge(options)
 
-          if @scope[:name_prefix] && options[:as]
-            options[:as] = "#{@scope[:name_prefix]}#{options[:as]}"
+          if @scope[:name_prefix] && !options[:as].blank?
+            options[:as] = "#{@scope[:name_prefix]}_#{options[:as]}"
+          elsif @scope[:name_prefix] && options[:as].blank?
+            options[:as] = @scope[:name_prefix].to_s
           end
 
           args.push(options)
@@ -274,10 +267,6 @@ module ActionDispatch
           def id_segment
             ":#{singular}_id"
           end
-
-          def member_name_prefix
-            "#{member_name}_"
-          end
         end
 
         class SingletonResource < Resource #:nodoc:
@@ -303,7 +292,7 @@ module ActionDispatch
 
           if @scope[:scope_level] == :resources
             with_scope_level(:member) do
-              scope(parent_resource.id_segment, :name_prefix => parent_resource.member_name_prefix) do
+              scope(parent_resource.id_segment, :name_prefix => parent_resource.member_name) do
                 resource(resource.name, options, &block)
               end
             end
@@ -341,7 +330,7 @@ module ActionDispatch
 
           if @scope[:scope_level] == :resources
             with_scope_level(:member) do
-              scope(parent_resource.id_segment, :name_prefix => parent_resource.member_name_prefix) do
+              scope(parent_resource.id_segment, :name_prefix => parent_resource.member_name) do
                 resources(resource.name, options, &block)
               end
             end
@@ -353,17 +342,19 @@ module ActionDispatch
               with_scope_level(:resources, resource) do
                 yield if block_given?
 
-                collection do
+                with_scope_level(:collection) do
                   get "", :to => :index, :as => resource.collection_name
                   post "", :to => :create
                   get "new", :to => :new, :as => "new_#{resource.singular}"
                 end
 
-                member do
-                  get "", :to => :show, :as => resource.member_name
-                  put "", :to => :update
-                  delete "", :to => :destroy
-                  get "edit", :to => :edit, :as => "edit_#{resource.singular}"
+                with_scope_level(:member) do
+                  scope(":id") do
+                    get "", :to => :show, :as => resource.member_name
+                    put "", :to => :update
+                    delete "", :to => :destroy
+                    get "edit", :to => :edit, :as => "edit_#{resource.singular}"
+                  end
                 end
               end
             end
@@ -378,7 +369,9 @@ module ActionDispatch
           end
 
           with_scope_level(:collection) do
-            yield
+            scope(:name_prefix => parent_resource.member_name, :as => "") do
+              yield
+            end
           end
         end
 
@@ -388,7 +381,7 @@ module ActionDispatch
           end
 
           with_scope_level(:member) do
-            scope(":id") do
+            scope(":id", :name_prefix => parent_resource.member_name, :as => "") do
               yield
             end
           end
@@ -396,6 +389,21 @@ module ActionDispatch
 
         def match(*args)
           options = args.extract_options!
+
+          if args.length > 1
+            args.each { |path| match(path, options) }
+            return self
+          end
+
+          if args.first.is_a?(Symbol)
+            begin
+              old_name_prefix, @scope[:name_prefix] = @scope[:name_prefix], "#{args.first}_#{@scope[:name_prefix]}"
+              return match(args.first.to_s, options.merge(:to => args.first.to_sym))
+            ensure
+              @scope[:name_prefix] = old_name_prefix
+            end
+          end
+
           args.push(options)
 
           case options.delete(:on)
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 0a35868d7c..9262b1c7db 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -93,7 +93,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       end
 
       controller :articles do
-        scope 'articles', :name_prefix => 'article_' do
+        scope 'articles', :name_prefix => 'article' do
           scope :path => ':title', :title => /[a-z]+/, :as => :with_title do
             match ':id', :to => :with_id
           end
@@ -267,9 +267,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       post '/projects/1/images/1/revise'
       assert_equal 'images#revise', @response.body
-      pending do
-        assert_equal '/projects/1/images/1/revise', revise_project_image_path(:project_id => '1', :id => '1')
-      end
+      assert_equal '/projects/1/images/1/revise', revise_project_image_path(:project_id => '1', :id => '1')
     end
   end
 
@@ -291,21 +289,15 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       put '/projects/1/people/1/accessible_projects'
       assert_equal 'people#accessible_projects', @response.body
-      pending do
-        assert_equal '/projects/1/people/1/accessible_projects', accessible_projects_project_person_path(:project_id => '1', :id => '1')
-      end
+      assert_equal '/projects/1/people/1/accessible_projects', accessible_projects_project_person_path(:project_id => '1', :id => '1')
 
       post '/projects/1/people/1/resend'
       assert_equal 'people#resend', @response.body
-      pending do
-        assert_equal '/projects/1/people/1/resend', resend_project_person_path(:project_id => '1', :id => '1')
-      end
+      assert_equal '/projects/1/people/1/resend', resend_project_person_path(:project_id => '1', :id => '1')
 
       post '/projects/1/people/1/generate_new_password'
       assert_equal 'people#generate_new_password', @response.body
-      pending do
-        assert_equal '/projects/1/people/1/generate_new_password', generate_new_password_project_person_path(:project_id => '1', :id => '1')
-      end
+      assert_equal '/projects/1/people/1/generate_new_password', generate_new_password_project_person_path(:project_id => '1', :id => '1')
     end
   end
 
@@ -329,9 +321,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       post '/projects/1/posts/1/preview'
       assert_equal 'posts#preview', @response.body
-      pending do
-        assert_equal '/projects/1/posts/1/preview', preview_project_post_path(:project_id => '1', :id => '1')
-      end
+      assert_equal '/projects/1/posts/1/preview', preview_project_post_path(:project_id => '1', :id => '1')
 
       get '/projects/1/posts/1/subscription'
       assert_equal 'subscriptions#show', @response.body

From 3d91d7f0a2bd4b1e104dd8847a2fe9f206c916ca Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 8 Dec 2009 15:31:56 -0600
Subject: [PATCH 10/21] Routes added under resource collection should be
 prefixed with resource collection name

---
 .../lib/action_dispatch/routing/mapper.rb       |  2 +-
 actionpack/test/dispatch/routing_test.rb        | 17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 7647bdeb5d..513c6a5c5f 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -369,7 +369,7 @@ module ActionDispatch
           end
 
           with_scope_level(:collection) do
-            scope(:name_prefix => parent_resource.member_name, :as => "") do
+            scope(:name_prefix => parent_resource.collection_name, :as => "") do
               yield
             end
           end
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 9262b1c7db..029bec2124 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -236,10 +236,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       put '/projects/1/participants/update_all'
       assert_equal 'participants#update_all', @response.body
-
-      pending do
-        assert_equal '/projects/1/participants/update_all', update_all_project_participants_path(:project_id => '1')
-      end
+      assert_equal '/projects/1/participants/update_all', update_all_project_participants_path(:project_id => '1')
     end
   end
 
@@ -309,15 +306,11 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       get '/projects/1/posts/archive'
       assert_equal 'posts#archive', @response.body
-      pending do
-        assert_equal '/projects/1/posts/archive', archive_project_posts_path(:project_id => '1')
-      end
+      assert_equal '/projects/1/posts/archive', archive_project_posts_path(:project_id => '1')
 
       get '/projects/1/posts/toggle_view'
       assert_equal 'posts#toggle_view', @response.body
-      pending do
-        assert_equal '/projects/1/posts/toggle_view', toggle_view_project_posts_path(:project_id => '1')
-      end
+      assert_equal '/projects/1/posts/toggle_view', toggle_view_project_posts_path(:project_id => '1')
 
       post '/projects/1/posts/1/preview'
       assert_equal 'posts#preview', @response.body
@@ -333,9 +326,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       post '/projects/1/posts/1/comments/preview'
       assert_equal 'comments#preview', @response.body
-      pending do
-        assert_equal '/projects/1/posts/1/comments/preview', preview_project_post_comments_path(:project_id => '1', :post_id => '1')
-      end
+      assert_equal '/projects/1/posts/1/comments/preview', preview_project_post_comments_path(:project_id => '1', :post_id => '1')
     end
   end
 

From 33658ea1ae4170f4b0b5123e240d79bb292719e7 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 8 Dec 2009 15:50:44 -0600
Subject: [PATCH 11/21] Don't use name prefix by itself unless as is an empty
 string

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 513c6a5c5f..e05845a04f 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -228,7 +228,7 @@ module ActionDispatch
 
           if @scope[:name_prefix] && !options[:as].blank?
             options[:as] = "#{@scope[:name_prefix]}_#{options[:as]}"
-          elsif @scope[:name_prefix] && options[:as].blank?
+          elsif @scope[:name_prefix] && options[:as] == ""
             options[:as] = @scope[:name_prefix].to_s
           end
 

From c4df6332a4d8292dd7d6bd6a1badc896a2323d11 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 8 Dec 2009 16:06:46 -0600
Subject: [PATCH 12/21] Seperate scope level for nesting resources

---
 .../lib/action_dispatch/routing/mapper.rb     | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index e05845a04f..24b04088e6 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -291,10 +291,8 @@ module ActionDispatch
           resource = SingletonResource.new(resources.pop)
 
           if @scope[:scope_level] == :resources
-            with_scope_level(:member) do
-              scope(parent_resource.id_segment, :name_prefix => parent_resource.member_name) do
-                resource(resource.name, options, &block)
-              end
+            nested do
+              resource(resource.name, options, &block)
             end
             return self
           end
@@ -329,10 +327,8 @@ module ActionDispatch
           resource = Resource.new(resources.pop)
 
           if @scope[:scope_level] == :resources
-            with_scope_level(:member) do
-              scope(parent_resource.id_segment, :name_prefix => parent_resource.member_name) do
-                resources(resource.name, options, &block)
-              end
+            nested do
+              resources(resource.name, options, &block)
             end
             return self
           end
@@ -387,6 +383,18 @@ module ActionDispatch
           end
         end
 
+        def nested
+          unless @scope[:scope_level] == :resources
+            raise ArgumentError, "can't use nested outside resources scope"
+          end
+
+          with_scope_level(:nested) do
+            scope(parent_resource.id_segment, :name_prefix => parent_resource.member_name) do
+              yield
+            end
+          end
+        end
+
         def match(*args)
           options = args.extract_options!
 

From ce5f27b04b1ff25eed520a3d06b3b9c150536e21 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 8 Dec 2009 16:13:00 -0600
Subject: [PATCH 13/21] Remove double scoping blocks and just use one

---
 .../lib/action_dispatch/routing/mapper.rb     | 50 +++++++++----------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 24b04088e6..8cb7745aff 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -297,18 +297,16 @@ module ActionDispatch
             return self
           end
 
-          controller(resource.controller) do
-            namespace(resource.name) do
-              with_scope_level(:resource, resource) do
-                yield if block_given?
+          scope(:path => resource.name, :controller => resource.controller) do
+            with_scope_level(:resource, resource) do
+              yield if block_given?
 
-                get "", :to => :show, :as => resource.member_name
-                post "", :to => :create
-                put "", :to => :update
-                delete "", :to => :destroy
-                get "new", :to => :new, :as => "new_#{resource.singular}"
-                get "edit", :to => :edit, :as => "edit_#{resource.singular}"
-              end
+              get "", :to => :show, :as => resource.member_name
+              post "", :to => :create
+              put "", :to => :update
+              delete "", :to => :destroy
+              get "new", :to => :new, :as => "new_#{resource.singular}"
+              get "edit", :to => :edit, :as => "edit_#{resource.singular}"
             end
           end
 
@@ -333,24 +331,22 @@ module ActionDispatch
             return self
           end
 
-          controller(resource.controller) do
-            namespace(resource.name) do
-              with_scope_level(:resources, resource) do
-                yield if block_given?
+          scope(:path => resource.name, :controller => resource.controller) do
+            with_scope_level(:resources, resource) do
+              yield if block_given?
 
-                with_scope_level(:collection) do
-                  get "", :to => :index, :as => resource.collection_name
-                  post "", :to => :create
-                  get "new", :to => :new, :as => "new_#{resource.singular}"
-                end
+              with_scope_level(:collection) do
+                get "", :to => :index, :as => resource.collection_name
+                post "", :to => :create
+                get "new", :to => :new, :as => "new_#{resource.singular}"
+              end
 
-                with_scope_level(:member) do
-                  scope(":id") do
-                    get "", :to => :show, :as => resource.member_name
-                    put "", :to => :update
-                    delete "", :to => :destroy
-                    get "edit", :to => :edit, :as => "edit_#{resource.singular}"
-                  end
+              with_scope_level(:member) do
+                scope(":id") do
+                  get "", :to => :show, :as => resource.member_name
+                  put "", :to => :update
+                  delete "", :to => :destroy
+                  get "edit", :to => :edit, :as => "edit_#{resource.singular}"
                 end
               end
             end

From ac711043ecec0dd15a159eff8081be8f10584be0 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 8 Dec 2009 16:15:25 -0600
Subject: [PATCH 14/21] Fix ambiguous access_token scoping example

---
 actionpack/test/dispatch/routing_test.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 029bec2124..97cacc4a02 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -58,8 +58,10 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         end
 
         resources :people do
-          namespace ":access_token" do
-            resource :avatar
+          nested do
+            namespace ":access_token" do
+              resource :avatar
+            end
           end
 
           member do
@@ -280,9 +282,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       get '/projects/1/people/1/7a2dec8/avatar'
       assert_equal 'avatars#show', @response.body
-      pending do
-        assert_equal '/projects/1/people/1/7a2dec8/avatar', project_person_avatar_path(:project_id => '1', :person_id => '1', :access_token => '7a2dec8')
-      end
+      assert_equal '/projects/1/people/1/7a2dec8/avatar', project_person_avatar_path(:project_id => '1', :person_id => '1', :access_token => '7a2dec8')
 
       put '/projects/1/people/1/accessible_projects'
       assert_equal 'people#accessible_projects', @response.body

From 2be5e088d27f17cd7210cbfd227aff2e5be6b800 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 8 Dec 2009 16:52:26 -0600
Subject: [PATCH 15/21] Use new routing dsl in tests

---
 actionpack/test/abstract_unit.rb              |  2 +-
 .../activerecord/active_record_store_test.rb  |  2 +-
 .../controller/action_pack_assertions_test.rb | 22 +++++++-------
 actionpack/test/controller/base_test.rb       |  6 ++--
 .../test/controller/mime_responds_test.rb     |  8 +++--
 actionpack/test/controller/redirect_test.rb   |  4 +--
 actionpack/test/controller/render_test.rb     | 30 +++++++++----------
 actionpack/test/controller/render_xml_test.rb |  4 +--
 actionpack/test/controller/test_test.rb       | 11 -------
 .../test/controller/url_rewriter_test.rb      |  4 +--
 actionpack/test/controller/webservice_test.rb |  4 +--
 .../request/multipart_params_parsing_test.rb  |  2 +-
 .../test/template/atom_feed_helper_test.rb    | 12 ++++----
 actionpack/test/template/test_case_test.rb    |  4 +--
 actionpack/test/template/url_helper_test.rb   |  8 ++---
 15 files changed, 56 insertions(+), 67 deletions(-)

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 9d055da4b9..eab9f8b83d 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -83,7 +83,7 @@ class ActiveSupport::TestCase
   # have been loaded.
   setup_once do
     ActionController::Routing::Routes.draw do |map|
-      map.connect ':controller/:action/:id'
+      match ':controller(/:action(/:id))'
     end
   end
 end
diff --git a/actionpack/test/activerecord/active_record_store_test.rb b/actionpack/test/activerecord/active_record_store_test.rb
index c6c079f88c..61bee1b66c 100644
--- a/actionpack/test/activerecord/active_record_store_test.rb
+++ b/actionpack/test/activerecord/active_record_store_test.rb
@@ -155,7 +155,7 @@ class ActiveRecordStoreTest < ActionController::IntegrationTest
     def with_test_route_set(options = {})
       with_routing do |set|
         set.draw do |map|
-          map.connect "/:action", :controller => "active_record_store_test/test"
+          match ':action', :to => 'active_record_store_test/test'
         end
         @app = ActiveRecord::SessionStore.new(set, options.reverse_merge(:key => '_session_id'))
         yield
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index 901cb940ea..d54be9bdc0 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -221,8 +221,8 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
   def test_assert_redirect_to_named_route
     with_routing do |set|
       set.draw do |map|
-        map.route_one 'route_one', :controller => 'action_pack_assertions', :action => 'nothing'
-        map.connect   ':controller/:action/:id'
+        match 'route_one', :to => 'action_pack_assertions#nothing', :as => :route_one
+        match ':controller/:action'
       end
       set.install_helpers
 
@@ -235,9 +235,9 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
   def test_assert_redirect_to_named_route_failure
     with_routing do |set|
       set.draw do |map|
-        map.route_one 'route_one', :controller => 'action_pack_assertions', :action => 'nothing', :id => 'one'
-        map.route_two 'route_two', :controller => 'action_pack_assertions', :action => 'nothing', :id => 'two'
-        map.connect   ':controller/:action/:id'
+        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'
       end
       process :redirect_to_named_route
       assert_raise(ActiveSupport::TestCase::Assertion) do
@@ -255,8 +255,8 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
   def test_assert_redirect_to_nested_named_route
     with_routing do |set|
       set.draw do |map|
-        map.admin_inner_module 'admin/inner_module', :controller => 'admin/inner_module', :action => 'index'
-        map.connect            ':controller/:action/:id'
+        match 'admin/inner_module', :to => 'admin/inner_module#index', :as => :admin_inner_module
+        match ':controller/:action'
       end
       @controller = Admin::InnerModuleController.new
       process :redirect_to_index
@@ -268,8 +268,8 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
   def test_assert_redirected_to_top_level_named_route_from_nested_controller
     with_routing do |set|
       set.draw do |map|
-        map.top_level '/action_pack_assertions/:id', :controller => 'action_pack_assertions', :action => 'index'
-        map.connect   ':controller/:action/:id'
+        match '/action_pack_assertions/:id', :to => 'action_pack_assertions#index', :as => :top_level
+        match ':controller/:action'
       end
       @controller = Admin::InnerModuleController.new
       process :redirect_to_top_level_named_route
@@ -282,8 +282,8 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
     with_routing do |set|
       set.draw do |map|
         # this controller exists in the admin namespace as well which is the only difference from previous test
-        map.top_level '/user/:id', :controller => 'user', :action => 'index'
-        map.connect   ':controller/:action/:id'
+        match '/user/:id', :to => 'user#index', :as => :top_level
+        match ':controller/:action'
       end
       @controller = Admin::InnerModuleController.new
       process :redirect_to_top_level_named_route
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb
index b57550a69a..8f8ada8d8c 100644
--- a/actionpack/test/controller/base_test.rb
+++ b/actionpack/test/controller/base_test.rb
@@ -179,8 +179,8 @@ class DefaultUrlOptionsTest < ActionController::TestCase
   def test_default_url_options_are_used_if_set
     with_routing do |set|
       set.draw do |map|
-        map.default_url_options 'default_url_options', :controller => 'default_url_options'
-        map.connect ':controller/:action/:id'
+        match 'default_url_options', :to => 'default_url_options#default_url_options_action', :as => :default_url_options
+        match ':controller/:action'
       end
 
       get :default_url_options_action # Make a dummy request so that the controller is initialized properly.
@@ -210,7 +210,7 @@ class EnsureNamedRoutesWorksTicket22BugTest < ActionController::TestCase
   def test_named_routes_still_work
     with_routing do |set|
       set.draw do |map|
-        map.resources :things
+        resources :things
       end
       EmptyController.send :include, ActionController::UrlWriter
 
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index c1fa74b8c8..dd1f2f3d3c 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -827,9 +827,11 @@ class RespondWithControllerTest < ActionController::TestCase
     def with_test_route_set
       with_routing do |set|
         set.draw do |map|
-          map.resources :customers
-          map.resources :quiz_stores, :has_many => :customers
-          map.connect ":controller/:action/:id"
+          resources :customers
+          resources :quiz_stores do
+            resources :customers
+          end
+          match ":controller/:action"
         end
         yield
       end
diff --git a/actionpack/test/controller/redirect_test.rb b/actionpack/test/controller/redirect_test.rb
index ea278fd8f0..570ff4a41b 100644
--- a/actionpack/test/controller/redirect_test.rb
+++ b/actionpack/test/controller/redirect_test.rb
@@ -233,8 +233,8 @@ class RedirectTest < ActionController::TestCase
   def test_redirect_to_record
     with_routing do |set|
       set.draw do |map|
-        map.resources :workshops
-        map.connect ':controller/:action/:id'
+        resources :workshops
+        match ':controller/:action'
       end
 
       get :redirect_to_existing_record
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index cffa970011..f26b15d2e0 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -39,35 +39,35 @@ class TestController < ActionController::Base
       render :action => 'hello_world'
     end
   end
-  
+
   def conditional_hello_with_public_header
     if stale?(:last_modified => Time.now.utc.beginning_of_day, :etag => [:foo, 123], :public => true)
       render :action => 'hello_world'
     end
   end
-  
+
   def conditional_hello_with_public_header_and_expires_at
     expires_in 1.minute
     if stale?(:last_modified => Time.now.utc.beginning_of_day, :etag => [:foo, 123], :public => true)
       render :action => 'hello_world'
     end
   end
-  
+
   def conditional_hello_with_expires_in
     expires_in 60.1.seconds
     render :action => 'hello_world'
   end
-  
+
   def conditional_hello_with_expires_in_with_public
     expires_in 1.minute, :public => true
     render :action => 'hello_world'
   end
-  
+
   def conditional_hello_with_expires_in_with_public_with_more_keys
     expires_in 1.minute, :public => true, 'max-stale' => 5.hours
     render :action => 'hello_world'
   end
-  
+
   def conditional_hello_with_expires_in_with_public_with_more_keys_old_syntax
     expires_in 1.minute, :public => true, :private => nil, 'max-stale' => 5.hours
     render :action => 'hello_world'
@@ -272,7 +272,7 @@ class TestController < ActionController::Base
   def builder_layout_test
     render :action => "hello", :layout => "layouts/builder"
   end
-  
+
   # :move: test this in ActionView
   def builder_partial_test
     render :action => "hello_world_container"
@@ -1093,8 +1093,8 @@ class RenderTest < ActionController::TestCase
   def test_head_with_location_object
     with_routing do |set|
       set.draw do |map|
-        map.resources :customers
-        map.connect ':controller/:action/:id'
+        resources :customers
+        match ':controller/:action'
       end
 
       get :head_with_location_object
@@ -1306,22 +1306,22 @@ class ExpiresInRenderTest < ActionController::TestCase
   def setup
     @request.host = "www.nextangle.com"
   end
-  
+
   def test_expires_in_header
     get :conditional_hello_with_expires_in
     assert_equal "max-age=60, private", @response.headers["Cache-Control"]
   end
-  
+
   def test_expires_in_header_with_public
     get :conditional_hello_with_expires_in_with_public
     assert_equal "max-age=60, public", @response.headers["Cache-Control"]
   end
-  
+
   def test_expires_in_header_with_additional_headers
     get :conditional_hello_with_expires_in_with_public_with_more_keys
     assert_equal "max-age=60, public, max-stale=18000", @response.headers["Cache-Control"]
   end
-  
+
   def test_expires_in_old_syntax
     get :conditional_hello_with_expires_in_with_public_with_more_keys_old_syntax
     assert_equal "max-age=60, public, max-stale=18000", @response.headers["Cache-Control"]
@@ -1425,12 +1425,12 @@ class EtagRenderTest < ActionController::TestCase
     get :conditional_hello_with_bangs
     assert_response :not_modified
   end
-  
+
   def test_etag_with_public_true_should_set_header
     get :conditional_hello_with_public_header
     assert_equal "public", @response.headers['Cache-Control']
   end
-  
+
   def test_etag_with_public_true_should_set_header_and_retain_other_headers
     get :conditional_hello_with_public_header_and_expires_at
     assert_equal "max-age=60, public", @response.headers['Cache-Control']
diff --git a/actionpack/test/controller/render_xml_test.rb b/actionpack/test/controller/render_xml_test.rb
index 68a52c3e8c..b5b0d0b9d5 100644
--- a/actionpack/test/controller/render_xml_test.rb
+++ b/actionpack/test/controller/render_xml_test.rb
@@ -61,8 +61,8 @@ class RenderXmlTest < ActionController::TestCase
   def test_rendering_with_object_location_should_set_header_with_url_for
     with_routing do |set|
       set.draw do |map|
-        map.resources :customers
-        map.connect ':controller/:action/:id'
+        resources :customers
+        match ':controller/:action'
       end
 
       get :render_with_object_location
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index 375878b755..52020922f2 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -628,17 +628,6 @@ XML
       assert_nothing_raised(NoMethodError) { @response.binary_content }
     end
   end
-
-  protected
-    def with_foo_routing
-      with_routing do |set|
-        set.draw do |map|
-          map.generate_url 'foo', :controller => 'test'
-          map.connect      ':controller/:action/:id'
-        end
-        yield set
-      end
-    end
 end
 
 class InferringClassNameTest < ActionController::TestCase
diff --git a/actionpack/test/controller/url_rewriter_test.rb b/actionpack/test/controller/url_rewriter_test.rb
index 3b14cbb2d8..ffc0353b00 100644
--- a/actionpack/test/controller/url_rewriter_test.rb
+++ b/actionpack/test/controller/url_rewriter_test.rb
@@ -247,7 +247,7 @@ class UrlWriterTests < ActionController::TestCase
 
     with_routing do |set|
       set.draw do |map|
-        map.home '/home/sweet/home/:user', :controller => 'home', :action => 'index'
+        match '/home/sweet/home/:user', :to => 'home#index', :as => :home
       end
 
       kls = Class.new { include ActionController::UrlWriter }
@@ -264,7 +264,7 @@ class UrlWriterTests < ActionController::TestCase
     with_routing do |set|
       set.draw do |map|
         match 'home/sweet/home/:user', :to => 'home#index', :as => :home
-        map.connect ':controller/:action/:id'
+        match ':controller/:action/:id'
       end
 
       # We need to create a new class in order to install the new named route.
diff --git a/actionpack/test/controller/webservice_test.rb b/actionpack/test/controller/webservice_test.rb
index 0514c098bf..5882a8cfa3 100644
--- a/actionpack/test/controller/webservice_test.rb
+++ b/actionpack/test/controller/webservice_test.rb
@@ -255,9 +255,7 @@ class WebServiceTest < ActionController::IntegrationTest
     def with_test_route_set
       with_routing do |set|
         set.draw do |map|
-          map.with_options :controller => "web_service_test/test" do |c|
-            c.connect "/", :action => "assign_parameters"
-          end
+          match '/', :to => 'web_service_test/test#assign_parameters'
         end
         yield
       end
diff --git a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
index 301080842e..40c5ac2d09 100644
--- a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
@@ -151,7 +151,7 @@ class MultipartParamsParsingTest < ActionController::IntegrationTest
     def with_test_routing
       with_routing do |set|
         set.draw do |map|
-          map.connect ':action', :controller => "multipart_params_parsing_test/test"
+          match ':action', :to => 'multipart_params_parsing_test/test'
         end
         yield
       end
diff --git a/actionpack/test/template/atom_feed_helper_test.rb b/actionpack/test/template/atom_feed_helper_test.rb
index 6a5fb0acff..347cb98303 100644
--- a/actionpack/test/template/atom_feed_helper_test.rb
+++ b/actionpack/test/template/atom_feed_helper_test.rb
@@ -187,10 +187,9 @@ class ScrollsController < ActionController::Base
   end
 
   protected
-
-  def rescue_action(e)
-    raise(e)
-  end
+    def rescue_action(e)
+      raise(e)
+    end
 end
 
 class AtomFeedTest < ActionController::TestCase
@@ -311,11 +310,12 @@ class AtomFeedTest < ActionController::TestCase
       assert_select "summary div p", :text => "after 2"
     end
   end
-private
+
+  private
     def with_restful_routing(resources)
       with_routing do |set|
         set.draw do |map|
-          map.resources(resources)
+          resources(resources)
         end
         yield
       end
diff --git a/actionpack/test/template/test_case_test.rb b/actionpack/test/template/test_case_test.rb
index 05a409d05a..9a448ce328 100644
--- a/actionpack/test/template/test_case_test.rb
+++ b/actionpack/test/template/test_case_test.rb
@@ -114,7 +114,7 @@ module ActionView
 
       test "is able to use named routes" do
         with_routing do |set|
-          set.draw { |map| map.resources :contents }
+          set.draw { |map| resources :contents }
           assert_equal 'http://test.host/contents/new', new_content_url
           assert_equal 'http://test.host/contents/1',   content_url(:id => 1)
         end
@@ -122,7 +122,7 @@ module ActionView
 
       test "named routes can be used from helper included in view" do
         with_routing do |set|
-          set.draw { |map| map.resources :contents }
+          set.draw { |map| resources :contents }
           _helpers.module_eval do
             def render_from_helper
               new_content_url
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index 5c463a4f60..d4b58efe1e 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -451,7 +451,7 @@ class UrlHelperControllerTest < ActionController::TestCase
     def with_url_helper_routing
       with_routing do |set|
         set.draw do |map|
-          map.show_named_route 'url_helper_controller_test/url_helper/show_named_route', :controller => 'url_helper_controller_test/url_helper', :action => 'show_named_route'
+          match 'url_helper_controller_test/url_helper/show_named_route', :to => 'url_helper_controller_test/url_helper#show_named_route', :as => :show_named_route
         end
         yield
       end
@@ -505,7 +505,7 @@ class LinkToUnlessCurrentWithControllerTest < ActionController::TestCase
     def with_restful_routing
       with_routing do |set|
         set.draw do |map|
-          map.resources :tasks
+          resources :tasks
         end
         yield
       end
@@ -625,8 +625,8 @@ class PolymorphicControllerTest < ActionController::TestCase
     def with_restful_routing
       with_routing do |set|
         set.draw do |map|
-          map.resources :workshops do |w|
-            w.resources :sessions
+          resources :workshops do
+            resources :sessions
           end
         end
         yield

From 511cef296bd07fa43794e029e12e4cd1053aa8d1 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 8 Dec 2009 17:19:49 -0600
Subject: [PATCH 16/21] Tack format onto resource routes

---
 .../lib/action_dispatch/routing/mapper.rb     | 44 +++++++++----------
 actionpack/test/dispatch/routing_test.rb      | 18 ++++++--
 2 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 8cb7745aff..3b185c2576 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -46,8 +46,8 @@ module ActionDispatch
           conditions, defaults = {}, {}
 
           path = nil if path == ""
-          path = Rack::Mount::Utils.normalize_path(path) if path
           path = "#{@scope[:path]}#{path}" if @scope[:path]
+          path = Rack::Mount::Utils.normalize_path(path) if path
 
           raise ArgumentError, "path is required" unless path
 
@@ -169,7 +169,7 @@ module ActionDispatch
 
           if path = options.delete(:path)
             path_set = true
-            path, @scope[:path] = @scope[:path], "#{@scope[:path]}#{Rack::Mount::Utils.normalize_path(path)}"
+            path, @scope[:path] = @scope[:path], Rack::Mount::Utils.normalize_path(@scope[:path].to_s + path.to_s)
           else
             path_set = false
           end
@@ -214,7 +214,7 @@ module ActionDispatch
         end
 
         def namespace(path)
-          scope(path.to_s) { yield }
+          scope("/#{path}") { yield }
         end
 
         def constraints(constraints = {})
@@ -297,16 +297,16 @@ module ActionDispatch
             return self
           end
 
-          scope(:path => resource.name, :controller => resource.controller) do
+          scope(:path => "/#{resource.name}", :controller => resource.controller) do
             with_scope_level(:resource, resource) do
               yield if block_given?
 
-              get "", :to => :show, :as => resource.member_name
-              post "", :to => :create
-              put "", :to => :update
-              delete "", :to => :destroy
-              get "new", :to => :new, :as => "new_#{resource.singular}"
-              get "edit", :to => :edit, :as => "edit_#{resource.singular}"
+              get "(.:format)", :to => :show, :as => resource.member_name
+              post "(.:format)", :to => :create
+              put "(.:format)", :to => :update
+              delete "(.:format)", :to => :destroy
+              get "/new(.:format)", :to => :new, :as => "new_#{resource.singular}"
+              get "/edit(.:format)", :to => :edit, :as => "edit_#{resource.singular}"
             end
           end
 
@@ -331,22 +331,22 @@ module ActionDispatch
             return self
           end
 
-          scope(:path => resource.name, :controller => resource.controller) do
+          scope(:path => "/#{resource.name}", :controller => resource.controller) do
             with_scope_level(:resources, resource) do
               yield if block_given?
 
               with_scope_level(:collection) do
-                get "", :to => :index, :as => resource.collection_name
-                post "", :to => :create
-                get "new", :to => :new, :as => "new_#{resource.singular}"
+                get "(.:format)", :to => :index, :as => resource.collection_name
+                post "(.:format)", :to => :create
+                get "/new(.:format)", :to => :new, :as => "new_#{resource.singular}"
               end
 
               with_scope_level(:member) do
-                scope(":id") do
-                  get "", :to => :show, :as => resource.member_name
-                  put "", :to => :update
-                  delete "", :to => :destroy
-                  get "edit", :to => :edit, :as => "edit_#{resource.singular}"
+                scope("/:id") do
+                  get "(.:format)", :to => :show, :as => resource.member_name
+                  put "(.:format)", :to => :update
+                  delete "(.:format)", :to => :destroy
+                  get "/edit(.:format)", :to => :edit, :as => "edit_#{resource.singular}"
                 end
               end
             end
@@ -373,7 +373,7 @@ module ActionDispatch
           end
 
           with_scope_level(:member) do
-            scope(":id", :name_prefix => parent_resource.member_name, :as => "") do
+            scope("/:id", :name_prefix => parent_resource.member_name, :as => "") do
               yield
             end
           end
@@ -385,7 +385,7 @@ module ActionDispatch
           end
 
           with_scope_level(:nested) do
-            scope(parent_resource.id_segment, :name_prefix => parent_resource.member_name) do
+            scope("/#{parent_resource.id_segment}", :name_prefix => parent_resource.member_name) do
               yield
             end
           end
@@ -402,7 +402,7 @@ module ActionDispatch
           if args.first.is_a?(Symbol)
             begin
               old_name_prefix, @scope[:name_prefix] = @scope[:name_prefix], "#{args.first}_#{@scope[:name_prefix]}"
-              return match(args.first.to_s, options.merge(:to => args.first.to_sym))
+              return match("/#{args.first}(.:format)", options.merge(:to => args.first.to_sym))
             ensure
               @scope[:name_prefix] = old_name_prefix
             end
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 97cacc4a02..01088e9d8f 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -95,9 +95,9 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       end
 
       controller :articles do
-        scope 'articles', :name_prefix => 'article' do
-          scope :path => ':title', :title => /[a-z]+/, :as => :with_title do
-            match ':id', :to => :with_id
+        scope '/articles', :name_prefix => 'article' do
+          scope :path => '/:title', :title => /[a-z]+/, :as => :with_title do
+            match '/:id', :to => :with_id
           end
         end
       end
@@ -196,14 +196,26 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       assert_equal 'projects#index', @response.body
       assert_equal '/projects', projects_path
 
+      get '/projects.xml'
+      assert_equal 'projects#index', @response.body
+      assert_equal '/projects.xml', projects_path(:format => 'xml')
+
       get '/projects/new'
       assert_equal 'projects#new', @response.body
       assert_equal '/projects/new', new_project_path
 
+      get '/projects/new.xml'
+      assert_equal 'projects#new', @response.body
+      assert_equal '/projects/new.xml', new_project_path(:format => 'xml')
+
       get '/projects/1'
       assert_equal 'projects#show', @response.body
       assert_equal '/projects/1', project_path(:id => '1')
 
+      get '/projects/1.xml'
+      assert_equal 'projects#show', @response.body
+      assert_equal '/projects/1.xml', project_path(:id => '1', :format => 'xml')
+
       get '/projects/1/edit'
       assert_equal 'projects#edit', @response.body
       assert_equal '/projects/1/edit', edit_project_path(:id => '1')

From 9fbde11b8b2a43206bcd1a135e763751cae98264 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 8 Dec 2009 17:41:00 -0600
Subject: [PATCH 17/21] More test porting

---
 actionpack/test/controller/caching_test.rb      | 7 +++----
 actionpack/test/controller/test_test.rb         | 6 +++---
 actionpack/test/controller/url_rewriter_test.rb | 6 +++---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 682a8f3995..4ea2e57741 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -70,8 +70,8 @@ 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|
-        map.main '', :controller => 'posts', :format => nil
-        map.formatted_posts 'posts.:format', :controller => 'posts'
+        match 'posts.:format', :to => 'posts#index', :as => :formatted_posts
+        match '/', :to => 'posts#index', :as => :main
       end
       @params[:format] = 'rss'
       assert_equal '/posts.rss', @rewriter.rewrite(@params)
@@ -422,8 +422,7 @@ class ActionCacheTest < ActionController::TestCase
   def test_xml_version_of_resource_is_treated_as_different_cache
     with_routing do |set|
       set.draw do |map|
-        map.connect ':controller/:action.:format'
-        map.connect ':controller/:action'
+        match ':controller(/:action(.:format))'
       end
 
       get :index, :format => 'xml'
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index 52020922f2..a788b2495e 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -456,8 +456,8 @@ XML
   def test_array_path_parameter_handled_properly
     with_routing do |set|
       set.draw do |map|
-        map.connect 'file/*path', :controller => 'test_test/test', :action => 'test_params'
-        map.connect ':controller/:action/:id'
+        match 'file/*path', :to => 'test_test/test#test_params'
+        match ':controller/:action'
       end
 
       get :test_params, :path => ['hello', 'world']
@@ -662,7 +662,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| map.resources :contents }
+      set.draw { |map| 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_rewriter_test.rb b/actionpack/test/controller/url_rewriter_test.rb
index ffc0353b00..428f40b9f8 100644
--- a/actionpack/test/controller/url_rewriter_test.rb
+++ b/actionpack/test/controller/url_rewriter_test.rb
@@ -331,8 +331,8 @@ class UrlWriterTests < ActionController::TestCase
   def test_named_routes_with_nil_keys
     with_routing do |set|
       set.draw do |map|
-        map.main '', :controller => 'posts', :format => nil
-        map.resources :posts
+        match 'posts.:format', :to => 'posts#index', :as => :posts
+        match '/', :to => 'posts#index', :as => :main
       end
 
       # We need to create a new class in order to install the new named route.
@@ -350,7 +350,7 @@ class UrlWriterTests < ActionController::TestCase
   def test_formatted_url_methods_are_deprecated
     with_routing do |set|
       set.draw do |map|
-        map.resources :posts
+        resources :posts
       end
       # We need to create a new class in order to install the new named route.
       kls = Class.new { include ActionController::UrlWriter }

From f9d570bdd80010825c21eb32204471ba525915fa Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Wed, 9 Dec 2009 13:38:47 -0800
Subject: [PATCH 18/21] Simpler RenderOption API -- removes the need for
 registering the types and extending a module

---
 .../action_controller/metal/render_options.rb | 117 ++++++++----------
 .../test/controller/render_other_test.rb      |  14 +++
 2 files changed, 67 insertions(+), 64 deletions(-)

diff --git a/actionpack/lib/action_controller/metal/render_options.rb b/actionpack/lib/action_controller/metal/render_options.rb
index 0d69ca10df..b6a7ca0eda 100644
--- a/actionpack/lib/action_controller/metal/render_options.rb
+++ b/actionpack/lib/action_controller/metal/render_options.rb
@@ -1,19 +1,24 @@
 module ActionController
+
+  def self.add_renderer(key, &block)
+    RenderOptions.add(key, &block)
+  end
+
   module RenderOptions
     extend ActiveSupport::Concern
 
     included do
       extlib_inheritable_accessor :_renderers
-      self._renderers = []
+      self._renderers = {}
     end
 
     module ClassMethods
       def _write_render_options
-        renderers = _renderers.map do |r|
+        renderers = _renderers.map do |name, value|
           <<-RUBY_EVAL
-            if options.key?(:#{r})
+            if options.key?(:#{name})
               _process_options(options)
-              return render_#{r}(options[:#{r}], options)
+              return _render_option_#{name}(options[:#{name}], options)
             end
           RUBY_EVAL
         end
@@ -25,79 +30,63 @@ module ActionController
         RUBY_EVAL
       end
 
-      def _add_render_option(name)
-        _renderers << name
+      def use_renderers(*args)
+        args.each do |key|
+          _renderers[key] = RENDERERS[key]
+        end
         _write_render_options
       end
+      alias use_renderer use_renderers
     end
 
     def render_to_body(options)
       _handle_render_options(options) || super
     end
-  end
 
-  module RenderOption #:nodoc:
-    def self.extended(base)
-      base.extend ActiveSupport::Concern
-      base.send :include, ::ActionController::RenderOptions
-
-      def base.register_renderer(name)
-        included { _add_render_option(name) }
-      end
-    end
-  end
-
-  module RenderOptions
-    module Json
-      extend RenderOption
-      register_renderer :json
-
-      def render_json(json, options)
-        json = ActiveSupport::JSON.encode(json) unless json.respond_to?(:to_str)
-        json = "#{options[:callback]}(#{json})" unless options[:callback].blank?
-        self.content_type ||= Mime::JSON
-        self.response_body = json
-      end
-    end
-
-    module Js
-      extend RenderOption
-      register_renderer :js
-
-      def render_js(js, options)
-        self.content_type ||= Mime::JS
-        self.response_body  = js.respond_to?(:to_js) ? js.to_js : js
-      end
-    end
-
-    module Xml
-      extend RenderOption
-      register_renderer :xml
-
-      def render_xml(xml, options)
-        self.content_type ||= Mime::XML
-        self.response_body  = xml.respond_to?(:to_xml) ? xml.to_xml : xml
-      end
-    end
-
-    module RJS
-      extend RenderOption
-      register_renderer :update
-
-      def render_update(proc, options)
-        generator = ActionView::Helpers::PrototypeHelper::JavaScriptGenerator.new(view_context, &proc)
-        self.content_type = Mime::JS
-        self.response_body = generator.to_s
-      end
+    RENDERERS = {}
+    def self.add(key, &block)
+      define_method("_render_option_#{key}", &block)
+      RENDERERS[key] = block
+      All._write_render_options
     end
 
     module All
       extend ActiveSupport::Concern
+      include RenderOptions
 
-      include ActionController::RenderOptions::Json
-      include ActionController::RenderOptions::Js
-      include ActionController::RenderOptions::Xml
-      include ActionController::RenderOptions::RJS
+      INCLUDED = []
+      included do
+        self._renderers = RENDERERS
+        _write_render_options
+        INCLUDED << self
+      end
+
+      def self._write_render_options
+        INCLUDED.each(&:_write_render_options)
+      end
+    end
+
+    add :json do |json, options|
+      json = ActiveSupport::JSON.encode(json) unless json.respond_to?(:to_str)
+      json = "#{options[:callback]}(#{json})" unless options[:callback].blank?
+      self.content_type ||= Mime::JSON
+      self.response_body  = json
+    end
+
+    add :js do |js, options|
+      self.content_type ||= Mime::JS
+      self.response_body  = js.respond_to?(:to_js) ? js.to_js : js
+    end
+
+    add :xml do |xml, options|
+      self.content_type ||= Mime::XML
+      self.response_body  = xml.respond_to?(:to_xml) ? xml.to_xml : xml
+    end
+
+    add :update do |proc, options|
+      generator = ActionView::Helpers::PrototypeHelper::JavaScriptGenerator.new(view_context, &proc)
+      self.content_type = Mime::JS
+      self.response_body = generator.to_s
     end
   end
 end
diff --git a/actionpack/test/controller/render_other_test.rb b/actionpack/test/controller/render_other_test.rb
index 51c3c55545..dfc4f2db8c 100644
--- a/actionpack/test/controller/render_other_test.rb
+++ b/actionpack/test/controller/render_other_test.rb
@@ -2,6 +2,11 @@ require 'abstract_unit'
 require 'controller/fake_models'
 require 'pathname'
 
+ActionController.add_renderer :simon do |says, options|
+  self.content_type  = Mime::TEXT
+  self.response_body = "Simon says: #{says}"
+end
+
 class RenderOtherTest < ActionController::TestCase
   class TestController < ActionController::Base
     protect_from_forgery
@@ -109,6 +114,10 @@ class RenderOtherTest < ActionController::TestCase
       end
     end
 
+    def render_simon_says
+      render :simon => "foo"
+    end
+
     private
       def default_render
         if @alternate_default_render
@@ -240,4 +249,9 @@ class RenderOtherTest < ActionController::TestCase
     xhr :get, :render_alternate_default
     assert_equal %(Element.replace("foo", "partial html");), @response.body
   end
+
+  def test_using_custom_render_option
+    get :render_simon_says
+    assert_equal "Simon says: foo", @response.body
+  end
 end

From 0fec53f243079a60df817cab55100a136fafc1c9 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Wed, 9 Dec 2009 18:57:16 -0600
Subject: [PATCH 19/21] Scaffolding generates new routing dsl examples

---
 .../rails/app/templates/config/routes.rb      | 57 ++++++++++++-------
 .../rails/resource/resource_generator.rb      |  2 +-
 .../lib/rails/generators/rails/scaffold/USAGE |  2 +-
 .../plugins/engines/engine/config/routes.rb   |  2 +-
 railties/test/generators/actions_test.rb      |  2 +-
 .../generators/resource_generator_test.rb     |  6 +-
 .../generators/scaffold_generator_test.rb     |  4 +-
 railties/test/rails_info_controller_test.rb   |  2 +-
 8 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/railties/lib/rails/generators/rails/app/templates/config/routes.rb b/railties/lib/rails/generators/rails/app/templates/config/routes.rb
index ea14ce1bfc..5d110f6a1c 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/routes.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/routes.rb
@@ -1,43 +1,60 @@
 ActionController::Routing::Routes.draw do |map|
-  # The priority is based upon order of creation: first created -> highest priority.
+  # The priority is based upon order of creation:
+  # first created -> highest priority.
 
   # Sample of regular route:
-  #   map.connect 'products/:id', :controller => 'catalog', :action => 'view'
+  #   match 'products/:id', :to => 'catalog#view'
   # Keep in mind you can assign values other than :controller and :action
 
   # Sample of named route:
-  #   map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase'
+  #   match 'products/:id/purchase', :to => 'catalog#purchase', :as => :purchase
   # This route can be invoked with purchase_url(:id => product.id)
 
   # Sample resource route (maps HTTP verbs to controller actions automatically):
-  #   map.resources :products
+  #   resources :products
 
   # Sample resource route with options:
-  #   map.resources :products, :member => { :short => :get, :toggle => :post }, :collection => { :sold => :get }
+  #   resources :products do
+  #     member do
+  #       get :short
+  #       post :toggle
+  #     end
+  #
+  #     collection do
+  #       get :sold
+  #     end
+  #   end
 
   # Sample resource route with sub-resources:
-  #   map.resources :products, :has_many => [ :comments, :sales ], :has_one => :seller
-  
+  #   resources :products do
+  #     resources :comments, :sales
+  #     resource :seller
+  #   end
+
   # Sample resource route with more complex sub-resources
-  #   map.resources :products do |products|
-  #     products.resources :comments
-  #     products.resources :sales, :collection => { :recent => :get }
+  #   resources :products do
+  #     resources :comments
+  #     resources :sales do
+  #       get :recent, :on => :collection
+  #     end
   #   end
 
   # Sample resource route within a namespace:
-  #   map.namespace :admin do |admin|
-  #     # Directs /admin/products/* to Admin::ProductsController (app/controllers/admin/products_controller.rb)
-  #     admin.resources :products
+  #   namespace :admin do
+  #     # Directs /admin/products/* to Admin::ProductsController
+  #     # (app/controllers/admin/products_controller.rb)
+  #     resources :products
   #   end
 
-  # You can have the root of your site routed with map.root -- just remember to delete public/index.html.
-  # map.root :controller => "welcome"
+  # You can have the root of your site routed with map.root
+  # just remember to delete public/index.html.
+  # root :to => "welcome"
 
   # See how all your routes lay out with "rake routes"
 
-  # Install the default routes as the lowest priority.
-  # Note: These default routes make all actions in every controller accessible via GET requests. You should
-  # consider removing or commenting them out if you're using named routes and resources.
-  map.connect ':controller/:action/:id'
-  map.connect ':controller/:action/:id.:format'
+  # Install the default route as the lowest priority.
+  # Note: The default route make all actions in every controller accessible
+  # via GET requests. You should consider removing or commenting it out if
+  # you're using named routes and resources.
+  match ':controller(/:action(/:id(.:format)))'
 end
diff --git a/railties/lib/rails/generators/rails/resource/resource_generator.rb b/railties/lib/rails/generators/rails/resource/resource_generator.rb
index e49f9aea1b..a89ce7faed 100644
--- a/railties/lib/rails/generators/rails/resource/resource_generator.rb
+++ b/railties/lib/rails/generators/rails/resource/resource_generator.rb
@@ -16,7 +16,7 @@ module Rails
       class_option :singleton, :type => :boolean, :desc => "Supply to create a singleton controller"
 
       def add_resource_route
-        route "map.resource#{:s unless options[:singleton]} :#{pluralize?(file_name)}"
+        route "resource#{:s unless options[:singleton]} :#{pluralize?(file_name)}"
       end
 
       protected
diff --git a/railties/lib/rails/generators/rails/scaffold/USAGE b/railties/lib/rails/generators/rails/scaffold/USAGE
index 71edd2f469..530ccdaf0a 100644
--- a/railties/lib/rails/generators/rails/scaffold/USAGE
+++ b/railties/lib/rails/generators/rails/scaffold/USAGE
@@ -17,7 +17,7 @@ Description:
     For example, 'scaffold post title:string body:text published:boolean'
     gives you a model with those three attributes, a controller that handles
     the create/show/update/destroy, forms to create and edit your posts, and
-    an index that lists them all, as well as a map.resources :posts
+    an index that lists them all, as well as a resources :posts
     declaration in config/routes.rb.
 
     If you want to remove all the generated files, run
diff --git a/railties/test/fixtures/plugins/engines/engine/config/routes.rb b/railties/test/fixtures/plugins/engines/engine/config/routes.rb
index cca8d1b146..da44595693 100644
--- a/railties/test/fixtures/plugins/engines/engine/config/routes.rb
+++ b/railties/test/fixtures/plugins/engines/engine/config/routes.rb
@@ -1,3 +1,3 @@
 ActionController::Routing::Routes.draw do |map|
-  map.connect '/engine', :controller => "engine"
+  match '/engine', :to => "engine"
 end
diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb
index 7d03a37f2a..b69f23c965 100644
--- a/railties/test/generators/actions_test.rb
+++ b/railties/test/generators/actions_test.rb
@@ -171,7 +171,7 @@ class ActionsTest < GeneratorsTestCase
 
   def test_route_should_add_data_to_the_routes_block_in_config_routes
     run_generator
-    route_command = "map.route '/login', :controller => 'sessions', :action => 'new'"
+    route_command = "route '/login', :controller => 'sessions', :action => 'new'"
     action :route, route_command
     assert_file 'config/routes.rb', /#{Regexp.escape(route_command)}/
   end
diff --git a/railties/test/generators/resource_generator_test.rb b/railties/test/generators/resource_generator_test.rb
index 886af01b22..dff3908ea1 100644
--- a/railties/test/generators/resource_generator_test.rb
+++ b/railties/test/generators/resource_generator_test.rb
@@ -62,7 +62,7 @@ class ResourceGeneratorTest < GeneratorsTestCase
     run_generator
 
     assert_file "config/routes.rb" do |route|
-      assert_match /map\.resources :accounts$/, route
+      assert_match /resources :accounts$/, route
     end
   end
 
@@ -70,7 +70,7 @@ class ResourceGeneratorTest < GeneratorsTestCase
     run_generator ["account", "--singleton"]
 
     assert_file "config/routes.rb" do |route|
-      assert_match /map\.resource :account$/, route
+      assert_match /resource :account$/, route
     end
   end
 
@@ -93,7 +93,7 @@ class ResourceGeneratorTest < GeneratorsTestCase
     run_generator ["account"], :behavior => :revoke
 
     assert_file "config/routes.rb" do |route|
-      assert_no_match /map\.resources :accounts$/, route
+      assert_no_match /resources :accounts$/, route
     end
   end
 
diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb
index c0652c034f..0b961cee19 100644
--- a/railties/test/generators/scaffold_generator_test.rb
+++ b/railties/test/generators/scaffold_generator_test.rb
@@ -25,7 +25,7 @@ class ScaffoldGeneratorTest < GeneratorsTestCase
 
     # Route
     assert_file "config/routes.rb" do |route|
-      assert_match /map\.resources :product_lines$/, route
+      assert_match /resources :product_lines$/, route
     end
 
     # Controller
@@ -99,7 +99,7 @@ class ScaffoldGeneratorTest < GeneratorsTestCase
 
     # Route
     assert_file "config/routes.rb" do |route|
-      assert_no_match /map\.resources :product_lines$/, route
+      assert_no_match /resources :product_lines$/, route
     end
 
     # Controller
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index 558109ba1b..435bd34925 100644
--- a/railties/test/rails_info_controller_test.rb
+++ b/railties/test/rails_info_controller_test.rb
@@ -16,7 +16,7 @@ class InfoControllerTest < ActionController::TestCase
 
   def setup
     ActionController::Routing::Routes.draw do |map|
-      map.connect ':controller/:action/:id'
+      match ':controller/:action'
     end
     @controller.stubs(:consider_all_requests_local => false, :local_request? => true)
   end

From b2ef6d13f0a0b3d07b8a2f9a1ec64988ba7e4392 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Wed, 9 Dec 2009 20:39:42 -0600
Subject: [PATCH 20/21] Fixed old routing mapper example in generated routes.rb

---
 railties/lib/rails/generators/actions.rb                        | 2 +-
 .../lib/rails/generators/rails/app/templates/config/routes.rb   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index 57abc151d2..2efdf29127 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -269,7 +269,7 @@ module Rails
       #
       # === Example
       #
-      #   route "map.root :controller => :welcome"
+      #   route "root :to => 'welcome'"
       #
       def route(routing_code)
         log :route, routing_code
diff --git a/railties/lib/rails/generators/rails/app/templates/config/routes.rb b/railties/lib/rails/generators/rails/app/templates/config/routes.rb
index 5d110f6a1c..e0f9ca8a12 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/routes.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/routes.rb
@@ -46,7 +46,7 @@ ActionController::Routing::Routes.draw do |map|
   #     resources :products
   #   end
 
-  # You can have the root of your site routed with map.root
+  # You can have the root of your site routed with "root"
   # just remember to delete public/index.html.
   # root :to => "welcome"
 

From ec5434c3c2631bb47b568eede397c3bd596eeb88 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Wed, 9 Dec 2009 20:46:32 -0600
Subject: [PATCH 21/21] Check block arity passed to routes draw so you don't
 need to use |map|

---
 actionpack/lib/action_dispatch/routing/route_set.rb | 9 ++++++++-
 actionpack/test/dispatch/routing_test.rb            | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index a8073c2105..0e83ea3b7e 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -216,7 +216,14 @@ module ActionDispatch
 
       def draw(&block)
         clear!
-        Mapper.new(self).instance_exec(DeprecatedMapper.new(self), &block)
+
+        mapper = Mapper.new(self)
+        if block.arity == 1
+          mapper.instance_exec(DeprecatedMapper.new(self), &block)
+        else
+          mapper.instance_exec(&block)
+        end
+
         @set.add_route(NotFound)
         install_helpers
         @set.freeze
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 01088e9d8f..22ef48b668 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -14,7 +14,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
   stub_controllers do |routes|
     Routes = routes
-    Routes.draw do |map|
+    Routes.draw do
       controller :sessions do
         get  'login', :to => :new, :as => :login
         post 'login', :to => :create