Changeset 4394

Timestamp:

06/01/06 15:42:08 (3 years ago)

Author:

minam

Message:

New routes implementation. Simpler, faster, easier to understand. The published API for config/routes.rb is unchanged, but nearly everything else is different, so expect breakage in plugins and libs that try to fiddle with routes.

Files:

• trunk/actionpack/CHANGELOG (modified) (2 diffs)
• trunk/actionpack/lib/action_controller/assertions.rb (modified) (2 diffs)
• trunk/actionpack/lib/action_controller/base.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/code_generation.rb (deleted)
• trunk/actionpack/lib/action_controller/routing.rb (modified) (2 diffs)
• trunk/actionpack/lib/action_controller/test_process.rb (modified) (2 diffs)
• trunk/actionpack/lib/action_controller/url_rewriter.rb (modified) (1 diff)
• trunk/actionpack/test/controller/action_pack_assertions_test.rb (modified) (2 diffs)
• trunk/actionpack/test/controller/controller_fixtures (added)
• trunk/actionpack/test/controller/controller_fixtures/app (added)
• trunk/actionpack/test/controller/controller_fixtures/app/controllers (added)
• trunk/actionpack/test/controller/controller_fixtures/app/controllers/admin (added)
• trunk/actionpack/test/controller/controller_fixtures/app/controllers/admin/user_controller.rb (added)
• trunk/actionpack/test/controller/controller_fixtures/app/controllers/user_controller.rb (added)
• trunk/actionpack/test/controller/controller_fixtures/vendor (added)
• trunk/actionpack/test/controller/controller_fixtures/vendor/plugins (added)
• trunk/actionpack/test/controller/controller_fixtures/vendor/plugins/bad_plugin (added)
• trunk/actionpack/test/controller/controller_fixtures/vendor/plugins/bad_plugin/lib (added)
• trunk/actionpack/test/controller/controller_fixtures/vendor/plugins/bad_plugin/lib/plugin_controller.rb (added)
• trunk/actionpack/test/controller/mime_type_test.rb (modified) (1 diff)
• trunk/actionpack/test/controller/routing_test.rb (modified) (15 diffs)
• trunk/actionpack/test/controller/test_test.rb (modified) (3 diffs)
• trunk/actionpack/test/controller/url_rewriter_test.rb (modified) (1 diff)
• trunk/railties/CHANGELOG (modified) (1 diff)
• trunk/railties/lib/dispatcher.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Routing rewrite. Simpler, faster, easier to understand. The published API for config/routes.rb is unchanged, but nearly everything else is different, so expect breakage in plugins and libs that try to fiddle with routes. [Nicholas Seckar, Jamis Buck]
+
+  map.connect '/foo/:id', :controller => '...', :action => '...'
+  map.connect '/foo/:id.:format', :controller => '...', :action => '...'
+  map.connect '/foo/:id', ..., :conditions => { :method => :get }
-
-* Cope with missing content type and length headers. Parse parameters from multipart and urlencoded request bodies only. [Jeremy Kemper]
@@ -38 +44 @@
-  All this relies on the fact that you have a route that includes .:format.
-  
-
-* Expanded :method option in FormTagHelper#form_tag, FormHelper#form_for, PrototypeHelper#remote_form_for, PrototypeHelper#remote_form_tag, and PrototypeHelper#link_to_remote to allow for verbs other than GET and POST by automatically creating a hidden form field named _method, which will simulate the other verbs over post [DHH]
-

trunk/actionpack/lib/action_controller/assertions.rb

@@ -190 +190 @@
-          ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty? 
-      
-
+_extras
-          found_extras = options.reject {|k, v| ! extra_keys.include? k}
-
@@ -366 +366 @@
-          request.env["REQUEST_METHOD"] = request_method.to_s.upcase if request_method
-          request.path   = path
-
+
+
-          request
-        end

trunk/actionpack/lib/action_controller/base.rb

@@ -3 +3 @@
-require 'action_controller/response'
-require 'action_controller/routing'
-require 'action_controller/code_generation'
-require 'action_controller/url_rewriter'
-require 'drb'

trunk/actionpack/lib/action_controller/routing.rb

@@ +1 @@
+require 'cgi'
+require 'pathname'
+
+class Object
+  def to_param
+    to_s
+  end
+end
+
+class TrueClass
+  def to_param
+    self
+  end
+end
+
+class FalseClass
+  def to_param
+    self
+  end
+end
+
+class NilClass
+  def to_param
+    self
+  end
+end
+
+class Regexp
+  def number_of_captures
+    Regexp.new("|#{source}").match('').captures.length
+  end
+  
+  class << self
+    def optionalize(pattern)
+      case unoptionalize(pattern)
+        when /\A(.|\(.*\))\Z/ then "#{pattern}?"
+        else "(?:#{pattern})?"
+      end
+    end
+    
+    def unoptionalize(pattern)
+      [/\A\(\?:(.*)\)\?\Z/, /\A(.|\(.*\))\?\Z/].each do |regexp|
+        return $1 if regexp =~ pattern
+      end
+      return pattern
+    end
+  end
+end
+
-module ActionController
-
+
+
+
-    class << self
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      def controller_relative_to(controller, previous)
-        if controller.nil?           then previous
@@ -17 +91 @@
-        elsif %r{^(.*)/} =~ previous then "#{$1}/#{controller}"
-        else controller
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-          else
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        else
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      class Result < ::Array #:nodoc:
-
+ 
-        def self.new_escaped(strings)
-          new strings.collect {|str| CGI.unescape str}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            end
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-            end
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-            end
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-              else
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                end
-              end
+
+              url_for(send(hash_access_method, opts))
-            end
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            end
-          end
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      end
-    end

trunk/actionpack/lib/action_controller/test_process.rb

@@ -107 +107 @@
-          value = value.to_s
-        elsif value.is_a? Array
-Compon
+Segm
-        end
-
@@ -434 +434 @@
-
-    def method_missing(selector, *args)
-NamedRoutes::H
+Routes.named_routes.h
-      return super
-    end

trunk/actionpack/lib/action_controller/url_rewriter.rb

@@ -42 +42 @@
-        end
-        RESERVED_OPTIONS.each {|k| options.delete k}
-        path, extra_keys = Routing::Routes.generate(options.dup, @request) # Warning: Routes will mutate and violate the options hash
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-      end
-  end

trunk/actionpack/test/controller/action_pack_assertions_test.rb

@@ -228 +228 @@
-  def test_assert_redirect_to_named_route
-    with_routing do |set|
-
-
-
-
+
+
+
+
+
+
-      process :redirect_to_named_route
-      assert_redirected_to 'http://test.host/route_one'
@@ -241 +243 @@
-  def test_assert_redirect_to_named_route_failure
-    with_routing do |set|
-
-set
-set
-set
+ |map|
+map
+map
+map
-      end
-      process :redirect_to_named_route

trunk/actionpack/test/controller/mime_type_test.rb

@@ -6 +6 @@
-
-  def test_parse_single
+p Mime::LOOKUP.keys.sort
-    Mime::LOOKUP.keys.each do |mime_type|
-      assert_equal [Mime::Type.lookup(mime_type)], Mime::Type.parse(mime_type)

trunk/actionpack/test/controller/routing_test.rb

@@ -2 +2 @@
-require 'test/unit'
-require File.dirname(__FILE__) + '/fake_controllers'
-stringio
+action_controller/routing
-
-RunTimeTests = ARGV.include? 'time'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-end
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  attr_reader :rs
-  def setup
-    @rs = ::ActionController::Routing::RouteSet.new
+    ActionController::Routing.use_controllers! %w(content admin/user admin/news_feed)
-    @rs.draw {|m| m.connect ':controller/:action/:id' }
-    ::ActionController::Routing::NamedRoutes.clear
-  end
-  
-  def test_default_setup
-::ContentController, :action => 'index'}.stringify_keys, rs.recognize_path(%w(content)
-::ContentController, :action => 'list'}.stringify_keys, rs.recognize_path(%w(content list)
-::ContentController, :action => 'show', :id => '10'}.stringify_keys, rs.recognize_path(%w(content show 10)
-
-::Admin::UserController, :action => 'show', :id => '10'}.stringify_keys, rs.recognize_path(%w(admin user show 10)
-
-['/admin/user/show/10', []], rs.generate({:controller => 'admin/user', :action => 'show', :id => 10}
-
-['/admin/user/show', []]
-['/admin/user/list/10', []]
-
-['/admin/stuff', []]
-['/stuff', []]
+"content", :action => 'index'}, rs.recognize_path("/content"
+"content", :action => 'list'}, rs.recognize_path("/content/list"
+"content", :action => 'show', :id => '10'}, rs.recognize_path("/content/show/10"
+
+"admin/user", :action => 'show', :id => '10'}, rs.recognize_path("/admin/user/show/10"
+
+'/admin/user/show/10', rs.generate(:controller => 'admin/user', :action => 'show', :id => 10
+
+'/admin/user/show'
+'/admin/user/list/10'
+
+'/admin/stuff'
+'/stuff'
-  end
-  
@@ -656 +50 @@
-      rectime = Benchmark.realtime do
-        n.times do
-%w(content)
-%w(content list)
-%w(content show 10)
-%w(admin user)
-%w(admin user list)
-%w(admin user show 10)
+"content"
+"content/list"
+"content/show/10"
+"admin/user"
+"admin/user/list"
+"admin/user/show/10"
-        end
-      end
@@ -705 +99 @@
-  end
-
-  def test_route_generating_string_literal_in_comparison_warning
-    old_stderr = $stderr
-    $stderr = StringIO.new
-    rs.draw do |map|
-      map.connect 'subscriptions/:action/:subscription_type', :controller => "subscriptions"
-    end
-    assert_equal "", $stderr.string
-  ensure
-    $stderr = old_stderr
-  end
-
-  def test_route_with_regexp_for_controller
-    rs.draw do |map|
@@ -721 +104 @@
-      map.connect ':controller/:action/:id'
-    end
-
-
-
-
-
-
+
+
+
+
+
-  end
-  
-  def test_basic_named_route
-home
-
-/content', :action => 'list'
-new.
+add_named_route :home,
+.new
+content', :action => 'list', :use_route => :home
+
-  end
-
-  def test_named_route_with_option
-page
-
-/content', :action => 'show_page', :title => 'new stuff'
-new.
+add_named_route :page,
+.new
+content', :action => 'show_page', :title => 'new stuff', :use_route => :page
+
-  end
-
-  def test_named_route_with_default
-page
-
-/content', :action => 'show_page', :title => 'AboutPage'
-new.
-/content', :action => 'show_page', :title => 'AboutRails'
-new.
+add_named_route :page,
+.new
+content', :action => 'show_page', :title => 'AboutPage', :use_route => :page
+
+content', :action => 'show_page', :title => 'AboutRails', :use_route => :page
+
-
-  end
@@ -756 +138 @@
-    x = Class.new
-    x.send(:define_method, :url_for) {|x| x}
-x.send :include, ::ActionController::Routing::NamedRoutes
+rs.named_routes.install(x)
-    x
-  end
@@ -762 +144 @@
-  def test_named_route_without_hash
-    rs.draw do |map|
-rs
+map
-    end
-  end
@@ -768 +150 @@
-  def test_named_route_with_regexps
-    rs.draw do |map|
-rs
+map
-        :year => /^\d+$/, :month => /^\d+$/, :day => /^\d+$/
-rs
-
-
+map
+
+.new
-    assert_equal(
-/page', :action => 'show', :title => 'hi'
-new.
+page', :action => 'show', :title => 'hi', :use_route => :article
+
-    )
-    assert_equal(
-/page', :action => 'show', :title => 'hi', :day => 10, :year => 2005, :month => 6
-new.
+page', :action => 'show', :title => 'hi', :day => 10, :year => 2005, :month => 6, :use_route => :article
+
-    )
-  end
-
-  def test_changing_controller
-['/admin/stuff/show/10', []]
+'/admin/stuff/show/10'
-      {:controller => 'stuff', :action => 'show', :id => 10},
-      {:controller => 'admin/user', :action => 'index'}
@@ -792 +174 @@
-  def test_paths_escaped
-    rs.draw do |map|
-rs
-rs
-
-%w(file hello+world how+are+you%3F)
+map
+map
+
+"/file/hello+world/how+are+you%3F"
-    assert results, "Recognition should have succeeded"
-'path'
-
-%w(file)
+:path
+
+"/file"
-    assert results, "Recognition should have succeeded"
-'path'
+:path
-  end
-  
-  def test_non_controllers_cannot_be_matched
-
-rs
-
-nil rs.recognize_path(%w(not_a show 10)), "Shouldn't recognize non-controllers as controllers!"
+ |map|
+map
+
+raises(ActionController::RoutingError) { rs.recognize_path("/not_a/show/10") }
-  end
-
@@ -814 +196 @@
-    assert_raises(ActionController::RoutingError) do
-      rs.draw do |map|
-rs
-rs
+map
+map
-      end
-    end
-    
-    rs.draw do |map|
-rs
-rs
+map
+map
-    end
-  end
@@ -827 +209 @@
-  def test_dynamic_path_allowed
-    rs.draw do |map|
-rs
-
-
-['/pages/boo', []]
+map
+
+
+'/pages/boo'
-  end
-
-  def test_backwards
-    rs.draw do |map|
-rs
-rs
-
-
-['/page/20', []], rs.generate({:id => 20}, {:controller => 'pages
-['/page/20', []]
-['/pages/boo', []]
+map
+map
+
+
+'/page/20', rs.generate({:id => 20}, {:controller => 'pages', :action => 'show
+'/page/20'
+'/pages/boo'
-  end
-
-  def test_route_with_fixnum_default
-    rs.draw do |map|
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-  end
-
-  def test_action_expiry
-['/content', []]
+'/content'
-  end
-
-  def test_recognition_with_uppercase_controller_name
-
-
-
-
-
-
+
+
+
+
+
+
+
-  end
-
-  def test_both_requirement_and_optional
-
-rs
+ |map|
+map
-        :defaults => { :year => nil },
-        :requirements => { :year => /\d{4}/ }
-      )
-rs
-
-
-['/test', []]
-['/test', []]
-
-
-/post', :action => 'show'
-new.
+map
+
+
+'/test'
+'/test'
+
+.new
+post', :action => 'show', :use_route => :blog
+
-  end
-  
-  def test_set_to_nil_forgets
-
-rs
-rs
-
-
-['/pages/2005', []]
+ |map|
+map
+map
+
+
+'/pages/2005'
-      rs.generate(:controller => 'content', :action => 'list_pages', :year => 2005)
-['/pages/2005/6', []]
+'/pages/2005/6'
-      rs.generate(:controller => 'content', :action => 'list_pages', :year => 2005, :month => 6)
-['/pages/2005/6/12', []]
+'/pages/2005/6/12'
-      rs.generate(:controller => 'content', :action => 'list_pages', :year => 2005, :month => 6, :day => 12)
-    
-['/pages/2005/6/4', []]
+'/pages/2005/6/4'
-      rs.generate({:day => 4}, {:controller => 'content', :action => 'list_pages', :year => '2005', :month => '6', :day => '12'})
-
-['/pages/2005/6', []]
+'/pages/2005/6'
-      rs.generate({:day => nil}, {:controller => 'content', :action => 'list_pages', :year => '2005', :month => '6', :day => '12'})
-
-['/pages/2005', []]
+'/pages/2005'
-      rs.generate({:day => nil, :month => nil}, {:controller => 'content', :action => 'list_pages', :year => '2005', :month => '6', :day => '12'})
-  end
-  
-  def test_url_with_no_action_specified
-
-rs
-rs
-
-
-['/', []]
-['/', []]
+ |map|
+map
+map
+
+
+'/'
+'/'
-  end
-
-  def test_named_url_with_no_action_specified
-
-rs
-rs
-
-
-['/', []]
-['/', []]
-
-
-/content', :action => 'index'
-new.
+ |map|
+map
+map
+
+
+'/'
+'/'
+
+.new
+content', :action => 'index', :use_route => :root
+
-  end
-  
-  def test_url_generated_when_forgetting_action
-    [{:controller => 'content', :action => 'index'}, {:controller => 'content'}].each do |hash| 
-
-rs
-rs
+ |map|
+map
+map
-      end
-['/', []]
-['/', []]
-['/content/hi', []]
+'/'
+'/'
+'/content/hi'
-    end
-  end
-  
-  def test_named_route_method
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    test_named_route_method
-_url, :hash_for_categories_url], ::ActionController::Routing::NamedRoutes::Helper
+], rs.named_routes.name
-  end
-
-  def test_nil_defaults
-
-rs
+ |map|
+map
-        :controller => 'content',
-        :action => 'list_journal',
-        :date => nil, :user_id => nil
-rs
-
-
-['/journal', []]
+map
+
+
+'/journal'
-  end
-
@@ -986 +365 @@
-
-    rs.draw do |r|
-require
-require
-require
-require
+conditions
+conditions
+conditions
+conditions
-    end
-  end
@@ -1001 +380 @@
-
-        assert_nothing_raised { rs.recognize(@request) }
-"action"
+:action
-      ensure
-        Object.send(:remove_const, :BooksController) rescue nil
@@ -1018 +397 @@
-    end
-
-%w(books 17;edit)
+"/books/17;edit"
-    assert_not_nil hash
-"controller"].controller_name, hash["id"], hash["action"
-
-%w(items 3;complete)
+:controller], hash[:id], hash[:action
+
+"/items/3;complete"
-    assert_not_nil hash
-"controller"].controller_name, hash["id"], hash["action"
-
-%w(posts new;preview)
+:controller], hash[:id], hash[:action
+
+"/posts/new;preview"
-    assert_not_nil hash
-"controller"].controller_name, hash["action"
-
-%w(posts 7)
+:controller], hash[:action
+
+"/posts/7"
-    assert_not_nil hash
-
-
-
-
-
-
-
-
-
+
-  ensure
-    Object.send(:remove_const, :SubpathBooksController) rescue nil
@@ -1054 +425 @@
-    end
-
-["/books/7;edit", []]
-["/items/15;complete", []]
-["/posts/new;preview", []]
+"/books/7;edit"
+"/items/15;complete"
+"/posts/new;preview"
-  ensure
-    Object.send(:remove_const, :SubpathBooksController) rescue nil
@@ -1062 +433 @@
-end
-
+class SegmentTest < Test::Unit::TestCase
+  
+  def test_first_segment_should_interpolate_for_structure
+    s = ROUTING::Segment.new
+    def s.interpolation_statement(array) 'hello' end
+    assert_equal 'hello', s.continue_string_structure([])
+  end
+  
+  def test_interpolation_statement
+    s = ROUTING::StaticSegment.new
+    s.value = "Hello"
+    assert_equal "Hello", eval(s.interpolation_statement([]))
+    assert_equal "HelloHello", eval(s.interpolation_statement([s]))
+    
+    s2 = ROUTING::StaticSegment.new
+    s2.value = "-"
+    assert_equal "Hello-Hello", eval(s.interpolation_statement([s, s2]))
+    
+    s3 = ROUTING::StaticSegment.new
+    s3.value = "World"
+    assert_equal "Hello-World", eval(s3.interpolation_statement([s, s2]))
+  end
+  
-end
+
+class StaticSegmentTest < Test::Unit::TestCase
+  
+  def test_interpolation_chunk_should_respect_raw
+    s = ROUTING::StaticSegment.new
+    s.value = 'Hello/World'
+    assert ! s.raw?
+    assert_equal 'Hello/World', CGI.unescape(s.interpolation_chunk)
+    
+    s.raw = true
+    assert s.raw?
+    assert_equal 'Hello/World', s.interpolation_chunk
+  end
+  
+  def test_regexp_chunk_should_escape_specials
+    s = ROUTING::StaticSegment.new
+    
+    s.value = 'Hello*World'
+    assert_equal 'Hello\*World', s.regexp_chunk
+    
+    s.value = 'HelloWorld'
+    assert_equal 'HelloWorld', s.regexp_chunk
+  end
+  
+  def test_regexp_chunk_should_add_question_mark_for_optionals
+    s = ROUTING::StaticSegment.new
+    s.value = "/"
+    s.is_optional = true
+    assert_equal "/?", s.regexp_chunk
+    
+    s.value = "hello"
+    assert_equal "(?:hello)?", s.regexp_chunk
+  end
+  
+end
+
+class DynamicSegmentTest < Test::Unit::TestCase
+  
+  def segment
+    unless @segment
+      @segment = ROUTING::DynamicSegment.new
+      @segment.key = :a
+    end
+    @segment
+  end
+  
+  def test_extract_value
+    s = ROUTING::DynamicSegment.new
+    s.key = :a
+    
+    hash = {:a => '10', :b => '20'}
+    assert_equal '10', eval(s.extract_value)
+    
+    hash = {:b => '20'}
+    assert_equal nil, eval(s.extract_value)
+    
+    s.default = '20'
+    assert_equal '20', eval(s.extract_value)
+  end
+  
+  def test_default_local_name
+    assert_equal 'a_value', segment.local_name,
+      "Unexpected name -- all value_check tests will fail!"
+  end
+  
+  def test_presence_value_check
+    a_value = 10
+    assert eval(segment.value_check)
+  end
+  
+  def test_regexp_value_check_rejects_nil
+    segment.regexp = /\d+/
+    a_value = nil
+    assert ! eval(segment.value_check)
+  end
+  
+  def test_optional_regexp_value_check_should_accept_nil
+    segment.regexp = /\d+/
+    segment.is_optional = true
+    a_value = nil
+    assert eval(segment.value_check)
+  end
+  
+  def test_regexp_value_check_rejects_no_match
+    segment.regexp = /\d+/
+    
+    a_value = "Hello20World"
+    assert ! eval(segment.value_check)
+    
+    a_value = "20Hi"
+    assert ! eval(segment.value_check)
+  end
+  
+  def test_regexp_value_check_accepts_match
+    segment.regexp = /\d+/
+    
+    a_value = "30"
+    assert eval(segment.value_check)
+  end
+  
+  def test_value_check_fails_on_nil
+    a_value = nil
+    assert ! eval(segment.value_check)
+  end
+  
+  def test_optional_value_needs_no_check
+    segment.is_optional = true
+    a_value = nil
+    assert_equal nil, segment.value_check
+  end
+  
+  def test_regexp_value_check_should_accept_match_with_default
+    segment.regexp = /\d+/
+    segment.default = '200'
+    
+    a_value = '100'
+    assert eval(segment.value_check)
+  end
+  
+  def test_expiry_should_not_trigger_once_expired
+    not_expired = false
+    hash = merged = {:a => 2, :b => 3}
+    options = {:b => 3}
+    expire_on = Hash.new { raise 'No!!!' }
+    
+    eval(segment.expiry_statement)
+  rescue RuntimeError
+    flunk "Expiry check should not have occured!"
+  end
+  
+  def test_expiry_should_occur_according_to_expire_on
+    not_expired = true
+    hash = merged = {:a => 2, :b => 3}
+    options = {:b => 3}
+    
+    expire_on = {:b => true, :a => false}
+    eval(segment.expiry_statement)
+    assert not_expired
+    assert_equal({:a => 2, :b => 3}, hash)
+    
+    expire_on = {:b => true, :a => true}
+    eval(segment.expiry_statement)
+    assert ! not_expired
+    assert_equal({:b => 3}, hash)
+  end
+  
+  def test_extraction_code_should_return_on_nil
+    hash = merged = {:b => 3}
+    options = {:b => 3}
+    a_value = nil
+    
+    # Local jump because of return inside eval.
+    assert_raises(LocalJumpError) { eval(segment.extraction_code) }
+  end
+  
+  def test_extraction_code_should_return_on_mismatch
+    segment.regexp = /\d+/
+    hash = merged = {:a => 'Hi', :b => '3'}
+    options = {:b => '3'}
+    a_value = nil
+    
+    # Local jump because of return inside eval.
+    assert_raises(LocalJumpError) { eval(segment.extraction_code) }
+  end
+  
+  def test_extraction_code_should_accept_value_and_set_local
+    hash = merged = {:a => 'Hi', :b => '3'}
+    options = {:b => '3'}
+    a_value = nil
+    
+    eval(segment.extraction_code)
+    assert_equal 'Hi', a_value
+  end
+  
+  def test_extraction_should_work_without_value_check
+    segment.default = 'hi'
+    hash = merged = {:b => '3'}
+    options = {:b => '3'}
+    a_value = nil
+    
+    eval(segment.extraction_code)
+    assert_equal 'hi', a_value
+  end
+  
+  def test_extraction_code_should_perform_expiry
+    not_expired = true
+    hash = merged = {:a => 'Hi', :b => '3'}
+    options = {:b => '3'}
+    expire_on = {:a => true}
+    a_value = nil
+    
+    eval(segment.extraction_code)
+    assert_equal 'Hi', a_value
+    assert ! not_expired
+    assert_equal options, hash
+  end
+  
+  def test_interpolation_chunk_should_replace_value
+    a_value = 'Hi'
+    assert_equal a_value, eval(%("#{segment.interpolation_chunk}"))
+  end
+  
+  def test_value_regexp_should_be_nil_without_regexp
+    assert_equal nil, segment.value_regexp
+  end
+  
+  def test_value_regexp_should_match_exacly
+    segment.regexp = /\d+/
+    assert_no_match segment.value_regexp, "Hello 10 World"
+    assert_no_match segment.value_regexp, "Hello 10"
+    assert_no_match segment.value_regexp, "10 World"
+    assert_match segment.value_regexp, "10"
+  end
+  
+  def test_regexp_chunk_should_return_string
+    segment.regexp = /\d+/
+    assert_kind_of String, segment.regexp_chunk
+  end
+  
+end
+
+class ControllerSegmentTest < Test::Unit::TestCase
+  
+  def test_regexp_should_only_match_possible_controllers
+    ActionController::Routing.with_controllers %w(admin/accounts admin/users account pages) do
+      cs = ROUTING::ControllerSegment.new :controller
+      regexp = %r{\A#{cs.regexp_chunk}\Z}
+      
+      ActionController::Routing.possible_controllers.each do |name|
+        assert_match regexp, name
+        assert_no_match regexp, "#{name}_fake"
+        
+        match = regexp.match name
+        assert_equal name, match[1]
+      end
+    end
+  end
+  
+end
+
+class RouteTest < Test::Unit::TestCase
+
+  def setup
+    @route = ROUTING::Route.new
+  end
+
+  def slash_segment(is_optional = false)
+    returning ROUTING::DividerSegment.new('/') do |s|
+      s.is_optional = is_optional
+    end
+  end
+  
+  def default_route
+    unless @default_route
+      @default_route = ROUTING::Route.new
+      
+      @default_route.segments << (s = ROUTING::StaticSegment.new)
+      s.value = '/'
+      s.raw = true
+      
+      @default_route.segments << (s = ROUTING::DynamicSegment.new)
+      s.key = :controller
+      
+      @default_route.segments << slash_segment(:optional)
+      @default_route.segments << (s = ROUTING::DynamicSegment.new)
+      s.key = :action
+      s.default = 'index'
+      s.is_optional = true
+      
+      @default_route.segments << slash_segment(:optional)
+      @default_route.segments << (s = ROUTING::DynamicSegment.new)
+      s.key = :id
+      s.is_optional = true
+      
+      @default_route.segments << slash_segment(:optional)
+    end
+    @default_route
+  end
+
+  def test_default_route_recognition
+    expected = {:controller => 'accounts', :action => 'show', :id => '10'}
+    assert_equal expected, default_route.recognize('/accounts/show/10')
+    assert_equal expected, default_route.recognize('/accounts/show/10/')
+    
+    expected[:id] = 'jamis'
+    assert_equal expected, default_route.recognize('/accounts/show/jamis/')
+    
+    expected.delete :id
+    assert_equal expected, default_route.recognize('/accounts/show')
+    assert_equal expected, default_route.recognize('/accounts/show/')
+    
+    expected[:action] = 'index'
+    assert_equal expected, default_route.recognize('/accounts/')
+    assert_equal expected, default_route.recognize('/accounts')
+    
+    assert_equal nil, default_route.recognize('/')
+    assert_equal nil, default_route.recognize('/accounts/how/goood/it/is/to/be/free')
+  end
+  
+  def test_default_route_should_omit_default_action
+    o = {:controller => 'accounts', :action => 'index'}
+    assert_equal '/accounts', default_route.generate(o, o, {})
+  end
+  
+  def test_default_route_should_include_default_action_when_id_present
+    o = {:controller => 'accounts', :action => 'index', :id => '20'}
+    assert_equal '/accounts/index/20', default_route.generate(o, o, {})
+  end
+  
+  def test_default_route_should_work_with_action_but_no_id
+    o = {:controller => 'accounts', :action => 'list_all'}
+    assert_equal '/accounts/list_all', default_route.generate(o, o, {})
+  end
+  
+  def test_parameter_shell
+    page_url = ROUTING::Route.new
+    page_url.requirements = {:controller => 'pages', :action => 'show', :id => /\d+/}
+    assert_equal({:controller => 'pages', :action => 'show'}, page_url.parameter_shell)
+  end
+
+  def test_defaults
+    route = ROUTING::RouteBuilder.new.build '/users/:id.:format', :controller => "users", :action => "show", :format => "html"
+    assert_equal(
+      { :controller => "users", :action => "show", :format => "html" },
+      route.defaults)
+  end
+
+  def test_significant_keys_for_default_route
+    keys = default_route.significant_keys.sort_by {|k| k.to_s }
+    assert_equal [:action, :controller, :id], keys
+  end
+  
+  def test_significant_keys
+    user_url = ROUTING::Route.new
+    user_url.segments << (s = ROUTING::StaticSegment.new)
+    s.value = '/'
+    s.raw = true
+    
+    user_url.segments << (s = ROUTING::StaticSegment.new)
+    s.value = 'user'
+    
+    user_url.segments << (s = ROUTING::StaticSegment.new)
+    s.value = '/'
+    s.raw = true
+    s.is_optional = true
+    
+    user_url.segments << (s = ROUTING::DynamicSegment.new)
+    s.key = :user
+    
+    user_url.segments << (s = ROUTING::StaticSegment.new)
+    s.value = '/'
+    s.raw = true
+    s.is_optional = true
+    
+    user_url.requirements = {:controller => 'users', :action => 'show'}
+    
+    keys = user_url.significant_keys.sort_by { |k| k.to_s }
+    assert_equal [:action, :controller, :user], keys
+  end
+
+  def test_build_empty_query_string
+    assert_equal '', @route.build_query_string({})
+  end
+
+  def test_simple_build_query_string
+    assert_equal '?x=1&y=2', @route.build_query_string(:x => '1', :y => '2')
+  end
+
+  def test_convert_ints_build_query_string
+    assert_equal '?x=1&y=2', @route.build_query_string(:x => 1, :y => 2)
+  end
+
+  def test_escape_spaces_build_query_string
+    assert_equal '?x=hello+world&y=goodbye+world', @route.build_query_string(:x => 'hello world', :y => 'goodbye world')
+  end
+
+  def test_expand_array_build_query_string
+    assert_equal '?x[]=1&x[]=2', @route.build_query_string(:x => [1, 2])
+  end
+
+  def test_escape_spaces_build_query_string_selected_keys
+    assert_equal '?x=hello+world', @route.build_query_string({:x => 'hello world', :y => 'goodbye world'}, [:x])
+  end
+end
+
+class RouteBuilderTest < Test::Unit::TestCase
+  
+  def builder
+    @bulider ||= ROUTING::RouteBuilder.new
+  end
+  
+  def test_segment_for_static
+    segment, rest = builder.segment_for 'ulysses'
+    assert_equal '', rest
+    assert_kind_of ROUTING::StaticSegment, segment
+    assert_equal 'ulysses', segment.value
+  end
+  
+  def test_segment_for_action
+    segment, rest = builder.segment_for ':action'
+    assert_equal '', rest
+    assert_kind_of ROUTING::DynamicSegment, segment
+    assert_equal :action, segment.key
+    assert_equal 'index', segment.default
+  end
+  
+  def test_segment_for_dynamic
+    segment, rest = builder.segment_for ':login'
+    assert_equal '', rest
+    assert_kind_of ROUTING::DynamicSegment, segment
+    assert_equal :login, segment.key
+    assert_equal nil, segment.default
+    assert ! segment.optional?
+  end
+  
+  def test_segment_for_with_rest
+    segment, rest = builder.segment_for ':login/:action'
+    assert_equal :login, segment.key
+    assert_equal '/:action', rest
+    segment, rest = builder.segment_for rest
+    assert_equal '/', segment.value
+    assert_equal ':action', rest
+    segment, rest = builder.segment_for rest
+    assert_equal :action, segment.key
+    assert_equal '', rest
+  end
+  
+  def test_segments_for
+    segments = builder.segments_for_route_path '/:controller/:action/:id'
+    
+    assert_kind_of ROUTING::DividerSegment, segments[0]
+    assert_equal '/', segments[2].value
+    
+    assert_kind_of ROUTING::DynamicSegment, segments[1]
+    assert_equal :controller, segments[1].key
+    
+    assert_kind_of ROUTING::DividerSegment, segments[2]
+    assert_equal '/', segments[2].value
+    
+    assert_kind_of ROUTING::DynamicSegment, segments[3]
+    assert_equal :action, segments[3].key
+    
+    assert_kind_of ROUTING::DividerSegment, segments[4]
+    assert_equal '/', segments[4].value
+    
+    assert_kind_of ROUTING::DynamicSegment, segments[5]
+    assert_equal :id, segments[5].key
+  end
+  
+  def test_segment_for_action
+    s, r = builder.segment_for(':action/something/else')
+    assert_equal '/something/else', r
+    assert_equal 'index', s.default
+    assert_equal :action, s.key
+  end
+  
+  def test_action_default_should_not_trigger_on_prefix
+    s, r = builder.segment_for ':action_name/something/else'
+    assert_equal '/something/else', r
+    assert_equal :action_name, s.key
+    assert_equal nil, s.default
+  end
+  
+  def test_divide_route_options
+    segments = builder.segments_for_route_path '/cars/:action/:person/:car/'
+    defaults, requirements = builder.divide_route_options(segments,
+      :action => 'buy', :person => /\w+/, :car => /\w+/,
+      :defaults => {:person => nil, :car => nil}
+    )
+    
+    assert_equal({:action => 'buy', :person => nil, :car => nil}, defaults)
+    assert_equal({:person => /\w+/, :car => /\w+/}, requirements)
+  end
+  
+  def test_assign_route_options
+    segments = builder.segments_for_route_path '/cars/:action/:person/:car/'
+    defaults = {:action => 'buy', :person => nil, :car => nil}
+    requirements = {:person => /\w+/, :car => /\w+/}
+    
+    route_requirements = builder.assign_route_options(segments, defaults, requirements)
+    assert_equal({}, route_requirements)
+    
+    assert_equal :action, segments[3].key
+    assert_equal 'buy', segments[3].default
+    
+    assert_equal :person, segments[5].key
+    assert_equal %r/\w+/, segments[5].regexp
+    assert segments[5].optional?
+    
+    assert_equal :car, segments[7].key
+    assert_equal %r/\w+/, segments[7].regexp
+    assert segments[7].optional?
+  end
+
+  def test_optional_segments_preceding_required_segments
+    segments = builder.segments_for_route_path '/cars/:action/:person/:car/'
+    defaults = {:action => 'buy', :person => nil, :car => "model-t"}
+    assert builder.assign_route_options(segments, defaults, {}).empty?
+    
+    0.upto(1) { |i| assert !segments[i].optional?, "segment #{i} is optional and it shouldn't be" }
+    assert segments[2].optional?
+    
+    assert_equal nil, builder.warn_output # should only warn on the :person segment
+  end
+  
+  def test_segmentation_of_semicolon_path
+    segments = builder.segments_for_route_path '/books/:id;:action'
+    defaults = { :action => 'show' }
+    assert builder.assign_route_options(segments, defaults, {}).empty?
+    segments.each do |segment|
+      assert ! segment.optional? || segment.key == :action
+    end
+  end
+  
+  def test_segmentation_of_dot_path
+    segments = builder.segments_for_route_path '/books/:action.rss'
+    assert builder.assign_route_options(segments, {}, {}).empty?
+    assert_equal 6, segments.length # "/", "books", "/", ":action", ".", "rss"
+    assert !segments.any? { |seg| seg.optional? }
+  end
+  
+  def test_segmentation_of_dynamic_dot_path
+    segments = builder.segments_for_route_path '/books/:action.:format'
+    assert builder.assign_route_options(segments, {}, {}).empty?
+    assert_equal 6, segments.length # "/", "books", "/", ":action", ".", ":format"
+    assert !segments.any? { |seg| seg.optional? }
+    assert_kind_of ROUTING::DynamicSegment, segments.last
+  end
+  
+  def test_assignment_of_is_optional_when_default
+    segments = builder.segments_for_route_path '/books/:action.rss'
+    assert_equal segments[3].key, :action
+    segments[3].default = 'changes'
+    builder.ensure_required_segments(segments)
+    assert ! segments[3].optional?
+  end
+  
+  def test_is_optional_is_assigned_to_default_segments
+    segments = builder.segments_for_route_path '/books/:action'
+    builder.assign_route_options(segments, {:action => 'index'}, {})
+    
+    assert_equal segments[3].key, :action
+    assert segments[3].optional?
+    assert_kind_of ROUTING::DividerSegment, segments[2]
+    assert segments[2].optional?
+  end
+  
+  # XXX is optional not being set right?
+  # /blah/:defaulted_segment <-- is the second slash optional? it should be.
+  
+  def test_route_build
+    ActionController::Routing.with_controllers %w(users pages) do
+      r = builder.build '/:controller/:action/:id/', :action => nil
+      
+      [0, 2, 4].each do |i|
+        assert_kind_of ROUTING::DividerSegment, r.segments[i]
+        assert_equal '/', r.segments[i].value
+        assert r.segments[i].optional? if i > 1
+      end
+      
+      assert_kind_of ROUTING::DynamicSegment, r.segments[1]
+      assert_equal :controller, r.segments[1].key
+      assert_equal nil, r.segments[1].default
+      
+      assert_kind_of ROUTING::DynamicSegment, r.segments[3]
+      assert_equal :action, r.segments[3].key
+      assert_equal 'index', r.segments[3].default
+      
+      assert_kind_of ROUTING::DynamicSegment, r.segments[5]
+      assert_equal :id, r.segments[5].key
+      assert r.segments[5].optional?
+    end
+  end
+  
+  def test_slashes_are_implied
+    routes = [
+      builder.build('/:controller/:action/:id/', :action => nil),
+      builder.build('/:controller/:action/:id', :action => nil),
+      builder.build(':controller/:action/:id', :action => nil),
+      builder.build('/:controller/:action/:id/', :action => nil)
+    ]
+    expected = routes.first.segments.length
+    routes.each_with_index do |route, i|
+      found = route.segments.length
+      assert_equal expected, found, "Route #{i + 1} has #{found} segments, expected #{expected}"
+    end
+  end
+  
+end
+
+class RouteSetTest < Test::Unit::TestCase
+  class MockController
+    attr_accessor :routes
+
+    def initialize(routes)
+      self.routes = routes
+    end
+
+    def url_for(options)
+      path = routes.generate(options)
+      "http://named.route.test#{path}"
+    end
+  end
+
+  class MockRequest
+    attr_accessor :path, :path_parameters, :host, :subdomains, :domain, :method
+
+    def initialize(values={})
+      values.each { |key, value| send("#{key}=", value) }
+      if values[:host]
+        subdomain, self.domain = values[:host].split(/\./, 2)
+        self.subdomains = [subdomain]
+      end
+    end
+  end
+
+  def set
+    @set ||= ROUTING::RouteSet.new
+  end
+
+  def request
+    @request ||= MockRequest.new(:host => "named.routes.test", :method => :get)
+  end
+
+  def test_generate_extras
+    set.draw { |m| m.connect ':controller/:action/:id' }
+    path, extras = set.generate_extras(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
+    assert_equal "/foo/bar/15", path
+    assert_equal %w(that this), extras.map(&:to_s).sort
+  end
+
+  def test_extra_keys
+    set.draw { |m| m.connect ':controller/:action/:id' }
+    extras = set.extra_keys(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
+    assert_equal %w(that this), extras.map(&:to_s).sort
+  end
+
+  def test_draw
+    assert_equal 0, set.routes.size
+    set.draw do |map|
+      map.connect '/hello/world', :controller => 'a', :action => 'b'
+    end
+    assert_equal 1, set.routes.size
+  end
+  
+  def test_named_draw
+    assert_equal 0, set.routes.size
+    set.draw do |map|
+      map.hello '/hello/world', :controller => 'a', :action => 'b'
+    end
+    assert_equal 1, set.routes.size
+    assert_equal set.routes.first, set.named_routes[:hello]
+  end
+  
+  def test_later_named_routes_take_precedence
+    set.draw do |map|
+      map.hello '/hello/world', :controller => 'a', :action => 'b'
+      map.hello '/hello', :controller => 'a', :action => 'b'
+    end
+    assert_equal set.routes.last, set.named_routes[:hello]
+  end
+
+  def setup_named_route_test
+    set.draw do |map|
+      map.show '/people/:id', :controller => 'people', :action => 'show'
+      map.index '/people', :controller => 'people', :action => 'index'
+      map.multi '/people/go/:foo/:bar/joe/:id', :controller => 'people', :action => 'multi'
+    end
+
+    klass = Class.new(MockController)
+    set.named_routes.install(klass)
+    klass.new(set)
+  end
+
+  def test_named_route_hash_access_method
+    controller = setup_named_route_test
+
+    assert_equal(
+      { :controller => 'people', :action => 'show', :id => 5, :use_route => :show },
+      controller.send(:hash_for_show_url, :id => 5))
+
+    assert_equal(
+      { :controller => 'people', :action => 'index', :use_route => :index },
+      controller.send(:hash_for_index_url))
+  end
+
+  def test_named_route_url_method
+    controller = setup_named_route_test
+
+    assert_equal "http://named.route.test/people/5", controller.send(:show_url, :id => 5)
+    assert_equal "http://named.route.test/people", controller.send(:index_url)
+  end
+
+  def test_namd_route_url_method_with_ordered_parameters
+    controller = setup_named_route_test
+    assert_equal "http://named.route.test/people/go/7/hello/joe/5",
+      controller.send(:multi_url, 7, "hello", 5)
+  end
+  
+  def test_draw_default_route
+    ActionController::Routing.with_controllers(['users']) do
+      set.draw do |map|
+        map.connect '/:controller/:action/:id'
+      end
+      
+      assert_equal 1, set.routes.size
+      route = set.routes.first
+      
+      assert route.segments.last.optional?
+      
+      assert_equal '/users/show/10', set.generate(:controller => 'users', :action => 'show', :id => 10)
+      assert_equal '/users/index/10', set.generate(:controller => 'users', :id => 10)
+      
+      assert_equal({:controller => 'users', :action => 'index', :id => '10'}, set.recognize_path('/users/index/10'))
+      assert_equal({:controller => 'users', :action => 'index', :id => '10'}, set.recognize_path('/users/index/10/'))
+    end
+  end
+  
+  def test_route_with_parameter_shell
+    ActionController::Routing.with_controllers(['users', 'pages']) do
+      set.draw do |map|
+        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+/
+        map.connect '/:controller/:action/:id'
+      end
+      
+      assert_equal({:controller => 'pages', :action => 'index'}, set.recognize_path('/pages'))
+      assert_equal({:controller => 'pages', :action => 'index'}, set.recognize_path('/pages/index'))
+      assert_equal({:controller => 'pages', :action => 'list'}, set.recognize_path('/pages/list'))
+      
+      assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/pages/show/10'))
+      assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/page/10'))
+    end
+  end
+
+  def test_recognize_with_conditions
+    Object.const_set(:PeopleController, Class.new)
+
+    set.draw do |map|
+      map.with_options(:controller => "people") do |people|
+        people.people  "/people",     :action => "index",   :conditions => { :method => :get }
+        people.connect "/people",     :action => "create",  :conditions => { :method => :post }
+        people.person  "/people/:id", :action => "show",    :conditions => { :method => :get }
+        people.connect "/people/:id", :action => "update",  :conditions => { :method => :put }
+        people.connect "/people/:id", :action => "destroy", :conditions => { :method => :delete }
+      end
+    end
+
+    request.path = "/people"
+    request.method = :get
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("index", request.path_parameters[:action])
+    
+    request.method = :post
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("create", request.path_parameters[:action])
+
+    request.path = "/people/5"
+    request.method = :get
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("show", request.path_parameters[:action])
+    assert_equal("5", request.path_parameters[:id])
+
+    request.method = :put
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("update", request.path_parameters[:action])
+    assert_equal("5", request.path_parameters[:id])
+
+    request.method = :delete
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("destroy", request.path_parameters[:action])
+    assert_equal("5", request.path_parameters[:id])
+  ensure
+    Object.send(:remove_const, :PeopleController)
+  end
+
+  def test_recognize_with_conditions_and_format
+    Object.const_set(:PeopleController, Class.new)
+
+    set.draw do |map|
+      map.with_options(:controller => "people") do |people|
+        people.person  "/people/:id", :action => "show",    :conditions => { :method => :get }
+        people.connect "/people/:id", :action => "update",  :conditions => { :method => :put }
+        people.connect "/people/:id.:_format", :action => "show", :conditions => { :method => :get }
+      end
+    end
+
+    request.path = "/people/5"
+    request.method = :get
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("show", request.path_parameters[:action])
+    assert_equal("5", request.path_parameters[:id])
+
+    request.method = :put
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("update", request.path_parameters[:action])
+
+    request.path = "/people/5.png"
+    request.method = :get
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("show", request.path_parameters[:action])
+    assert_equal("5", request.path_parameters[:id])
+    assert_equal("png", request.path_parameters[:_format])
+  ensure
+    Object.send(:remove_const, :PeopleController)
+  end
+
+  def test_generate_with_default_action
+    set.draw do |map|
+      map.connect "/people", :controller => "people"
+      map.connect "/people/list", :controller => "people", :action => "list"
+    end
+
+    url = set.generate(:controller => "people", :action => "list")
+    assert_equal "/people/list", url
+  end
+
+  def test_generate_finds_best_fit
+    set.draw do |map|
+      map.connect "/people", :controller => "people", :action => "index"
+      map.connect "/ws/people", :controller => "people", :action => "index", :ws => true
+    end
+
+    url = set.generate(:controller => "people", :action => "index", :ws => true)
+    assert_equal "/ws/people", url
+  end
+end
+
+class RoutingTest < Test::Unit::TestCase
+  
+  def test_possible_controllers
+    true_load_paths = $LOAD_PATH.dup
+    
+    ActionController::Routing.use_controllers! nil
+    Object.send(:const_set, :RAILS_ROOT, File.dirname(__FILE__) + '/controller_fixtures')
+    
+    $LOAD_PATH.clear
+    $LOAD_PATH.concat [
+      RAILS_ROOT, RAILS_ROOT + '/app/controllers', RAILS_ROOT + '/vendor/plugins/bad_plugin/lib'
+    ]
+    
+    assert_equal ["admin/user", "plugin", "user"], ActionController::Routing.possible_controllers.sort
+  ensure
+    if true_load_paths
+      $LOAD_PATH.clear
+      $LOAD_PATH.concat true_load_paths
+    end
+    Object.send(:remove_const, :RAILS_ROOT) rescue nil
+  end
+  
+  def test_with_controllers
+    c = %w(admin/accounts admin/users account pages)
+    ActionController::Routing.with_controllers c do
+      assert_equal c, ActionController::Routing.possible_controllers
+    end
+  end
+  
+end

trunk/actionpack/test/controller/test_test.rb

@@ -82 +82 @@
-    @response   = ActionController::TestResponse.new
-    ActionController::Routing::Routes.reload
+    ActionController::Routing.use_controllers! %w(content admin/user)
-  end
-
@@ -318 +319 @@
-  def test_array_path_parameter_handled_properly
-    with_routing do |set|
-
-set
-set
+|map|
+map
+map
-      end
-      
@@ -441 +442 @@
-    def with_foo_routing
-      with_routing do |set|
-
-set
-set
+ |map|
+map
+map
-        end
-        yield set

trunk/actionpack/test/controller/url_rewriter_test.rb

@@ -7 +7 @@
-    @rewriter = ActionController::UrlRewriter.new(@request, @params)
-  end 
-  
-  def test_simple_build_query_string
-    assert_query_equal '?x=1&y=2', @rewriter.send(:build_query_string, :x => '1', :y => '2')
-  end
-  def test_convert_ints_build_query_string
-    assert_query_equal '?x=1&y=2', @rewriter.send(:build_query_string, :x => 1, :y => 2)
-  end
-  def test_escape_spaces_build_query_string
-    assert_query_equal '?x=hello+world&y=goodbye+world', @rewriter.send(:build_query_string, :x => 'hello world', :y => 'goodbye world')
-  end
-  def test_expand_array_build_query_string
-    assert_query_equal '?x[]=1&x[]=2', @rewriter.send(:build_query_string, :x => [1, 2])
-  end
-
-  def test_escape_spaces_build_query_string_selected_keys
-    assert_query_equal '?x=hello+world', @rewriter.send(:build_query_string, {:x => 'hello world', :y => 'goodbye world'}, [:x])
-  end
-
-  def test_overwrite_params

trunk/railties/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Minor tweak to dispatcher to use recognize instead of recognize!, as per the new routes. [Jamis Buck]
-
-* Make "script/plugin install" work with svn+ssh URLs. [Sam Stephenson]

trunk/railties/lib/dispatcher.rb

@@ -36 +36 @@
-        request, response = ActionController::CgiRequest.new(cgi, session_options), ActionController::CgiResponse.new(cgi)
-        prepare_application
-!
+
-      end
-    rescue Object => exception