diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-10-19 23:32:06 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-10-19 23:32:17 -0500 |
| commit | a1df2590744ed126981dfd5b5709ff6fd5dc6476 (patch) | |
| tree | 1c01e2ba7465f554a2470155c46c0309dfe7615f /actionpack/lib/action_controller/routing.rb | |
| parent | cbedcb06152ed6d7e7457334cd45af5ab24ef6ea (diff) | |
| download | rails-a1df2590744ed126981dfd5b5709ff6fd5dc6476.tar.gz rails-a1df2590744ed126981dfd5b5709ff6fd5dc6476.tar.bz2 rails-a1df2590744ed126981dfd5b5709ff6fd5dc6476.zip | |
Replace decaying routing internals w/ rack-mount
Diffstat (limited to 'actionpack/lib/action_controller/routing.rb')
| -rw-r--r-- | actionpack/lib/action_controller/routing.rb | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index 5b9ded83dd..979a4ad8c9 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -1,16 +1,8 @@ -require 'cgi' -require 'uri' -require 'set' - -require 'active_support/core_ext/module/aliasing' -require 'active_support/core_ext/module/attribute_accessors' -require 'action_controller/routing/optimisations' -require 'action_controller/routing/routing_ext' -require 'action_controller/routing/route' -require 'action_controller/routing/segments' -require 'action_controller/routing/builder' +require 'active_support/core_ext/object/conversions' +require 'active_support/core_ext/boolean/conversions' +require 'active_support/core_ext/nil/conversions' +require 'active_support/core_ext/regexp' require 'action_controller/routing/route_set' -require 'action_controller/routing/recognition_optimisation' module ActionController # == Routing @@ -197,7 +189,7 @@ module ActionController # # map.connect '*path' , :controller => 'blog' , :action => 'unrecognized?' # - # will glob all remaining parts of the route that were not recognized earlier. + # will glob all remaining parts of the route that were not recognized earlier. # The globbed values are in <tt>params[:path]</tt> as an array of path segments. # # == Route conditions |