rack 1.2.8 → 1.3.0.beta

data/test/multipart/content_type_and_no_filename

@@ -0,0 +1,6 @@
+--AaB03x
+Content-Disposition: form-data; name="text"
+Content-Type: text/plain; charset=US-ASCII
+
+contents
+--AaB03x--

data/test/multipart/text

@@ -3,6 +3,11 @@ Content-Disposition: form-data; name="submit-name"
 
 Larry
 --AaB03x
+Content-Disposition: form-data; name="submit-name-with-content"
+Content-Type: text/plain
+
+Berry
+--AaB03x
 Content-Disposition: form-data; name="files"; filename="file1.txt"
 Content-Type: text/plain
 

data/test/multipart/webkit

@@ -0,0 +1,32 @@
+------WebKitFormBoundaryWLHCs9qmcJJoyjKR
+Content-Disposition: form-data; name="_method"
+
+put
+------WebKitFormBoundaryWLHCs9qmcJJoyjKR
+Content-Disposition: form-data; name="profile[blog]"
+
+
+------WebKitFormBoundaryWLHCs9qmcJJoyjKR
+Content-Disposition: form-data; name="profile[public_email]"
+
+
+------WebKitFormBoundaryWLHCs9qmcJJoyjKR
+Content-Disposition: form-data; name="profile[interests]"
+
+
+------WebKitFormBoundaryWLHCs9qmcJJoyjKR
+Content-Disposition: form-data; name="profile[bio]"
+
+hello
+
+"quote"
+------WebKitFormBoundaryWLHCs9qmcJJoyjKR
+Content-Disposition: form-data; name="media"; filename=""
+Content-Type: application/octet-stream
+
+
+------WebKitFormBoundaryWLHCs9qmcJJoyjKR
+Content-Disposition: form-data; name="commit"
+
+Save
+------WebKitFormBoundaryWLHCs9qmcJJoyjKR--

data/test/registering_handler/rack/handler/registering_myself.rb

@@ -0,0 +1,8 @@
+module Rack
+  module Handler
+    class RegisteringMyself
+    end
+
+    register :registering_myself, RegisteringMyself
+  end
+end

data/test/spec_auth_digest.rb

@@ -8,17 +8,15 @@ describe Rack::Auth::Digest::MD5 do
 
   def unprotected_app
     lambda do |env|
-      [ 200, {'Content-Type' => 'text/plain'}, ["Hi #{env['REMOTE_USER']}"] ]
+      friend = Rack::Utils.parse_query(env["QUERY_STRING"])["friend"]
+      [ 200, {'Content-Type' => 'text/plain'}, ["Hi #{env['REMOTE_USER']}#{friend ? " and #{friend}" : ''}"] ]
     end
   end
 
   def protected_app
-    app = Rack::Auth::Digest::MD5.new(unprotected_app) do |username|
+    Rack::Auth::Digest::MD5.new(unprotected_app, :realm => realm, :opaque => 'this-should-be-secret') do |username|
       { 'Alice' => 'correct-password' }[username]
     end
-    app.realm = realm
-    app.opaque = 'this-should-be-secret'
-    app
   end
 
   def protected_app_with_hashed_passwords
@@ -207,6 +205,23 @@ describe Rack::Auth::Digest::MD5 do
     end
   end
 
+  should 'return application output when used with a query string and path as uri' do
+    @request = Rack::MockRequest.new(partially_protected_app)
+    request_with_digest_auth 'GET', '/protected?friend=Mike', 'Alice', 'correct-password' do |response|
+      response.status.should.equal 200
+      response.body.to_s.should.equal 'Hi Alice and Mike'
+    end
+  end
+
+  should 'return application output when used with a query string and fullpath as uri' do
+    @request = Rack::MockRequest.new(partially_protected_app)
+    qs_uri = '/protected?friend=Mike'
+    request_with_digest_auth 'GET', qs_uri, 'Alice', 'correct-password', 'uri' => qs_uri do |response|
+      response.status.should.equal 200
+      response.body.to_s.should.equal 'Hi Alice and Mike'
+    end
+  end
+
   should 'return application output if correct credentials given for POST' do
     request_with_digest_auth 'POST', '/', 'Alice', 'correct-password' do |response|
       response.status.should.equal 200

data/test/spec_builder.rb

@@ -120,4 +120,33 @@ describe Rack::Builder do
     Rack::MockRequest.new(app).get("/").should.be.server_error
   end
 
+  describe "parse_file" do
+    def config_file(name)
+      File.join(File.dirname(__FILE__), 'builder', name)
+    end
+
+    it "parses commented options" do
+      app, options = Rack::Builder.parse_file config_file('options.ru')
+      options[:debug].should.be.true
+      Rack::MockRequest.new(app).get("/").body.to_s.should.equal 'OK'
+    end
+
+    it "removes __END__ before evaluating app" do
+      app, options = Rack::Builder.parse_file config_file('end.ru')
+      Rack::MockRequest.new(app).get("/").body.to_s.should.equal 'OK'
+    end
+
+    it "supports multi-line comments" do
+      lambda {
+        Rack::Builder.parse_file config_file('comment.ru')
+      }.should.not.raise(SyntaxError)
+    end
+
+    it "requires anything not ending in .ru" do
+      $: << File.dirname(__FILE__)
+      app, options = Rack::Builder.parse_file 'builder/anything'
+      Rack::MockRequest.new(app).get("/").body.to_s.should.equal 'OK'
+      $:.pop
+    end
+  end
 end

data/test/spec_cgi.rb

@@ -1,3 +1,4 @@
+begin
 require File.expand_path('../testrequest', __FILE__)
 require 'rack/handler/cgi'
 
@@ -7,6 +8,10 @@ describe Rack::Handler::CGI do
   @host = '0.0.0.0'
   @port = 9203
 
+  if `which lighttpd` && !$?.success?
+    raise "lighttpd not found"
+  end
+
   # Keep this first.
   $pid = fork {
     ENV['RACK_ENV'] = 'deployment'
@@ -89,3 +94,9 @@ describe Rack::Handler::CGI do
     Process.wait($pid).should == $pid
   end
 end
+
+rescue RuntimeError
+  $stderr.puts "Skipping Rack::Handler::CGI tests (lighttpd is required). Install lighttpd and try again."
+rescue NotImplementedError
+  $stderr.puts "Your Ruby implemenation or platform does not support fork. Skipping Rack::Handler::CGI tests."
+end

data/test/spec_chunked.rb

@@ -52,7 +52,7 @@ describe Rack::Chunked do
   [100, 204, 304].each do |status_code|
     should "not modify response when status code is #{status_code}" do
       app = lambda { |env| [status_code, {}, []] }
-      status, headers, body = Rack::Chunked.new(app).call(@env)
+      status, headers, _ = Rack::Chunked.new(app).call(@env)
       status.should.equal status_code
       headers.should.not.include 'Transfer-Encoding'
     end

data/test/spec_commonlogger.rb

@@ -27,7 +27,7 @@ describe Rack::CommonLogger do
 
   should "log to anything with +write+" do
     log = StringIO.new
-    res = Rack::MockRequest.new(Rack::CommonLogger.new(app, log)).get("/")
+    Rack::MockRequest.new(Rack::CommonLogger.new(app, log)).get("/")
 
     log.string.should =~ /"GET \/ " 200 #{length} /
   end

data/test/spec_conditionalget.rb

@@ -15,6 +15,17 @@ describe Rack::ConditionalGet do
     response.body.should.be.empty
   end
 
+  should "set a 304 status and truncate body when If-Modified-Since hits and is higher than current time" do
+    app = Rack::ConditionalGet.new(lambda { |env|
+      [200, {'Last-Modified'=>(Time.now - 3600).httpdate}, ['TEST']] })
+
+    response = Rack::MockRequest.new(app).
+      get("/", 'HTTP_IF_MODIFIED_SINCE' => Time.now.httpdate)
+
+    response.status.should.equal 304
+    response.body.should.be.empty
+  end
+
   should "set a 304 status and truncate body when If-None-Match hits" do
     app = Rack::ConditionalGet.new(lambda { |env|
       [200, {'Etag'=>'1234'}, ['TEST']] })
@@ -26,6 +37,30 @@ describe Rack::ConditionalGet do
     response.body.should.be.empty
   end
 
+  should "not set a 304 status if If-Modified-Since hits but Etag does not" do
+    timestamp = Time.now.httpdate
+    app = Rack::ConditionalGet.new(lambda { |env|
+      [200, {'Last-Modified'=>timestamp, 'Etag'=>'1234'}, ['TEST']] })
+
+    response = Rack::MockRequest.new(app).
+      get("/", 'HTTP_IF_MODIFIED_SINCE' => timestamp, 'HTTP_IF_NONE_MATCH' => '4321')
+
+    response.status.should.equal 200
+    response.body.should.equal 'TEST'
+  end
+
+  should "set a 304 status and truncate body when both If-None-Match and If-Modified-Since hits" do
+    timestamp = Time.now.httpdate
+    app = Rack::ConditionalGet.new(lambda { |env|
+      [200, {'Last-Modified'=>timestamp, 'Etag'=>'1234'}, ['TEST']] })
+
+    response = Rack::MockRequest.new(app).
+      get("/", 'HTTP_IF_MODIFIED_SINCE' => timestamp, 'HTTP_IF_NONE_MATCH' => '1234')
+
+    response.status.should.equal 304
+    response.body.should.be.empty
+  end
+
   should "not affect non-GET/HEAD requests" do
     app = Rack::ConditionalGet.new(lambda { |env|
       [200, {'Etag'=>'1234'}, ['TEST']] })
@@ -36,4 +71,16 @@ describe Rack::ConditionalGet do
     response.status.should.equal 200
     response.body.should.equal 'TEST'
   end
+
+  should "not affect non-200 requests" do
+    app = Rack::ConditionalGet.new(lambda { |env|
+      [302, {'Etag'=>'1234'}, ['TEST']] })
+
+    response = Rack::MockRequest.new(app).
+      get("/", 'HTTP_IF_NONE_MATCH' => '1234')
+
+    response.status.should.equal 302
+    response.body.should.equal 'TEST'
+  end
+
 end

data/test/spec_content_length.rb

@@ -1,12 +1,6 @@
 require 'rack/content_length'
 
 describe Rack::ContentLength do
-  should "set Content-Length on String bodies if none is set" do
-    app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, "Hello, World!"] }
-    response = Rack::ContentLength.new(app).call({})
-    response[1]['Content-Length'].should.equal '13'
-  end
-
   should "set Content-Length on Array bodies if none is set" do
     app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, ["Hello, World!"]] }
     response = Rack::ContentLength.new(app).call({})

data/test/spec_content_type.rb

@@ -3,26 +3,26 @@ require 'rack/content_type'
 describe Rack::ContentType do
   should "set Content-Type to default text/html if none is set" do
     app = lambda { |env| [200, {}, "Hello, World!"] }
-    status, headers, body = Rack::ContentType.new(app).call({})
+    headers = Rack::ContentType.new(app).call({})[1]
     headers['Content-Type'].should.equal 'text/html'
   end
 
   should "set Content-Type to chosen default if none is set" do
     app = lambda { |env| [200, {}, "Hello, World!"] }
-    status, headers, body =
-      Rack::ContentType.new(app, 'application/octet-stream').call({})
+    headers =
+      Rack::ContentType.new(app, 'application/octet-stream').call({})[1]
     headers['Content-Type'].should.equal 'application/octet-stream'
   end
 
   should "not change Content-Type if it is already set" do
     app = lambda { |env| [200, {'Content-Type' => 'foo/bar'}, "Hello, World!"] }
-    status, headers, body = Rack::ContentType.new(app).call({})
+    headers = Rack::ContentType.new(app).call({})[1]
     headers['Content-Type'].should.equal 'foo/bar'
   end
 
   should "detect Content-Type case insensitive" do
     app = lambda { |env| [200, {'CONTENT-Type' => 'foo/bar'}, "Hello, World!"] }
-    status, headers, body = Rack::ContentType.new(app).call({})
+    headers = Rack::ContentType.new(app).call({})[1]
     headers.to_a.select { |k,v| k.downcase == "content-type" }.
       should.equal [["CONTENT-Type","foo/bar"]]
   end

data/test/spec_deflater.rb

@@ -2,6 +2,7 @@ require 'stringio'
 require 'time'  # for Time#httpdate
 require 'rack/deflater'
 require 'rack/mock'
+require 'zlib'
 
 describe Rack::Deflater do
   def build_response(status, body, accept_encoding, headers = {})
@@ -13,6 +14,11 @@ describe Rack::Deflater do
     return response
   end
 
+  def inflate(buf)
+    inflater = Zlib::Inflate.new(-Zlib::MAX_WBITS)
+    inflater.inflate(buf) << inflater.finish
+  end
+
   should "be able to deflate bodies that respond to each" do
     body = Object.new
     class << body; def each; yield("foo"); yield("bar"); end; end
@@ -26,7 +32,26 @@ describe Rack::Deflater do
     })
     buf = ''
     response[2].each { |part| buf << part }
-    buf.should.equal("K\313\317OJ,\002\000")
+    inflate(buf).should.equal("foobar")
+  end
+
+  should "flush deflated chunks to the client as they become ready" do
+    body = Object.new
+    class << body; def each; yield("foo"); yield("bar"); end; end
+
+    response = build_response(200, body, "deflate")
+
+    response[0].should.equal(200)
+    response[1].should.equal({
+      "Content-Encoding" => "deflate",
+      "Vary" => "Accept-Encoding"
+    })
+    buf = []
+    inflater = Zlib::Inflate.new(-Zlib::MAX_WBITS)
+    response[2].each { |part| buf << inflater.inflate(part) }
+    buf << inflater.finish
+    buf.delete_if { |part| part.empty? }
+    buf.should.equal(%w(foo bar))
   end
 
   # TODO: This is really just a special case of the above...
@@ -40,7 +65,7 @@ describe Rack::Deflater do
     })
     buf = ''
     response[2].each { |part| buf << part }
-    buf.should.equal("\363H\315\311\311W(\317/\312IQ\004\000")
+    inflate(buf).should.equal("Hello world!")
   end
 
   should "be able to gzip bodies that respond to each" do
@@ -63,6 +88,25 @@ describe Rack::Deflater do
     gz.close
   end
 
+  should "flush gzipped chunks to the client as they become ready" do
+    body = Object.new
+    class << body; def each; yield("foo"); yield("bar"); end; end
+
+    response = build_response(200, body, "gzip")
+
+    response[0].should.equal(200)
+    response[1].should.equal({
+      "Content-Encoding" => "gzip",
+      "Vary" => "Accept-Encoding"
+    })
+    buf = []
+    inflater = Zlib::Inflate.new(Zlib::MAX_WBITS + 32)
+    response[2].each { |part| buf << inflater.inflate(part) }
+    buf << inflater.finish
+    buf.delete_if { |part| part.empty? }
+    buf.should.equal(%w(foo bar))
+  end
+
   should "be able to fallback to no deflation" do
     response = build_response(200, "Hello world!", "superzip")
 

data/test/spec_etag.rb

@@ -1,15 +1,82 @@
 require 'rack/etag'
+require 'time'
 
 describe Rack::ETag do
-  should "set ETag if none is set" do
+  def sendfile_body
+    res = ['Hello World']
+    def res.to_path ; "/tmp/hello.txt" ; end
+    res
+  end
+
+  should "set ETag if none is set if status is 200" do
     app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, ["Hello, World!"]] }
     response = Rack::ETag.new(app).call({})
     response[1]['ETag'].should.equal "\"65a8e27d8879283831b664bd8b7f0ad4\""
   end
 
+  should "set ETag if none is set if status is 201" do
+    app = lambda { |env| [201, {'Content-Type' => 'text/plain'}, ["Hello, World!"]] }
+    response = Rack::ETag.new(app).call({})
+    response[1]['ETag'].should.equal "\"65a8e27d8879283831b664bd8b7f0ad4\""
+  end
+
+  should "set Cache-Control to 'max-age=0, private, must-revalidate' (default) if none is set" do
+    app = lambda { |env| [201, {'Content-Type' => 'text/plain'}, ["Hello, World!"]] }
+    response = Rack::ETag.new(app).call({})
+    response[1]['Cache-Control'].should.equal 'max-age=0, private, must-revalidate'
+  end
+
+  should "set Cache-Control to chosen one if none is set" do
+    app = lambda { |env| [201, {'Content-Type' => 'text/plain'}, ["Hello, World!"]] }
+    response = Rack::ETag.new(app, nil, 'public').call({})
+    response[1]['Cache-Control'].should.equal 'public'
+  end
+
+  should "set a given Cache-Control even if digest could not be calculated" do
+    app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, []] }
+    response = Rack::ETag.new(app, 'no-cache').call({})
+    response[1]['Cache-Control'].should.equal 'no-cache'
+  end
+
+  should "not set Cache-Control if it is already set" do
+    app = lambda { |env| [201, {'Content-Type' => 'text/plain', 'Cache-Control' => 'public'}, ["Hello, World!"]] }
+    response = Rack::ETag.new(app).call({})
+    response[1]['Cache-Control'].should.equal 'public'
+  end
+
   should "not change ETag if it is already set" do
     app = lambda { |env| [200, {'Content-Type' => 'text/plain', 'ETag' => '"abc"'}, ["Hello, World!"]] }
     response = Rack::ETag.new(app).call({})
     response[1]['ETag'].should.equal "\"abc\""
   end
+
+  should "not set ETag if body is empty" do
+    app = lambda { |env| [200, {'Content-Type' => 'text/plain', 'Last-Modified' => Time.now.httpdate}, []] }
+    response = Rack::ETag.new(app).call({})
+    response[1]['ETag'].should.be.nil
+  end
+
+  should "not set ETag if Last-Modified is set" do
+    app = lambda { |env| [200, {'Content-Type' => 'text/plain', 'Last-Modified' => Time.now.httpdate}, ["Hello, World!"]] }
+    response = Rack::ETag.new(app).call({})
+    response[1]['ETag'].should.be.nil
+  end
+
+  should "not set ETag if a sendfile_body is given" do
+    app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, sendfile_body] }
+    response = Rack::ETag.new(app).call({})
+    response[1]['ETag'].should.be.nil
+  end
+
+  should "not set ETag if a status is not 200 or 201" do
+    app = lambda { |env| [401, {'Content-Type' => 'text/plain'}, ['Access denied.']] }
+    response = Rack::ETag.new(app).call({})
+    response[1]['ETag'].should.be.nil
+  end
+
+  should "not set ETag if no-cache is given" do
+    app = lambda { |env| [200, {'Cache-Control' => 'no-cache'}, ['Hello, World!']] }
+    response = Rack::ETag.new(app).call({})
+    response[1]['ETag'].should.be.nil
+  end
 end