Merge branch 'master' into nested_has_many_through

Gemfile

@@ -6,6 +6,7 @@ else
   gem "arel", :git => "git://github.com/rails/arel.git"
 end
 
+gem "rack", :git => "git://github.com/rack/rack.git"
 gem "rails", :path => File.dirname(__FILE__)
 
 gem "rake",  ">= 0.8.7"

actionmailer/lib/action_mailer/old_api.rb

@@ -247,8 +247,8 @@ def parse_content_type(defaults=nil)
         [ nil, {} ]
       else
         ctype, *attrs = @content_type.split(/;\s*/)
-        attrs = attrs.inject({}) { |h,s| k,v = s.split(/\=/, 2); h[k] = v; h }
-        [ctype, {"charset" => @charset}.merge(attrs)]
+        attrs = Hash[attrs.map { |attr| attr.split(/\=/, 2) }]
+        [ctype, {"charset" => @charset}.merge!(attrs)]
       end
     end
   end

actionmailer/lib/rails/generators/mailer/templates/mailer.rb

@@ -6,7 +6,7 @@ class <%= class_name %> < ActionMailer::Base
   # Subject can be set in your I18n file at config/locales/en.yml
   # with the following lookup:
   #
-  #   en.<%= file_name %>.<%= action %>.subject
+  #   en.<%= file_path.gsub("/",".") %>.<%= action %>.subject
   #
   def <%= action %>
     @greeting = "Hi"

actionpack/CHANGELOG

@@ -1,12 +1,12 @@
 *Rails 3.1.0 (unreleased)*
 
+* Rely on Rack::Session stores API for more compatibility across the Ruby world. This is backwards incompatible since Rack::Session expects #get_session to accept 4 arguments and requires #destroy_session instead of simply #destroy. [José Valim]
+
 * file_field automatically adds :multipart => true to the enclosing form. [Santiago Pastorino]
 
 * Renames csrf_meta_tag -> csrf_meta_tags, and aliases csrf_meta_tag for backwards compatibility. [fxn]
 
-* Add Rack::Cache to the default stack. Create a Rails store that delegates to the Rails cache, so by default, whatever caching layer you are using will be used
-  for HTTP caching. Note that Rack::Cache will be used if you use #expires_in, #fresh_when or #stale with :public => true. Otherwise, the caching rules will apply
-  to the browser only.
+* Add Rack::Cache to the default stack. Create a Rails store that delegates to the Rails cache, so by default, whatever caching layer you are using will be used for HTTP caching. Note that Rack::Cache will be used if you use #expires_in, #fresh_when or #stale with :public => true. Otherwise, the caching rules will apply to the browser only. [Yehuda Katz, Carl Lerche]
 
 *Rails 3.0.0 (August 29, 2010)*
 

actionpack/lib/action_controller/test_case.rb

@@ -187,15 +187,18 @@ def recycle!
     end
   end
 
-  class TestSession < ActionDispatch::Session::AbstractStore::SessionHash #:nodoc:
-    DEFAULT_OPTIONS = ActionDispatch::Session::AbstractStore::DEFAULT_OPTIONS
+  class TestSession < Rack::Session::Abstract::SessionHash #:nodoc:
+    DEFAULT_OPTIONS = Rack::Session::Abstract::ID::DEFAULT_OPTIONS
 
     def initialize(session = {})
+      @env, @by = nil, nil
       replace(session.stringify_keys)
       @loaded = true
     end
 
-    def exists?; true; end
+    def exists?
+      true
+    end
   end
 
   # Superclass for ActionController functional tests. Functional tests allow you to

actionpack/lib/action_dispatch/http/cache.rb

@@ -50,8 +50,7 @@ def initialize(*)
           if cache_control = self["Cache-Control"]
             cache_control.split(/,\s*/).each do |segment|
               first, last = segment.split("=")
-              last ||= true
-              @cache_control[first.to_sym] = last
+              @cache_control[first.to_sym] = last || true
             end
           end
         end
@@ -88,28 +87,9 @@ def etag=(etag)
         def handle_conditional_get!
           if etag? || last_modified? || !@cache_control.empty?
             set_conditional_cache_control!
-          elsif nonempty_ok_response?
-            self.etag = body
-
-            if request && request.etag_matches?(etag)
-              self.status = 304
-              self.body = []
-            end
-
-            set_conditional_cache_control!
-          else
-            headers["Cache-Control"] = "no-cache"
           end
         end
 
-        def nonempty_ok_response?
-          @status == 200 && string_body?
-        end
-
-        def string_body?
-          !@blank && @body.respond_to?(:all?) && @body.all? { |part| part.is_a?(String) }
-        end
-
         DEFAULT_CACHE_CONTROL = "max-age=0, private, must-revalidate"
 
         def set_conditional_cache_control!

actionpack/lib/action_dispatch/http/request.rb

@@ -199,7 +199,7 @@ def body_stream #:nodoc:
     # TODO This should be broken apart into AD::Request::Session and probably
     # be included by the session middleware.
     def reset_session
-      session.destroy if session
+      session.destroy if session && session.respond_to?(:destroy)
       self.session = {}
       @env['action_dispatch.request.flash_hash'] = nil
     end

actionpack/lib/action_dispatch/http/response.rb

@@ -132,7 +132,7 @@ def location=(url)
     # information.
     attr_accessor :charset, :content_type
 
-    CONTENT_TYPE    = "Content-Type"
+    CONTENT_TYPE = "Content-Type"
 
     cattr_accessor(:default_charset) { "utf-8" }
 

actionpack/lib/action_dispatch/http/upload.rb

@@ -2,27 +2,28 @@
 
 module ActionDispatch
   module Http
-    class UploadedFile < Tempfile
+    class UploadedFile
       attr_accessor :original_filename, :content_type, :tempfile, :headers
 
       def initialize(hash)
         @original_filename = hash[:filename]
         @content_type      = hash[:type]
         @headers           = hash[:head]
+        @tempfile          = hash[:tempfile]
+        raise(ArgumentError, ':tempfile is required') unless @tempfile
+      end
 
-        # To the untrained eye, this may appear as insanity. Given the alternatives,
-        # such as busting the method cache on every request or breaking backwards
-        # compatibility with is_a?(Tempfile), this solution is the best available
-        # option.
-        #
-        # TODO: Deprecate is_a?(Tempfile) and define a real API for this parameter
-        tempfile = hash[:tempfile]
-        tempfile.instance_variables.each do |ivar|
-          instance_variable_set(ivar, tempfile.instance_variable_get(ivar))
-        end
+      def read(*args)
+        @tempfile.read(*args)
       end
 
-      alias local_path path
+      def rewind
+        @tempfile.rewind
+      end
+
+      def size
+        @tempfile.size
+      end
     end
 
     module Upload

actionpack/lib/action_dispatch/http/url.rb

@@ -18,11 +18,6 @@ def protocol
         @protocol ||= ssl? ? 'https://' : 'http://'
       end
 
-      # Is this an SSL request?
-      def ssl?
-        @ssl ||= @env['HTTPS'] == 'on' || @env['HTTP_X_FORWARDED_PROTO'] == 'https'
-      end
-
       # Returns the \host for this request, such as "example.com".
       def raw_host_with_port
         if forwarded = env["HTTP_X_FORWARDED_HOST"]