Merge branch 'conditional-get'

16 files changed, 326 insertions, 303 deletions

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 177c6a354e..6f65d4003d 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -7,8 +7,14 @@
 * Update Prototype to 1.6.0.2 #599 [Patrick Joyce]
 
 * Conditional GET utility methods.  [Jeremy Kemper]
-  * etag!([:admin, post, current_user]) sets the ETag response header and returns head(:not_modified) if it matches the If-None-Match request header.
-  * last_modified!(post.updated_at) sets Last-Modified and returns head(:not_modified) if it's no later than If-Modified-Since.
+    response.last_modified = @post.updated_at
+    response.etag = [:admin, @post, current_user]
+
+    if request.fresh?(response)
+      head :not_modified
+    else
+      # render ...
+    end
 
 * All 2xx requests are considered successful [Josh Peek]
 
diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb
index 8bc5e4c3a7..0ca27b30db 100644
--- a/actionpack/lib/action_controller/cgi_process.rb
+++ b/actionpack/lib/action_controller/cgi_process.rb
@@ -43,7 +43,7 @@ module ActionController #:nodoc:
       :session_path     => "/",             # available to all paths in app
       :session_key      => "_session_id",
       :cookie_only      => true
-    } unless const_defined?(:DEFAULT_SESSION_OPTIONS)
+    }
 
     def initialize(cgi, session_options = {})
       @cgi = cgi
@@ -61,53 +61,14 @@ module ActionController #:nodoc:
       end
     end
 
-    # The request body is an IO input stream. If the RAW_POST_DATA environment
-    # variable is already set, wrap it in a StringIO.
-    def body
-      if raw_post = env['RAW_POST_DATA']
-        raw_post.force_encoding(Encoding::BINARY) if raw_post.respond_to?(:force_encoding)
-        StringIO.new(raw_post)
-      else
-        @cgi.stdinput
-      end
-    end
-
-    def query_parameters
-      @query_parameters ||= self.class.parse_query_parameters(query_string)
-    end
-
-    def request_parameters
-      @request_parameters ||= parse_formatted_request_parameters
+    def body_stream #:nodoc:
+      @cgi.stdinput
     end
 
     def cookies
       @cgi.cookies.freeze
     end
 
-    def host_with_port_without_standard_port_handling
-      if forwarded = env["HTTP_X_FORWARDED_HOST"]
-        forwarded.split(/,\s?/).last
-      elsif http_host = env['HTTP_HOST']
-        http_host
-      elsif server_name = env['SERVER_NAME']
-        server_name
-      else
-        "#{env['SERVER_ADDR']}:#{env['SERVER_PORT']}"
-      end
-    end
-
-    def host
-      host_with_port_without_standard_port_handling.sub(/:\d+$/, '')
-    end
-
-    def port
-      if host_with_port_without_standard_port_handling =~ /:(\d+)$/
-        $1.to_i
-      else
-        standard_port
-      end
-    end
-
     def session
       unless defined?(@session)
         if @session_options == false
diff --git a/actionpack/lib/action_controller/headers.rb b/actionpack/lib/action_controller/headers.rb
index 7239438c49..139669c66f 100644
--- a/actionpack/lib/action_controller/headers.rb
+++ b/actionpack/lib/action_controller/headers.rb
@@ -1,31 +1,33 @@
+require 'active_support/memoizable'
+
 module ActionController
   module Http
     class Headers < ::Hash
-      
-      def initialize(constructor = {})
-         if constructor.is_a?(Hash)
+      extend ActiveSupport::Memoizable
+
+      def initialize(*args)
+         if args.size == 1 && args[0].is_a?(Hash)
            super()
-           update(constructor)
+           update(args[0])
          else
-           super(constructor)
+           super
          end
        end
-      
+
       def [](header_name)
         if include?(header_name)
-          super 
+          super
         else
-          super(normalize_header(header_name))
+          super(env_name(header_name))
         end
       end
-      
-      
+
       private
-        # Takes an HTTP header name and returns it in the 
-        # format 
-        def normalize_header(header_name)
+        # Converts a HTTP header name to an environment variable name.
+        def env_name(header_name)
           "HTTP_#{header_name.upcase.gsub(/-/, '_')}"
         end
+        memoize :env_name
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/lib/action_controller/rack_process.rb b/actionpack/lib/action_controller/rack_process.rb
index 7e0a6b091e..dcbcf8bc1d 100644
--- a/actionpack/lib/action_controller/rack_process.rb
+++ b/actionpack/lib/action_controller/rack_process.rb
@@ -3,7 +3,7 @@ require 'action_controller/session/cookie_store'
 
 module ActionController #:nodoc:
   class RackRequest < AbstractRequest #:nodoc:
-    attr_accessor :env, :session_options
+    attr_accessor :session_options
     attr_reader :cgi
 
     class SessionFixationAttempt < StandardError #:nodoc:
@@ -15,7 +15,7 @@ module ActionController #:nodoc:
       :session_path     => "/",             # available to all paths in app
       :session_key      => "_session_id",
       :cookie_only      => true
-    } unless const_defined?(:DEFAULT_SESSION_OPTIONS)
+    }
 
     def initialize(env, session_options = DEFAULT_SESSION_OPTIONS)
       @session_options = session_options
@@ -30,35 +30,21 @@ module ActionController #:nodoc:
         SERVER_NAME SERVER_PROTOCOL
 
         HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ACCEPT_ENCODING
-        HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_FROM HTTP_HOST
+        HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_FROM
         HTTP_NEGOTIATE HTTP_PRAGMA HTTP_REFERER HTTP_USER_AGENT ].each do |env|
       define_method(env.sub(/^HTTP_/n, '').downcase) do
         @env[env]
       end
     end
 
-    # The request body is an IO input stream. If the RAW_POST_DATA environment
-    # variable is already set, wrap it in a StringIO.
-    def body
-      if raw_post = env['RAW_POST_DATA']
-        StringIO.new(raw_post)
-      else
-        @env['rack.input']
-      end
+    def body_stream #:nodoc:
+      @env['rack.input']
     end
 
     def key?(key)
       @env.key?(key)
     end
 
-    def query_parameters
-      @query_parameters ||= self.class.parse_query_parameters(query_string)
-    end
-
-    def request_parameters
-      @request_parameters ||= parse_formatted_request_parameters
-    end
-
     def cookies
       return {} unless @env["HTTP_COOKIE"]
 
@@ -70,34 +56,6 @@ module ActionController #:nodoc:
       @env["rack.request.cookie_hash"]
     end
 
-    def host_with_port_without_standard_port_handling
-      if forwarded = @env["HTTP_X_FORWARDED_HOST"]
-        forwarded.split(/,\s?/).last
-      elsif http_host = @env['HTTP_HOST']
-        http_host
-      elsif server_name = @env['SERVER_NAME']
-        server_name
-      else
-        "#{env['SERVER_ADDR']}:#{env['SERVER_PORT']}"
-      end
-    end
-
-    def host
-      host_with_port_without_standard_port_handling.sub(/:\d+$/, '')
-    end
-
-    def port
-      if host_with_port_without_standard_port_handling =~ /:(\d+)$/
-        $1.to_i
-      else
-        standard_port
-      end
-    end
-
-    def remote_addr
-      @env['REMOTE_ADDR']
-    end
-
     def server_port
       @env['SERVER_PORT'].to_i
     end
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb
index c55788a531..90bced14e6 100644
--- a/actionpack/lib/action_controller/request.rb
+++ b/actionpack/lib/action_controller/request.rb
@@ -2,18 +2,22 @@ require 'tempfile'
 require 'stringio'
 require 'strscan'
 
-module ActionController
-  # HTTP methods which are accepted by default.
-  ACCEPTED_HTTP_METHODS = Set.new(%w( get head put post delete options ))
+require 'active_support/memoizable'
 
+module ActionController
   # CgiRequest and TestRequest provide concrete implementations.
   class AbstractRequest
+    extend ActiveSupport::Memoizable
+
     def self.relative_url_root=(*args)
       ActiveSupport::Deprecation.warn(
         "ActionController::AbstractRequest.relative_url_root= has been renamed." +
         "You can now set it with config.action_controller.relative_url_root=", caller)
     end
 
+    HTTP_METHODS = %w(get head put post delete options)
+    HTTP_METHOD_LOOKUP = HTTP_METHODS.inject({}) { |h, m| h[m] = h[m.upcase] = m.to_sym; h }
+
     # The hash of environment variables for this request,
     # such as { 'RAILS_ENV' => 'production' }.
     attr_reader :env
@@ -21,15 +25,12 @@ module ActionController
     # The true HTTP request method as a lowercase symbol, such as <tt>:get</tt>.
     # UnknownHttpMethod is raised for invalid methods not listed in ACCEPTED_HTTP_METHODS.
     def request_method
-      @request_method ||= begin
-        method = ((@env['REQUEST_METHOD'] == 'POST' && !parameters[:_method].blank?) ? parameters[:_method].to_s : @env['REQUEST_METHOD']).downcase
-        if ACCEPTED_HTTP_METHODS.include?(method)
-          method.to_sym
-        else
-          raise UnknownHttpMethod, "#{method}, accepted HTTP methods are #{ACCEPTED_HTTP_METHODS.to_a.to_sentence}"
-        end
-      end
+      method = @env['REQUEST_METHOD']
+      method = parameters[:_method] if method == 'POST' && !parameters[:_method].blank?
+
+      HTTP_METHOD_LOOKUP[method] || raise(UnknownHttpMethod, "#{method}, accepted HTTP methods are #{HTTP_METHODS.to_sentence}")
     end
+    memoize :request_method
 
     # The HTTP request method as a lowercase symbol, such as <tt>:get</tt>.
     # Note, HEAD is returned as <tt>:get</tt> since the two are functionally
@@ -67,33 +68,59 @@ module ActionController
     # Provides access to the request's HTTP headers, for example:
     #  request.headers["Content-Type"] # => "text/plain"
     def headers
-      @headers ||= ActionController::Http::Headers.new(@env)
+      ActionController::Http::Headers.new(@env)
     end
+    memoize :headers
 
     def content_length
-      @content_length ||= env['CONTENT_LENGTH'].to_i
+      @env['CONTENT_LENGTH'].to_i
     end
+    memoize :content_length
 
     # The MIME type of the HTTP request, such as Mime::XML.
     #
     # For backward compatibility, the post format is extracted from the
     # X-Post-Data-Format HTTP header if present.
     def content_type
-      @content_type ||= Mime::Type.lookup(content_type_without_parameters)
+      Mime::Type.lookup(content_type_without_parameters)
     end
+    memoize :content_type
 
     # Returns the accepted MIME type for the request
     def accepts
-      @accepts ||=
-        begin
-          header = @env['HTTP_ACCEPT'].to_s.strip
+      header = @env['HTTP_ACCEPT'].to_s.strip
 
-          if header.empty?
-            [content_type, Mime::ALL].compact
-          else
-            Mime::Type.parse(header)
-          end
-        end
+      if header.empty?
+        [content_type, Mime::ALL].compact
+      else
+        Mime::Type.parse(header)
+      end
+    end
+    memoize :accepts
+
+    def if_modified_since
+      if since = env['HTTP_IF_MODIFIED_SINCE']
+        Time.rfc2822(since)
+      end
+    end
+    memoize :if_modified_since
+
+    def if_none_match
+      env['HTTP_IF_NONE_MATCH']
+    end
+
+    def not_modified?(modified_at)
+      if_modified_since && modified_at && if_modified_since >= modified_at
+    end
+
+    def etag_matches?(etag)
+      if_none_match && if_none_match == etag
+    end
+
+    # Check response freshness (Last-Modified and ETag) against request
+    # If-Modified-Since and If-None-Match conditions.
+    def fresh?(response)
+      not_modified?(response.last_modified) || etag_matches?(response.etag)
     end
 
     # Returns the Mime type for the format used in the request.
@@ -102,7 +129,7 @@ module ActionController
     #   GET /posts/5.xhtml | request.format => Mime::HTML
     #   GET /posts/5       | request.format => Mime::HTML or MIME::JS, or request.accepts.first depending on the value of <tt>ActionController::Base.use_accept_header</tt>
     def format
-      @format ||= begin
+      @format ||=
         if parameters[:format]
           Mime::Type.lookup_by_extension(parameters[:format])
         elsif ActionController::Base.use_accept_header
@@ -112,7 +139,6 @@ module ActionController
         else
           Mime::Type.lookup_by_extension("html")
         end
-      end
     end
 
 
@@ -200,42 +226,62 @@ EOM
 
       @env['REMOTE_ADDR']
     end
+    memoize :remote_ip
 
     # Returns the lowercase name of the HTTP server software.
     def server_software
       (@env['SERVER_SOFTWARE'] && /^([a-zA-Z]+)/ =~ @env['SERVER_SOFTWARE']) ? $1.downcase : nil
     end
+    memoize :server_software
 
 
     # Returns the complete URL used for this request
     def url
       protocol + host_with_port + request_uri
     end
+    memoize :url
 
     # Return 'https://' if this is an SSL request and 'http://' otherwise.
     def protocol
       ssl? ? 'https://' : 'http://'
     end
+    memoize :protocol
 
     # Is this an SSL request?
     def ssl?
       @env['HTTPS'] == 'on' || @env['HTTP_X_FORWARDED_PROTO'] == 'https'
     end
 
+    def raw_host_with_port
+      if forwarded = env["HTTP_X_FORWARDED_HOST"]
+        forwarded.split(/,\s?/).last
+      else
+        env['HTTP_HOST'] || env['SERVER_NAME'] || "#{env['SERVER_ADDR']}:#{env['SERVER_PORT']}"
+      end
+    end
+
     # Returns the host for this request, such as example.com.
     def host
+      raw_host_with_port.sub(/:\d+$/, '')
     end
+    memoize :host
 
     # Returns a host:port string for this request, such as example.com or
     # example.com:8080.
     def host_with_port
-      @host_with_port ||= host + port_string
+      "#{host}#{port_string}"
     end
+    memoize :host_with_port
 
     # Returns the port number of this request as an integer.
     def port
-      @port_as_int ||= @env['SERVER_PORT'].to_i
+      if raw_host_with_port =~ /:(\d+)$/
+        $1.to_i
+      else
+        standard_port
+      end
     end
+    memoize :port
 
     # Returns the standard port number for this request's protocol
     def standard_port
@@ -248,7 +294,7 @@ EOM
     # Returns a port suffix like ":8080" if the port number of this request
     # is not the default HTTP port 80 or HTTPS port 443.
     def port_string
-      (port == standard_port) ? '' : ":#{port}"
+      port == standard_port ? '' : ":#{port}"
     end
 
     # Returns the domain part of a host, such as rubyonrails.org in "www.rubyonrails.org". You can specify
@@ -276,6 +322,7 @@ EOM
         @env['QUERY_STRING'] || ''
       end
     end
+    memoize :query_string
 
     # Return the request URI, accounting for server idiosyncrasies.
     # WEBrick includes the full URL. IIS leaves REQUEST_URI blank.
@@ -285,21 +332,23 @@ EOM
         (%r{^\w+\://[^/]+(/.*|$)$} =~ uri) ? $1 : uri
       else
         # Construct IIS missing REQUEST_URI from SCRIPT_NAME and PATH_INFO.
-        script_filename = @env['SCRIPT_NAME'].to_s.match(%r{[^/]+$})
-        uri = @env['PATH_INFO']
-        uri = uri.sub(/#{script_filename}\//, '') unless script_filename.nil?
-        unless (env_qs = @env['QUERY_STRING']).nil? || env_qs.empty?
-          uri << '?' << env_qs
+        uri = @env['PATH_INFO'].to_s
+
+        if script_filename = @env['SCRIPT_NAME'].to_s.match(%r{[^/]+$})
+          uri = uri.sub(/#{script_filename}\//, '')
         end
 
-        if uri.nil?
+        env_qs = @env['QUERY_STRING'].to_s
+        uri += "?#{env_qs}" unless env_qs.empty?
+
+        if uri.blank?
           @env.delete('REQUEST_URI')
-          uri
         else
           @env['REQUEST_URI'] = uri
         end
       end
     end
+    memoize :request_uri
 
     # Returns the interpreted path to requested resource after all the installation directory of this application was taken into account
     def path
@@ -309,6 +358,7 @@ EOM
       path.sub!(%r/^#{ActionController::Base.relative_url_root}/, '')
       path || ''
     end
+    memoize :path
 
     # Read the request body. This is useful for web services that need to
     # work with raw requests directly.
@@ -345,19 +395,41 @@ EOM
       @path_parameters ||= {}
     end
 
+    # The request body is an IO input stream. If the RAW_POST_DATA environment
+    # variable is already set, wrap it in a StringIO.
+    def body
+      if raw_post = env['RAW_POST_DATA']
+        raw_post.force_encoding(Encoding::BINARY) if raw_post.respond_to?(:force_encoding)
+        StringIO.new(raw_post)
+      else
+        body_stream
+      end
+    end
 
-    #--
-    # Must be implemented in the concrete request
-    #++
+    def remote_addr
+      @env['REMOTE_ADDR']
+    end
 
-    # The request body is an IO input stream.
-    def body
+    def referrer
+      @env['HTTP_REFERER']
+    end
+    alias referer referrer
+
+
+    def query_parameters
+      @query_parameters ||= self.class.parse_query_parameters(query_string)
     end
 
-    def query_parameters #:nodoc:
+    def request_parameters
+      @request_parameters ||= parse_formatted_request_parameters
     end
 
-    def request_parameters #:nodoc:
+
+    #--
+    # Must be implemented in the concrete request
+    #++
+
+    def body_stream #:nodoc:
     end
 
     def cookies #:nodoc:
@@ -384,8 +456,9 @@ EOM
 
       # The raw content type string with its parameters stripped off.
       def content_type_without_parameters
-        @content_type_without_parameters ||= self.class.extract_content_type_without_parameters(content_type_with_parameters)
+        self.class.extract_content_type_without_parameters(content_type_with_parameters)
       end
+      memoize :content_type_without_parameters
 
     private
       def content_type_from_legacy_post_data_format_header
diff --git a/actionpack/lib/action_controller/response.rb b/actionpack/lib/action_controller/response.rb
index da352b6993..a85fad0d39 100644
--- a/actionpack/lib/action_controller/response.rb
+++ b/actionpack/lib/action_controller/response.rb
@@ -37,12 +37,20 @@ module ActionController # :nodoc:
     attr_accessor :body
     # The headers of the response, as a Hash. It maps header names to header values.
     attr_accessor :headers
-    attr_accessor :session, :cookies, :assigns, :template, :redirected_to, :redirected_to_method_params, :layout
+    attr_accessor :session, :cookies, :assigns, :template, :layout
+    attr_accessor :redirected_to, :redirected_to_method_params
 
     def initialize
       @body, @headers, @session, @assigns = "", DEFAULT_HEADERS.merge("cookie" => []), [], []
     end
 
+    def status; headers['Status'] end
+    def status=(status) headers['Status'] = status end
+
+    def location; headers['Location'] end
+    def location=(url) headers['Location'] = url end
+
+
     # Sets the HTTP response's content MIME type. For example, in the controller
     # you could write this:
     #
@@ -70,35 +78,29 @@ module ActionController # :nodoc:
       charset.blank? ? nil : charset.strip.split("=")[1]
     end
 
-    def redirect(to_url, response_status)
-      self.headers["Status"] = response_status
-      self.headers["Location"] = to_url
+    def last_modified
+      Time.rfc2822(headers['Last-Modified'])
+    end
 
-      self.body = "<html><body>You are being <a href=\"#{to_url}\">redirected</a>.</body></html>"
+    def last_modified=(utc_time)
+      headers['Last-Modified'] = utc_time.httpdate
     end
 
-    def prepare!
-      handle_conditional_get!
-      convert_content_type!
-      set_content_length!
+    def etag; headers['ETag'] end
+    def etag=(etag)
+      headers['ETag'] = %("#{Digest::MD5.hexdigest(ActiveSupport::Cache.expand_cache_key(etag))}")
     end
 
-    # Sets the Last-Modified response header. Returns whether it's older than
-    # the If-Modified-Since request header.
-    def last_modified!(utc_time)
-      headers['Last-Modified'] ||= utc_time.httpdate
-      if request && since = request.headers['HTTP_IF_MODIFIED_SINCE']
-        utc_time <= Time.rfc2822(since)
-      end
+    def redirect(url, status)
+      self.status = status
+      self.location = url
+      self.body = "<html><body>You are being <a href=\"#{url}\">redirected</a>.</body></html>"
     end
 
-    # Sets the ETag response header. Returns whether it matches the
-    # If-None-Match request header.
-    def etag!(tag)
-      headers['ETag'] ||= %("#{Digest::MD5.hexdigest(ActiveSupport::Cache.expand_cache_key(tag))}")
-      if request && request.headers['HTTP_IF_NONE_MATCH'] == headers['ETag']
-        true
-      end
+    def prepare!
+      handle_conditional_get!
+      convert_content_type!
+      set_content_length!
     end
 
     private
@@ -106,15 +108,15 @@ module ActionController # :nodoc:
         if nonempty_ok_response?
           set_conditional_cache_control!
 
-          if etag!(body)
-            headers['Status'] = '304 Not Modified'
+          self.etag ||= body
+          if request && request.etag_matches?(etag)
+            self.status = '304 Not Modified'
             self.body = ''
           end
         end
       end
 
       def nonempty_ok_response?
-        status = headers['Status']
         ok = !status || status[0..2] == '200'
         ok && body.is_a?(String) && !body.empty?
       end
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb
index 66675aaa13..636e1c38b3 100644
--- a/actionpack/lib/action_controller/test_process.rb
+++ b/actionpack/lib/action_controller/test_process.rb
@@ -23,7 +23,7 @@ module ActionController #:nodoc:
 
   class TestRequest < AbstractRequest #:nodoc:
     attr_accessor :cookies, :session_options
-    attr_accessor :query_parameters, :request_parameters, :path, :session, :env
+    attr_accessor :query_parameters, :request_parameters, :path, :session
     attr_accessor :host, :user_agent
 
     def initialize(query_parameters = nil, request_parameters = nil, session = nil)
@@ -42,7 +42,7 @@ module ActionController #:nodoc:
     end
 
     # Wraps raw_post in a StringIO.
-    def body
+    def body_stream #:nodoc:
       StringIO.new(raw_post)
     end
 
@@ -54,7 +54,7 @@ module ActionController #:nodoc:
 
     def port=(number)
       @env["SERVER_PORT"] = number.to_i
-      @port_as_int = nil
+      port(true)
     end
 
     def action=(action_name)
@@ -68,6 +68,8 @@ module ActionController #:nodoc:
       @env["REQUEST_URI"] = value
       @request_uri = nil
       @path = nil
+      request_uri(true)
+      path(true)
     end
 
     def request_uri=(uri)
@@ -77,21 +79,26 @@ module ActionController #:nodoc:
 
     def accept=(mime_types)
       @env["HTTP_ACCEPT"] = Array(mime_types).collect { |mime_types| mime_types.to_s }.join(",")
+      accepts(true)
     end
 
-    def remote_addr=(addr)
-      @env['REMOTE_ADDR'] = addr
+    def if_modified_since=(last_modified)
+      @env["HTTP_IF_MODIFIED_SINCE"] = last_modified
     end
 
-    def remote_addr
-      @env['REMOTE_ADDR']
+    def if_none_match=(etag)
+      @env["HTTP_IF_NONE_MATCH"] = etag
+    end
+
+    def remote_addr=(addr)
+      @env['REMOTE_ADDR'] = addr
     end
 
-    def request_uri
+    def request_uri(*args)
       @request_uri || super
     end
 
-    def path
+    def path(*args)
       @path || super
     end
 
@@ -120,10 +127,6 @@ module ActionController #:nodoc:
       self.query_parameters   = {}
       self.path_parameters    = {}
       @request_method, @accepts, @content_type = nil, nil, nil
-    end    
-
-    def referer
-      @env["HTTP_REFERER"]
     end
 
     private
@@ -448,10 +451,13 @@ module ActionController #:nodoc:
     end
 
     def method_missing(selector, *args)
-      return @controller.send!(selector, *args) if ActionController::Routing::Routes.named_routes.helpers.include?(selector)
-      return super
+      if ActionController::Routing::Routes.named_routes.helpers.include?(selector)
+        @controller.send(selector, *args)
+      else
+        super
+      end
     end
-    
+
     # Shortcut for <tt>ActionController::TestUploadedFile.new(Test::Unit::TestCase.fixture_path + path, type)</tt>:
     #
     #   post :change_avatar, :avatar => fixture_file_upload('/files/spongebob.png', 'image/png')
diff --git a/actionpack/lib/action_view/renderable.rb b/actionpack/lib/action_view/renderable.rb
index 5fe1ca86f3..89ac500717 100644
--- a/actionpack/lib/action_view/renderable.rb
+++ b/actionpack/lib/action_view/renderable.rb
@@ -31,10 +31,10 @@ module ActionView
 
       view.send(:evaluate_assigns)
       view.send(:set_controller_content_type, mime_type) if respond_to?(:mime_type)
-      view.send(:execute, method(local_assigns), local_assigns)
+      view.send(:execute, method_name(local_assigns), local_assigns)
     end
 
-    def method(local_assigns)
+    def method_name(local_assigns)
       if local_assigns && local_assigns.any?
         local_assigns_keys = "locals_#{local_assigns.keys.map { |k| k.to_s }.sort.join('_')}"
       end
@@ -44,7 +44,7 @@ module ActionView
     private
       # Compile and evaluate the template's code (if necessary)
       def compile(local_assigns)
-        render_symbol = method(local_assigns)
+        render_symbol = method_name(local_assigns)
 
         @@mutex.synchronize do
           if recompile?(render_symbol)
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 47a0fcf99d..b6cdd116e5 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -109,7 +109,7 @@ class PageCachingTest < Test::Unit::TestCase
 
   uses_mocha("should_cache_ok_at_custom_path") do
     def test_should_cache_ok_at_custom_path
-      @request.expects(:path).returns("/index.html")
+      @request.stubs(:path).returns("/index.html")
       get :ok
       assert_response :ok
       assert File.exist?("#{FILE_STORE_PATH}/index.html")
diff --git a/actionpack/test/controller/cgi_test.rb b/actionpack/test/controller/cgi_test.rb
index 8ca70f8595..813171857a 100644
--- a/actionpack/test/controller/cgi_test.rb
+++ b/actionpack/test/controller/cgi_test.rb
@@ -75,7 +75,7 @@ class CgiRequestTest < BaseCgiTest
     assert_equal "rubyonrails.org:8080", @request.host_with_port
 
     @request_hash['HTTP_X_FORWARDED_HOST'] = "www.firsthost.org, www.secondhost.org"
-    assert_equal "www.secondhost.org", @request.host
+    assert_equal "www.secondhost.org", @request.host(true)
   end
 
   def test_http_host_with_default_port_overrides_server_port
diff --git a/actionpack/test/controller/content_type_test.rb b/actionpack/test/controller/content_type_test.rb
index d457d13aef..e1bc46bb56 100644
--- a/actionpack/test/controller/content_type_test.rb
+++ b/actionpack/test/controller/content_type_test.rb
@@ -128,23 +128,23 @@ class AcceptBasedContentTypeTest < ActionController::TestCase
 
 
   def test_render_default_content_types_for_respond_to
-    @request.env["HTTP_ACCEPT"] = Mime::HTML.to_s
+    @request.accept = Mime::HTML.to_s
     get :render_default_content_types_for_respond_to
     assert_equal Mime::HTML, @response.content_type
 
-    @request.env["HTTP_ACCEPT"] = Mime::JS.to_s
+    @request.accept = Mime::JS.to_s
     get :render_default_content_types_for_respond_to
     assert_equal Mime::JS, @response.content_type
   end
 
   def test_render_default_content_types_for_respond_to_with_template
-    @request.env["HTTP_ACCEPT"] = Mime::XML.to_s
+    @request.accept = Mime::XML.to_s
     get :render_default_content_types_for_respond_to
     assert_equal Mime::XML, @response.content_type
   end
 
   def test_render_default_content_types_for_respond_to_with_overwrite
-    @request.env["HTTP_ACCEPT"] = Mime::RSS.to_s
+    @request.accept = Mime::RSS.to_s
     get :render_default_content_types_for_respond_to
     assert_equal Mime::XML, @response.content_type
   end
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index 1701431858..0d508eb8df 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -177,7 +177,7 @@ class MimeControllerTest < Test::Unit::TestCase
   end
 
   def test_html
-    @request.env["HTTP_ACCEPT"] = "text/html"
+    @request.accept = "text/html"
     get :js_or_html
     assert_equal 'HTML', @response.body
 
@@ -189,7 +189,7 @@ class MimeControllerTest < Test::Unit::TestCase
   end
 
   def test_all
-    @request.env["HTTP_ACCEPT"] = "*/*"
+    @request.accept = "*/*"
     get :js_or_html
     assert_equal 'HTML', @response.body # js is not part of all
 
@@ -201,13 +201,13 @@ class MimeControllerTest < Test::Unit::TestCase
   end
 
   def test_xml
-    @request.env["HTTP_ACCEPT"] = "application/xml"
+    @request.accept = "application/xml"
     get :html_xml_or_rss
     assert_equal 'XML', @response.body
   end
 
   def test_js_or_html
-    @request.env["HTTP_ACCEPT"] = "text/javascript, text/html"
+    @request.accept = "text/javascript, text/html"
     get :js_or_html
     assert_equal 'JS', @response.body
 
@@ -232,7 +232,7 @@ class MimeControllerTest < Test::Unit::TestCase
       'JSON' => %w(application/json text/x-json)
     }.each do |body, content_types|
       content_types.each do |content_type|
-        @request.env['HTTP_ACCEPT'] = content_type
+        @request.accept = content_type
         get :json_or_yaml
         assert_equal body, @response.body
       end
@@ -240,7 +240,7 @@ class MimeControllerTest < Test::Unit::TestCase
   end
 
   def test_js_or_anything
-    @request.env["HTTP_ACCEPT"] = "text/javascript, */*"
+    @request.accept = "text/javascript, */*"
     get :js_or_html
     assert_equal 'JS', @response.body
 
@@ -252,34 +252,34 @@ class MimeControllerTest < Test::Unit::TestCase
   end
 
   def test_using_defaults
-    @request.env["HTTP_ACCEPT"] = "*/*"
+    @request.accept = "*/*"
     get :using_defaults
     assert_equal "text/html", @response.content_type
     assert_equal 'Hello world!', @response.body
 
-    @request.env["HTTP_ACCEPT"] = "text/javascript"
+    @request.accept = "text/javascript"
     get :using_defaults
     assert_equal "text/javascript", @response.content_type
     assert_equal '$("body").visualEffect("highlight");', @response.body
 
-    @request.env["HTTP_ACCEPT"] = "application/xml"
+    @request.accept = "application/xml"
     get :using_defaults
     assert_equal "application/xml", @response.content_type
     assert_equal "<p>Hello world!</p>\n", @response.body
   end
 
   def test_using_defaults_with_type_list
-    @request.env["HTTP_ACCEPT"] = "*/*"
+    @request.accept = "*/*"
     get :using_defaults_with_type_list
     assert_equal "text/html", @response.content_type
     assert_equal 'Hello world!', @response.body
 
-    @request.env["HTTP_ACCEPT"] = "text/javascript"
+    @request.accept = "text/javascript"
     get :using_defaults_with_type_list
     assert_equal "text/javascript", @response.content_type
     assert_equal '$("body").visualEffect("highlight");', @response.body
 
-    @request.env["HTTP_ACCEPT"] = "application/xml"
+    @request.accept = "application/xml"
     get :using_defaults_with_type_list
     assert_equal "application/xml", @response.content_type
     assert_equal "<p>Hello world!</p>\n", @response.body
@@ -298,55 +298,55 @@ class MimeControllerTest < Test::Unit::TestCase
   end
 
   def test_synonyms
-    @request.env["HTTP_ACCEPT"] = "application/javascript"
+    @request.accept = "application/javascript"
     get :js_or_html
     assert_equal 'JS', @response.body
 
-    @request.env["HTTP_ACCEPT"] = "application/x-xml"
+    @request.accept = "application/x-xml"
     get :html_xml_or_rss
     assert_equal "XML", @response.body
   end
 
   def test_custom_types
-    @request.env["HTTP_ACCEPT"] = "application/crazy-xml"
+    @request.accept = "application/crazy-xml"
     get :custom_type_handling
     assert_equal "application/crazy-xml", @response.content_type
     assert_equal 'Crazy XML', @response.body
 
-    @request.env["HTTP_ACCEPT"] = "text/html"
+    @request.accept = "text/html"
     get :custom_type_handling
     assert_equal "text/html", @response.content_type
     assert_equal 'HTML', @response.body
   end
 
   def test_xhtml_alias
-    @request.env["HTTP_ACCEPT"] = "application/xhtml+xml,application/xml"
+    @request.accept = "application/xhtml+xml,application/xml"
     get :html_or_xml
     assert_equal 'HTML', @response.body
   end
 
   def test_firefox_simulation
-    @request.env["HTTP_ACCEPT"] = "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"
+    @request.accept = "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"
     get :html_or_xml
     assert_equal 'HTML', @response.body
   end
 
   def test_handle_any
-    @request.env["HTTP_ACCEPT"] = "*/*"
+    @request.accept = "*/*"
     get :handle_any
     assert_equal 'HTML', @response.body
 
-    @request.env["HTTP_ACCEPT"] = "text/javascript"
+    @request.accept = "text/javascript"
     get :handle_any
     assert_equal 'Either JS or XML', @response.body
 
-    @request.env["HTTP_ACCEPT"] = "text/xml"
+    @request.accept = "text/xml"
     get :handle_any
     assert_equal 'Either JS or XML', @response.body
   end
 
   def test_handle_any_any
-    @request.env["HTTP_ACCEPT"] = "*/*"
+    @request.accept = "*/*"
     get :handle_any_any
     assert_equal 'HTML', @response.body
   end
@@ -357,31 +357,31 @@ class MimeControllerTest < Test::Unit::TestCase
   end
 
   def test_handle_any_any_explicit_html
-    @request.env["HTTP_ACCEPT"] = "text/html"
+    @request.accept = "text/html"
     get :handle_any_any
     assert_equal 'HTML', @response.body
   end
 
   def test_handle_any_any_javascript
-    @request.env["HTTP_ACCEPT"] = "text/javascript"
+    @request.accept = "text/javascript"
     get :handle_any_any
     assert_equal 'Whatever you ask for, I got it', @response.body
   end
 
   def test_handle_any_any_xml
-    @request.env["HTTP_ACCEPT"] = "text/xml"
+    @request.accept = "text/xml"
     get :handle_any_any
     assert_equal 'Whatever you ask for, I got it', @response.body
   end
 
   def test_rjs_type_skips_layout
-    @request.env["HTTP_ACCEPT"] = "text/javascript"
+    @request.accept = "text/javascript"
     get :all_types_with_layout
     assert_equal 'RJS for all_types_with_layout', @response.body
   end
 
   def test_html_type_with_layout
-    @request.env["HTTP_ACCEPT"] = "text/html"
+    @request.accept = "text/html"
     get :all_types_with_layout
     assert_equal '<html><div id="html">HTML for all_types_with_layout</div></html>', @response.body
   end
@@ -460,7 +460,7 @@ class MimeControllerTest < Test::Unit::TestCase
   end
 
   def test_format_with_custom_response_type_and_request_headers
-    @request.env["HTTP_ACCEPT"] = "text/iphone"
+    @request.accept = "text/iphone"
     get :iphone_with_html_response_type
     assert_equal '<html><div id="iphone">Hello iPhone future from iPhone!</div></html>', @response.body
     assert_equal "text/html", @response.content_type
@@ -470,7 +470,7 @@ class MimeControllerTest < Test::Unit::TestCase
     get :iphone_with_html_response_type_without_layout
     assert_equal '<html><div id="html_missing">Hello future from Firefox!</div></html>', @response.body
 
-    @request.env["HTTP_ACCEPT"] = "text/iphone"
+    @request.accept = "text/iphone"
     assert_raises(ActionView::MissingTemplate) { get :iphone_with_html_response_type_without_layout }
   end
 end
@@ -522,7 +522,7 @@ class MimeControllerLayoutsTest < Test::Unit::TestCase
     get :index
     assert_equal '<html><div id="html">Hello Firefox</div></html>', @response.body
 
-    @request.env["HTTP_ACCEPT"] = "text/iphone"
+    @request.accept = "text/iphone"
     get :index
     assert_equal 'Hello iPhone', @response.body
   end
@@ -533,7 +533,7 @@ class MimeControllerLayoutsTest < Test::Unit::TestCase
     get :index
     assert_equal 'Super Firefox', @response.body
 
-    @request.env["HTTP_ACCEPT"] = "text/iphone"
+    @request.accept = "text/iphone"
     get :index
     assert_equal '<html><div id="super_iphone">Super iPhone</div></html>', @response.body
   end
diff --git a/actionpack/test/controller/rack_test.rb b/actionpack/test/controller/rack_test.rb
index ab8bbc3bf9..d1650de1fc 100644
--- a/actionpack/test/controller/rack_test.rb
+++ b/actionpack/test/controller/rack_test.rb
@@ -64,58 +64,61 @@ end
 
 class RackRequestTest < BaseRackTest
   def test_proxy_request
-    assert_equal 'glu.ttono.us', @request.host_with_port
+    assert_equal 'glu.ttono.us', @request.host_with_port(true)
   end
 
   def test_http_host
     @env.delete "HTTP_X_FORWARDED_HOST"
     @env['HTTP_HOST'] = "rubyonrails.org:8080"
-    assert_equal "rubyonrails.org:8080", @request.host_with_port
+    assert_equal "rubyonrails.org", @request.host(true)
+    assert_equal "rubyonrails.org:8080", @request.host_with_port(true)
 
     @env['HTTP_X_FORWARDED_HOST'] = "www.firsthost.org, www.secondhost.org"
-    assert_equal "www.secondhost.org", @request.host
+    assert_equal "www.secondhost.org", @request.host(true)
   end
 
   def test_http_host_with_default_port_overrides_server_port
     @env.delete "HTTP_X_FORWARDED_HOST"
     @env['HTTP_HOST'] = "rubyonrails.org"
-    assert_equal "rubyonrails.org", @request.host_with_port
+    assert_equal "rubyonrails.org", @request.host_with_port(true)
   end
 
   def test_host_with_port_defaults_to_server_name_if_no_host_headers
     @env.delete "HTTP_X_FORWARDED_HOST"
     @env.delete "HTTP_HOST"
-    assert_equal "glu.ttono.us:8007", @request.host_with_port
+    assert_equal "glu.ttono.us:8007", @request.host_with_port(true)
   end
 
   def test_host_with_port_falls_back_to_server_addr_if_necessary
     @env.delete "HTTP_X_FORWARDED_HOST"
     @env.delete "HTTP_HOST"
     @env.delete "SERVER_NAME"
-    assert_equal "207.7.108.53:8007", @request.host_with_port
+    assert_equal "207.7.108.53", @request.host(true)
+    assert_equal 8007, @request.port(true)
+    assert_equal "207.7.108.53:8007", @request.host_with_port(true)
   end
 
   def test_host_with_port_if_http_standard_port_is_specified
     @env['HTTP_X_FORWARDED_HOST'] = "glu.ttono.us:80"
-    assert_equal "glu.ttono.us", @request.host_with_port
+    assert_equal "glu.ttono.us", @request.host_with_port(true)
   end
 
   def test_host_with_port_if_https_standard_port_is_specified
     @env['HTTP_X_FORWARDED_PROTO'] = "https"
     @env['HTTP_X_FORWARDED_HOST'] = "glu.ttono.us:443"
-    assert_equal "glu.ttono.us", @request.host_with_port
+    assert_equal "glu.ttono.us", @request.host_with_port(true)
   end
 
   def test_host_if_ipv6_reference
     @env.delete "HTTP_X_FORWARDED_HOST"
     @env['HTTP_HOST'] = "[2001:1234:5678:9abc:def0::dead:beef]"
-    assert_equal "[2001:1234:5678:9abc:def0::dead:beef]", @request.host
+    assert_equal "[2001:1234:5678:9abc:def0::dead:beef]", @request.host(true)
   end
 
   def test_host_if_ipv6_reference_with_port
     @env.delete "HTTP_X_FORWARDED_HOST"
     @env['HTTP_HOST'] = "[2001:1234:5678:9abc:def0::dead:beef]:8008"
-    assert_equal "[2001:1234:5678:9abc:def0::dead:beef]", @request.host
+    assert_equal "[2001:1234:5678:9abc:def0::dead:beef]", @request.host(true)
   end
 
   def test_cgi_environment_variables
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 76832f5713..1b9b12acc6 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -15,9 +15,14 @@ class TestController < ActionController::Base
   end
 
   def conditional_hello
-    etag! [:foo, 123]
-    last_modified! Time.now.utc.beginning_of_day
-    render :action => 'hello_world' unless performed?
+    response.last_modified = Time.now.utc.beginning_of_day
+    response.etag = [:foo, 123]
+
+    if request.fresh?(response)
+      head :not_modified
+    else
+      render :action => 'hello_world'
+    end
   end
 
   def render_hello_world
@@ -428,7 +433,7 @@ class RenderTest < Test::Unit::TestCase
   end
 
   def test_should_render_formatted_html_erb_template_with_faulty_accepts_header
-    @request.env["HTTP_ACCEPT"] = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, appliction/x-shockwave-flash, */*"
+    @request.accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, appliction/x-shockwave-flash, */*"
     get :formatted_xml_erb
     assert_equal '<test>passed formatted html erb</test>', @response.body
   end
@@ -490,16 +495,16 @@ class EtagRenderTest < Test::Unit::TestCase
   end
 
   def test_render_against_etag_request_should_304_when_match
-    @request.headers["HTTP_IF_NONE_MATCH"] = etag_for("hello david")
+    @request.if_none_match = etag_for("hello david")
     get :render_hello_world_from_variable
-    assert_equal "304 Not Modified", @response.headers['Status']
+    assert_equal "304 Not Modified", @response.status
     assert @response.body.empty?
   end
 
   def test_render_against_etag_request_should_200_when_no_match
-    @request.headers["HTTP_IF_NONE_MATCH"] = etag_for("hello somewhere else")
+    @request.if_none_match = etag_for("hello somewhere else")
     get :render_hello_world_from_variable
-    assert_equal "200 OK", @response.headers['Status']
+    assert_equal "200 OK", @response.status
     assert !@response.body.empty?
   end
 
@@ -508,13 +513,13 @@ class EtagRenderTest < Test::Unit::TestCase
     expected_etag = etag_for('hello david')
     assert_equal expected_etag, @response.headers['ETag']
 
-    @request.headers["HTTP_IF_NONE_MATCH"] = expected_etag
+    @request.if_none_match = expected_etag
     get :render_hello_world_from_variable
-    assert_equal "304 Not Modified", @response.headers['Status']
+    assert_equal "304 Not Modified", @response.status
 
-    @request.headers["HTTP_IF_NONE_MATCH"] = "\"diftag\""
+    @request.if_none_match = "\"diftag\""
     get :render_hello_world_from_variable
-    assert_equal "200 OK", @response.headers['Status']
+    assert_equal "200 OK", @response.status
   end
 
   def render_with_404_shouldnt_have_etag
@@ -557,17 +562,17 @@ class LastModifiedRenderTest < Test::Unit::TestCase
   end
 
   def test_request_not_modified
-    @request.headers["HTTP_IF_MODIFIED_SINCE"] = @last_modified
+    @request.if_modified_since = @last_modified
     get :conditional_hello
-    assert_equal "304 Not Modified", @response.headers['Status']
+    assert_equal "304 Not Modified", @response.status
     assert @response.body.blank?, @response.body
     assert_equal @last_modified, @response.headers['Last-Modified']
   end
 
   def test_request_modified
-    @request.headers["HTTP_IF_MODIFIED_SINCE"] = 'Thu, 16 Jul 2008 00:00:00 GMT'
+    @request.if_modified_since = 'Thu, 16 Jul 2008 00:00:00 GMT'
     get :conditional_hello
-    assert_equal "200 OK", @response.headers['Status']
+    assert_equal "200 OK", @response.status
     assert !@response.body.blank?
     assert_equal @last_modified, @response.headers['Last-Modified']
   end
diff --git a/actionpack/test/controller/request_test.rb b/actionpack/test/controller/request_test.rb
index 7db5264840..226c1ac018 100644
--- a/actionpack/test/controller/request_test.rb
+++ b/actionpack/test/controller/request_test.rb
@@ -15,57 +15,57 @@ class RequestTest < Test::Unit::TestCase
     assert_equal '0.0.0.0', @request.remote_ip
 
     @request.remote_addr = '1.2.3.4'
-    assert_equal '1.2.3.4', @request.remote_ip
+    assert_equal '1.2.3.4', @request.remote_ip(true)
 
     @request.env['HTTP_CLIENT_IP'] = '2.3.4.5'
-    assert_equal '1.2.3.4', @request.remote_ip
+    assert_equal '1.2.3.4', @request.remote_ip(true)
 
     @request.remote_addr = '192.168.0.1'
-    assert_equal '2.3.4.5', @request.remote_ip
+    assert_equal '2.3.4.5', @request.remote_ip(true)
     @request.env.delete 'HTTP_CLIENT_IP'
 
     @request.remote_addr = '1.2.3.4'
     @request.env['HTTP_X_FORWARDED_FOR'] = '3.4.5.6'
-    assert_equal '1.2.3.4', @request.remote_ip
+    assert_equal '1.2.3.4', @request.remote_ip(true)
 
     @request.remote_addr = '127.0.0.1'
     @request.env['HTTP_X_FORWARDED_FOR'] = '3.4.5.6'
-    assert_equal '3.4.5.6', @request.remote_ip
+    assert_equal '3.4.5.6', @request.remote_ip(true)
 
     @request.env['HTTP_X_FORWARDED_FOR'] = 'unknown,3.4.5.6'
-    assert_equal '3.4.5.6', @request.remote_ip
+    assert_equal '3.4.5.6', @request.remote_ip(true)
 
     @request.env['HTTP_X_FORWARDED_FOR'] = '172.16.0.1,3.4.5.6'
-    assert_equal '3.4.5.6', @request.remote_ip
+    assert_equal '3.4.5.6', @request.remote_ip(true)
 
     @request.env['HTTP_X_FORWARDED_FOR'] = '192.168.0.1,3.4.5.6'
-    assert_equal '3.4.5.6', @request.remote_ip
+    assert_equal '3.4.5.6', @request.remote_ip(true)
 
     @request.env['HTTP_X_FORWARDED_FOR'] = '10.0.0.1,3.4.5.6'
-    assert_equal '3.4.5.6', @request.remote_ip
+    assert_equal '3.4.5.6', @request.remote_ip(true)
 
     @request.env['HTTP_X_FORWARDED_FOR'] = '10.0.0.1, 10.0.0.1, 3.4.5.6'
-    assert_equal '3.4.5.6', @request.remote_ip
+    assert_equal '3.4.5.6', @request.remote_ip(true)
 
     @request.env['HTTP_X_FORWARDED_FOR'] = '127.0.0.1,3.4.5.6'
-    assert_equal '3.4.5.6', @request.remote_ip
+    assert_equal '3.4.5.6', @request.remote_ip(true)
 
     @request.env['HTTP_X_FORWARDED_FOR'] = 'unknown,192.168.0.1'
-    assert_equal 'unknown', @request.remote_ip
+    assert_equal 'unknown', @request.remote_ip(true)
 
     @request.env['HTTP_X_FORWARDED_FOR'] = '9.9.9.9, 3.4.5.6, 10.0.0.1, 172.31.4.4'
-    assert_equal '3.4.5.6', @request.remote_ip
+    assert_equal '3.4.5.6', @request.remote_ip(true)
 
     @request.env['HTTP_CLIENT_IP'] = '8.8.8.8'
     e = assert_raises(ActionController::ActionControllerError) {
-      @request.remote_ip
+      @request.remote_ip(true)
     }
     assert_match /IP spoofing attack/, e.message
     assert_match /HTTP_X_FORWARDED_FOR="9.9.9.9, 3.4.5.6, 10.0.0.1, 172.31.4.4"/, e.message
     assert_match /HTTP_CLIENT_IP="8.8.8.8"/, e.message
 
     @request.env['HTTP_X_FORWARDED_FOR'] = '8.8.8.8, 9.9.9.9'
-    assert_equal '8.8.8.8', @request.remote_ip
+    assert_equal '8.8.8.8', @request.remote_ip(true)
 
     @request.env.delete 'HTTP_CLIENT_IP'
     @request.env.delete 'HTTP_X_FORWARDED_FOR'
@@ -168,58 +168,58 @@ class RequestTest < Test::Unit::TestCase
     ActionController::Base.relative_url_root = nil
 
     # The following tests are for when REQUEST_URI is not supplied (as in IIS)
-    @request.set_REQUEST_URI nil
     @request.env['PATH_INFO'] = "/path/of/some/uri?mapped=1"
     @request.env['SCRIPT_NAME'] = nil #"/path/dispatch.rb"
+    @request.set_REQUEST_URI nil
     assert_equal "/path/of/some/uri?mapped=1", @request.request_uri
     assert_equal "/path/of/some/uri", @request.path
 
     ActionController::Base.relative_url_root = '/path'
-    @request.set_REQUEST_URI nil
     @request.env['PATH_INFO'] = "/path/of/some/uri?mapped=1"
     @request.env['SCRIPT_NAME'] = "/path/dispatch.rb"
-    assert_equal "/path/of/some/uri?mapped=1", @request.request_uri
-    assert_equal "/of/some/uri", @request.path
+    @request.set_REQUEST_URI nil
+    assert_equal "/path/of/some/uri?mapped=1", @request.request_uri(true)
+    assert_equal "/of/some/uri", @request.path(true)
     ActionController::Base.relative_url_root = nil
 
-    @request.set_REQUEST_URI nil
     @request.env['PATH_INFO'] = "/path/of/some/uri"
     @request.env['SCRIPT_NAME'] = nil
+    @request.set_REQUEST_URI nil
     assert_equal "/path/of/some/uri", @request.request_uri
     assert_equal "/path/of/some/uri", @request.path
 
-    @request.set_REQUEST_URI nil
     @request.env['PATH_INFO'] = "/"
+    @request.set_REQUEST_URI nil
     assert_equal "/", @request.request_uri
     assert_equal "/", @request.path
 
-    @request.set_REQUEST_URI nil
     @request.env['PATH_INFO'] = "/?m=b"
+    @request.set_REQUEST_URI nil
     assert_equal "/?m=b", @request.request_uri
     assert_equal "/", @request.path
 
-    @request.set_REQUEST_URI nil
     @request.env['PATH_INFO'] = "/"
     @request.env['SCRIPT_NAME'] = "/dispatch.cgi"
+    @request.set_REQUEST_URI nil
     assert_equal "/", @request.request_uri
     assert_equal "/", @request.path
 
     ActionController::Base.relative_url_root = '/hieraki'
-    @request.set_REQUEST_URI nil
     @request.env['PATH_INFO'] = "/hieraki/"
     @request.env['SCRIPT_NAME'] = "/hieraki/dispatch.cgi"
+    @request.set_REQUEST_URI nil
     assert_equal "/hieraki/", @request.request_uri
     assert_equal "/", @request.path
     ActionController::Base.relative_url_root = nil
 
     @request.set_REQUEST_URI '/hieraki/dispatch.cgi'
     ActionController::Base.relative_url_root = '/hieraki'
-    assert_equal "/dispatch.cgi", @request.path
+    assert_equal "/dispatch.cgi", @request.path(true)
     ActionController::Base.relative_url_root = nil
 
     @request.set_REQUEST_URI '/hieraki/dispatch.cgi'
     ActionController::Base.relative_url_root = '/foo'
-    assert_equal "/hieraki/dispatch.cgi", @request.path
+    assert_equal "/hieraki/dispatch.cgi", @request.path(true)
     ActionController::Base.relative_url_root = nil
 
     # This test ensures that Rails uses REQUEST_URI over PATH_INFO
@@ -227,8 +227,8 @@ class RequestTest < Test::Unit::TestCase
     @request.env['REQUEST_URI'] = "/some/path"
     @request.env['PATH_INFO'] = "/another/path"
     @request.env['SCRIPT_NAME'] = "/dispatch.cgi"
-    assert_equal "/some/path", @request.request_uri
-    assert_equal "/some/path", @request.path
+    assert_equal "/some/path", @request.request_uri(true)
+    assert_equal "/some/path", @request.path(true)
   end
 
   def test_host_with_default_port
@@ -244,13 +244,13 @@ class RequestTest < Test::Unit::TestCase
   end
 
   def test_server_software
-    assert_equal nil, @request.server_software
+    assert_equal nil, @request.server_software(true)
 
     @request.env['SERVER_SOFTWARE'] = 'Apache3.422'
-    assert_equal 'apache', @request.server_software
+    assert_equal 'apache', @request.server_software(true)
 
     @request.env['SERVER_SOFTWARE'] = 'lighttpd(1.1.4)'
-    assert_equal 'lighttpd', @request.server_software
+    assert_equal 'lighttpd', @request.server_software(true)
   end
 
   def test_xml_http_request
@@ -280,44 +280,44 @@ class RequestTest < Test::Unit::TestCase
 
   def test_symbolized_request_methods
     [:get, :post, :put, :delete].each do |method|
-      set_request_method_to method
+      self.request_method = method
       assert_equal method, @request.method
     end
   end
 
   def test_invalid_http_method_raises_exception
-    set_request_method_to :random_method
     assert_raises(ActionController::UnknownHttpMethod) do
-      @request.method
+      self.request_method = :random_method
     end
   end
 
   def test_allow_method_hacking_on_post
-    set_request_method_to :post
+    self.request_method = :post
     [:get, :head, :options, :put, :post, :delete].each do |method|
-      @request.instance_eval { @parameters = { :_method => method } ; @request_method = nil }
+      @request.instance_eval { @parameters = { :_method => method.to_s } ; @request_method = nil }
+      @request.request_method(true)
       assert_equal(method == :head ? :get : method, @request.method)
     end
   end
 
   def test_invalid_method_hacking_on_post_raises_exception
-    set_request_method_to :post
+    self.request_method = :post
     @request.instance_eval { @parameters = { :_method => :random_method } ; @request_method = nil }
     assert_raises(ActionController::UnknownHttpMethod) do
-      @request.method
+      @request.request_method(true)
     end
   end
 
   def test_restrict_method_hacking
     @request.instance_eval { @parameters = { :_method => 'put' } }
     [:get, :put, :delete].each do |method|
-      set_request_method_to method
+      self.request_method = method
       assert_equal method, @request.method
     end
   end
 
-  def test_head_masquarading_as_get
-    set_request_method_to :head
+  def test_head_masquerading_as_get
+    self.request_method = :head
     assert_equal :get, @request.method
     assert @request.get?
     assert @request.head?
@@ -339,9 +339,16 @@ class RequestTest < Test::Unit::TestCase
   end
 
   def test_nil_format
-    @request.instance_eval { @parameters = { :format => nil } }
+    ActionController::Base.use_accept_header, old =
+      false, ActionController::Base.use_accept_header
+
+    @request.instance_eval { @parameters = {} }
     @request.env["HTTP_X_REQUESTED_WITH"] = "XMLHttpRequest"
+    assert @request.xhr?
     assert_equal Mime::JS, @request.format
+
+  ensure
+    ActionController::Base.use_accept_header = old
   end
 
   def test_content_type
@@ -384,9 +391,9 @@ class RequestTest < Test::Unit::TestCase
   end
 
   protected
-    def set_request_method_to(method)
+    def request_method=(method)
       @request.env['REQUEST_METHOD'] = method.to_s.upcase
-      @request.instance_eval { @request_method = nil }
+      @request.request_method(true)
     end
 end
 
diff --git a/activesupport/lib/active_support/memoizable.rb b/activesupport/lib/active_support/memoizable.rb
index e6049d9496..b5adc2330c 100644
--- a/activesupport/lib/active_support/memoizable.rb
+++ b/activesupport/lib/active_support/memoizable.rb
@@ -14,7 +14,7 @@ module ActiveSupport
           methods.each do |method|
             if method.to_s =~ /^_unmemoized_(.*)/
               begin
-                __send__($1)
+                __send__($1).freeze
               rescue ArgumentError
               end
             end
@@ -41,7 +41,7 @@ module ActiveSupport
               if !reload && defined? #{memoized_ivar}
                 #{memoized_ivar}
               else
-                #{memoized_ivar} = #{original_method}.freeze
+                #{memoized_ivar} = #{original_method}
               end
             end
           else
@@ -52,7 +52,7 @@ module ActiveSupport
               if !reload && #{memoized_ivar} && #{memoized_ivar}.has_key?(args)
                 #{memoized_ivar}[args]
               else
-                #{memoized_ivar}[args] = #{original_method}(*args).freeze
+                #{memoized_ivar}[args] = #{original_method}(*args)
               end
             end
           end