RubyGems - actionpack - Versions diffs - 1.12.5 → 1.13.0 - Mend

actionpack 1.12.5 → 1.13.0

Potentially problematic release.

This version of actionpack might be problematic. Click here for more details.

Files changed (179) hide show

data/CHANGELOG +517 -15
data/MIT-LICENSE +1 -1
data/README +18 -20
data/Rakefile +7 -4
data/examples/address_book_controller.rb +3 -3
data/examples/blog_controller.cgi +3 -3
data/examples/debate_controller.cgi +5 -5
data/lib/action_controller.rb +2 -2
data/lib/action_controller/assertions.rb +73 -311
data/lib/action_controller/{deprecated_assertions.rb → assertions/deprecated_assertions.rb} +32 -8
data/lib/action_controller/assertions/dom_assertions.rb +25 -0
data/lib/action_controller/assertions/model_assertions.rb +12 -0
data/lib/action_controller/assertions/response_assertions.rb +140 -0
data/lib/action_controller/assertions/routing_assertions.rb +82 -0
data/lib/action_controller/assertions/selector_assertions.rb +571 -0
data/lib/action_controller/assertions/tag_assertions.rb +117 -0
data/lib/action_controller/base.rb +334 -163
data/lib/action_controller/benchmarking.rb +3 -6
data/lib/action_controller/caching.rb +83 -22
data/lib/action_controller/cgi_ext/cgi_ext.rb +0 -7
data/lib/action_controller/cgi_ext/cgi_methods.rb +167 -173
data/lib/action_controller/cgi_ext/raw_post_data_fix.rb +43 -22
data/lib/action_controller/cgi_process.rb +50 -27
data/lib/action_controller/components.rb +21 -25
data/lib/action_controller/cookies.rb +10 -9
data/lib/action_controller/{dependencies.rb → deprecated_dependencies.rb} +9 -27
data/lib/action_controller/filters.rb +448 -225
data/lib/action_controller/flash.rb +24 -20
data/lib/action_controller/helpers.rb +2 -5
data/lib/action_controller/integration.rb +40 -16
data/lib/action_controller/layout.rb +11 -8
data/lib/action_controller/macros/auto_complete.rb +3 -2
data/lib/action_controller/macros/in_place_editing.rb +3 -2
data/lib/action_controller/mime_responds.rb +41 -29
data/lib/action_controller/mime_type.rb +68 -10
data/lib/action_controller/pagination.rb +4 -3
data/lib/action_controller/request.rb +22 -14
data/lib/action_controller/rescue.rb +25 -22
data/lib/action_controller/resources.rb +302 -0
data/lib/action_controller/response.rb +20 -2
data/lib/action_controller/response.rb.rej +17 -0
data/lib/action_controller/routing.rb +1165 -567
data/lib/action_controller/scaffolding.rb +30 -31
data/lib/action_controller/session/active_record_store.rb +2 -0
data/lib/action_controller/session/drb_store.rb +4 -0
data/lib/action_controller/session/mem_cache_store.rb +4 -0
data/lib/action_controller/session_management.rb +6 -9
data/lib/action_controller/status_codes.rb +89 -0
data/lib/action_controller/streaming.rb +6 -15
data/lib/action_controller/templates/rescues/_request_and_response.rhtml +5 -5
data/lib/action_controller/templates/rescues/diagnostics.rhtml +2 -2
data/lib/action_controller/templates/rescues/routing_error.rhtml +4 -4
data/lib/action_controller/templates/rescues/template_error.rhtml +1 -1
data/lib/action_controller/templates/scaffolds/list.rhtml +1 -1
data/lib/action_controller/test_process.rb +52 -30
data/lib/action_controller/url_rewriter.rb +63 -29
data/lib/action_controller/vendor/html-scanner/html/document.rb +1 -0
data/lib/action_controller/vendor/html-scanner/html/node.rb +3 -4
data/lib/action_controller/vendor/html-scanner/html/selector.rb +822 -0
data/lib/action_controller/verification.rb +22 -11
data/lib/action_pack.rb +1 -1
data/lib/action_pack/version.rb +2 -2
data/lib/action_view.rb +1 -1
data/lib/action_view/base.rb +46 -43
data/lib/action_view/compiled_templates.rb +1 -1
data/lib/action_view/helpers/active_record_helper.rb +54 -17
data/lib/action_view/helpers/asset_tag_helper.rb +97 -46
data/lib/action_view/helpers/capture_helper.rb +1 -1
data/lib/action_view/helpers/date_helper.rb +258 -136
data/lib/action_view/helpers/debug_helper.rb +1 -1
data/lib/action_view/helpers/deprecated_helper.rb +34 -0
data/lib/action_view/helpers/form_helper.rb +75 -35
data/lib/action_view/helpers/form_options_helper.rb +7 -5
data/lib/action_view/helpers/form_tag_helper.rb +44 -6
data/lib/action_view/helpers/java_script_macros_helper.rb +59 -46
data/lib/action_view/helpers/javascript_helper.rb +71 -10
data/lib/action_view/helpers/javascripts/controls.js +41 -23
data/lib/action_view/helpers/javascripts/dragdrop.js +105 -76
data/lib/action_view/helpers/javascripts/effects.js +293 -163
data/lib/action_view/helpers/javascripts/prototype.js +897 -389
data/lib/action_view/helpers/javascripts/prototype.js.rej +561 -0
data/lib/action_view/helpers/number_helper.rb +111 -65
data/lib/action_view/helpers/prototype_helper.rb +84 -109
data/lib/action_view/helpers/scriptaculous_helper.rb +5 -0
data/lib/action_view/helpers/tag_helper.rb +69 -16
data/lib/action_view/helpers/text_helper.rb +149 -112
data/lib/action_view/helpers/url_helper.rb +200 -107
data/lib/action_view/template_error.rb +66 -42
data/test/abstract_unit.rb +4 -2
data/test/active_record_unit.rb +84 -56
data/test/activerecord/active_record_assertions_test.rb +26 -18
data/test/activerecord/active_record_store_test.rb +4 -36
data/test/activerecord/pagination_test.rb +1 -6
data/test/controller/action_pack_assertions_test.rb +230 -113
data/test/controller/addresses_render_test.rb +2 -6
data/test/controller/assert_select_test.rb +576 -0
data/test/controller/base_test.rb +73 -3
data/test/controller/caching_test.rb +228 -0
data/test/controller/capture_test.rb +12 -10
data/test/controller/cgi_test.rb +89 -12
data/test/controller/components_test.rb +24 -2
data/test/controller/content_type_test.rb +139 -0
data/test/controller/controller_fixtures/app/controllers/admin/user_controller.rb +0 -0
data/test/controller/controller_fixtures/app/controllers/user_controller.rb +0 -0
data/test/controller/controller_fixtures/vendor/plugins/bad_plugin/lib/plugin_controller.rb +0 -0
data/test/controller/cookie_test.rb +33 -25
data/test/controller/deprecated_instance_variables_test.rb +48 -0
data/test/controller/deprecation/deprecated_base_methods_test.rb +60 -0
data/test/controller/fake_controllers.rb +0 -1
data/test/controller/filters_test.rb +301 -16
data/test/controller/flash_test.rb +19 -2
data/test/controller/helper_test.rb +2 -2
data/test/controller/integration_test.rb +154 -0
data/test/controller/layout_test.rb +115 -1
data/test/controller/mime_responds_test.rb +94 -0
data/test/controller/mime_type_test.rb +9 -0
data/test/controller/new_render_test.rb +161 -11
data/test/controller/raw_post_test.rb +52 -15
data/test/controller/redirect_test.rb +27 -14
data/test/controller/render_test.rb +76 -29
data/test/controller/request_test.rb +55 -4
data/test/controller/resources_test.rb +274 -0
data/test/controller/routing_test.rb +1533 -824
data/test/controller/selector_test.rb +628 -0
data/test/controller/send_file_test.rb +9 -1
data/test/controller/session_management_test.rb +51 -0
data/test/controller/test_test.rb +113 -29
data/test/controller/url_rewriter_test.rb +86 -17
data/test/controller/verification_test.rb +19 -17
data/test/controller/webservice_test.rb +0 -7
data/test/fixtures/content_type/render_default_content_types_for_respond_to.rhtml +1 -0
data/test/fixtures/content_type/render_default_for_rhtml.rhtml +1 -0
data/test/fixtures/content_type/render_default_for_rjs.rjs +1 -0
data/test/fixtures/content_type/render_default_for_rxml.rxml +1 -0
data/test/fixtures/deprecated_instance_variables/_cookies_ivar.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_cookies_method.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_flash_ivar.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_flash_method.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_headers_ivar.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_headers_method.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_params_ivar.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_params_method.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_request_ivar.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_request_method.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_response_ivar.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_response_method.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_session_ivar.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_session_method.rhtml +1 -0
data/test/fixtures/multipart/binary_file +0 -0
data/test/fixtures/public/javascripts/application.js +1 -0
data/test/fixtures/test/_hello.rxml +1 -0
data/test/fixtures/test/hello_world_container.rxml +3 -0
data/test/fixtures/topic.rb +2 -2
data/test/template/active_record_helper_test.rb +83 -12
data/test/template/asset_tag_helper_test.rb +75 -95
data/test/template/compiled_templates_test.rb +1 -0
data/test/template/date_helper_test.rb +873 -181
data/test/template/deprecated_helper_test.rb +36 -0
data/test/template/deprecated_instance_variables_test.rb +43 -0
data/test/template/form_helper_test.rb +77 -1
data/test/template/form_options_helper_test.rb +4 -0
data/test/template/form_tag_helper_test.rb +66 -2
data/test/template/java_script_macros_helper_test.rb +4 -1
data/test/template/javascript_helper_test.rb +29 -0
data/test/template/number_helper_test.rb +63 -27
data/test/template/prototype_helper_test.rb +77 -34
data/test/template/tag_helper_test.rb +34 -6
data/test/template/text_helper_test.rb +69 -34
data/test/template/url_helper_test.rb +168 -16
data/test/testing_sandbox.rb +7 -22
metadata +66 -20
data/filler.txt +0 -50
data/lib/action_controller/code_generation.rb +0 -235
data/lib/action_controller/vendor/xml_simple.rb +0 -1019
data/test/controller/caching_filestore.rb +0 -74
data/test/fixtures/application_root/app/controllers/a_class_that_contains_a_controller/poorly_placed_controller.rb +0 -7
data/test/fixtures/application_root/app/controllers/module_that_holds_controllers/nested_controller.rb +0 -3
data/test/fixtures/application_root/app/models/a_class_that_contains_a_controller.rb +0 -7
data/test/fixtures/dont_load.rb +0 -3

data/lib/action_controller/response.rb CHANGED

@@ -1,15 +1,33 @@
 module ActionController
   class AbstractResponse #:nodoc:
     DEFAULT_HEADERS = { "Cache-Control" => "no-cache" }
-    attr_accessor :body, :headers, :session, :cookies, :assigns, :template, :redirected_to, :redirected_to_method_params
+    attr_accessor :body, :headers, :session, :cookies, :assigns, :template, :redirected_to, :redirected_to_method_params, :layout
     def initialize
       @body, @headers, @session, @assigns = "", DEFAULT_HEADERS.merge("cookie" => []), [], []
     end
+    def content_type=(mime_type)
+      @headers["Content-Type"] = charset ? "#{mime_type}; charset=#{charset}" : mime_type
+    end
+    def content_type
+      content_type = String(@headers["Content-Type"]).split(";")[0]
+      content_type.blank? ? nil : content_type
+    end
+    def charset=(encoding)
+      @headers["Content-Type"] = "#{content_type || "text/html"}; charset=#{encoding}"
+    end
+    def charset
+      charset = String(@headers["Content-Type"]).split(";")[1]
+      charset.blank? ? nil : charset.strip.split("=")[1]
+    end
     def redirect(to_url, permanently = false)
       @headers["Status"]   = "302 Found" unless @headers["Status"] == "301 Moved Permanently"
-      @headers["location"] = to_url
+      @headers["Location"] = to_url
       @body = "<html><body>You are being <a href=\"#{to_url}\">redirected</a>.</body></html>"
     end

data/lib/action_controller/response.rb.rej ADDED

@@ -0,0 +1,17 @@
+***************
+*** 27,33 ****
+      def redirect(to_url, permanently = false)
+        @headers["Status"]   = "302 Found" unless @headers["Status"] == "301 Moved Permanently"
+-       @headers["location"] = to_url
+        @body = "<html><body>You are being <a href=\"#{to_url}\">redirected</a>.</body></html>"
+      end
+--- 27,33 ----
+      def redirect(to_url, permanently = false)
+        @headers["Status"]   = "302 Found" unless @headers["Status"] == "301 Moved Permanently"
++       @headers["Location"] = to_url
+        @body = "<html><body>You are being <a href=\"#{to_url}\">redirected</a>.</body></html>"
+      end

data/lib/action_controller/routing.rb CHANGED

@@ -1,716 +1,1314 @@
+require 'cgi'
+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
-  module Routing #:nodoc:
+  # == Routing
+  #
+  # The routing module provides URL rewriting in native Ruby. It's a way to
+  # redirect incoming requests to controllers and actions. This replaces
+  # mod_rewrite rules. Best of all Rails' Routing works with any web server.
+  # Routes are defined in routes.rb in your RAILS_ROOT/config directory.
+  #
+  # Consider the following route, installed by Rails when you generate your
+  # application:
+  #
+  #   map.connect ':controller/:action/:id'
+  #
+  # This route states that it expects requests to consist of a
+  # :controller followed by an :action that in turns is fed by some :id
+  #
+  # Suppose you get an incoming request for <tt>/blog/edit/22</tt>, you'll end up
+  # with:
+  #
+  #   params = { :controller => 'blog',
+  #              :action     => 'edit'
+  #              :id         => '22'
+  #           }
+  #
+  # Think of creating routes as drawing a map for your requests. The map tells
+  # them where to go based on some predefined pattern:
+  #
+  #  ActionController::Routing::Routes.draw do |map|
+  #   Pattern 1 tells some request to go to one place
+  #   Pattern 2 tell them to go to another
+  #   ...
+  #  end
+  #
+  # The following symbols are special:
+  #
+  #   :controller maps to your controller name
+  #   :action     maps to an action with your controllers
+  #
+  # Other names simply map to a parameter as in the case of +:id+.
+  #
+  # == Route priority
+  #
+  # Not all routes are created equally. Routes have priority defined by the
+  # order of appearance of the routes in the routes.rb file. The priority goes
+  # from top to bottom. The last route in that file is at the lowest priority
+  # will be applied last. If no route matches, 404 is returned.
+  #
+  # Within blocks, the empty pattern goes first i.e. is at the highest priority.
+  # In practice this works out nicely:
+  #
+  #  ActionController::Routing::Routes.draw do |map|
+  #    map.with_options :controller => 'blog' do |blog|
+  #      blog.show    '',  :action => 'list'
+  #    end
+  #    map.connect ':controller/:action/:view
+  #  end
+  #
+  # In this case, invoking blog controller (with an URL like '/blog/')
+  # without parameters will activate the 'list' action by default.
+  #
+  # == Defaults routes and default parameters
+  #
+  # Setting a default route is straightforward in Rails because by appending a
+  # Hash to the end of your mapping you can set default parameters.
+  #
+  # Example:
+  #  ActionController::Routing:Routes.draw do |map|
+  #    map.connect ':controller/:action/:id', :controller => 'blog'
+  #  end
+  #
+  # This sets up  +blog+ as the default controller if no other is specified.
+  # This means visiting '/' would invoke the blog controller.
+  #
+  # More formally, you can define defaults in a route with the +:defaults+ key.
+  #
+  #   map.connect ':controller/:id/:action', :action => 'show', :defaults => { :page => 'Dashboard' }
+  #
+  # == Named routes
+  #
+  # Routes can be named with the syntax <tt>map.name_of_route options</tt>,
+  # allowing for easy reference within your source as +name_of_route_url+.
+  #
+  # Example:
+  #   # In routes.rb
+  #   map.login 'login', :controller => 'accounts', :action => 'login'
+  #
+  #   # With render, redirect_to, tests, etc.
+  #   redirect_to login_url
+  #
+  # Arguments can be passed as well.
+  #
+  #   redirect_to show_item_url(:id => 25)
+  #
+  # When using +with_options+, the name goes after the item passed to the block.
+  #
+  #  ActionController::Routing::Routes.draw do |map|
+  #    map.with_options :controller => 'blog' do |blog|
+  #      blog.show    '',            :action  => 'list'
+  #      blog.delete  'delete/:id',  :action  => 'delete',
+  #      blog.edit    'edit/:id',    :action  => 'edit'
+  #    end
+  #    map.connect ':controller/:action/:view
+  #  end
+  #
+  # You would then use the named routes in your views:
+  #
+  #   link_to @article.title, show_url(:id => @article.id)
+  #
+  # == Pretty URL's
+  #
+  # Routes can generate pretty URLs. For example:
+  #
+  #  map.connect 'articles/:year/:month/:day',
+  #   	         :controller => 'articles',
+  #              :action     => 'find_by_date',
+  #              :year       => /\d{4}/,
+  #              :month => /\d{1,2}/,
+  #              :day   => /\d{1,2}/
+  #
+  #  # Using the route above, the url below maps to:
+  #  # params = {:year => '2005', :month => '11', :day => '06'}
+  #  # http://localhost:3000/articles/2005/11/06
+  #
+  # == Regular Expressions and parameters
+  # You can specify a reqular expression to define a format for a parameter.
+  #
+  #  map.geocode 'geocode/:postalcode', :controller => 'geocode',
+  #              :action => 'show', :postalcode => /\d{5}(-\d{4})?/
+  #
+  # or  more formally:
+  #
+  #   map.geocode 'geocode/:postalcode', :controller => 'geocode',
+  #                      :action => 'show',
+  #                      :requirements { :postalcode => /\d{5}(-\d{4})?/ }
+  #
+  # == Route globbing
+  #
+  # Specifying <tt>*[string]</tt> as part of a rule like :
+  #
+  #  map.connect '*path' , :controller => 'blog' , :action => 'unrecognized?'
+  #
+  # will glob all remaining parts of the route that were not recognized earlier. This idiom must appear at the end of the path. The globbed values are in <tt>params[:path]</tt> in this case.
+  #
+  # == Reloading routes
+  #
+  # You can reload routes if you feel you must:
+  #
+  #  Action::Controller::Routes.reload
+  #
+  # This will clear all named routes and reload routes.rb
+  #
+  # == Testing Routes
+  #
+  # The two main methods for testing your routes:
+  #
+  # === +assert_routing+
+  #
+  #  def test_movie_route_properly_splits
+  #   opts = {:controller => "plugin", :action => "checkout", :id => "2"}
+  #   assert_routing "plugin/checkout/2", opts
+  #  end
+  #
+  # +assert_routing+ lets you test whether or not the route properly resolves into options.
+  #
+  # === +assert_recognizes+
+  #
+  #  def test_route_has_options
+  #   opts = {:controller => "plugin", :action => "show", :id => "12"}
+  #   assert_recognizes opts, "/plugins/show/12"
+  #  end
+  #
+  # Note the subtle difference between the two: +assert_routing+ tests that
+  # an URL fits options while +assert_recognizes+ tests that an URL
+  # breaks into parameters properly.
+  #
+  # In tests you can simply pass the URL or named route to +get+ or +post+.
+  #
+  #  def send_to_jail
+  #    get '/jail'
+  #    assert_response :success
+  #    assert_template "jail/front"
+  #  end
+  #
+  #  def goes_to_login
+  #    get login_url
+  #    #...
+  #  end
+  #
+  module Routing
+    SEPARATORS = %w( / ; . , ? )
+    # The root paths which may contain controller files
+    mattr_accessor :controller_paths
+    self.controller_paths = []
     class << self
-      def expiry_hash(options, recall)
-        k = v = nil
-        expire_on = {}
-        options.each {|k, v| expire_on[k] = ((rcv = recall[k]) && (rcv != v))}
-        expire_on
+      def with_controllers(names)
+        prior_controllers = @possible_controllers
+        use_controllers! names
+        yield
+      ensure
+        use_controllers! prior_controllers
       end
-      def extract_parameter_value(parameter) #:nodoc:
-        CGI.escape((parameter.respond_to?(:to_param) ? parameter.to_param : parameter).to_s)
-      end
-      def controller_relative_to(controller, previous)
-        if controller.nil?           then previous
-        elsif controller[0] == ?/    then controller[1..-1]
-        elsif %r{^(.*)/} =~ previous then "#{$1}/#{controller}"
-        else controller
-        end
-      end
+      def normalize_paths(paths)
+        # do the hokey-pokey of path normalization...
+        paths = paths.collect do |path|
+          path = path.
+            gsub("//", "/").           # replace double / chars with a single
+            gsub("\\\\", "\\").        # replace double \ chars with a single
+            gsub(%r{(.)[\\/]$}, '\1')  # drop final / or \ if path ends with it
-      def treat_hash(hash, keys_to_delete = [])
-        k = v = nil
-        hash.each do |k, v|
-          if v then hash[k] = (v.respond_to? :to_param) ? v.to_param.to_s : v.to_s
-          else
-            hash.delete k
-            keys_to_delete << k
-          end
+          # eliminate .. paths where possible
+          re = %r{\w+[/\\]\.\.[/\\]}
+          path.gsub!(%r{\w+[/\\]\.\.[/\\]}, "") while path.match(re)
+          path
         end
-        hash
+        # start with longest path, first
+        paths = paths.uniq.sort_by { |path| - path.length }
       end
-      def test_condition(expression, condition)
-        case condition
-          when String then "(#{expression} == #{condition.inspect})"
-          when Regexp then
-            condition = Regexp.new("^#{condition.source}$") unless /^\^.*\$$/ =~ condition.source
-            "(#{condition.inspect} =~ #{expression})"
-          when Array then
-            conds = condition.collect do |condition|
-              cond = test_condition(expression, condition)
-              (cond[0, 1] == '(' && cond[-1, 1] == ')') ? cond : "(#{cond})"
+      def possible_controllers
+        unless @possible_controllers
+          @possible_controllers = []
+          paths = controller_paths.select { |path| File.directory?(path) && path != "." }
+          seen_paths = Hash.new {|h, k| h[k] = true; false}
+          normalize_paths(paths).each do |load_path|
+            Dir["#{load_path}/**/*_controller.rb"].collect do |path|
+              next if seen_paths[path.gsub(%r{^\.[/\\]}, "")]
+              controller_name = path[(load_path.length + 1)..-1]
+              controller_name.gsub!(/_controller\.rb\Z/, '')
+              @possible_controllers << controller_name
             end
-            "(#{conds.join(' || ')})"
-          when true then expression
-          when nil then "! #{expression}"
-          else
-            raise ArgumentError, "Valid criteria are strings, regular expressions, true, or nil"
+          end
+          # remove duplicates
+          @possible_controllers.uniq!
         end
+        @possible_controllers
       end
-    end
-    class Component #:nodoc:
-      def dynamic?()  false end
-      def optional?() false end
+      def use_controllers!(controller_names)
+        @possible_controllers = controller_names
+      end
-      def key() nil end
-      def self.new(string, *args)
-        return super(string, *args) unless self == Component
-        case string
-          when ':controller' then ControllerComponent.new(:controller, *args)
-          when /^:(\w+)$/    then DynamicComponent.new($1, *args)
-          when /^\*(\w+)$/   then PathComponent.new($1, *args)
-          else StaticComponent.new(string, *args)
-        end
-      end
+      def controller_relative_to(controller, previous)
+        if controller.nil?           then previous
+        elsif controller[0] == ?/    then controller[1..-1]
+        elsif %r{^(.*)/} =~ previous then "#{$1}/#{controller}"
+        else controller
+        end
+      end
     end
-    class StaticComponent < Component #:nodoc:
-      attr_reader :value
-      def initialize(value)
-        @value = value
+    class Route
+      attr_accessor :segments, :requirements, :conditions
+      def initialize
+        @segments = []
+        @requirements = {}
+        @conditions = {}
       end
+      # Write and compile a +generate+ method for this Route.
+      def write_generation
+        # Build the main body of the generation
+        body = "expired = false\n#{generation_extraction}\n#{generation_structure}"
+        # If we have conditions that must be tested first, nest the body inside an if
+        body = "if #{generation_requirements}\n#{body}\nend" if generation_requirements
+        args = "options, hash, expire_on = {}"
-      def write_recognition(g)
-        g.if_next_matches(value) do |gp|
-          gp.move_forward {|gpp| gpp.continue}
-        end
-      end
+        # Nest the body inside of a def block, and then compile it.
+        raw_method = method_decl = "def generate_raw(#{args})\npath = begin\n#{body}\nend\n[path, hash]\nend"
+        instance_eval method_decl, "generated code (#{__FILE__}:#{__LINE__})"
-      def write_generation(g)
-        g.add_segment(value) {|gp| gp.continue }
-      end
-    end
+        # expire_on.keys == recall.keys; in other words, the keys in the expire_on hash
+        # are the same as the keys that were recalled from the previous request. Thus,
+        # we can use the expire_on.keys to determine which keys ought to be used to build
+        # the query string. (Never use keys from the recalled request when building the
+        # query string.)
-    class DynamicComponent < Component #:nodoc:
-      attr_reader :key, :default
-      attr_accessor :condition
-      def dynamic?()  true      end
-      def optional?() @optional end
+        method_decl = "def generate(#{args})\npath, hash = generate_raw(options, hash, expire_on)\nappend_query_string(path, hash, extra_keys(hash, expire_on))\nend"
+        instance_eval method_decl, "generated code (#{__FILE__}:#{__LINE__})"
-      def default=(default)
-        @optional = true
-        @default = default
+        method_decl = "def generate_extras(#{args})\npath, hash = generate_raw(options, hash, expire_on)\n[path, extra_keys(hash, expire_on)]\nend"
+        instance_eval method_decl, "generated code (#{__FILE__}:#{__LINE__})"
+        raw_method
       end
-      def initialize(key, options = {})
-        @key = key.to_sym
-        @optional = false
-        default, @condition = options[:default], options[:condition]
-        self.default = default if options.key?(:default)
+      # Build several lines of code that extract values from the options hash. If any
+      # of the values are missing or rejected then a return will be executed.
+      def generation_extraction
+        segments.collect do |segment|
+          segment.extraction_code
+        end.compact * "\n"
       end
-      def default_check(g)
-        presence = "#{g.hash_value(key, !! default)}"
-        if default
-           "!(#{presence} && #{g.hash_value(key, false)} != #{default.to_s.inspect})"
-        else
-          "! #{presence}"
+      # Produce a condition expression that will check the requirements of this route
+      # upon generation.
+      def generation_requirements
+        requirement_conditions = requirements.collect do |key, req|
+          if req.is_a? Regexp
+            value_regexp = Regexp.new "\\A#{req.source}\\Z"
+            "hash[:#{key}] && #{value_regexp.inspect} =~ options[:#{key}]"
+          else
+            "hash[:#{key}] == #{req.inspect}"
+          end
         end
+        requirement_conditions * ' && ' unless requirement_conditions.empty?
+      end
+      def generation_structure
+        segments.last.string_structure segments[0..-2]
       end
-      def write_generation(g)
-        wrote_dropout = write_dropout_generation(g)
-        write_continue_generation(g, wrote_dropout)
+      # Write and compile a +recognize+ method for this Route.
+      def write_recognition
+        # Create an if structure to extract the params from a match if it occurs.
+        body = "params = parameter_shell.dup\n#{recognition_extraction * "\n"}\nparams"
+        body = "if #{recognition_conditions.join(" && ")}\n#{body}\nend"
+        # Build the method declaration and compile it
+        method_decl = "def recognize(path, env={})\n#{body}\nend"
+        instance_eval method_decl, "generated code (#{__FILE__}:#{__LINE__})"
+        method_decl
       end
-      def write_dropout_generation(g)
-        return false unless optional? && g.after.all? {|c| c.optional?}
-        check = [default_check(g)]
-        gp = g.dup # Use another generator to write the conditions after the first &&
-        # We do this to ensure that the generator will not assume x_value is set. It will
-        # not be set if it follows a false condition -- for example, false && (x = 2)
-        check += gp.after.map {|c| c.default_check gp}
-        gp.if(check.join(' && ')) { gp.finish } # If this condition is met, we stop here
-        true
+      # Plugins may override this method to add other conditions, like checks on
+      # host, subdomain, and so forth. Note that changes here only affect route
+      # recognition, not generation.
+      def recognition_conditions
+        result = ["(match = #{Regexp.new(recognition_pattern).inspect}.match(path))"]
+        result << "conditions[:method] === env[:method]" if conditions[:method]
+        result
       end
-      def write_continue_generation(g, use_else)
-        test  = Routing.test_condition(g.hash_value(key, true, default), condition || true)
-        check = (use_else && condition.nil? && default) ? [:else] : [use_else ? :elsif : :if, test]
-        g.send(*check) do |gp|
-          gp.expire_for_keys(key) unless gp.after.empty?
-          add_segments_to(gp) {|gpp| gpp.continue}
+      # Build the regular expression pattern that will match this route.
+      def recognition_pattern(wrap = true)
+        pattern = ''
+        segments.reverse_each do |segment|
+          pattern = segment.build_pattern pattern
         end
+        wrap ? ("\\A" + pattern + "\\Z") : pattern
       end
-      def add_segments_to(g)
-        g.add_segment(%(\#{CGI.escape(#{g.hash_value(key, true, default)})})) {|gp| yield gp}
+      # Write the code to extract the parameters from a matched route.
+      def recognition_extraction
+        next_capture = 1
+        extraction = segments.collect do |segment|
+          x = segment.match_extraction next_capture
+          next_capture += Regexp.new(segment.regexp_chunk).number_of_captures
+          x
+        end
+        extraction.compact
       end
-      def recognition_check(g)
-        test_type = [true, nil].include?(condition) ? :presence : :constraint
-        prefix = condition.is_a?(Regexp) ? "#{g.next_segment(true)} && " : ''
-        check = prefix + Routing.test_condition(g.next_segment(true), condition || true)
-        g.if(check) {|gp| yield gp, test_type}
+      # Write the real generation implementation and then resend the message.
+      def generate(options, hash, expire_on = {})
+        write_generation
+        generate options, hash, expire_on
       end
-      def write_recognition(g)
-        test_type = nil
-        recognition_check(g) do |gp, test_type|
-          assign_result(gp) {|gpp| gpp.continue}
-        end
-        if optional? && g.after.all? {|c| c.optional?}
-          call = (test_type == :presence) ? [:else] : [:elsif, "! #{g.next_segment(true)}"]
-          g.send(*call) do |gp|
-            assign_default(gp)
-            gp.after.each {|c| c.assign_default(gp)}
-            gp.finish(false)
-          end
-        end
+      def generate_extras(options, hash, expire_on = {})
+        write_generation
+        generate_extras options, hash, expire_on
       end
-      def assign_result(g, with_default = false)
-        g.result key, "CGI.unescape(#{g.next_segment(true, with_default ? default : nil)})"
-        g.move_forward {|gp| yield gp}
+      # Generate the query string with any extra keys in the hash and append
+      # it to the given path, returning the new path.
+      def append_query_string(path, hash, query_keys=nil)
+        return nil unless path
+        query_keys ||= extra_keys(hash)
+        "#{path}#{build_query_string(hash, query_keys)}"
       end
-      def assign_default(g)
-        g.constant_result key, default unless default.nil?
+      # Determine which keys in the given hash are "extra". Extra keys are
+      # those that were not used to generate a particular route. The extra
+      # keys also do not include those recalled from the prior request, nor
+      # do they include any keys that were implied in the route (like a
+      # :controller that is required, but not explicitly used in the text of
+      # the route.)
+      def extra_keys(hash, recall={})
+        (hash || {}).keys.map { |k| k.to_sym } - (recall || {}).keys - significant_keys
       end
-    end
-    class ControllerComponent < DynamicComponent #:nodoc:
-      def key() :controller end
+      # Build a query string from the keys of the given hash. If +only_keys+
+      # is given (as an array), only the keys indicated will be used to build
+      # the query string. The query string will correctly build array parameter
+      # values.
+      def build_query_string(hash, only_keys=nil)
+        elements = []
-      def add_segments_to(g)
-        g.add_segment(%(\#{#{g.hash_value(key, true, default)}})) {|gp| yield gp}
+        only_keys ||= hash.keys
+        only_keys.each do |key|
+          value = hash[key] or next
+          key = CGI.escape key.to_s
+          if value.class == Array
+            key <<  '[]'
+          else
+            value = [ value ]
+          end
+          value.each { |val| elements << "#{key}=#{CGI.escape(val.to_param.to_s)}" }
+        end
+        query_string = "?#{elements.join("&")}" unless elements.empty?
+        query_string || ""
       end
-      def recognition_check(g)
-        g << "controller_result = ::ActionController::Routing::ControllerComponent.traverse_to_controller(#{g.path_name}, #{g.index_name})"
-        g.if('controller_result') do |gp|
-          gp << 'controller_value, segments_to_controller = controller_result'
-          if condition
-            gp << "controller_path = #{gp.path_name}[#{gp.index_name},segments_to_controller].join('/')"
-            gp.if(Routing.test_condition("controller_path", condition)) do |gpp|
-              gpp.move_forward('segments_to_controller') {|gppp| yield gppp, :constraint}
-            end
-          else
-            gp.move_forward('segments_to_controller') {|gpp| yield gpp, :constraint}
+      # Write the real recognition implementation and then resend the message.
+      def recognize(path, environment={})
+        write_recognition
+        recognize path, environment
+      end
+      # A route's parameter shell contains parameter values that are not in the
+      # route's path, but should be placed in the recognized hash.
+      #
+      # For example, +{:controller => 'pages', :action => 'show'} is the shell for the route:
+      #
+      #   map.connect '/page/:id', :controller => 'pages', :action => 'show', :id => /\d+/
+      #
+      def parameter_shell
+        @parameter_shell ||= returning({}) do |shell|
+          requirements.each do |key, requirement|
+            shell[key] = requirement unless requirement.is_a? Regexp
           end
         end
       end
-      def assign_result(g)
-        g.result key, 'controller_value'
-        yield g
+      # Return an array containing all the keys that are used in this route. This
+      # includes keys that appear inside the path, and keys that have requirements
+      # placed upon them.
+      def significant_keys
+        @significant_keys ||= returning [] do |sk|
+          segments.each { |segment| sk << segment.key if segment.respond_to? :key }
+          sk.concat requirements.keys
+          sk.uniq!
+        end
       end
-      def assign_default(g)
-        ControllerComponent.assign_controller(g, default)
+      # Return a hash of key/value pairs representing the keys in the route that
+      # have defaults, or which are specified by non-regexp requirements.
+      def defaults
+        @defaults ||= returning({}) do |hash|
+          segments.each do |segment|
+            next unless segment.respond_to? :default
+            hash[segment.key] = segment.default unless segment.default.nil?
+          end
+          requirements.each do |key,req|
+            next if Regexp === req || req.nil?
+            hash[key] = req
+          end
+        end
       end
-      class << self
-        def assign_controller(g, controller)
-          expr = "::#{controller.split('/').collect {|c| c.camelize}.join('::')}Controller"
-          g.result :controller, expr, true
+      def matches_controller_and_action?(controller, action)
+        unless @matching_prepared
+          @controller_requirement = requirement_for(:controller)
+          @action_requirement = requirement_for(:action)
+          @matching_prepared = true
         end
-        def traverse_to_controller(segments, start_at = 0)
-          mod = ::Object
-          length = segments.length
-          index = start_at
-          mod_name = controller_name = segment = nil
-          while index < length
-            return nil unless /\A[A-Za-z][A-Za-z\d_]*\Z/ =~ (segment = segments[index])
-            index += 1
-            mod_name = segment.camelize
-            controller_name = "#{mod_name}Controller"
-            path_suffix = File.join(segments[start_at..(index - 1)])
-            next_mod = nil
-            # If the controller is already present, or if we load it, return it.
-            if mod.const_defined?(controller_name) || attempt_load(mod, controller_name, path_suffix + "_controller") == :defined
-              controller = mod.const_get(controller_name)
-              return nil unless controller.is_a?(Class) && controller.ancestors.include?(ActionController::Base) # it's not really a controller?
-              return [controller, (index - start_at)]
-            end
-            # No controller? Look for the module
-            if mod.const_defined? mod_name
-              next_mod = mod.send(:const_get, mod_name)
-              next_mod = nil unless next_mod.is_a?(Module)
-            else
-              # Try to load a file that defines the module we want.
-              case attempt_load(mod, mod_name, path_suffix)
-                when :defined then next_mod = mod.const_get mod_name
-                when :dir then # We didn't find a file, but there's a dir.
-                  next_mod = Module.new # So create a module for the directory
-                  mod.send :const_set, mod_name, next_mod
-                else
-                  return nil
-              end
-            end
-            mod = next_mod
-            return nil unless mod && mod.is_a?(Module)
-          end
-          nil
-        end
-      protected
-        def safe_load_paths #:nodoc:
-          if defined?(RAILS_ROOT)
-            $LOAD_PATH.select do |base|
-              base = File.expand_path(base)
-              extended_root = File.expand_path(RAILS_ROOT)
-              # Exclude all paths that are not nested within app, lib, or components.
-              base.match(/\A#{Regexp.escape(extended_root)}\/*(app|lib|components)\/[a-z]/) || base =~ %r{rails-[\d.]+/builtin}
-            end
-          else
-            $LOAD_PATH
-          end
+        (@controller_requirement.nil? || @controller_requirement === controller) &&
+        (@action_requirement.nil? || @action_requirement === action)
+      end
+      def to_s
+        @to_s ||= begin
+          segs = segments.inject("") { |str,s| str << s.to_s }
+          "%-6s %-40s %s" % [(conditions[:method] || :any).to_s.upcase, segs, requirements.inspect]
         end
-        def attempt_load(mod, const_name, path)
-          has_dir = false
-          safe_load_paths.each do |load_path|
-            full_path = File.join(load_path, path)
-            file_path = full_path + '.rb'
-            if File.file?(file_path) # Found a .rb file? Load it up
-              require_dependency(file_path)
-              return :defined if mod.const_defined? const_name
-            else
-              has_dir ||= File.directory?(full_path)
-            end
-          end
-          return (has_dir ? :dir : nil)
+      end
+    protected
+      def requirement_for(key)
+        return requirements[key] if requirements.key? key
+        segments.each do |segment|
+          return segment.regexp if segment.respond_to?(:key) && segment.key == key
         end
+        nil
       end
     end
-    class PathComponent < DynamicComponent #:nodoc:
-      def optional?() true end
-      def default()   []  end
-      def condition() nil  end
+    class Segment
+      attr_accessor :is_optional
+      alias_method :optional?, :is_optional
+      def initialize
+        self.is_optional = false
+      end
-      def default=(value)
-        raise RoutingError, "All path components have an implicit default of []" unless value == []
+      def extraction_code
+        nil
       end
-      def write_generation(g)
-        raise RoutingError, 'Path components must occur last' unless g.after.empty?
-        g.if("#{g.hash_value(key, true)} && ! #{g.hash_value(key, true)}.empty?") do
-          g << "#{g.hash_value(key, true)} = #{g.hash_value(key, true)}.join('/') unless #{g.hash_value(key, true)}.is_a?(String)"
-          g.add_segment("\#{CGI.escape_skipping_slashes(#{g.hash_value(key, true)})}") {|gp| gp.finish }
+      # Continue generating string for the prior segments.
+      def continue_string_structure(prior_segments)
+        if prior_segments.empty?
+          interpolation_statement(prior_segments)
+        else
+          new_priors = prior_segments[0..-2]
+          prior_segments.last.string_structure(new_priors)
         end
-        g.else { g.finish }
       end
-      def write_recognition(g)
-        raise RoutingError, "Path components must occur last" unless g.after.empty?
-        start = g.index_name
-        start = "(#{start})" unless /^\w+$/ =~ start
-        value_expr = "#{g.path_name}[#{start}..-1] || []"
-        g.result key, "ActionController::Routing::PathComponent::Result.new_escaped(#{value_expr})"
-        g.finish(false)
+      # Return a string interpolation statement for this segment and those before it.
+      def interpolation_statement(prior_segments)
+        chunks = prior_segments.collect { |s| s.interpolation_chunk }
+        chunks << interpolation_chunk
+        "\"#{chunks * ''}\"#{all_optionals_available_condition(prior_segments)}"
       end
-      class Result < ::Array #:nodoc:
-        def to_s() join '/' end
-        def self.new_escaped(strings)
-          new strings.collect {|str| CGI.unescape str}
-        end
+      def string_structure(prior_segments)
+        optional? ? continue_string_structure(prior_segments) : interpolation_statement(prior_segments)
+      end
+      # Return an if condition that is true if all the prior segments can be generated.
+      # If there are no optional segments before this one, then nil is returned.
+      def all_optionals_available_condition(prior_segments)
+        optional_locals = prior_segments.collect { |s| s.local_name if s.optional? && s.respond_to?(:local_name) }.compact
+        optional_locals.empty? ? nil : " if #{optional_locals * ' && '}"
+      end
+      # Recognition
+      def match_extraction(next_capture)
+        nil
+      end
+      # Warning
+      # Returns true if this segment is optional? because of a default. If so, then
+      # no warning will be emitted regarding this segment.
+      def optionality_implied?
+        false
       end
     end
-    class Route #:nodoc:
-      attr_accessor :components, :known
-      attr_reader :path, :options, :keys, :defaults
+    class StaticSegment < Segment
+      attr_accessor :value, :raw
+      alias_method :raw?, :raw
-      def initialize(path, options = {})
-        @path, @options = path, options
-        initialize_components path
-        defaults, conditions = initialize_hashes options.dup
-        @defaults = defaults.dup
-        configure_components(defaults, conditions)
-        add_default_requirements
-        initialize_keys
+      def initialize(value = nil)
+        super()
+        self.value = value
       end
-      def inspect
-        "<#{self.class} #{path.inspect}, #{options.inspect[1..-1]}>"
+      def interpolation_chunk
+        raw? ? value : CGI.escape(value)
       end
-      def write_generation(generator = CodeGeneration::GenerationGenerator.new)
-        generator.before, generator.current, generator.after = [], components.first, (components[1..-1] || [])
-        if known.empty? then generator.go
+      def regexp_chunk
+        chunk = Regexp.escape value
+        optional? ? Regexp.optionalize(chunk) : chunk
+      end
+      def build_pattern(pattern)
+        escaped = Regexp.escape(value)
+        if optional? && ! pattern.empty?
+          "(?:#{Regexp.optionalize escaped}\\Z|#{escaped}#{Regexp.unoptionalize pattern})"
+        elsif optional?
+          Regexp.optionalize escaped
         else
-          # Alter the conditions to allow :action => 'index' to also catch :action => nil
-          altered_known = known.collect do |k, v|
-            if k == :action && v== 'index' then [k, [nil, 'index']]
-            else [k, v]
-            end
-          end
-          generator.if(generator.check_conditions(altered_known)) {|gp| gp.go }
+          escaped + pattern
         end
-        generator
       end
-      def write_recognition(generator = CodeGeneration::RecognitionGenerator.new)
-        g = generator.dup
-        g.share_locals_with generator
-        g.before, g.current, g.after = [], components.first, (components[1..-1] || [])
-        known.each do |key, value|
-          if key == :controller then ControllerComponent.assign_controller(g, value)
-          else g.constant_result(key, value)
-          end
-        end
-        g.go
-        generator
+      def to_s
+        value
       end
+    end
-      def initialize_keys
-        @keys = (components.collect {|c| c.key} + known.keys).compact
-        @keys.freeze
+    class DividerSegment < StaticSegment
+      def initialize(value = nil)
+        super(value)
+        self.raw = true
+        self.is_optional = true
       end
-      def extra_keys(options)
-        options.keys - @keys
+      def optionality_implied?
+        true
       end
-      def matches_controller?(controller)
-        if known[:controller] then known[:controller] == controller
-        else
-          c = components.find {|c| c.key == :controller}
-          return false unless c
-          return c.condition.nil? || eval(Routing.test_condition('controller', c.condition))
-        end
+    end
+    class DynamicSegment < Segment
+      attr_accessor :key, :default, :regexp
+      def initialize(key = nil, options = {})
+        super()
+        self.key = key
+        self.default = options[:default] if options.key? :default
+        self.is_optional = true if options[:optional] || options.key?(:default)
       end
-      protected
-        def initialize_components(path)
-          path = path.split('/') if path.is_a? String
-          path.shift if path.first.blank?
-          self.components = path.collect {|str| Component.new str}
-        end
-        def initialize_hashes(options)
-          path_keys = components.collect {|c| c.key }.compact
-          self.known = {}
-          defaults = options.delete(:defaults) || {}
-          conditions = options.delete(:require) || {}
-          conditions.update(options.delete(:requirements) || {})
-          options.each do |k, v|
-            if path_keys.include?(k) then (v.is_a?(Regexp) ? conditions : defaults)[k] = v
-            else known[k] = v
-            end
-          end
-          [defaults, conditions]
+      def to_s
+        ":#{key}"
+      end
+      # The local variable name that the value of this segment will be extracted to.
+      def local_name
+        "#{key}_value"
+      end
+      def extract_value
+        "#{local_name} = hash[:#{key}] #{"|| #{default.inspect}" if default}"
+      end
+      def value_check
+        if default # Then we know it won't be nil
+          "#{value_regexp.inspect} =~ #{local_name}" if regexp
+        elsif optional?
+          # If we have a regexp check that the value is not given, or that it matches.
+          # If we have no regexp, return nil since we do not require a condition.
+          "#{local_name}.nil? || #{value_regexp.inspect} =~ #{local_name}" if regexp
+        else # Then it must be present, and if we have a regexp, it must match too.
+          "#{local_name} #{"&& #{value_regexp.inspect} =~ #{local_name}" if regexp}"
         end
-        def configure_components(defaults, conditions)
-          components.each do |component|
-            if defaults.key?(component.key) then component.default = defaults[component.key]
-            elsif component.key == :action  then component.default = 'index'
-            elsif component.key == :id      then component.default = nil
-            end
-            component.condition = conditions[component.key] if conditions.key?(component.key)
-          end
+      end
+      def expiry_statement
+        "expired, hash = true, options if !expired && expire_on[:#{key}]"
+      end
+      def extraction_code
+        s = extract_value
+        vc = value_check
+        s << "\nreturn [nil,nil] unless #{vc}" if vc
+        s << "\n#{expiry_statement}"
+      end
+      def interpolation_chunk
+        "\#{CGI.escape(#{local_name}.to_s)}"
+      end
+      def string_structure(prior_segments)
+        if optional? # We have a conditional to do...
+          # If we should not appear in the url, just write the code for the prior
+          # segments. This occurs if our value is the default value, or, if we are
+          # optional, if we have nil as our value.
+          "if #{local_name} == #{default.inspect}\n" +
+            continue_string_structure(prior_segments) +
+          "\nelse\n" + # Otherwise, write the code up to here
+            "#{interpolation_statement(prior_segments)}\nend"
+        else
+          interpolation_statement(prior_segments)
         end
+      end
+      def value_regexp
+        Regexp.new "\\A#{regexp.source}\\Z" if regexp
+      end
+      def regexp_chunk
+        regexp ? "(#{regexp.source})" : "([^#{Routing::SEPARATORS.join}]+)"
+      end
+      def build_pattern(pattern)
+        chunk = regexp_chunk
+        chunk = "(#{chunk})" if Regexp.new(chunk).number_of_captures == 0
+        pattern = "#{chunk}#{pattern}"
+        optional? ? Regexp.optionalize(pattern) : pattern
+      end
+      def match_extraction(next_capture)
+        hangon = (default ? "|| #{default.inspect}" : "if match[#{next_capture}]")
-        def add_default_requirements
-          component_keys = components.collect {|c| c.key}
-          known[:action] ||= 'index' unless component_keys.include? :action
+        # All non code-related keys (such as :id, :slug) have to be unescaped as other CGI params
+        "params[:#{key}] = match[#{next_capture}] #{hangon}"
+      end
+      def optionality_implied?
+        [:action, :id].include? key
+      end
+    end
+    class ControllerSegment < DynamicSegment
+      def regexp_chunk
+        possible_names = Routing.possible_controllers.collect { |name| Regexp.escape name }
+        "(?i-:(#{(regexp || Regexp.union(*possible_names)).source}))"
+      end
+      # Don't CGI.escape the controller name, since it may have slashes in it,
+      # like admin/foo.
+      def interpolation_chunk
+        "\#{#{local_name}.to_s}"
+      end
+      # Make sure controller names like Admin/Content are correctly normalized to
+      # admin/content
+      def extract_value
+        "#{local_name} = (hash[:#{key}] #{"|| #{default.inspect}" if default}).downcase"
+      end
+      def match_extraction(next_capture)
+        if default
+          "params[:#{key}] = match[#{next_capture}] ? match[#{next_capture}].downcase : '#{default}'"
+        else
+          "params[:#{key}] = match[#{next_capture}].downcase if match[#{next_capture}]"
         end
+      end
     end
-    class RouteSet #:nodoc:
-      attr_reader :routes, :categories, :controller_to_selector
-      def initialize
-        @routes = []
-        @generation_methods = Hash.new(:generate_default_path)
+    class PathSegment < DynamicSegment
+      EscapedSlash = CGI.escape("/")
+      def interpolation_chunk
+        "\#{CGI.escape(#{local_name}.to_s).gsub(#{EscapedSlash.inspect}, '/')}"
       end
-      def generate(options, request_or_recall_hash = {})
-        recall = request_or_recall_hash.is_a?(Hash) ? request_or_recall_hash : request_or_recall_hash.symbolized_path_parameters
-        use_recall = true
-        controller = options[:controller]
-        options[:action] ||= 'index' if controller
-        recall_controller = recall[:controller]
-        if (recall_controller && recall_controller.include?(?/)) || (controller && controller.include?(?/))
-          recall = {} if controller && controller[0] == ?/
-          options[:controller] = Routing.controller_relative_to(controller, recall_controller)
-        end
-        options = recall.dup if options.empty? # XXX move to url_rewriter?
-        keys_to_delete = []
-        Routing.treat_hash(options, keys_to_delete)
-        merged = recall.merge(options)
-        keys_to_delete.each {|key| merged.delete key}
-        expire_on = Routing.expiry_hash(options, recall)
-        generate_path(merged, options, expire_on)
+      def default
+        ''
       end
-      def generate_path(merged, options, expire_on)
-        send @generation_methods[merged[:controller]], merged, options, expire_on
+      def default=(path)
+        raise RoutingError, "paths cannot have non-empty default values" unless path.blank?
       end
-      def generate_default_path(*args)
-        write_generation
-        generate_default_path(*args)
+      def match_extraction(next_capture)
+        "params[:#{key}] = PathSegment::Result.new_escaped((match[#{next_capture}]#{" || " + default.inspect if default}).split('/'))#{" if match[" + next_capture + "]" if !default}"
       end
-      def write_generation
-        method_sources = []
-        @generation_methods = Hash.new(:generate_default_path)
-        categorize_routes.each do |controller, routes|
-          next unless routes.length < @routes.length
-          ivar = controller.gsub('/', '__')
-          method_name = "generate_path_for_#{ivar}".to_sym
-          instance_variable_set "@#{ivar}", routes
-          code = generation_code_for(ivar, method_name).to_s
-          method_sources << code
-          filename = "generated_code/routing/generation_for_controller_#{controller}.rb"
-          eval(code, nil, filename)
-          @generation_methods[controller.to_s]   = method_name
-          @generation_methods[controller.to_sym] = method_name
-        end
-        code = generation_code_for('routes', 'generate_default_path').to_s
-        eval(code, nil, 'generated_code/routing/generation.rb')
-        return (method_sources << code)
+      def regexp_chunk
+        regexp || "(.*)"
       end
-      def recognize(request)
-        string_path = request.path
-        string_path.chomp! if string_path[0] == ?/
-        path = string_path.split '/'
-        path.shift
-        hash = recognize_path(path)
-        return recognition_failed(request) unless hash && hash['controller']
-        controller = hash['controller']
-        hash['controller'] = controller.controller_path
-        request.path_parameters = hash
-        controller.new
+      class Result < ::Array #:nodoc:
+        def to_s() join '/' end
+        def self.new_escaped(strings)
+          new strings.collect {|str| CGI.unescape str}
+        end
+      end
+    end
+    class RouteBuilder
+      attr_accessor :separators, :optional_separators
+      def initialize
+        self.separators = Routing::SEPARATORS
+        self.optional_separators = %w( / )
       end
-      alias :recognize! :recognize
-      def recognition_failed(request)
-        raise ActionController::RoutingError, "Recognition failed for #{request.path.inspect}"
+      def separator_pattern(inverted = false)
+        "[#{'^' if inverted}#{Regexp.escape(separators.join)}]"
       end
-      def write_recognition
-        g = generator = CodeGeneration::RecognitionGenerator.new
-        g.finish_statement = Proc.new {|hash_expr| "return #{hash_expr}"}
+      def interval_regexp
+        Regexp.new "(.*?)(#{separators.source}|$)"
+      end
+      # Accepts a "route path" (a string defining a route), and returns the array
+      # of segments that corresponds to it. Note that the segment array is only
+      # partially initialized--the defaults and requirements, for instance, need
+      # to be set separately, via the #assign_route_options method, and the
+      # #optional? method for each segment will not be reliable until after
+      # #assign_route_options is called, as well.
+      def segments_for_route_path(path)
+        rest, segments = path, []
-        g.def "self.recognize_path(path)" do
-          each do |route|
-            g << 'index = 0'
-            route.write_recognition(g)
-          end
+        until rest.empty?
+          segment, rest = segment_for rest
+          segments << segment
         end
-        eval g.to_s, nil, 'generated/routing/recognition.rb'
-        return g.to_s
+        segments
       end
-      def generation_code_for(ivar = 'routes', method_name = nil)
-        routes = instance_variable_get('@' + ivar)
-        key_ivar = "@keys_for_#{ivar}"
-        instance_variable_set(key_ivar, routes.collect {|route| route.keys})
+      # A factory method that returns a new segment instance appropriate for the
+      # format of the given string.
+      def segment_for(string)
+        segment = case string
+          when /\A:(\w+)/
+            key = $1.to_sym
+            case key
+              when :controller then ControllerSegment.new(key)
+              else DynamicSegment.new key
+            end
+          when /\A\*(\w+)/ then PathSegment.new($1.to_sym, :optional => true)
+          when /\A\?(.*?)\?/
+            returning segment = StaticSegment.new($1) do
+              segment.is_optional = true
+            end
+          when /\A(#{separator_pattern(:inverted)}+)/ then StaticSegment.new($1)
+          when Regexp.new(separator_pattern) then
+            returning segment = DividerSegment.new($&) do
+              segment.is_optional = (optional_separators.include? $&)
+            end
+        end
+        [segment, $~.post_match]
+      end
+      # Split the given hash of options into requirement and default hashes. The
+      # segments are passed alongside in order to distinguish between default values
+      # and requirements.
+      def divide_route_options(segments, options)
+        options = options.dup
+        requirements = (options.delete(:requirements) || {}).dup
+        defaults     = (options.delete(:defaults)     || {}).dup
+        conditions   = (options.delete(:conditions)   || {}).dup
+        path_keys = segments.collect { |segment| segment.key if segment.respond_to?(:key) }.compact
+        options.each do |key, value|
+          hash = (path_keys.include?(key) && ! value.is_a?(Regexp)) ? defaults : requirements
+          hash[key] = value
+        end
-        g = generator = CodeGeneration::GenerationGenerator.new
-        g.def "self.#{method_name}(merged, options, expire_on)" do
-          g << 'unused_count = options.length + 1'
-          g << "unused_keys = keys = options.keys"
-          g << 'path = nil'
+        [defaults, requirements, conditions]
+      end
-          routes.each_with_index do |route, index|
-            g << "new_unused_keys = keys - #{key_ivar}[#{index}]"
-            g << 'new_path = ('
-            g.source.indent do
-              if index.zero?
-                g << "new_unused_count = new_unused_keys.length"
-                g << "hash = merged; not_expired = true"
-                route.write_generation(g.dup)
-              else
-                g.if "(new_unused_count = new_unused_keys.length) < unused_count" do |gp|
-                  gp << "hash = merged; not_expired = true"
-                  route.write_generation(gp)
-                end
-              end
-            end
-            g.source.lines.last << ' )' # Add the closing brace to the end line
-            g.if 'new_path' do
-              g << 'return new_path, [] if new_unused_count.zero?'
-              g << 'path = new_path; unused_keys = new_unused_keys; unused_count = new_unused_count'
+      # Takes a hash of defaults and a hash of requirements, and assigns them to
+      # the segments. Any unused requirements (which do not correspond to a segment)
+      # are returned as a hash.
+      def assign_route_options(segments, defaults, requirements)
+        route_requirements = {} # Requirements that do not belong to a segment
+        segment_named = Proc.new do |key|
+          segments.detect { |segment| segment.key == key if segment.respond_to?(:key) }
+        end
+        requirements.each do |key, requirement|
+          segment = segment_named[key]
+          if segment
+            raise TypeError, "#{key}: requirements on a path segment must be regular expressions" unless requirement.is_a?(Regexp)
+            if requirement.source =~ %r{\A(\\A|\^)|(\\Z|\\z|\$)\Z}
+              raise ArgumentError, "Regexp anchor characters are not allowed in routing requirements: #{requirement.inspect}"
             end
+            segment.regexp = requirement
+          else
+            route_requirements[key] = requirement
           end
+        end
-          g << "raise RoutingError, \"No url can be generated for the hash \#{options.inspect}\" unless path"
-          g << "return path, unused_keys"
+        defaults.each do |key, default|
+          segment = segment_named[key]
+          raise ArgumentError, "#{key}: No matching segment exists; cannot assign default" unless segment
+          segment.is_optional = true
+          segment.default = default.to_param if default
         end
-        return g
+        assign_default_route_options(segments)
+        ensure_required_segments(segments)
+        route_requirements
       end
-      def categorize_routes
-        @categorized_routes = by_controller = Hash.new(self)
-        known_controllers.each do |name|
-          set = by_controller[name] = []
-          each do |route|
-            set << route if route.matches_controller? name
+      # Assign default options, such as 'index' as a default for :action. This
+      # method must be run *after* user supplied requirements and defaults have
+      # been applied to the segments.
+      def assign_default_route_options(segments)
+        segments.each do |segment|
+          next unless segment.is_a? DynamicSegment
+          case segment.key
+            when :action
+              if segment.regexp.nil? || segment.regexp.match('index').to_s == 'index'
+                segment.default ||= 'index'
+                segment.is_optional = true
+              end
+            when :id
+              if segment.default.nil? && segment.regexp.nil? || segment.regexp =~ ''
+                segment.is_optional = true
+              end
           end
         end
-        @categorized_routes
       end
-      def known_controllers
-        @routes.inject([]) do |known, route|
-          if (controller = route.known[:controller])
-            if controller.is_a?(Regexp)
-              known << controller.source.scan(%r{[\w\d/]+}).select {|word| controller =~ word}
-            else known << controller
+      # Makes sure that there are no optional segments that precede a required
+      # segment. If any are found that precede a required segment, they are
+      # made required.
+      def ensure_required_segments(segments)
+        allow_optional = true
+        segments.reverse_each do |segment|
+          allow_optional &&= segment.optional?
+          if !allow_optional && segment.optional?
+            unless segment.optionality_implied?
+              warn "Route segment \"#{segment.to_s}\" cannot be optional because it precedes a required segment. This segment will be required."
             end
+            segment.is_optional = false
+          elsif allow_optional & segment.respond_to?(:default) && segment.default
+            # if a segment has a default, then it is optional
+            segment.is_optional = true
           end
-          known
-        end.uniq
+        end
       end
+      # Construct and return a route with the given path and options.
+      def build(path, options)
+        # Wrap the path with slashes
+        path = "/#{path}" unless path[0] == ?/
+        path = "#{path}/" unless path[-1] == ?/
+        segments = segments_for_route_path(path)
+        defaults, requirements, conditions = divide_route_options(segments, options)
+        requirements = assign_route_options(segments, defaults, requirements)
-      def reload
-        NamedRoutes.clear
-        if defined?(RAILS_ROOT) then load(File.join(RAILS_ROOT, 'config', 'routes.rb'))
-        else connect(':controller/:action/:id', :action => 'index', :id => nil)
+        route = Route.new
+        route.segments = segments
+        route.requirements = requirements
+        route.conditions = conditions
+        if !route.significant_keys.include?(:action) && !route.requirements[:action]
+          route.requirements[:action] = "index"
+          route.significant_keys << :action
+        end
+        if !route.significant_keys.include?(:controller)
+          raise ArgumentError, "Illegal route: the :controller must be specified!"
+        end
+        route
+      end
+    end
+    class RouteSet
+      # Mapper instances are used to build routes. The object passed to the draw
+      # block in config/routes.rb is a Mapper instance.
+      #
+      # Mapper instances have relatively few instance methods, in order to avoid
+      # clashes with named routes.
+      class Mapper
+        def initialize(set)
+          @set = set
+        end
+        # Create an unnamed route with the provided +path+ and +options+. See
+        # SomeHelpfulUrl for an introduction to routes.
+        def connect(path, options = {})
+          @set.add_route(path, options)
+        end
+        def named_route(name, path, options = {})
+          @set.add_named_route(name, path, options)
+        end
+        # Added deprecation notice for anyone who already added a named route called "root".
+        # It'll be used as a shortcut for map.connect '' in Rails 2.0.
+        def root(*args, &proc)
+          super unless args.length >= 1 && proc.nil?
+          @set.add_named_route("root", *args)
+        end
+        deprecate :root => "(as the the label for a named route) will become a shortcut for map.connect '', so find another name"
+        def method_missing(route_name, *args, &proc)
+          super unless args.length >= 1 && proc.nil?
+          @set.add_named_route(route_name, *args)
+        end
+      end
+      # A NamedRouteCollection instance is a collection of named routes, and also
+      # maintains an anonymous module that can be used to install helpers for the
+      # named routes.
+      class NamedRouteCollection
+        include Enumerable
+        attr_reader :routes, :helpers
+        def initialize
+          clear!
+        end
+        def clear!
+          @routes = {}
+          @helpers = []
+          @module ||= Module.new
+          @module.instance_methods.each do |selector|
+            @module.send :remove_method, selector
+          end
         end
-        NamedRoutes.install
+        def add(name, route)
+          routes[name.to_sym] = route
+          define_named_route_methods(name, route)
+        end
+        def get(name)
+          routes[name.to_sym]
+        end
+        alias []=   add
+        alias []    get
+        alias clear clear!
+        def each
+          routes.each { |name, route| yield name, route }
+          self
+        end
+        def names
+          routes.keys
+        end
+        def length
+          routes.length
+        end
+        def install(destinations = [ActionController::Base, ActionView::Base])
+          Array(destinations).each { |dest| dest.send :include, @module }
+        end
+        private
+          def url_helper_name(name, kind = :url)
+            :"#{name}_#{kind}"
+          end
+          def hash_access_name(name, kind = :url)
+            :"hash_for_#{name}_#{kind}"
+          end
+          def define_named_route_methods(name, route)
+            {:url => {:only_path => false}, :path => {:only_path => true}}.each do |kind, opts|
+              hash = route.defaults.merge(:use_route => name).merge(opts)
+              define_hash_access route, name, kind, hash
+              define_url_helper route, name, kind, hash
+            end
+          end
+          def define_hash_access(route, name, kind, options)
+            selector = hash_access_name(name, kind)
+            @module.send :module_eval, <<-end_eval # We use module_eval to avoid leaks
+              def #{selector}(options = nil)
+                options ? #{options.inspect}.merge(options) : #{options.inspect}
+              end
+            end_eval
+            @module.send(:protected, selector)
+            helpers << selector
+          end
+          def define_url_helper(route, name, kind, options)
+            selector = url_helper_name(name, kind)
+            # The segment keys used for positional paramters
+            segment_keys = route.segments.collect do |segment|
+              segment.key if segment.respond_to? :key
+            end.compact
+            hash_access_method = hash_access_name(name, kind)
+            @module.send :module_eval, <<-end_eval # We use module_eval to avoid leaks
+              def #{selector}(*args)
+                opts = if args.empty? || Hash === args.first
+                  args.first || {}
+                else
+                  # allow ordered parameters to be associated with corresponding
+                  # dynamic segments, so you can do
+                  #
+                  #   foo_url(bar, baz, bang)
+                  #
+                  # instead of
+                  #
+                  #   foo_url(:bar => bar, :baz => baz, :bang => bang)
+                  args.zip(#{segment_keys.inspect}).inject({}) do |h, (v, k)|
+                    h[k] = v
+                    h
+                  end
+                end
+                url_for(#{hash_access_method}(opts))
+              end
+            end_eval
+            @module.send(:protected, selector)
+            helpers << selector
+          end
+      end
+      attr_accessor :routes, :named_routes
+      def initialize
+        self.routes = []
+        self.named_routes = NamedRouteCollection.new
       end
-      def connect(*args)
-        new_route = Route.new(*args)
-        @routes << new_route
-        return new_route
+      # Subclasses and plugins may override this method to specify a different
+      # RouteBuilder instance, so that other route DSL's can be created.
+      def builder
+        @builder ||= RouteBuilder.new
       end
       def draw
-        old_routes = @routes
-        @routes = []
-        begin yield self
-        rescue
-          @routes = old_routes
-          raise
+        clear!
+        yield Mapper.new(self)
+        named_routes.install
+      end
+      def clear!
+        routes.clear
+        named_routes.clear
+        @combined_regexp = nil
+        @routes_by_controller = nil
+      end
+      def empty?
+        routes.empty?
+      end
+      def load!
+        Routing.use_controllers! nil # Clear the controller cache so we may discover new ones
+        clear!
+        load_routes!
+        named_routes.install
+      end
+      alias reload load!
+      def load_routes!
+        if defined?(RAILS_ROOT) && defined?(::ActionController::Routing::Routes) && self == ::ActionController::Routing::Routes
+          load File.join("#{RAILS_ROOT}/config/routes.rb")
+        else
+          add_route ":controller/:action/:id"
         end
-        write_generation
-        write_recognition
       end
-      def empty?() @routes.empty? end
-      def each(&block) @routes.each(&block) end
-      # Defines a new named route with the provided name and arguments.
-      # This method need only be used when you wish to use a name that a RouteSet instance
-      # method exists for, such as categories.
-      #
-      # For example, map.categories '/categories', :controller => 'categories' will not work
-      # due to RouteSet#categories.
-      def named_route(name, path, hash = {})
-        route = connect(path, hash)
-        NamedRoutes.name_route(route, name)
+      def add_route(path, options = {})
+        route = builder.build(path, options)
+        routes << route
         route
       end
-      def method_missing(name, *args)
-        (1..2).include?(args.length) ? named_route(name, *args) : super(name, *args)
+      def add_named_route(name, path, options = {})
+        named_routes[name] = add_route(path, options)
       end
+      def options_as_params(options)
+        # If an explicit :controller was given, always make :action explicit
+        # too, so that action expiry works as expected for things like
+        #
+        #   generate({:controller => 'content'}, {:controller => 'content', :action => 'show'})
+        #
+        # (the above is from the unit tests). In the above case, because the
+        # controller was explicitly given, but no action, the action is implied to
+        # be "index", not the recalled action of "show".
+        #
+        # great fun, eh?
-      def extra_keys(options, recall = {})
-        generate(options.dup, recall).last
+        options_as_params = options[:controller] ? { :action => "index" } : {}
+        options.each do |k, value|
+          options_as_params[k] = value.to_param
+        end
+        options_as_params
       end
-    end
-    module NamedRoutes #:nodoc:
-      Helpers = []
-      class << self
-        def clear() Helpers.clear end
-        def hash_access_name(name)
-          "hash_for_#{name}_url"
+      def build_expiry(options, recall)
+        recall.inject({}) do |expiry, (key, recalled_value)|
+          expiry[key] = (options.key?(key) && options[key] != recalled_value)
+          expiry
         end
+      end
-        def url_helper_name(name)
-          "#{name}_url"
+      # Generate the path indicated by the arguments, and return an array of
+      # the keys that were not used to generate it.
+      def extra_keys(options, recall={})
+        generate_extras(options, recall).last
+      end
+      def generate_extras(options, recall={})
+        generate(options, recall, :generate_extras)
+      end
+      def generate(options, recall = {}, method=:generate)
+        named_route_name = options.delete(:use_route)
+        if named_route_name
+          named_route = named_routes[named_route_name]
+          options = named_route.parameter_shell.merge(options)
         end
-        def known_hash_for_route(route)
-          hash = route.known.symbolize_keys
-          route.defaults.each do |key, value|
-            hash[key.to_sym] ||= value if value
-          end
-          hash[:controller] = "/#{hash[:controller]}"
-          hash
+        options = options_as_params(options)
+        expire_on = build_expiry(options, recall)
+        # if the controller has changed, make sure it changes relative to the
+        # current controller module, if any. In other words, if we're currently
+        # on admin/get, and the new controller is 'set', the new controller
+        # should really be admin/set.
+        if !named_route && expire_on[:controller] && options[:controller] && options[:controller][0] != ?/
+          old_parts = recall[:controller].split('/')
+          new_parts = options[:controller].split('/')
+          parts = old_parts[0..-(new_parts.length + 1)] + new_parts
+          options[:controller] = parts.join('/')
         end
-        def define_hash_access_method(route, name)
-          hash = known_hash_for_route(route)
-          define_method(hash_access_name(name)) do |*args|
-            args.first ? hash.merge(args.first) : hash
+        # drop the leading '/' on the controller name
+        options[:controller] = options[:controller][1..-1] if options[:controller] && options[:controller][0] == ?/
+        merged = recall.merge(options)
+        if named_route
+          path = named_route.generate(options, merged, expire_on)
+          raise RoutingError, "#{named_route_name}_url failed to generate from #{options.inspect}, expected: #{named_route.requirements.inspect}, diff: #{named_route.requirements.diff(options).inspect}" if path.nil?
+          return path
+        else
+          merged[:action] ||= 'index'
+          options[:action] ||= 'index'
+          controller = merged[:controller]
+          action = merged[:action]
+          raise RoutingError, "Need controller and action!" unless controller && action
+          # don't use the recalled keys when determining which routes to check
+          routes = routes_by_controller[controller][action][options.keys.sort_by { |x| x.object_id }]
+          routes.each do |route|
+            results = route.send(method, options, merged, expire_on)
+            return results if results && (!results.is_a?(Array) || results.first)
           end
         end
-        def name_route(route, name)
-          define_hash_access_method(route, name)
-          module_eval(%{def #{url_helper_name name}(options = {})
-            url_for(#{hash_access_name(name)}.merge(options))
-          end}, "generated/routing/named_routes/#{name}.rb")
-          protected url_helper_name(name), hash_access_name(name)
-          Helpers << url_helper_name(name).to_sym
-          Helpers << hash_access_name(name).to_sym
-          Helpers.uniq!
-        end
-        def install(cls = ActionController::Base)
-          cls.send :include, self
-          if cls.respond_to? :helper_method
-            Helpers.each do |helper_name|
-              cls.send :helper_method, helper_name
+        raise RoutingError, "No route matches #{options.inspect}"
+      end
+      def recognize(request)
+        params = recognize_path(request.path, extract_request_environment(request))
+        request.path_parameters = params.with_indifferent_access
+        "#{params[:controller].camelize}Controller".constantize
+      end
+      def recognize_path(path, environment={})
+        path = CGI.unescape(path)
+        routes.each do |route|
+          result = route.recognize(path, environment) and return result
+        end
+        raise RoutingError, "no route found to match #{path.inspect} with #{environment.inspect}"
+      end
+      def routes_by_controller
+        @routes_by_controller ||= Hash.new do |controller_hash, controller|
+          controller_hash[controller] = Hash.new do |action_hash, action|
+            action_hash[action] = Hash.new do |key_hash, keys|
+              key_hash[keys] = routes_for_controller_and_action_and_keys(controller, action, keys)
             end
           end
         end
       end
+      def routes_for(options, merged, expire_on)
+        raise "Need controller and action!" unless controller && action
+        controller = merged[:controller]
+        merged = options if expire_on[:controller]
+        action = merged[:action] || 'index'
+        routes_by_controller[controller][action][merged.keys]
+      end
+      def routes_for_controller_and_action(controller, action)
+        selected = routes.select do |route|
+          route.matches_controller_and_action? controller, action
+        end
+        (selected.length == routes.length) ? routes : selected
+      end
+      def routes_for_controller_and_action_and_keys(controller, action, keys)
+        selected = routes.select do |route|
+          route.matches_controller_and_action? controller, action
+        end
+        selected.sort_by do |route|
+          (keys - route.significant_keys).length
+        end
+      end
+      # Subclasses and plugins may override this method to extract further attributes
+      # from the request, for use by route conditions and such.
+      def extract_request_environment(request)
+        { :method => request.method }
+      end
     end
     Routes = RouteSet.new
   end
 end