RubyGems - actionpack - Versions diffs - 1.13.6 → 2.0.0 - Mend

actionpack 1.13.6 → 2.0.0

Potentially problematic release.

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

Files changed (317) hide show

data/CHANGELOG +1400 -20
data/MIT-LICENSE +1 -1
data/README +5 -5
data/RUNNING_UNIT_TESTS +4 -5
data/Rakefile +5 -6
data/install.rb +2 -2
data/lib/action_controller.rb +11 -15
data/lib/action_controller/assertions.rb +12 -25
data/lib/action_controller/assertions/dom_assertions.rb +18 -4
data/lib/action_controller/assertions/model_assertions.rb +8 -1
data/lib/action_controller/assertions/response_assertions.rb +35 -12
data/lib/action_controller/assertions/routing_assertions.rb +56 -12
data/lib/action_controller/assertions/selector_assertions.rb +105 -38
data/lib/action_controller/assertions/tag_assertions.rb +28 -15
data/lib/action_controller/base.rb +318 -250
data/lib/action_controller/benchmarking.rb +33 -29
data/lib/action_controller/caching.rb +130 -64
data/lib/action_controller/cgi_ext.rb +16 -0
data/lib/action_controller/cgi_ext/{cookie_performance_fix.rb → cookie.rb} +25 -40
data/lib/action_controller/cgi_ext/query_extension.rb +22 -0
data/lib/action_controller/cgi_ext/session.rb +73 -0
data/lib/action_controller/cgi_ext/stdinput.rb +23 -0
data/lib/action_controller/cgi_process.rb +34 -57
data/lib/action_controller/components.rb +19 -36
data/lib/action_controller/cookies.rb +10 -9
data/lib/action_controller/dispatcher.rb +195 -0
data/lib/action_controller/filters.rb +35 -34
data/lib/action_controller/flash.rb +30 -35
data/lib/action_controller/helpers.rb +121 -47
data/lib/action_controller/http_authentication.rb +126 -0
data/lib/action_controller/integration.rb +105 -101
data/lib/action_controller/layout.rb +59 -47
data/lib/action_controller/mime_responds.rb +57 -68
data/lib/action_controller/mime_type.rb +43 -80
data/lib/action_controller/mime_types.rb +20 -0
data/lib/action_controller/polymorphic_routes.rb +88 -0
data/lib/action_controller/record_identifier.rb +91 -0
data/lib/action_controller/request.rb +553 -88
data/lib/action_controller/request_forgery_protection.rb +126 -0
data/lib/action_controller/request_profiler.rb +138 -0
data/lib/action_controller/rescue.rb +185 -69
data/lib/action_controller/resources.rb +211 -172
data/lib/action_controller/response.rb +49 -8
data/lib/action_controller/routing.rb +359 -236
data/lib/action_controller/routing_optimisation.rb +119 -0
data/lib/action_controller/session/active_record_store.rb +3 -2
data/lib/action_controller/session/cookie_store.rb +161 -0
data/lib/action_controller/session/mem_cache_store.rb +9 -16
data/lib/action_controller/session_management.rb +17 -8
data/lib/action_controller/streaming.rb +6 -3
data/lib/action_controller/templates/rescues/_request_and_response.erb +24 -0
data/lib/action_controller/templates/rescues/{_trace.rhtml → _trace.erb} +0 -0
data/lib/action_controller/templates/rescues/{diagnostics.rhtml → diagnostics.erb} +2 -2
data/lib/action_controller/templates/rescues/{layout.rhtml → layout.erb} +0 -0
data/lib/action_controller/templates/rescues/{missing_template.rhtml → missing_template.erb} +0 -0
data/lib/action_controller/templates/rescues/{routing_error.rhtml → routing_error.erb} +0 -0
data/lib/action_controller/templates/rescues/{template_error.rhtml → template_error.erb} +2 -2
data/lib/action_controller/templates/rescues/{unknown_action.rhtml → unknown_action.erb} +0 -0
data/lib/action_controller/test_case.rb +53 -0
data/lib/action_controller/test_process.rb +59 -46
data/lib/action_controller/url_rewriter.rb +48 -24
data/lib/action_controller/vendor/html-scanner/html/document.rb +7 -4
data/lib/action_controller/vendor/html-scanner/html/sanitizer.rb +173 -0
data/lib/action_controller/vendor/html-scanner/html/selector.rb +11 -6
data/lib/action_controller/verification.rb +27 -21
data/lib/action_pack.rb +1 -1
data/lib/action_pack/version.rb +4 -4
data/lib/action_view.rb +2 -3
data/lib/action_view/base.rb +218 -63
data/lib/action_view/compiled_templates.rb +1 -2
data/lib/action_view/helpers/active_record_helper.rb +35 -17
data/lib/action_view/helpers/asset_tag_helper.rb +395 -87
data/lib/action_view/helpers/atom_feed_helper.rb +111 -0
data/lib/action_view/helpers/benchmark_helper.rb +12 -5
data/lib/action_view/helpers/cache_helper.rb +29 -0
data/lib/action_view/helpers/capture_helper.rb +97 -63
data/lib/action_view/helpers/date_helper.rb +295 -35
data/lib/action_view/helpers/debug_helper.rb +6 -2
data/lib/action_view/helpers/form_helper.rb +354 -111
data/lib/action_view/helpers/form_options_helper.rb +171 -109
data/lib/action_view/helpers/form_tag_helper.rb +332 -76
data/lib/action_view/helpers/javascript_helper.rb +35 -11
data/lib/action_view/helpers/javascripts/controls.js +484 -354
data/lib/action_view/helpers/javascripts/dragdrop.js +88 -58
data/lib/action_view/helpers/javascripts/effects.js +396 -364
data/lib/action_view/helpers/javascripts/prototype.js +2817 -1107
data/lib/action_view/helpers/number_helper.rb +84 -60
data/lib/action_view/helpers/prototype_helper.rb +419 -43
data/lib/action_view/helpers/record_identification_helper.rb +20 -0
data/lib/action_view/helpers/record_tag_helper.rb +59 -0
data/lib/action_view/helpers/sanitize_helper.rb +223 -0
data/lib/action_view/helpers/scriptaculous_helper.rb +63 -4
data/lib/action_view/helpers/tag_helper.rb +69 -39
data/lib/action_view/helpers/text_helper.rb +221 -148
data/lib/action_view/helpers/url_helper.rb +283 -165
data/lib/action_view/partials.rb +134 -62
data/lib/action_view/template_error.rb +4 -12
data/lib/actionpack.rb +1 -0
data/test/abstract_unit.rb +21 -1
data/test/action_view_test.rb +26 -0
data/test/active_record_unit.rb +12 -20
data/test/activerecord/active_record_store_test.rb +2 -2
data/test/activerecord/render_partial_with_record_identification_test.rb +74 -0
data/test/controller/action_pack_assertions_test.rb +21 -152
data/test/controller/addresses_render_test.rb +2 -7
data/test/controller/assert_select_test.rb +120 -14
data/test/controller/base_test.rb +11 -13
data/test/controller/caching_test.rb +125 -5
data/test/controller/capture_test.rb +23 -16
data/test/controller/cgi_test.rb +66 -391
data/test/controller/components_test.rb +31 -42
data/test/controller/content_type_test.rb +1 -1
data/test/controller/cookie_test.rb +42 -14
data/test/controller/deprecation/deprecated_base_methods_test.rb +1 -42
data/test/controller/dispatcher_test.rb +123 -0
data/test/controller/fake_models.rb +5 -0
data/test/controller/filters_test.rb +44 -7
data/test/controller/flash_test.rb +46 -2
data/test/controller/fragment_store_setting_test.rb +10 -8
data/test/controller/helper_test.rb +19 -2
data/test/controller/html-scanner/document_test.rb +124 -0
data/test/controller/html-scanner/node_test.rb +69 -0
data/test/controller/html-scanner/sanitizer_test.rb +250 -0
data/test/controller/html-scanner/tag_node_test.rb +239 -0
data/test/controller/html-scanner/text_node_test.rb +51 -0
data/test/controller/html-scanner/tokenizer_test.rb +125 -0
data/test/controller/http_authentication_test.rb +54 -0
data/test/controller/integration_test.rb +12 -26
data/test/controller/layout_test.rb +64 -12
data/test/controller/mime_responds_test.rb +193 -38
data/test/controller/mime_type_test.rb +30 -8
data/test/controller/new_render_test.rb +104 -22
data/test/controller/polymorphic_routes_test.rb +98 -0
data/test/controller/record_identifier_test.rb +103 -0
data/test/controller/redirect_test.rb +120 -18
data/test/controller/render_test.rb +195 -45
data/test/controller/request_forgery_protection_test.rb +217 -0
data/test/controller/request_test.rb +545 -27
data/test/controller/rescue_test.rb +501 -0
data/test/controller/resources_test.rb +258 -132
data/test/controller/routing_test.rb +502 -106
data/test/controller/selector_test.rb +5 -5
data/test/controller/send_file_test.rb +17 -7
data/test/controller/session/cookie_store_test.rb +246 -0
data/test/controller/session/mem_cache_store_test.rb +182 -0
data/test/controller/session_fixation_test.rb +8 -11
data/test/controller/session_management_test.rb +7 -7
data/test/controller/test_test.rb +150 -38
data/test/controller/url_rewriter_test.rb +87 -12
data/test/controller/verification_test.rb +11 -0
data/test/controller/view_paths_test.rb +137 -0
data/test/controller/webservice_test.rb +11 -75
data/test/fixtures/addresses/{list.rhtml → list.erb} +0 -0
data/test/fixtures/db_definitions/sqlite.sql +2 -1
data/test/fixtures/developer.rb +2 -0
data/test/fixtures/fun/games/{hello_world.rhtml → hello_world.erb} +0 -0
data/test/fixtures/helpers/fun/pdf_helper.rb +1 -1
data/test/fixtures/layout_tests/alt/hello.rhtml +1 -0
data/test/fixtures/layout_tests/layouts/multiple_extensions.html.erb +1 -0
data/test/fixtures/layouts/{builder.rxml → builder.builder} +0 -0
data/test/fixtures/layouts/{standard.rhtml → standard.erb} +0 -0
data/test/fixtures/layouts/{talk_from_action.rhtml → talk_from_action.erb} +0 -0
data/test/fixtures/layouts/{yield.rhtml → yield.erb} +0 -0
data/test/fixtures/multipart/binary_file +0 -0
data/test/fixtures/multipart/bracketed_param +5 -0
data/test/fixtures/override/test/hello_world.erb +1 -0
data/test/fixtures/override2/layouts/test/sub.erb +1 -0
data/test/fixtures/post_test/layouts/post.html.erb +1 -0
data/test/fixtures/post_test/layouts/super_post.iphone.erb +1 -0
data/test/fixtures/post_test/post/index.html.erb +1 -0
data/test/fixtures/post_test/post/index.iphone.erb +1 -0
data/test/fixtures/post_test/super_post/index.html.erb +1 -0
data/test/fixtures/post_test/super_post/index.iphone.erb +1 -0
data/test/fixtures/public/404.html +1 -0
data/test/fixtures/public/500.html +1 -0
data/test/fixtures/public/javascripts/application.js +0 -1
data/test/fixtures/public/javascripts/bank.js +1 -0
data/test/fixtures/public/javascripts/robber.js +1 -0
data/test/fixtures/public/stylesheets/bank.css +1 -0
data/test/fixtures/public/stylesheets/robber.css +1 -0
data/test/fixtures/replies.yml +2 -0
data/test/fixtures/reply.rb +2 -1
data/test/fixtures/respond_to/{all_types_with_layout.rhtml → all_types_with_layout.html.erb} +0 -0
data/test/fixtures/respond_to/{all_types_with_layout.rjs → all_types_with_layout.js.rjs} +0 -0
data/test/fixtures/respond_to/custom_constant_handling_without_block.mobile.erb +1 -0
data/test/fixtures/respond_to/iphone_with_html_response_type.html.erb +1 -0
data/test/fixtures/respond_to/iphone_with_html_response_type.iphone.erb +1 -0
data/test/fixtures/respond_to/layouts/missing.html.erb +1 -0
data/test/fixtures/respond_to/layouts/standard.html.erb +1 -0
data/test/fixtures/respond_to/layouts/standard.iphone.erb +1 -0
data/test/fixtures/respond_to/{using_defaults.rhtml → using_defaults.html.erb} +0 -0
data/test/fixtures/respond_to/{using_defaults.rjs → using_defaults.js.rjs} +0 -0
data/test/fixtures/respond_to/{using_defaults.rxml → using_defaults.xml.builder} +0 -0
data/test/fixtures/respond_to/{using_defaults_with_type_list.rhtml → using_defaults_with_type_list.html.erb} +0 -0
data/test/fixtures/respond_to/{using_defaults_with_type_list.rjs → using_defaults_with_type_list.js.rjs} +0 -0
data/test/fixtures/respond_to/{using_defaults_with_type_list.rxml → using_defaults_with_type_list.xml.builder} +0 -0
data/test/fixtures/scope/test/{modgreet.rhtml → modgreet.erb} +0 -0
data/test/fixtures/test/{_customer.rhtml → _customer.erb} +0 -0
data/test/fixtures/test/{_customer_greeting.rhtml → _customer_greeting.erb} +0 -0
data/test/fixtures/test/_hash_greeting.erb +1 -0
data/test/fixtures/test/_hash_object.erb +2 -0
data/test/fixtures/test/{_hello.rxml → _hello.builder} +0 -0
data/test/fixtures/test/_layout_for_partial.html.erb +3 -0
data/test/fixtures/test/_partial.erb +1 -0
data/test/fixtures/test/_partial.html.erb +1 -0
data/test/fixtures/test/_partial.js.erb +1 -0
data/test/fixtures/test/_partial_for_use_in_layout.html.erb +1 -0
data/test/fixtures/test/{_partial_only.rhtml → _partial_only.erb} +0 -0
data/test/fixtures/test/{_person.rhtml → _person.erb} +0 -0
data/test/fixtures/test/{action_talk_to_layout.rhtml → action_talk_to_layout.erb} +0 -0
data/test/fixtures/test/{block_content_for.rhtml → block_content_for.erb} +0 -0
data/test/fixtures/test/calling_partial_with_layout.html.erb +1 -0
data/test/fixtures/test/{capturing.rhtml → capturing.erb} +0 -0
data/test/fixtures/test/{content_for.rhtml → content_for.erb} +0 -0
data/test/fixtures/test/content_for_concatenated.erb +3 -0
data/test/fixtures/test/content_for_with_parameter.erb +2 -0
data/test/fixtures/test/dot.directory/{render_file_with_ivar.rhtml → render_file_with_ivar.erb} +0 -0
data/test/fixtures/test/{erb_content_for.rhtml → erb_content_for.erb} +0 -0
data/test/fixtures/test/formatted_html_erb.html.erb +1 -0
data/test/fixtures/test/formatted_xml_erb.builder +1 -0
data/test/fixtures/test/formatted_xml_erb.html.erb +1 -0
data/test/fixtures/test/formatted_xml_erb.xml.erb +1 -0
data/test/fixtures/test/{greeting.rhtml → greeting.erb} +0 -0
data/test/fixtures/test/{hello.rxml → hello.builder} +0 -0
data/test/fixtures/test/{hello_world.rxml → hello_world.builder} +0 -0
data/test/fixtures/test/{hello_world.rhtml → hello_world.erb} +0 -0
data/test/fixtures/test/{hello_world_container.rxml → hello_world_container.builder} +0 -0
data/test/fixtures/test/{hello_world_with_layout_false.rhtml → hello_world_with_layout_false.erb} +0 -0
data/test/fixtures/test/{hello_xml_world.rxml → hello_xml_world.builder} +0 -0
data/test/fixtures/test/list.erb +1 -0
data/test/fixtures/test/{non_erb_block_content_for.rxml → non_erb_block_content_for.builder} +0 -0
data/test/fixtures/test/{potential_conflicts.rhtml → potential_conflicts.erb} +0 -0
data/test/fixtures/test/{render_file_with_ivar.rhtml → render_file_with_ivar.erb} +0 -0
data/test/fixtures/test/{render_file_with_locals.rhtml → render_file_with_locals.erb} +0 -0
data/test/fixtures/test/{render_to_string_test.rhtml → render_to_string_test.erb} +0 -0
data/test/fixtures/test/{update_element_with_capture.rhtml → update_element_with_capture.erb} +0 -0
data/test/fixtures/test/using_layout_around_block.html.erb +1 -0
data/test/fixtures/topic.rb +1 -1
data/test/template/active_record_helper_test.rb +67 -20
data/test/template/asset_tag_helper_test.rb +222 -54
data/test/template/atom_feed_helper_test.rb +101 -0
data/test/template/benchmark_helper_test.rb +2 -2
data/test/template/compiled_templates_test.rb +76 -32
data/test/template/date_helper_test.rb +125 -9
data/test/template/form_helper_test.rb +326 -33
data/test/template/form_options_helper_test.rb +822 -15
data/test/template/form_tag_helper_test.rb +96 -30
data/test/template/javascript_helper_test.rb +61 -13
data/test/template/number_helper_test.rb +12 -11
data/test/template/prototype_helper_test.rb +185 -24
data/test/template/sanitize_helper_test.rb +49 -0
data/test/template/scriptaculous_helper_test.rb +9 -3
data/test/template/tag_helper_test.rb +13 -2
data/test/template/text_helper_test.rb +38 -52
data/test/template/url_helper_test.rb +216 -46
metadata +144 -116
data/examples/.htaccess +0 -24
data/examples/address_book/index.rhtml +0 -33
data/examples/address_book/layout.rhtml +0 -8
data/examples/address_book_controller.cgi +0 -9
data/examples/address_book_controller.fcgi +0 -6
data/examples/address_book_controller.rb +0 -52
data/examples/address_book_controller.rbx +0 -4
data/examples/benchmark.rb +0 -52
data/examples/benchmark_with_ar.fcgi +0 -89
data/examples/blog_controller.cgi +0 -53
data/examples/debate/index.rhtml +0 -14
data/examples/debate/new_topic.rhtml +0 -22
data/examples/debate/topic.rhtml +0 -32
data/examples/debate_controller.cgi +0 -57
data/lib/action_controller/assertions/deprecated_assertions.rb +0 -228
data/lib/action_controller/cgi_ext/cgi_ext.rb +0 -36
data/lib/action_controller/cgi_ext/cgi_methods.rb +0 -211
data/lib/action_controller/cgi_ext/pstore_performance_fix.rb +0 -30
data/lib/action_controller/cgi_ext/raw_post_data_fix.rb +0 -95
data/lib/action_controller/cgi_ext/session_performance_fix.rb +0 -30
data/lib/action_controller/deprecated_dependencies.rb +0 -65
data/lib/action_controller/deprecated_redirects.rb +0 -17
data/lib/action_controller/deprecated_request_methods.rb +0 -34
data/lib/action_controller/macros/auto_complete.rb +0 -53
data/lib/action_controller/macros/in_place_editing.rb +0 -33
data/lib/action_controller/pagination.rb +0 -408
data/lib/action_controller/scaffolding.rb +0 -189
data/lib/action_controller/templates/rescues/_request_and_response.rhtml +0 -44
data/lib/action_controller/templates/scaffolds/edit.rhtml +0 -7
data/lib/action_controller/templates/scaffolds/layout.rhtml +0 -69
data/lib/action_controller/templates/scaffolds/list.rhtml +0 -27
data/lib/action_controller/templates/scaffolds/new.rhtml +0 -6
data/lib/action_controller/templates/scaffolds/show.rhtml +0 -9
data/lib/action_controller/vendor/xml_node.rb +0 -97
data/lib/action_view/helpers/deprecated_helper.rb +0 -37
data/lib/action_view/helpers/java_script_macros_helper.rb +0 -233
data/lib/action_view/helpers/pagination_helper.rb +0 -86
data/test/activerecord/active_record_assertions_test.rb +0 -92
data/test/activerecord/pagination_test.rb +0 -165
data/test/controller/deprecated_instance_variables_test.rb +0 -48
data/test/controller/raw_post_test.rb +0 -68
data/test/fixtures/deprecated_instance_variables/_cookies_ivar.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_cookies_method.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_flash_ivar.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_flash_method.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_headers_ivar.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_headers_method.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_params_ivar.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_params_method.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_request_ivar.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_request_method.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_response_ivar.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_response_method.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_session_ivar.rhtml +0 -1
data/test/fixtures/deprecated_instance_variables/_session_method.rhtml +0 -1
data/test/fixtures/respond_to/layouts/standard.rhtml +0 -1
data/test/fixtures/test/_hash_object.rhtml +0 -1
data/test/fixtures/test/list.rhtml +0 -1
data/test/template/deprecated_helper_test.rb +0 -36
data/test/template/deprecated_instance_variables_test.rb +0 -43
data/test/template/java_script_macros_helper_test.rb +0 -109

data/lib/action_controller/response.rb CHANGED

@@ -1,6 +1,9 @@
+require 'digest/md5'
 module ActionController
   class AbstractResponse #:nodoc:
     DEFAULT_HEADERS = { "Cache-Control" => "no-cache" }
+    attr_accessor :request
     attr_accessor :body, :headers, :session, :cookies, :assigns, :template, :redirected_to, :redirected_to_method_params, :layout
     def initialize
@@ -8,28 +11,66 @@ module ActionController
     end
     def content_type=(mime_type)
-      @headers["Content-Type"] = charset ? "#{mime_type}; charset=#{charset}" : mime_type
+      self.headers["Content-Type"] = charset ? "#{mime_type}; charset=#{charset}" : mime_type
     end
     def content_type
-      content_type = String(@headers["Content-Type"]).split(";")[0]
+      content_type = String(headers["Content-Type"] || headers["type"]).split(";")[0]
       content_type.blank? ? nil : content_type
     end
     def charset=(encoding)
-      @headers["Content-Type"] = "#{content_type || "text/html"}; charset=#{encoding}"
+      self.headers["Content-Type"] = "#{content_type || Mime::HTML}; charset=#{encoding}"
     end
     def charset
-      charset = String(@headers["Content-Type"]).split(";")[1]
+      charset = String(headers["Content-Type"] || headers["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
+    def redirect(to_url, response_status)
+      self.headers["Status"] = response_status
+      self.headers["Location"] = to_url
+      self.body = "<html><body>You are being <a href=\"#{to_url}\">redirected</a>.</body></html>"
+    end
-      @body = "<html><body>You are being <a href=\"#{to_url}\">redirected</a>.</body></html>"
+    def prepare!
+      handle_conditional_get!
+      convert_content_type!
+      set_content_length!
     end
+    private
+      def handle_conditional_get!
+        if body.is_a?(String) && (headers['Status'] ? headers['Status'][0..2] == '200' : true)  && !body.empty?
+          self.headers['ETag'] ||= %("#{Digest::MD5.hexdigest(body)}")
+          self.headers['Cache-Control'] = 'private, max-age=0, must-revalidate' if headers['Cache-Control'] == DEFAULT_HEADERS['Cache-Control']
+          if request.headers['HTTP_IF_NONE_MATCH'] == headers['ETag']
+            self.headers['Status'] = '304 Not Modified'
+            self.body = ''
+          end
+        end
+      end
+      def convert_content_type!
+        if content_type = headers.delete("Content-Type")
+          self.headers["type"] = content_type
+        end
+        if content_type = headers.delete("Content-type")
+          self.headers["type"] = content_type
+        end
+        if content_type = headers.delete("content-type")
+          self.headers["type"] = content_type
+        end
+      end
+      # Don't set the Content-Length for block-based bodies as that would mean reading it all into memory. Not nice
+      # for, say, a 2GB streaming file.
+      def set_content_length!
+        self.headers["Content-Length"] = body.size unless body.respond_to?(:call)
+      end
   end
 end

data/lib/action_controller/routing.rb CHANGED

@@ -1,4 +1,7 @@
 require 'cgi'
+require 'uri'
+require 'action_controller/polymorphic_routes'
+require 'action_controller/routing_optimisation'
 class Object
   def to_param
@@ -28,7 +31,7 @@ class Regexp #:nodoc:
   def number_of_captures
     Regexp.new("|#{source}").match('').captures.length
   end
   class << self
     def optionalize(pattern)
       case unoptionalize(pattern)
@@ -36,7 +39,7 @@ class Regexp #:nodoc:
         else "(?:#{pattern})?"
       end
     end
     def unoptionalize(pattern)
       [/\A\(\?:(.*)\)\?\Z/, /\A(.|\(.*\))\?\Z/].each do |regexp|
         return $1 if regexp =~ pattern
@@ -47,30 +50,30 @@ class Regexp #:nodoc:
 end
 module ActionController
-  # == Routing
+  # == 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.
+  # 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
+  # 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
+  # This route states that it expects requests to consist of a
+  # :controller followed by an :action that in turn is fed some :id.
   #
-  # Suppose you get an incoming request for <tt>/blog/edit/22</tt>, you'll end up
+  # Suppose you get an incoming request for <tt>/blog/edit/22</tt>, you'll end up
   # with:
   #
   #   params = { :controller => 'blog',
-  #              :action     => 'edit'
+  #              :action     => 'edit',
   #              :id         => '22'
   #           }
   #
-  # Think of creating routes as drawing a map for your requests. The map tells
+  # 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|
@@ -83,45 +86,45 @@ module ActionController
   #
   #   :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
+  # 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.
+  # and 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.
+  # Within blocks, the empty pattern is at the highest priority.
   # In practice this works out nicely:
   #
-  #  ActionController::Routing::Routes.draw do |map|
+  #  ActionController::Routing::Routes.draw do |map|
   #    map.with_options :controller => 'blog' do |blog|
-  #      blog.show    '',  :action => 'list'
+  #      blog.show '',  :action => 'list'
   #    end
-  #    map.connect ':controller/:action/:view
+  #    map.connect ':controller/:action/:view'
   #  end
   #
-  # In this case, invoking blog controller (with an URL like '/blog/')
+  # 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.
+  # Setting a default route is straightforward in Rails - you simply append a
+  # Hash at the end of your mapping to set any 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 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' }
+  #
+  #   map.connect ':controller/:action/:id', :action => 'show', :defaults => { :page => 'Dashboard' }
   #
   # == Named routes
   #
@@ -140,7 +143,7 @@ module ActionController
   #
   #   redirect_to show_item_path(:id => 25)
   #
-  # Use <tt>map.root</tt> as a shorthand to name a route for the root path ""
+  # Use <tt>map.root</tt> as a shorthand to name a route for the root path "".
   #
   #   # In routes.rb
   #   map.root :controller => 'blogs'
@@ -163,73 +166,93 @@ module ActionController
   #   end
   #
   #   # provides named routes for show, delete, and edit
-  #   link_to @article.title, show_path(:id => @article.id)
+  #   link_to @article.title, show_path(:id => @article.id)
   #
   # == Pretty URLs
   #
   # Routes can generate pretty URLs. For example:
   #
   #  map.connect 'articles/:year/:month/:day',
-  #              :controller => 'articles',
+  #              :controller => 'articles',
   #              :action     => 'find_by_date',
   #              :year       => /\d{4}/,
-  #              :month => /\d{1,2}/,
-  #              :day   => /\d{1,2}/
-  #
+  #              :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.
+  # You can specify a regular expression to define a format for a parameter.
   #
   #  map.geocode 'geocode/:postalcode', :controller => 'geocode',
   #              :action => 'show', :postalcode => /\d{5}(-\d{4})?/
   #
-  # or  more formally:
+  # or, more formally:
   #
-  #   map.geocode 'geocode/:postalcode', :controller => 'geocode',
-  #                      :action => 'show',
-  #                      :requirements { :postalcode => /\d{5}(-\d{4})?/ }
+  #   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 :
+  # 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.
+  # 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.
+  #
+  # == Route conditions
+  #
+  # With conditions you can define restrictions on routes. Currently the only valid condition is <tt>:method</tt>.
+  #
+  # * <tt>:method</tt> - Allows you to specify which method can access the route. Possible values are <tt>:post</tt>,
+  #   <tt>:get</tt>, <tt>:put</tt>, <tt>:delete</tt> and <tt>:any</tt>. The default value is <tt>:any</tt>,
+  #   <tt>:any</tt> means that any method can access the route.
+  #
+  # Example:
+  #
+  #   map.connect 'post/:id', :controller => 'posts', :action => 'show',
+  #               :conditions => { :method => :get }
+  #   map.connect 'post/:id', :controller => 'posts', :action => 'create_comment',
+  #               :conditions => { :method => :post }
   #
+  # Now, if you POST to <tt>/posts/:id</tt>, it will route to the <tt>create_comment</tt> action. A GET on the same
+  # URL will route to the <tt>show</tt> action.
+  #
   # == Reloading routes
   #
   # You can reload routes if you feel you must:
   #
-  #  Action::Controller::Routes.reload
+  #  ActionController::Routing::Routes.reload
   #
-  # This will clear all named routes and reload routes.rb
+  # This will clear all named routes and reload routes.rb if the file has been modified from
+  # last load. To absolutely force reloading, use +reload!+.
   #
   # == 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"
+  #   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
+  # a URL fits options while +assert_recognizes+ tests that a URL
   # breaks into parameters properly.
   #
   # In tests you can simply pass the URL or named route to +get+ or +post+.
@@ -246,12 +269,21 @@ module ActionController
   #  end
   #
   module Routing
-    SEPARATORS = %w( / ; . , ? )
+    SEPARATORS = %w( / . ? )
+    HTTP_METHODS = [:get, :head, :post, :put, :delete]
+    ALLOWED_REQUIREMENTS_FOR_OPTIMISATION = [:controller, :action].to_set
     # The root paths which may contain controller files
     mattr_accessor :controller_paths
     self.controller_paths = []
+    # A helper module to hold URL related helpers.
+    module Helpers
+      include PolymorphicRoutes
+    end
     class << self
       def with_controllers(names)
         prior_controllers = @possible_controllers
@@ -282,16 +314,16 @@ module ActionController
       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
@@ -312,24 +344,37 @@ module ActionController
         elsif controller[0] == ?/    then controller[1..-1]
         elsif %r{^(.*)/} =~ previous then "#{$1}/#{controller}"
         else controller
-        end
-      end
+        end
+      end
     end
     class Route #:nodoc:
-      attr_accessor :segments, :requirements, :conditions
+      attr_accessor :segments, :requirements, :conditions, :optimise
       def initialize
         @segments = []
         @requirements = {}
         @conditions = {}
+        @optimise = true
       end
+      # Indicates whether the routes should be optimised with the string interpolation
+      # version of the named routes methods.
+      def optimise?
+        @optimise && ActionController::Base::optimise_named_routes
+      end
+      def segment_keys
+        segments.collect do |segment|
+          segment.key if segment.respond_to? :key
+        end.compact
+      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 = {}"
@@ -351,7 +396,7 @@ module ActionController
         instance_eval method_decl, "generated code (#{__FILE__}:#{__LINE__})"
         raw_method
       end
       # 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
@@ -359,7 +404,7 @@ module ActionController
           segment.extraction_code
         end.compact * "\n"
       end
       # Produce a condition expression that will check the requirements of this route
       # upon generation.
       def generation_requirements
@@ -373,16 +418,17 @@ module ActionController
         end
         requirement_conditions * ' && ' unless requirement_conditions.empty?
       end
       def generation_structure
         segments.last.string_structure segments[0..-2]
       end
       # 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__})"
@@ -406,18 +452,18 @@ module ActionController
         end
         wrap ? ("\\A" + pattern + "\\Z") : pattern
       end
       # 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
+          x = segment.match_extraction(next_capture)
           next_capture += Regexp.new(segment.regexp_chunk).number_of_captures
           x
         end
         extraction.compact
       end
       # Write the real generation implementation and then resend the message.
       def generate(options, hash, expire_on = {})
         write_generation
@@ -453,12 +499,13 @@ module ActionController
       # values.
       def build_query_string(hash, only_keys = nil)
         elements = []
         (only_keys || hash.keys).each do |key|
           if value = hash[key]
             elements << value.to_query(key)
           end
         end
         elements.empty? ? '' : "?#{elements.sort * '&'}"
       end
@@ -467,14 +514,14 @@ module ActionController
         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|
@@ -482,7 +529,7 @@ module ActionController
           end
         end
       end
       # 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.
@@ -508,9 +555,9 @@ module ActionController
           end
         end
       end
       def matches_controller_and_action?(controller, action)
-        unless @matching_prepared
+        unless defined? @matching_prepared
           @controller_requirement = requirement_for(:controller)
           @action_requirement = requirement_for(:action)
           @matching_prepared = true
@@ -526,7 +573,7 @@ module ActionController
           "%-6s %-40s %s" % [(conditions[:method] || :any).to_s.upcase, segs, requirements.inspect]
         end
       end
     protected
       def requirement_for(key)
         return requirements[key] if requirements.key? key
@@ -535,10 +582,13 @@ module ActionController
         end
         nil
       end
     end
     class Segment #:nodoc:
+      RESERVED_PCHAR = ':@&=+$,;'
+      UNSAFE_PCHAR = Regexp.new("[^#{URI::REGEXP::PATTERN::UNRESERVED}#{RESERVED_PCHAR}]", false, 'N').freeze
       attr_accessor :is_optional
       alias_method :optional?, :is_optional
@@ -549,7 +599,7 @@ module ActionController
       def extraction_code
         nil
       end
       # Continue generating string for the prior segments.
       def continue_string_structure(prior_segments)
         if prior_segments.empty?
@@ -559,33 +609,37 @@ module ActionController
           prior_segments.last.string_structure(new_priors)
         end
       end
+      def interpolation_chunk
+        URI.escape(value, UNSAFE_PCHAR)
+      end
       # 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
       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?
@@ -596,21 +650,21 @@ module ActionController
     class StaticSegment < Segment #:nodoc:
       attr_accessor :value, :raw
       alias_method :raw?, :raw
       def initialize(value = nil)
         super()
         self.value = value
       end
       def interpolation_chunk
-        raw? ? value : CGI.escape(value)
+        raw? ? value : super
       end
       def regexp_chunk
-        chunk = Regexp.escape value
+        chunk = Regexp.escape(value)
         optional? ? Regexp.optionalize(chunk) : chunk
       end
       def build_pattern(pattern)
         escaped = Regexp.escape(value)
         if optional? && ! pattern.empty?
@@ -621,7 +675,7 @@ module ActionController
           escaped + pattern
         end
       end
       def to_s
         value
       end
@@ -633,7 +687,7 @@ module ActionController
         self.raw = true
         self.is_optional = true
       end
       def optionality_implied?
         true
       end
@@ -641,23 +695,23 @@ module ActionController
     class DynamicSegment < Segment #:nodoc:
       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
       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}] && hash[:#{key}].to_param #{"|| #{default.inspect}" if default}"
       end
@@ -675,39 +729,39 @@ module ActionController
       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)}"
+      def interpolation_chunk(value_code = "#{local_name}")
+        "\#{URI.escape(#{value_code}.to_s, ActionController::Routing::Segment::UNSAFE_PCHAR)}"
       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) +
+          "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
@@ -715,16 +769,23 @@ module ActionController
         optional? ? Regexp.optionalize(pattern) : pattern
       end
       def match_extraction(next_capture)
-        hangon = (default ? "|| #{default.inspect}" : "if match[#{next_capture}]")
-        # All non code-related keys (such as :id, :slug) have to be unescaped as other CGI params
-        "params[:#{key}] = match[#{next_capture}] #{hangon}"
+        # All non code-related keys (such as :id, :slug) are URI-unescaped as
+        # path parameters.
+        default_value = default ? default.inspect : nil
+        %[
+          value = if (m = match[#{next_capture}])
+            URI.unescape(m)
+          else
+            #{default_value}
+          end
+          params[:#{key}] = value if value
+        ]
       end
       def optionality_implied?
         [:action, :id].include? key
       end
     end
     class ControllerSegment < DynamicSegment #:nodoc:
@@ -733,10 +794,9 @@ module ActionController
         "(?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}"
+      # Don't URI.escape the controller name since it may contain slashes.
+      def interpolation_chunk(value_code = "#{local_name}")
+        "\#{#{value_code}.to_s}"
       end
       # Make sure controller names like Admin/Content are correctly normalized to
@@ -755,9 +815,11 @@ module ActionController
     end
     class PathSegment < DynamicSegment #:nodoc:
-      EscapedSlash = CGI.escape("/")
-      def interpolation_chunk
-        "\#{CGI.escape(#{local_name}.to_s).gsub(#{EscapedSlash.inspect}, '/')}"
+      RESERVED_PCHAR = "#{Segment::RESERVED_PCHAR}/"
+      UNSAFE_PCHAR = Regexp.new("[^#{URI::REGEXP::PATTERN::UNRESERVED}#{RESERVED_PCHAR}]", false, 'N').freeze
+      def interpolation_chunk(value_code = "#{local_name}")
+        "\#{URI.escape(#{value_code}.to_s, ActionController::Routing::PathSegment::UNSAFE_PCHAR)}"
       end
       def default
@@ -776,30 +838,34 @@ module ActionController
         regexp || "(.*)"
       end
+      def optionality_implied?
+        true
+      end
       class Result < ::Array #:nodoc:
-        def to_s() join '/' end
+        def to_s() join '/' end
         def self.new_escaped(strings)
-          new strings.collect {|str| CGI.unescape str}
-        end
-      end
+          new strings.collect {|str| URI.unescape str}
+        end
+      end
     end
     class RouteBuilder #:nodoc:
       attr_accessor :separators, :optional_separators
       def initialize
         self.separators = Routing::SEPARATORS
         self.optional_separators = %w( / )
       end
       def separator_pattern(inverted = false)
         "[#{'^' if inverted}#{Regexp.escape(separators.join)}]"
       end
       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
@@ -808,7 +874,7 @@ module ActionController
       # #assign_route_options is called, as well.
       def segments_for_route_path(path)
         rest, segments = path, []
         until rest.empty?
           segment, rest = segment_for rest
           segments << segment
@@ -839,12 +905,20 @@ module ActionController
         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
+        if options[:namespace]
+          options[:controller] = "#{options[:path_prefix]}/#{options[:controller]}"
+          options.delete(:path_prefix)
+          options.delete(:name_prefix)
+          options.delete(:namespace)
+        end
         requirements = (options.delete(:requirements) || {}).dup
         defaults     = (options.delete(:defaults)     || {}).dup
         conditions   = (options.delete(:conditions)   || {}).dup
@@ -854,20 +928,20 @@ module ActionController
           hash = (path_keys.include?(key) && ! value.is_a?(Regexp)) ? defaults : requirements
           hash[key] = value
         end
         [defaults, requirements, conditions]
       end
       # 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
@@ -880,19 +954,19 @@ module ActionController
             route_requirements[key] = requirement
           end
         end
         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
         assign_default_route_options(segments)
         ensure_required_segments(segments)
         route_requirements
       end
       # 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.
@@ -912,7 +986,7 @@ module ActionController
           end
         end
       end
       # 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.
@@ -925,24 +999,27 @@ module ActionController
               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
+          elsif allow_optional && segment.respond_to?(:default) && segment.default
             # if a segment has a default, then it is optional
             segment.is_optional = true
           end
         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] == ?/
+        path = "/#{options[:path_prefix].to_s.gsub(/^\//,'')}#{path}" if options[:path_prefix]
         segments = segments_for_route_path(path)
         defaults, requirements, conditions = divide_route_options(segments, options)
         requirements = assign_route_options(segments, defaults, requirements)
         route = Route.new
         route.segments = segments
         route.requirements = requirements
         route.conditions = conditions
@@ -952,6 +1029,13 @@ module ActionController
           route.significant_keys << :action
         end
+        # Routes cannot use the current string interpolation method
+        # if there are user-supplied :requirements as the interpolation
+        # code won't raise RoutingErrors when generating
+        if options.key?(:requirements) || route.requirements.keys.to_set != Routing::ALLOWED_REQUIREMENTS_FOR_OPTIMISATION
+          route.optimise = false
+        end
         if !route.significant_keys.include?(:controller)
           raise ArgumentError, "Illegal route: the :controller must be specified!"
         end
@@ -963,35 +1047,48 @@ module ActionController
     class RouteSet #:nodoc:
       # 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 #:nodoc:
         def initialize(set)
           @set = set
         end
-        # Create an unnamed route with the provided +path+ and +options+. See
+        # 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
+        # Creates a named route called "root" for matching the root level request.
+        def root(options = {})
+          named_route("root", '', options)
+        end
         def named_route(name, path, options = {})
           @set.add_named_route(name, path, options)
         end
-        def deprecated_named_route(name, deprecated_name, options = {})
-          @set.add_deprecated_named_route(name, deprecated_name)
-        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)
+        # Enables the use of resources in a module by setting the name_prefix, path_prefix, and namespace for the model.
+        # Example:
+        #
+        #   map.namespace(:admin) do |admin|
+        #     admin.resources :products,
+        #       :has_many => [ :tags, :images, :variants ]
+        #   end
+        #
+        # This will create admin_products_url pointing to "admin/products", which will look for an Admin::ProductsController.
+        # It'll also create admin_product_tags_url pointing to "admin/products/#{product_id}/tags", which will look for
+        # Admin::TagsController.
+        def namespace(name, options = {}, &block)
+          if options[:namespace]
+            with_options({:path_prefix => "#{options.delete(:path_prefix)}/#{name}", :name_prefix => "#{options.delete(:name_prefix)}#{name}_", :namespace => "#{options.delete(:namespace)}#{name}/" }.merge(options), &block)
+          else
+            with_options({:path_prefix => name, :name_prefix => "#{name}_", :namespace => "#{name}/" }.merge(options), &block)
+          end
         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?
@@ -1004,7 +1101,7 @@ module ActionController
       # named routes.
       class NamedRouteCollection #:nodoc:
         include Enumerable
+        include ActionController::Routing::Optimisation
         attr_reader :routes, :helpers
         def initialize
@@ -1017,7 +1114,7 @@ module ActionController
           @module ||= Module.new
           @module.instance_methods.each do |selector|
-            @module.send :remove_method, selector
+            @module.class_eval { remove_method selector }
           end
         end
@@ -1047,40 +1144,19 @@ module ActionController
           routes.length
         end
-        def install(destinations = [ActionController::Base, ActionView::Base])
-          Array(destinations).each { |dest| dest.send :include, @module }
+        def reset!
+          old_routes = routes.dup
+          clear!
+          old_routes.each do |name, route|
+            add(name, route)
+          end
         end
-        def define_deprecated_named_route_methods(name, deprecated_name)
-          [:url, :path].each do |kind|
-            @module.send :module_eval, <<-end_eval # We use module_eval to avoid leaks
-              def #{url_helper_name(deprecated_name, kind)}(*args)
-                ActiveSupport::Deprecation.warn(
-                  'The named route "#{url_helper_name(deprecated_name, kind)}" uses a format that has been deprecated. ' +
-                  'You should use "#{url_helper_name(name, kind)}" instead.', caller
-                )
-                send :#{url_helper_name(name, kind)}, *args
-              end
-              def #{hash_access_name(deprecated_name, kind)}(*args)
-                ActiveSupport::Deprecation.warn(
-                  'The named route "#{hash_access_name(deprecated_name, kind)}" uses a format that has been deprecated. ' +
-                  'You should use "#{hash_access_name(name, kind)}" instead.', caller
-                )
-                send :#{hash_access_name(name, kind)}, *args
-              end
-            end_eval
+        def install(destinations = [ActionController::Base, ActionView::Base], regenerate = false)
+          reset! if regenerate
+          Array(destinations).each do |dest|
+            dest.send! :include, @module
           end
         end
         private
@@ -1099,57 +1175,62 @@ module ActionController
               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
+            @module.module_eval <<-end_eval # We use module_eval to avoid leaks
               def #{selector}(options = nil)
                 options ? #{options.inspect}.merge(options) : #{options.inspect}
               end
+              protected :#{selector}
             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
+            # 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)
+            #
+            # Also allow options hash, so you can do
+            #
+            #   foo_url(bar, baz, bang, :sort_by => 'baz')
+            #
+            @module.module_eval <<-end_eval # We use module_eval to avoid leaks
               def #{selector}(*args)
+                #{generate_optimisation_block(route, kind)}
                 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)|
+                  options = args.last.is_a?(Hash) ? args.pop : {}
+                  args = args.zip(#{route.segment_keys.inspect}).inject({}) do |h, (v, k)|
                     h[k] = v
                     h
                   end
+                  options.merge(args)
                 end
                 url_for(#{hash_access_method}(opts))
               end
+              protected :#{selector}
             end_eval
-            @module.send(:protected, selector)
             helpers << selector
           end
       end
       attr_accessor :routes, :named_routes
       def initialize
         self.routes = []
         self.named_routes = NamedRouteCollection.new
@@ -1164,9 +1245,9 @@ module ActionController
       def draw
         clear!
         yield Mapper.new(self)
-        named_routes.install
+        install_helpers
       end
       def clear!
         routes.clear
         named_routes.clear
@@ -1174,41 +1255,57 @@ module ActionController
         @routes_by_controller = nil
       end
+      def install_helpers(destinations = [ActionController::Base, ActionView::Base], regenerate_code = false)
+        Array(destinations).each { |d| d.module_eval { include Helpers } }
+        named_routes.install(destinations, regenerate_code)
+      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
+        install_helpers
       end
-      alias reload load!
+      # reload! will always force a reload whereas load checks the timestamp first
+      alias reload! load!
+      def reload
+        if @routes_last_modified && defined?(RAILS_ROOT)
+          mtime = File.stat("#{RAILS_ROOT}/config/routes.rb").mtime
+          # if it hasn't been changed, then just return
+          return if mtime == @routes_last_modified
+          # if it has changed then record the new time and fall to the load! below
+          @routes_last_modified = mtime
+        end
+        load!
+      end
       def load_routes!
         if defined?(RAILS_ROOT) && defined?(::ActionController::Routing::Routes) && self == ::ActionController::Routing::Routes
           load File.join("#{RAILS_ROOT}/config/routes.rb")
+          @routes_last_modified = File.stat("#{RAILS_ROOT}/config/routes.rb").mtime
         else
           add_route ":controller/:action/:id"
         end
       end
       def add_route(path, options = {})
         route = builder.build(path, options)
         routes << route
         route
       end
       def add_named_route(name, path, options = {})
-        named_routes[name] = add_route(path, options)
-      end
-      def add_deprecated_named_route(name, deprecated_name)
-        named_routes.define_deprecated_named_route_methods(name, deprecated_name)
+        # TODO - is options EVER used?
+        name = options[:name_prefix] + name.to_s if options[:name_prefix]
+        named_routes[name.to_sym] = 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
@@ -1226,10 +1323,10 @@ module ActionController
         options_as_params[:action] = options_as_params[:action].to_s if options_as_params[:action]
         options_as_params
       end
       def build_expiry(options, recall)
         recall.inject({}) do |expiry, (key, recalled_value)|
-          expiry[key] = (options.key?(key) && options[key] != recalled_value)
+          expiry[key] = (options.key?(key) && options[key].to_param != recalled_value.to_param)
           expiry
         end
       end
@@ -1246,6 +1343,7 @@ module ActionController
       def generate(options, recall = {}, method=:generate)
         named_route_name = options.delete(:use_route)
+        generate_all = options.delete(:generate_all)
         if named_route_name
           named_route = named_routes[named_route_name]
           options = named_route.parameter_shell.merge(options)
@@ -1274,7 +1372,7 @@ module ActionController
         if named_route
           path = named_route.generate(options, merged, expire_on)
-          if path.nil?
+          if path.nil?
             raise_named_route_error(options, named_route, named_route_name)
           else
             return path
@@ -1282,23 +1380,31 @@ module ActionController
         else
           merged[:action] ||= 'index'
           options[:action] ||= 'index'
           controller = merged[:controller]
           action = merged[:action]
           raise RoutingError, "Need controller and action!" unless controller && action
+          if generate_all
+            # Used by caching to expire all paths for a resource
+            return routes.collect do |route|
+              route.send!(method, options, merged, expire_on)
+            end.compact
+          end
           # 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)
+            results = route.send!(method, options, merged, expire_on)
             return results if results && (!results.is_a?(Array) || results.first)
           end
         end
         raise RoutingError, "No route matches #{options.inspect}"
       end
       # try to give a helpful error message when named route generation fails
       def raise_named_route_error(options, named_route, named_route_name)
         diff = named_route.requirements.diff(options)
@@ -1307,24 +1413,32 @@ module ActionController
         else
           required_segments = named_route.segments.select {|seg| (!seg.optional?) && (!seg.is_a?(DividerSegment)) }
           required_keys_or_values = required_segments.map { |seg| seg.key rescue seg.value } # we want either the key or the value from the segment
-          raise RoutingError, "#{named_route_name}_url failed to generate from #{options.inspect} - you may have ambiguous routes, or you may need to supply additional parameters for this route.  content_url has the following required parameters: #{required_keys_or_values.inspect} - are they all satisifed?"
+          raise RoutingError, "#{named_route_name}_url failed to generate from #{options.inspect} - you may have ambiguous routes, or you may need to supply additional parameters for this route.  content_url has the following required parameters: #{required_keys_or_values.inspect} - are they all satisfied?"
         end
       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}"
+        allows = HTTP_METHODS.select { |verb| routes.find { |r| r.recognize(path, :method => verb) } }
+        if environment[:method] && !HTTP_METHODS.include?(environment[:method])
+          raise NotImplemented.new(*allows)
+        elsif !allows.empty?
+          raise MethodNotAllowed.new(*allows)
+        else
+          raise RoutingError, "No route matches #{path.inspect} with #{environment.inspect}"
+        end
       end
       def routes_by_controller
         @routes_by_controller ||= Hash.new do |controller_hash, controller|
           controller_hash[controller] = Hash.new do |action_hash, action|
@@ -1334,23 +1448,23 @@ module ActionController
           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
@@ -1368,6 +1482,15 @@ module ActionController
     end
     Routes = RouteSet.new
+    ::Inflector.module_eval do
+      def inflections_with_route_reloading(&block)
+        returning(inflections_without_route_reloading(&block)) {
+          ActionController::Routing::Routes.reload! if block_given?
+        }
+      end
+      alias_method_chain :inflections, :route_reloading
+    end
   end
 end