rack 1.6.0.beta → 1.6.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7e9fdbcce0cd16bdeda0ee39e9aa066e2dbcb17
-  data.tar.gz: 1be24bd36bc380d25cb5ef7bff5bf2abab269412
+  metadata.gz: 67268c360a9006f4c63b876a1dff3d8f4dfbdc51
+  data.tar.gz: 394f5b04b57657f9fe03bbd84ea1d81bb6a438e5
 SHA512:
-  metadata.gz: 1f4730c383cd5346a255fe4a179470653370f345ccf508389bf4149c744908b195ec3676eb564f5bf434e261d698230c7ba38dd7d192ddd022c1df9d9c0f7bf7
-  data.tar.gz: 42f1f9f7239286710e4b3b58f142cd673fe66e56b9e42ec45c2c7a3406079118f2dd1684c165404d9f77e482129335fa315ef179fefd0711c0f59156c4ca7a31
+  metadata.gz: ff862d5cdcb4a71aecd2d94d4774ddf116cc0b94e5b07e5833d14928605b61c845103bcd8cc1638c69d8fb3ce1e4a2a2d39f7a896b3940b1adce960a276fae3f
+  data.tar.gz: e96164e1ee85b7d08e16fa2b80d6913f17161847e53eec50f9a8e745833b867c641798ab0857d3a055c6e3cb4ef8ee7094dbd19090a06a6e2c47a45cec636f1d

data/SPEC

@@ -112,6 +112,8 @@ be implemented by the server.
                         warn(message, &block)
                         error(message, &block)
                         fatal(message, &block)
+<tt>rack.multipart.buffer_size</tt>:: An Integer hint to the multipart parser as to what chunk size to use for reads and writes.
+<tt>rack.multipart.tempfile_factory</tt>:: An object responding to #call with two arguments, the filename and content_type given for the multipart form field, and returning an IO-like object that responds to #<< and optionally #rewind. This factory will be used to instantiate the tempfile for each multipart form file upload field, rather than the default class of Tempfile.
 The server or the application can store their own data in the
 environment, too.  The keys must contain at least one dot,
 and should be prefixed uniquely.  The prefix <tt>rack.</tt>
@@ -238,9 +240,7 @@ server, and must not be sent back to the client.
 The header keys must be Strings.
 The header must not contain a +Status+ key,
 contain keys with <tt>:</tt> or newlines in their name,
-contain keys names that end in <tt>-</tt> or <tt>_</tt>,
-but only contain keys that consist of
-letters, digits, <tt>_</tt> or <tt>-</tt> and start with a letter.
+but only contain keys that match the token rule according to RFC 2616.
 The values of the header must be Strings,
 consisting of lines (for multiple header values, e.g. multiple
 <tt>Set-Cookie</tt> values) separated by "\\n".

data/lib/rack.rb

@@ -22,6 +22,16 @@ module Rack
   def self.release
     "1.5"
   end
+  PATH_INFO      = 'PATH_INFO'.freeze
+  REQUEST_METHOD = 'REQUEST_METHOD'.freeze
+  SCRIPT_NAME    = 'SCRIPT_NAME'.freeze
+  QUERY_STRING   = 'QUERY_STRING'.freeze
+  CACHE_CONTROL  = 'Cache-Control'.freeze
+  CONTENT_LENGTH = 'Content-Length'.freeze
+  CONTENT_TYPE   = 'Content-Type'.freeze
+
+  GET  = 'GET'.freeze
+  HEAD = 'HEAD'.freeze
 
   autoload :Builder, "rack/builder"
   autoload :BodyProxy, "rack/body_proxy"

data/lib/rack/auth/abstract/handler.rb

@@ -17,8 +17,8 @@ module Rack
 
       def unauthorized(www_authenticate = challenge)
         return [ 401,
-          { 'Content-Type' => 'text/plain',
-            'Content-Length' => '0',
+          { CONTENT_TYPE => 'text/plain',
+            CONTENT_LENGTH => '0',
             'WWW-Authenticate' => www_authenticate.to_s },
           []
         ]
@@ -26,8 +26,8 @@ module Rack
 
       def bad_request
         return [ 400,
-          { 'Content-Type' => 'text/plain',
-            'Content-Length' => '0' },
+          { CONTENT_TYPE => 'text/plain',
+            CONTENT_LENGTH => '0' },
           []
         ]
       end

data/lib/rack/auth/digest/request.rb

@@ -7,7 +7,7 @@ module Rack
     module Digest
       class Request < Auth::AbstractRequest
         def method
-          @env['rack.methodoverride.original_method'] || @env['REQUEST_METHOD']
+          @env['rack.methodoverride.original_method'] || @env[REQUEST_METHOD]
         end
 
         def digest?

data/lib/rack/cascade.rb

@@ -4,7 +4,7 @@ module Rack
   # status codes).
 
   class Cascade
-    NotFound = [404, {"Content-Type" => "text/plain"}, []]
+    NotFound = [404, {CONTENT_TYPE => "text/plain"}, []]
 
     attr_reader :apps
 

data/lib/rack/chunked.rb

@@ -56,11 +56,11 @@ module Rack
 
       if ! chunkable_version?(env['HTTP_VERSION']) ||
          STATUS_WITH_NO_ENTITY_BODY.include?(status) ||
-         headers['Content-Length'] ||
+         headers[CONTENT_LENGTH] ||
          headers['Transfer-Encoding']
         [status, headers, body]
       else
-        headers.delete('Content-Length')
+        headers.delete(CONTENT_LENGTH)
         headers['Transfer-Encoding'] = 'chunked'
         [status, headers, Body.new(body)]
       end

data/lib/rack/commonlogger.rb

@@ -46,9 +46,9 @@ module Rack
         env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-",
         env["REMOTE_USER"] || "-",
         now.strftime("%d/%b/%Y:%H:%M:%S %z"),
-        env["REQUEST_METHOD"],
-        env["PATH_INFO"],
-        env["QUERY_STRING"].empty? ? "" : "?"+env["QUERY_STRING"],
+        env[REQUEST_METHOD],
+        env[PATH_INFO],
+        env[QUERY_STRING].empty? ? "" : "?"+env[QUERY_STRING],
         env["HTTP_VERSION"],
         status.to_s[0..3],
         length,
@@ -65,7 +65,7 @@ module Rack
     end
 
     def extract_content_length(headers)
-      value = headers['Content-Length'] or return '-'
+      value = headers[CONTENT_LENGTH] or return '-'
       value.to_s == '0' ? '-' : value
     end
   end

data/lib/rack/conditionalget.rb

@@ -20,14 +20,14 @@ module Rack
     end
 
     def call(env)
-      case env['REQUEST_METHOD']
+      case env[REQUEST_METHOD]
       when "GET", "HEAD"
         status, headers, body = @app.call(env)
         headers = Utils::HeaderHash.new(headers)
         if status == 200 && fresh?(env, headers)
           status = 304
-          headers.delete('Content-Type')
-          headers.delete('Content-Length')
+          headers.delete(CONTENT_TYPE)
+          headers.delete(CONTENT_LENGTH)
           original_body = body
           body = Rack::BodyProxy.new([]) do
             original_body.close if original_body.respond_to?(:close)

data/lib/rack/content_length.rb

@@ -16,7 +16,7 @@ module Rack
       headers = HeaderHash.new(headers)
 
       if !STATUS_WITH_NO_ENTITY_BODY.include?(status.to_i) &&
-         !headers['Content-Length'] &&
+         !headers[CONTENT_LENGTH] &&
          !headers['Transfer-Encoding'] &&
          body.respond_to?(:to_ary)
 
@@ -28,7 +28,7 @@ module Rack
           obody.close if obody.respond_to?(:close)
         end
 
-        headers['Content-Length'] = length.to_s
+        headers[CONTENT_LENGTH] = length.to_s
       end
 
       [status, headers, body]

data/lib/rack/content_type.rb

@@ -20,7 +20,7 @@ module Rack
       headers = Utils::HeaderHash.new(headers)
 
       unless STATUS_WITH_NO_ENTITY_BODY.include?(status)
-        headers['Content-Type'] ||= @content_type
+        headers[CONTENT_TYPE] ||= @content_type
       end
 
       [status, headers, body]

data/lib/rack/deflater.rb

@@ -1,5 +1,4 @@
 require "zlib"
-require "stringio"
 require "time"  # for Time.httpdate
 require 'rack/utils'
 
@@ -54,20 +53,20 @@ module Rack
       case encoding
       when "gzip"
         headers['Content-Encoding'] = "gzip"
-        headers.delete('Content-Length')
+        headers.delete(CONTENT_LENGTH)
         mtime = headers.key?("Last-Modified") ?
           Time.httpdate(headers["Last-Modified"]) : Time.now
         [status, headers, GzipStream.new(body, mtime)]
       when "deflate"
         headers['Content-Encoding'] = "deflate"
-        headers.delete('Content-Length')
+        headers.delete(CONTENT_LENGTH)
         [status, headers, DeflateStream.new(body)]
       when "identity"
         [status, headers, body]
       when nil
         message = "An acceptable encoding for the requested resource #{request.fullpath} could not be found."
         bp = Rack::BodyProxy.new([message]) { body.close if body.respond_to?(:close) }
-        [406, {"Content-Type" => "text/plain", "Content-Length" => message.length.to_s}, bp]
+        [406, {CONTENT_TYPE => "text/plain", CONTENT_LENGTH => message.length.to_s}, bp]
       end
     end
 
@@ -138,7 +137,7 @@ module Rack
       # Skip compressing empty entity body responses and responses with
       # no-transform set.
       if Utils::STATUS_WITH_NO_ENTITY_BODY.include?(status) ||
-          headers['Cache-Control'].to_s =~ /\bno-transform\b/ ||
+          headers[CACHE_CONTROL].to_s =~ /\bno-transform\b/ ||
          (headers['Content-Encoding'] && headers['Content-Encoding'] !~ /\bidentity\b/)
         return false
       end

data/lib/rack/directory.rb

@@ -55,8 +55,8 @@ table { width:100%%; }
 
     def _call(env)
       @env = env
-      @script_name = env['SCRIPT_NAME']
-      @path_info = Utils.unescape(env['PATH_INFO'])
+      @script_name = env[SCRIPT_NAME]
+      @path_info = Utils.unescape(env[PATH_INFO])
 
       if forbidden = check_forbidden
         forbidden
@@ -72,7 +72,7 @@ table { width:100%%; }
       body = "Forbidden\n"
       size = Rack::Utils.bytesize(body)
       return [403, {"Content-Type" => "text/plain",
-        "Content-Length" => size.to_s,
+        CONTENT_LENGTH => size.to_s,
         "X-Cascade" => "pass"}, [body]]
     end
 
@@ -101,7 +101,7 @@ table { width:100%%; }
         @files << [ url, basename, size, type, mtime ]
       end
 
-      return [ 200, {'Content-Type'=>'text/html; charset=utf-8'}, self ]
+      return [ 200, { CONTENT_TYPE =>'text/html; charset=utf-8'}, self ]
     end
 
     def stat(node, max = 10)
@@ -130,7 +130,7 @@ table { width:100%%; }
       body = "Entity not found: #{@path_info}\n"
       size = Rack::Utils.bytesize(body)
       return [404, {"Content-Type" => "text/plain",
-        "Content-Length" => size.to_s,
+        CONTENT_LENGTH => size.to_s,
         "X-Cascade" => "pass"}, [body]]
     end
 

data/lib/rack/etag.rb

@@ -11,6 +11,7 @@ module Rack
   # used when Etag is absent and a directive when it is present. The first
   # defaults to nil, while the second defaults to "max-age=0, private, must-revalidate"
   class ETag
+    ETAG_STRING = 'ETag'.freeze
     DEFAULT_CACHE_CONTROL = "max-age=0, private, must-revalidate".freeze
 
     def initialize(app, no_cache_control = nil, cache_control = DEFAULT_CACHE_CONTROL)
@@ -28,14 +29,14 @@ module Rack
         body = Rack::BodyProxy.new(new_body) do
           original_body.close if original_body.respond_to?(:close)
         end
-        headers['ETag'] = %(W/"#{digest}") if digest
+        headers[ETAG_STRING] = %(W/"#{digest}") if digest
       end
 
-      unless headers['Cache-Control']
+      unless headers[CACHE_CONTROL]
         if digest
-          headers['Cache-Control'] = @cache_control if @cache_control
+          headers[CACHE_CONTROL] = @cache_control if @cache_control
         else
-          headers['Cache-Control'] = @no_cache_control if @no_cache_control
+          headers[CACHE_CONTROL] = @no_cache_control if @no_cache_control
         end
       end
 
@@ -53,8 +54,8 @@ module Rack
       end
 
       def skip_caching?(headers)
-        (headers['Cache-Control'] && headers['Cache-Control'].include?('no-cache')) ||
-          headers.key?('ETag') || headers.key?('Last-Modified')
+        (headers[CACHE_CONTROL] && headers[CACHE_CONTROL].include?('no-cache')) ||
+          headers.key?(ETAG_STRING) || headers.key?('Last-Modified')
       end
 
       def digest_body(body)

data/lib/rack/file.rb

@@ -34,11 +34,11 @@ module Rack
     F = ::File
 
     def _call(env)
-      unless ALLOWED_VERBS.include? env["REQUEST_METHOD"]
+      unless ALLOWED_VERBS.include? env[REQUEST_METHOD]
         return fail(405, "Method Not Allowed", {'Allow' => ALLOW_HEADER})
       end
 
-      path_info = Utils.unescape(env["PATH_INFO"])
+      path_info = Utils.unescape(env[PATH_INFO])
       clean_path_info = Utils.clean_path_info(path_info)
 
       @path = F.join(@root, clean_path_info)
@@ -58,25 +58,20 @@ module Rack
 
     def serving(env)
       if env["REQUEST_METHOD"] == "OPTIONS"
-      	return [200, {'Allow' => ALLOW_HEADER, 'Content-Length' => '0'}, []]
+        return [200, {'Allow' => ALLOW_HEADER, CONTENT_LENGTH => '0'}, []]
       end
       last_modified = F.mtime(@path).httpdate
       return [304, {}, []] if env['HTTP_IF_MODIFIED_SINCE'] == last_modified
 
       headers = { "Last-Modified" => last_modified }
-      mime = Mime.mime_type(F.extname(@path), @default_mime)
-      headers["Content-Type"] = mime if mime
+      headers[CONTENT_TYPE] = mime_type if mime_type
 
       # Set custom headers
       @headers.each { |field, content| headers[field] = content } if @headers
 
-      response = [ 200, headers, env["REQUEST_METHOD"] == "HEAD" ? [] : self ]
+      response = [ 200, headers, env[REQUEST_METHOD] == "HEAD" ? [] : self ]
 
-      # NOTE:
-      #   We check via File::size? whether this file provides size info
-      #   via stat (e.g. /proc files often don't), otherwise we have to
-      #   figure it out by reading the whole file into memory.
-      size = F.size?(@path) || Utils.bytesize(F.read(@path))
+      size = filesize
 
       ranges = Rack::Utils.byte_ranges(env, size)
       if ranges.nil? || ranges.length > 1
@@ -97,7 +92,9 @@ module Rack
         size = @range.end - @range.begin + 1
       end
 
-      response[1]["Content-Length"] = size.to_s
+      response[2] = [response_body] unless response_body.nil?
+
+      response[1][CONTENT_LENGTH] = size.to_s
       response
     end
 
@@ -122,13 +119,34 @@ module Rack
       [
         status,
         {
-          "Content-Type" => "text/plain",
-          "Content-Length" => body.size.to_s,
+          CONTENT_TYPE   => "text/plain",
+          CONTENT_LENGTH => body.size.to_s,
           "X-Cascade" => "pass"
         }.merge!(headers),
         [body]
       ]
     end
 
+    # The MIME type for the contents of the file located at @path
+    def mime_type
+      Mime.mime_type(F.extname(@path), @default_mime)
+    end
+
+    def filesize
+      # If response_body is present, use its size.
+      return Rack::Utils.bytesize(response_body) if response_body
+
+      #   We check via File::size? whether this file provides size info
+      #   via stat (e.g. /proc files often don't), otherwise we have to
+      #   figure it out by reading the whole file into memory.
+      F.size?(@path) || Utils.bytesize(F.read(@path))
+    end
+
+    # By default, the response body for file requests is nil.
+    # In this case, the response body will be generated later
+    # from the file at @path
+    def response_body
+      nil
+    end
   end
 end

data/lib/rack/handler.rb

@@ -51,7 +51,7 @@ module Rack
         options.delete :Port
 
         Rack::Handler::FastCGI
-      elsif ENV.include?("REQUEST_METHOD")
+      elsif ENV.include?(REQUEST_METHOD)
         Rack::Handler::CGI
       elsif ENV.include?("RACK_HANDLER")
         self.get(ENV["RACK_HANDLER"])

data/lib/rack/handler/cgi.rb

@@ -26,7 +26,7 @@ module Rack
                      "rack.url_scheme" => ["yes", "on", "1"].include?(ENV["HTTPS"]) ? "https" : "http"
                    })
 
-        env["QUERY_STRING"] ||= ""
+        env[QUERY_STRING]   ||= ""
         env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
         env["REQUEST_PATH"] ||= "/"
 

data/lib/rack/handler/fastcgi.rb

@@ -59,7 +59,7 @@ module Rack
                      "rack.url_scheme" => ["yes", "on", "1"].include?(env["HTTPS"]) ? "https" : "http"
                    })
 
-        env["QUERY_STRING"] ||= ""
+        env[QUERY_STRING]   ||= ""
         env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
         env["REQUEST_PATH"] ||= "/"
         env.delete "CONTENT_TYPE"  if env["CONTENT_TYPE"] == ""

data/lib/rack/handler/lsws.rb

@@ -27,7 +27,7 @@ module Rack
           "rack.url_scheme" => ["yes", "on", "1"].include?(ENV["HTTPS"]) ? "https" : "http"
         )
 
-        env["QUERY_STRING"] ||= ""
+        env[QUERY_STRING]   ||= ""
         env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
         env["REQUEST_PATH"] ||= "/"
         status, headers, body = app.call(env)

data/lib/rack/handler/mongrel.rb

@@ -78,7 +78,7 @@ module Rack
 
                      "rack.url_scheme" => ["yes", "on", "1"].include?(env["HTTPS"]) ? "https" : "http"
                    })
-        env["QUERY_STRING"] ||= ""
+        env[QUERY_STRING] ||= ""
 
         status, headers, body = @app.call(env)
 

data/lib/rack/handler/scgi.rb

@@ -35,9 +35,9 @@ module Rack
         env = Hash[request]
         env.delete "HTTP_CONTENT_TYPE"
         env.delete "HTTP_CONTENT_LENGTH"
-        env["REQUEST_PATH"], env["QUERY_STRING"] = env["REQUEST_URI"].split('?', 2)
+        env["REQUEST_PATH"], env[QUERY_STRING] = env["REQUEST_URI"].split('?', 2)
         env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
-        env["PATH_INFO"] = env["REQUEST_PATH"]
+        env[PATH_INFO] = env["REQUEST_PATH"]
         env["QUERY_STRING"] ||= ""
         env["SCRIPT_NAME"] = ""
 

data/lib/rack/handler/webrick.rb

@@ -79,12 +79,12 @@ module Rack
                    })
 
         env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
-        env["QUERY_STRING"] ||= ""
-        unless env["PATH_INFO"] == ""
+        env[QUERY_STRING] ||= ""
+        unless env[PATH_INFO] == ""
           path, n = req.request_uri.path, env["SCRIPT_NAME"].length
-          env["PATH_INFO"] = path[n, path.length-n]
+          env[PATH_INFO] = path[n, path.length-n]
         end
-        env["REQUEST_PATH"] ||= [env["SCRIPT_NAME"], env["PATH_INFO"]].join
+        env["REQUEST_PATH"] ||= [env["SCRIPT_NAME"], env[PATH_INFO]].join
 
         status, headers, body = @app.call(env)
         begin
@@ -107,6 +107,8 @@ module Rack
             res.body = rd
             res.chunked = true
             io_lambda.call wr
+          elsif body.respond_to?(:to_path)
+            res.body = ::File.open(body.to_path, 'rb')
           else
             body.each { |part|
               res.body << part