rack 1.1.6 → 1.2.0

data/{test/spec_rack_cgi.rb → spec/spec_cgi.rb}

@@ -1,53 +1,55 @@
-require 'test/spec'
-require 'testrequest'
+require File.expand_path('../testrequest', __FILE__)
+require 'rack/handler/cgi'
 
-context "Rack::Handler::CGI" do
-  include TestRequest::Helpers
+describe Rack::Handler::CGI do
+  extend TestRequest::Helpers
 
-  setup do
-    @host = '0.0.0.0'
-    @port = 9203
-  end
+  @host = '0.0.0.0'
+  @port = 9203
 
   # Keep this first.
-  specify "startup" do
-    $pid = fork {
-      Dir.chdir(File.join(File.dirname(__FILE__), "..", "test", "cgi"))
+  $pid = fork {
+    ENV['RACK_ENV'] = 'deployment'
+    ENV['RUBYLIB'] = [
+      File.expand_path('../../lib', __FILE__),
+      ENV['RUBYLIB'],
+    ].compact.join(':')
+
+    Dir.chdir(File.expand_path("../cgi", __FILE__)) do
       exec "lighttpd -D -f lighttpd.conf"
-    }
-  end
+    end
+  }
 
-  specify "should respond" do
+  should "respond" do
     sleep 1
-    lambda {
-      GET("/test")
-    }.should.not.raise
+    GET("/test")
+    response.should.not.be.nil
   end
 
-  specify "should be a lighttpd" do
+  should "be a lighttpd" do
     GET("/test")
-    status.should.be 200
+    status.should.equal 200
     response["SERVER_SOFTWARE"].should =~ /lighttpd/
     response["HTTP_VERSION"].should.equal "HTTP/1.1"
     response["SERVER_PROTOCOL"].should.equal "HTTP/1.1"
     response["SERVER_PORT"].should.equal @port.to_s
-    response["SERVER_NAME"].should =~ @host
+    response["SERVER_NAME"].should.equal @host
   end
 
-  specify "should have rack headers" do
+  should "have rack headers" do
     GET("/test")
-    response["rack.version"].should.equal [1,1]
-    response["rack.multithread"].should.be false
-    response["rack.multiprocess"].should.be true
-    response["rack.run_once"].should.be true
+    response["rack.version"].should.equal([1,1])
+    response["rack.multithread"].should.be.false
+    response["rack.multiprocess"].should.be.true
+    response["rack.run_once"].should.be.true
   end
 
-  specify "should have CGI headers on GET" do
+  should "have CGI headers on GET" do
     GET("/test")
     response["REQUEST_METHOD"].should.equal "GET"
     response["SCRIPT_NAME"].should.equal "/test"
     response["REQUEST_PATH"].should.equal "/"
-    response["PATH_INFO"].should.be nil
+    response["PATH_INFO"].should.be.nil
     response["QUERY_STRING"].should.equal ""
     response["test.postdata"].should.equal ""
 
@@ -59,7 +61,7 @@ context "Rack::Handler::CGI" do
     response["QUERY_STRING"].should.equal "quux=1"
   end
 
-  specify "should have CGI headers on POST" do
+  should "have CGI headers on POST" do
     POST("/test", {"rack-form-data" => "23"}, {'X-test-header' => '42'})
     status.should.equal 200
     response["REQUEST_METHOD"].should.equal "POST"
@@ -70,20 +72,20 @@ context "Rack::Handler::CGI" do
     response["test.postdata"].should.equal "rack-form-data=23"
   end
 
-  specify "should support HTTP auth" do
+  should "support HTTP auth" do
     GET("/test", {:user => "ruth", :passwd => "secret"})
     response["HTTP_AUTHORIZATION"].should.equal "Basic cnV0aDpzZWNyZXQ="
   end
 
-  specify "should set status" do
+  should "set status" do
     GET("/test?secret")
     status.should.equal 403
     response["rack.url_scheme"].should.equal "http"
   end
 
   # Keep this last.
-  specify "shutdown" do
+  should "shutdown" do
     Process.kill 15, $pid
-    Process.wait($pid).should.equal $pid
+    Process.wait($pid).should == $pid
   end
 end

data/{test/spec_rack_chunked.rb → spec/spec_chunked.rb}

@@ -1,15 +1,13 @@
-require 'rack/mock'
 require 'rack/chunked'
-require 'rack/utils'
-
-context "Rack::Chunked" do
+require 'rack/mock'
 
+describe Rack::Chunked do
   before do
     @env = Rack::MockRequest.
       env_for('/', 'HTTP_VERSION' => '1.1', 'REQUEST_METHOD' => 'GET')
   end
 
-  specify 'chunks responses with no Content-Length' do
+  should 'chunk responses with no Content-Length' do
     app = lambda { |env| [200, {}, ['Hello', ' ', 'World!']] }
     response = Rack::MockResponse.new(*Rack::Chunked.new(app).call(@env))
     response.headers.should.not.include 'Content-Length'
@@ -17,7 +15,7 @@ context "Rack::Chunked" do
     response.body.should.equal "5\r\nHello\r\n1\r\n \r\n6\r\nWorld!\r\n0\r\n\r\n"
   end
 
-  specify 'chunks empty bodies properly' do
+  should 'chunks empty bodies properly' do
     app = lambda { |env| [200, {}, []] }
     response = Rack::MockResponse.new(*Rack::Chunked.new(app).call(@env))
     response.headers.should.not.include 'Content-Length'
@@ -25,7 +23,7 @@ context "Rack::Chunked" do
     response.body.should.equal "0\r\n\r\n"
   end
 
-  specify 'does not modify response when Content-Length header present' do
+  should 'not modify response when Content-Length header present' do
     app = lambda { |env| [200, {'Content-Length'=>'12'}, ['Hello', ' ', 'World!']] }
     status, headers, body = Rack::Chunked.new(app).call(@env)
     status.should.equal 200
@@ -34,7 +32,7 @@ context "Rack::Chunked" do
     body.join.should.equal 'Hello World!'
   end
 
-  specify 'does not modify response when client is HTTP/1.0' do
+  should 'not modify response when client is HTTP/1.0' do
     app = lambda { |env| [200, {}, ['Hello', ' ', 'World!']] }
     @env['HTTP_VERSION'] = 'HTTP/1.0'
     status, headers, body = Rack::Chunked.new(app).call(@env)
@@ -43,7 +41,7 @@ context "Rack::Chunked" do
     body.join.should.equal 'Hello World!'
   end
 
-  specify 'does not modify response when Transfer-Encoding header already present' do
+  should 'not modify response when Transfer-Encoding header already present' do
     app = lambda { |env| [200, {'Transfer-Encoding' => 'identity'}, ['Hello', ' ', 'World!']] }
     status, headers, body = Rack::Chunked.new(app).call(@env)
     status.should.equal 200
@@ -52,7 +50,7 @@ context "Rack::Chunked" do
   end
 
   [100, 204, 304].each do |status_code|
-    specify "does not modify response when status code is #{status_code}" do
+    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.should.equal status_code

data/{test/spec_rack_commonlogger.rb → spec/spec_commonlogger.rb}

@@ -1,11 +1,10 @@
-require 'test/spec'
-require 'stringio'
-
 require 'rack/commonlogger'
-require 'rack/lobster'
 require 'rack/mock'
 
-context "Rack::CommonLogger" do
+describe Rack::CommonLogger do
+  obj = 'foobar'
+  length = obj.size
+
   app = lambda { |env|
     [200,
      {"Content-Type" => "text/html", "Content-Length" => length.to_s},
@@ -19,42 +18,38 @@ context "Rack::CommonLogger" do
      {"Content-Type" => "text/html", "Content-Length" => "0"},
      []]}
 
-  specify "should log to rack.errors by default" do
+  should "log to rack.errors by default" do
     res = Rack::MockRequest.new(Rack::CommonLogger.new(app)).get("/")
 
     res.errors.should.not.be.empty
     res.errors.should =~ /"GET \/ " 200 #{length} /
   end
 
-  specify "should log to anything with +write+" do
+  should "log to anything with +write+" do
     log = StringIO.new
     res = Rack::MockRequest.new(Rack::CommonLogger.new(app, log)).get("/")
 
     log.string.should =~ /"GET \/ " 200 #{length} /
   end
 
-  specify "should log - content length if header is missing" do
+  should "log - content length if header is missing" do
     res = Rack::MockRequest.new(Rack::CommonLogger.new(app_without_length)).get("/")
 
     res.errors.should.not.be.empty
     res.errors.should =~ /"GET \/ " 200 - /
   end
 
-  specify "should log - content length if header is zero" do
+  should "log - content length if header is zero" do
     res = Rack::MockRequest.new(Rack::CommonLogger.new(app_with_zero_length)).get("/")
 
     res.errors.should.not.be.empty
     res.errors.should =~ /"GET \/ " 200 - /
   end
-  
+
   def length
-    self.class.length
-  end
-  
-  def self.length
     123
   end
-  
+
   def self.obj
     "hello world"
   end

data/{test/spec_rack_conditionalget.rb → spec/spec_conditionalget.rb}

@@ -1,11 +1,9 @@
-require 'test/spec'
 require 'time'
-
-require 'rack/mock'
 require 'rack/conditionalget'
+require 'rack/mock'
 
-context "Rack::ConditionalGet" do
-  specify "should set a 304 status and truncate body when If-Modified-Since hits" do
+describe Rack::ConditionalGet do
+  should "set a 304 status and truncate body when If-Modified-Since hits" do
     timestamp = Time.now.httpdate
     app = Rack::ConditionalGet.new(lambda { |env|
       [200, {'Last-Modified'=>timestamp}, ['TEST']] })
@@ -17,7 +15,7 @@ context "Rack::ConditionalGet" do
     response.body.should.be.empty
   end
 
-  specify "should set a 304 status and truncate body when If-None-Match hits" do
+  should "set a 304 status and truncate body when If-None-Match hits" do
     app = Rack::ConditionalGet.new(lambda { |env|
       [200, {'Etag'=>'1234'}, ['TEST']] })
 
@@ -28,7 +26,7 @@ context "Rack::ConditionalGet" do
     response.body.should.be.empty
   end
 
-  specify "should not affect non-GET/HEAD requests" do
+  should "not affect non-GET/HEAD requests" do
     app = Rack::ConditionalGet.new(lambda { |env|
       [200, {'Etag'=>'1234'}, ['TEST']] })
 

data/{test/spec_rack_config.rb → spec/spec_config.rb}

@@ -1,12 +1,11 @@
-require 'test/spec'
-require 'rack/mock'
 require 'rack/builder'
-require 'rack/content_length'
 require 'rack/config'
+require 'rack/content_length'
+require 'rack/lint'
+require 'rack/mock'
 
-context "Rack::Config" do
-
-  specify "should accept a block that modifies the environment" do
+describe Rack::Config do
+  should "accept a block that modifies the environment" do
     app = Rack::Builder.new do
       use Rack::Lint
       use Rack::ContentLength
@@ -17,8 +16,8 @@ context "Rack::Config" do
         [200, {'Content-Type' => 'text/plain'}, [env['greeting'] || '']]
       }
     end
+
     response = Rack::MockRequest.new(app).get('/')
     response.body.should.equal('hello')
   end
-
 end

data/{test/spec_rack_content_length.rb → spec/spec_content_length.rb}

@@ -1,20 +1,19 @@
-require 'rack/mock'
 require 'rack/content_length'
 
-context "Rack::ContentLength" do
-  specify "sets Content-Length on String bodies if none is set" do
+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
 
-  specify "sets Content-Length on Array bodies if none is set" do
+  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[1]['Content-Length'].should.equal '13'
   end
 
-  specify "does not set Content-Length on variable length bodies" do
+  should "not set Content-Length on variable length bodies" do
     body = lambda { "Hello World!" }
     def body.each ; yield call ; end
 
@@ -23,19 +22,19 @@ context "Rack::ContentLength" do
     response[1]['Content-Length'].should.be.nil
   end
 
-  specify "does not change Content-Length if it is already set" do
+  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[1]['Content-Length'].should.equal '1'
   end
 
-  specify "does not set Content-Length on 304 responses" do
+  should "not set Content-Length on 304 responses" do
     app = lambda { |env| [304, {'Content-Type' => 'text/plain'}, []] }
     response = Rack::ContentLength.new(app).call({})
     response[1]['Content-Length'].should.equal nil
   end
 
-  specify "does not set Content-Length when Transfer-Encoding is chunked" do
+  should "not set Content-Length when Transfer-Encoding is chunked" do
     app = lambda { |env| [200, {'Transfer-Encoding' => 'chunked'}, []] }
     response = Rack::ContentLength.new(app).call({})
     response[1]['Content-Length'].should.equal nil

data/{test/spec_rack_content_type.rb → spec/spec_content_type.rb}

@@ -1,27 +1,26 @@
-require 'rack/mock'
 require 'rack/content_type'
 
-context "Rack::ContentType" do
-  specify "sets Content-Type to default text/html if none is set" do
+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['Content-Type'].should.equal 'text/html'
   end
 
-  specify "sets Content-Type to chosen default if none is set" do
+  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['Content-Type'].should.equal 'application/octet-stream'
   end
 
-  specify "does not change Content-Type if it is already set" do
+  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['Content-Type'].should.equal 'foo/bar'
   end
 
-  specify "case insensitive detection of Content-Type" do
+  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.to_a.select { |k,v| k.downcase == "content-type" }.

data/{test/spec_rack_deflater.rb → spec/spec_deflater.rb}

@@ -1,11 +1,9 @@
-require 'test/spec'
-
-require 'rack/mock'
-require 'rack/deflater'
 require 'stringio'
 require 'time'  # for Time#httpdate
+require 'rack/deflater'
+require 'rack/mock'
 
-context "Rack::Deflater" do
+describe Rack::Deflater do
   def build_response(status, body, accept_encoding, headers = {})
     body = [body]  if body.respond_to? :to_str
     app = lambda { |env| [status, {}, body] }
@@ -15,7 +13,7 @@ context "Rack::Deflater" do
     return response
   end
 
-  specify "should be able to deflate bodies that respond to each" do
+  should "be able to deflate bodies that respond to each" do
     body = Object.new
     class << body; def each; yield("foo"); yield("bar"); end; end
 
@@ -32,7 +30,7 @@ context "Rack::Deflater" do
   end
 
   # TODO: This is really just a special case of the above...
-  specify "should be able to deflate String bodies" do
+  should "be able to deflate String bodies" do
     response = build_response(200, "Hello world!", "deflate")
 
     response[0].should.equal(200)
@@ -45,7 +43,7 @@ context "Rack::Deflater" do
     buf.should.equal("\363H\315\311\311W(\317/\312IQ\004\000")
   end
 
-  specify "should be able to gzip bodies that respond to each" do
+  should "be able to gzip bodies that respond to each" do
     body = Object.new
     class << body; def each; yield("foo"); yield("bar"); end; end
 
@@ -65,7 +63,7 @@ context "Rack::Deflater" do
     gz.close
   end
 
-  specify "should be able to fallback to no deflation" do
+  should "be able to fallback to no deflation" do
     response = build_response(200, "Hello world!", "superzip")
 
     response[0].should.equal(200)
@@ -73,7 +71,7 @@ context "Rack::Deflater" do
     response[2].should.equal(["Hello world!"])
   end
 
-  specify "should be able to skip when there is no response entity body" do
+  should "be able to skip when there is no response entity body" do
     response = build_response(304, [], "gzip")
 
     response[0].should.equal(304)
@@ -81,7 +79,7 @@ context "Rack::Deflater" do
     response[2].should.equal([])
   end
 
-  specify "should handle the lack of an acceptable encoding" do
+  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"})
@@ -93,7 +91,7 @@ context "Rack::Deflater" do
     response2[2].should.equal(["An acceptable encoding for the requested resource /foo/bar could not be found."])
   end
 
-  specify "should handle gzip response with Last-Modified header" do
+  should "handle gzip response with Last-Modified header" do
     last_modified = Time.now.httpdate
 
     app = lambda { |env| [200, { "Last-Modified" => last_modified }, ["Hello World!"]] }
@@ -115,7 +113,7 @@ context "Rack::Deflater" do
     gz.close
   end
 
-  specify "should do nothing when no-transform Cache-Control directive present" do
+  should "do nothing when no-transform Cache-Control directive present" do
     app = lambda { |env| [200, {'Cache-Control' => 'no-transform'}, ['Hello World!']] }
     request = Rack::MockRequest.env_for("", "HTTP_ACCEPT_ENCODING" => "gzip")
     response = Rack::Deflater.new(app).call(request)