rack 1.4.1 → 1.4.2

data/test/spec_chunked.rb

@@ -3,15 +3,15 @@ require 'rack/lint'
 require 'rack/mock'
 
 describe Rack::Chunked do
-  Enumerator = ::Enumerable::Enumerator unless defined?(Enumerator)
+  ::Enumerator = ::Enumerable::Enumerator unless Object.const_defined?(:Enumerator)
 
   def chunked(app)
     proc do |env|
       app = Rack::Chunked.new(app)
-      Rack::Lint.new(app).call(env).tap do |response|
-        # we want to use body like an array, but it only has #each
-        response[2] = Enumerator.new(response[2]).to_a
-      end
+      response = Rack::Lint.new(app).call(env)
+      # we want to use body like an array, but it only has #each
+      response[2] = Enumerator.new(response[2]).to_a
+      response
     end
   end
   
@@ -42,7 +42,7 @@ describe Rack::Chunked do
     response = Rack::MockResponse.new(*chunked(app).call(@env))
     response.headers.should.not.include 'Content-Length'
     response.headers['Transfer-Encoding'].should.equal 'chunked'
-    response.body.encoding.to_s.should == "ASCII-8BIT"
+    response.body.encoding.to_s.should.equal "ASCII-8BIT"
     response.body.should.equal "c\r\n\xFE\xFFH\x00e\x00l\x00l\x00o\x00\r\n2\r\n \x00\r\na\r\nW\x00o\x00r\x00l\x00d\x00\r\n0\r\n\r\n"
   end if RUBY_VERSION >= "1.9"
 

data/test/spec_config.rb

@@ -8,7 +8,6 @@ describe Rack::Config do
   should "accept a block that modifies the environment" do
     app = Rack::Builder.new do
       use Rack::Lint
-      use Rack::ContentLength
       use Rack::Config do |env|
         env['greeting'] = 'hello'
       end

data/test/spec_content_length.rb

@@ -1,9 +1,22 @@
+require 'enumerator'
 require 'rack/content_length'
+require 'rack/lint'
+require 'rack/mock'
 
 describe Rack::ContentLength do
+  ::Enumerator = ::Enumerable::Enumerator unless Object.const_defined?(:Enumerator)
+
+  def content_length(app)
+    Rack::Lint.new Rack::ContentLength.new(app)
+  end
+  
+  def request
+    Rack::MockRequest.env_for
+  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({})
+    response = content_length(app).call(request)
     response[1]['Content-Length'].should.equal '13'
   end
 
@@ -12,25 +25,25 @@ describe Rack::ContentLength do
     def body.each ; yield call ; end
 
     app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, body] }
-    response = Rack::ContentLength.new(app).call({})
+    response = content_length(app).call(request)
     response[1]['Content-Length'].should.be.nil
   end
 
   should "not change Content-Length if it is already set" do
     app = lambda { |env| [200, {'Content-Type' => 'text/plain', 'Content-Length' => '1'}, "Hello, World!"] }
-    response = Rack::ContentLength.new(app).call({})
+    response = content_length(app).call(request)
     response[1]['Content-Length'].should.equal '1'
   end
 
   should "not set Content-Length on 304 responses" do
-    app = lambda { |env| [304, {'Content-Type' => 'text/plain'}, []] }
-    response = Rack::ContentLength.new(app).call({})
+    app = lambda { |env| [304, {}, []] }
+    response = content_length(app).call(request)
     response[1]['Content-Length'].should.equal nil
   end
 
   should "not set Content-Length when Transfer-Encoding is chunked" do
-    app = lambda { |env| [200, {'Transfer-Encoding' => 'chunked'}, []] }
-    response = Rack::ContentLength.new(app).call({})
+    app = lambda { |env| [200, {'Content-Type' => 'text/plain', 'Transfer-Encoding' => 'chunked'}, []] }
+    response = content_length(app).call(request)
     response[1]['Content-Length'].should.equal nil
   end
 
@@ -39,7 +52,7 @@ describe Rack::ContentLength do
   #
   # should "not force a Content-Length when Connection:close" do
   #   app = lambda { |env| [200, {'Connection' => 'close'}, []] }
-  #   response = Rack::ContentLength.new(app).call({})
+  #   response = content_length(app).call({})
   #   response[1]['Content-Length'].should.equal nil
   # end
 
@@ -51,8 +64,8 @@ describe Rack::ContentLength do
       def to_ary; end
     end.new(%w[one two three])
 
-    app = lambda { |env| [200, {}, body] }
-    Rack::ContentLength.new(app).call({})
+    app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, body] }
+    content_length(app).call(request)
     body.closed.should.equal true
   end
 
@@ -64,10 +77,10 @@ describe Rack::ContentLength do
       def to_ary; end
     end.new(%w[one two three])
 
-    app = lambda { |env| [200, {}, body] }
-    response = Rack::ContentLength.new(app).call({})
+    app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, body] }
+    response = content_length(app).call(request)
     expected = %w[one two three]
     response[1]['Content-Length'].should.equal expected.join.size.to_s
-    response[2].should.equal expected
+    Enumerator.new(response[2]).to_a.should.equal expected
   end
 end

data/test/spec_content_type.rb

@@ -1,35 +1,45 @@
 require 'rack/content_type'
+require 'rack/lint'
+require 'rack/mock'
 
 describe Rack::ContentType do
+  def content_type(app, *args)
+    Rack::Lint.new Rack::ContentType.new(app, *args)
+  end
+  
+  def request
+    Rack::MockRequest.env_for
+  end
+  
   should "set Content-Type to default text/html if none is set" do
     app = lambda { |env| [200, {}, "Hello, World!"] }
-    headers = Rack::ContentType.new(app).call({})[1]
+    headers = content_type(app).call(request)[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!"] }
     headers =
-      Rack::ContentType.new(app, 'application/octet-stream').call({})[1]
+      content_type(app, 'application/octet-stream').call(request)[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!"] }
-    headers = Rack::ContentType.new(app).call({})[1]
+    headers = content_type(app).call(request)[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!"] }
-    headers = Rack::ContentType.new(app).call({})[1]
+    headers = content_type(app).call(request)[1]
     headers.to_a.select { |k,v| k.downcase == "content-type" }.
       should.equal [["CONTENT-Type","foo/bar"]]
   end
 
   should "not set Content-Type on 304 responses" do
     app = lambda { |env| [304, {}, []] }
-    response = Rack::ContentType.new(app, "text/html").call({})
+    response = content_type(app, "text/html").call(request)
     response[1]['Content-Type'].should.equal nil
   end
 end

data/test/spec_deflater.rb

@@ -1,15 +1,27 @@
+require 'enumerator'
 require 'stringio'
 require 'time'  # for Time#httpdate
 require 'rack/deflater'
+require 'rack/lint'
 require 'rack/mock'
 require 'zlib'
 
 describe Rack::Deflater do
+  ::Enumerator = ::Enumerable::Enumerator unless Object.const_defined?(:Enumerator)
+
+  def deflater(app)
+    Rack::Lint.new Rack::Deflater.new(app)
+  end
+  
   def build_response(status, body, accept_encoding, headers = {})
     body = [body]  if body.respond_to? :to_str
-    app = lambda { |env| [status, {}, body] }
+    app = lambda do |env|
+      res = [status, {}, body]
+      res[1]["Content-Type"] = "text/plain" unless res[0] == 304
+      res
+    end
     request = Rack::MockRequest.env_for("", headers.merge("HTTP_ACCEPT_ENCODING" => accept_encoding))
-    response = Rack::Deflater.new(app).call(request)
+    response = deflater(app).call(request)
 
     return response
   end
@@ -28,7 +40,8 @@ describe Rack::Deflater do
     response[0].should.equal(200)
     response[1].should.equal({
       "Content-Encoding" => "deflate",
-      "Vary" => "Accept-Encoding"
+      "Vary" => "Accept-Encoding",
+      "Content-Type" => "text/plain"
     })
     buf = ''
     response[2].each { |part| buf << part }
@@ -44,7 +57,8 @@ describe Rack::Deflater do
     response[0].should.equal(200)
     response[1].should.equal({
       "Content-Encoding" => "deflate",
-      "Vary" => "Accept-Encoding"
+      "Vary" => "Accept-Encoding",
+      "Content-Type" => "text/plain"
     })
     buf = []
     inflater = Zlib::Inflate.new(-Zlib::MAX_WBITS)
@@ -61,7 +75,8 @@ describe Rack::Deflater do
     response[0].should.equal(200)
     response[1].should.equal({
       "Content-Encoding" => "deflate",
-      "Vary" => "Accept-Encoding"
+      "Vary" => "Accept-Encoding",
+      "Content-Type" => "text/plain"
     })
     buf = ''
     response[2].each { |part| buf << part }
@@ -78,6 +93,7 @@ describe Rack::Deflater do
     response[1].should.equal({
       "Content-Encoding" => "gzip",
       "Vary" => "Accept-Encoding",
+      "Content-Type" => "text/plain"
     })
 
     buf = ''
@@ -97,7 +113,8 @@ describe Rack::Deflater do
     response[0].should.equal(200)
     response[1].should.equal({
       "Content-Encoding" => "gzip",
-      "Vary" => "Accept-Encoding"
+      "Vary" => "Accept-Encoding",
+      "Content-Type" => "text/plain"
     })
     buf = []
     inflater = Zlib::Inflate.new(Zlib::MAX_WBITS + 32)
@@ -111,8 +128,8 @@ describe Rack::Deflater do
     response = build_response(200, "Hello world!", "superzip")
 
     response[0].should.equal(200)
-    response[1].should.equal({ "Vary" => "Accept-Encoding" })
-    response[2].should.equal(["Hello world!"])
+    response[1].should.equal({ "Vary" => "Accept-Encoding", "Content-Type" => "text/plain" })
+    Enumerator.new(response[2]).to_a.should.equal(["Hello world!"])
   end
 
   should "be able to skip when there is no response entity body" do
@@ -120,33 +137,34 @@ describe Rack::Deflater do
 
     response[0].should.equal(304)
     response[1].should.equal({})
-    response[2].should.equal([])
+    Enumerator.new(response[2]).to_a.should.equal([])
   end
 
   should "handle the lack of an acceptable encoding" do
     response1 = build_response(200, "Hello world!", "identity;q=0", "PATH_INFO" => "/")
     response1[0].should.equal(406)
     response1[1].should.equal({"Content-Type" => "text/plain", "Content-Length" => "71"})
-    response1[2].should.equal(["An acceptable encoding for the requested resource / could not be found."])
+    Enumerator.new(response1[2]).to_a.should.equal(["An acceptable encoding for the requested resource / could not be found."])
 
     response2 = build_response(200, "Hello world!", "identity;q=0", "SCRIPT_NAME" => "/foo", "PATH_INFO" => "/bar")
     response2[0].should.equal(406)
     response2[1].should.equal({"Content-Type" => "text/plain", "Content-Length" => "78"})
-    response2[2].should.equal(["An acceptable encoding for the requested resource /foo/bar could not be found."])
+    Enumerator.new(response2[2]).to_a.should.equal(["An acceptable encoding for the requested resource /foo/bar could not be found."])
   end
 
   should "handle gzip response with Last-Modified header" do
     last_modified = Time.now.httpdate
 
-    app = lambda { |env| [200, { "Last-Modified" => last_modified }, ["Hello World!"]] }
+    app = lambda { |env| [200, { "Content-Type" => "text/plain", "Last-Modified" => last_modified }, ["Hello World!"]] }
     request = Rack::MockRequest.env_for("", "HTTP_ACCEPT_ENCODING" => "gzip")
-    response = Rack::Deflater.new(app).call(request)
+    response = deflater(app).call(request)
 
     response[0].should.equal(200)
     response[1].should.equal({
       "Content-Encoding" => "gzip",
       "Vary" => "Accept-Encoding",
-      "Last-Modified" => last_modified
+      "Last-Modified" => last_modified,
+      "Content-Type" => "text/plain"
     })
 
     buf = ''
@@ -158,12 +176,12 @@ describe Rack::Deflater do
   end
 
   should "do nothing when no-transform Cache-Control directive present" do
-    app = lambda { |env| [200, {'Cache-Control' => 'no-transform'}, ['Hello World!']] }
+    app = lambda { |env| [200, {'Content-Type' => 'text/plain', 'Cache-Control' => 'no-transform'}, ['Hello World!']] }
     request = Rack::MockRequest.env_for("", "HTTP_ACCEPT_ENCODING" => "gzip")
-    response = Rack::Deflater.new(app).call(request)
+    response = deflater(app).call(request)
 
     response[0].should.equal(200)
     response[1].should.not.include "Content-Encoding"
-    response[2].join.should.equal("Hello World!")
+    Enumerator.new(response[2]).to_a.join.should.equal("Hello World!")
   end
 end

data/test/spec_directory.rb

@@ -1,10 +1,11 @@
 require 'rack/directory'
+require 'rack/lint'
 require 'rack/mock'
 
 describe Rack::Directory do
   DOCROOT = File.expand_path(File.dirname(__FILE__)) unless defined? DOCROOT
   FILE_CATCH = proc{|env| [200, {'Content-Type'=>'text/plain', "Content-Length" => "7"}, ['passed!']] }
-  app = Rack::Directory.new DOCROOT, FILE_CATCH
+  app = Rack::Lint.new(Rack::Directory.new(DOCROOT, FILE_CATCH))
 
   should "serve directory indices" do
     res = Rack::MockRequest.new(Rack::Lint.new(app)).
@@ -66,4 +67,22 @@ describe Rack::Directory do
     res = mr.get("/cgi/test%2bdirectory/test%2bfile")
     res.should.be.ok
   end
+
+  should "correctly escape script name" do
+    app2 = Rack::Builder.new do
+      map '/script-path' do
+        run app
+      end
+    end
+
+    mr = Rack::MockRequest.new(Rack::Lint.new(app2))
+
+    res = mr.get("/script-path/cgi/test%2bdirectory")
+
+    res.should.be.ok
+    res.body.should =~ %r[/script-path/cgi/test%2Bdirectory/test%2Bfile]
+
+    res = mr.get("/script-path/cgi/test%2bdirectory/test%2bfile")
+    res.should.be.ok
+  end
 end

data/test/spec_etag.rb

@@ -1,7 +1,17 @@
 require 'rack/etag'
+require 'rack/lint'
+require 'rack/mock'
 require 'time'
 
 describe Rack::ETag do
+  def etag(app, *args)
+    Rack::Lint.new Rack::ETag.new(app, *args)
+  end
+  
+  def request
+    Rack::MockRequest.env_for
+  end
+  
   def sendfile_body
     res = ['Hello World']
     def res.to_path ; "/tmp/hello.txt" ; end
@@ -10,73 +20,79 @@ describe Rack::ETag do
 
   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 = etag(app).call(request)
     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 = etag(app).call(request)
     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 = etag(app).call(request)
     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 = etag(app, nil, 'public').call(request)
     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 = etag(app, 'no-cache').call(request)
     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 = etag(app).call(request)
     response[1]['Cache-Control'].should.equal 'public'
   end
 
+  should "not set Cache-Control if directive isn't present" do
+    app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, ["Hello, World!"]] }
+    response = etag(app, nil, nil).call(request)
+    response[1]['Cache-Control'].should.equal nil
+  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 = etag(app).call(request)
     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 = etag(app).call(request)
     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 = etag(app).call(request)
     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 = etag(app).call(request)
     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 = etag(app).call(request)
     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({})
+    app = lambda { |env| [200, {'Content-Type' => 'text/plain', 'Cache-Control' => 'no-cache, must-revalidate'}, ['Hello, World!']] }
+    response = etag(app).call(request)
     response[1]['ETag'].should.be.nil
   end
 end