rack 1.1.0 → 1.2.0

data/{test/spec_rack_session_pool.rb → spec/spec_session_pool.rb}

@@ -1,39 +1,40 @@
-require 'test/spec'
-
-require 'rack/session/pool'
-require 'rack/mock'
-require 'rack/response'
 require 'thread'
+require 'rack/mock'
+require 'rack/session/pool'
 
-context "Rack::Session::Pool" do
+describe Rack::Session::Pool do
   session_key = Rack::Session::Pool::DEFAULT_OPTIONS[:key]
   session_match = /#{session_key}=[0-9a-fA-F]+;/
+
   incrementor = lambda do |env|
     env["rack.session"]["counter"] ||= 0
     env["rack.session"]["counter"] += 1
     Rack::Response.new(env["rack.session"].inspect).to_a
   end
-  drop_session = proc do |env|
+
+  drop_session = lambda do |env|
     env['rack.session.options'][:drop] = true
     incrementor.call(env)
   end
-  renew_session = proc do |env|
+
+  renew_session = lambda do |env|
     env['rack.session.options'][:renew] = true
     incrementor.call(env)
   end
-  defer_session = proc do |env|
+
+  defer_session = lambda do |env|
     env['rack.session.options'][:defer] = true
     incrementor.call(env)
   end
 
-  specify "creates a new cookie" do
+  it "creates a new cookie" do
     pool = Rack::Session::Pool.new(incrementor)
     res = Rack::MockRequest.new(pool).get("/")
     res["Set-Cookie"].should.match session_match
     res.body.should.equal '{"counter"=>1}'
   end
 
-  specify "determines session from a cookie" do
+  it "determines session from a cookie" do
     pool = Rack::Session::Pool.new(incrementor)
     req = Rack::MockRequest.new(pool)
     cookie = req.get("/")["Set-Cookie"]
@@ -43,14 +44,14 @@ context "Rack::Session::Pool" do
       body.should.equal '{"counter"=>3}'
   end
 
-  specify "survives nonexistant cookies" do
+  it "survives nonexistant cookies" do
     pool = Rack::Session::Pool.new(incrementor)
     res = Rack::MockRequest.new(pool).
       get("/", "HTTP_COOKIE" => "#{session_key}=blarghfasel")
     res.body.should.equal '{"counter"=>1}'
   end
 
-  specify "deletes cookies with :drop option" do
+  it "deletes cookies with :drop option" do
     pool = Rack::Session::Pool.new(incrementor)
     req = Rack::MockRequest.new(pool)
     drop = Rack::Utils::Context.new(pool, drop_session)
@@ -59,25 +60,25 @@ context "Rack::Session::Pool" do
     res0 = req.get("/")
     session = (cookie = res0["Set-Cookie"])[session_match]
     res0.body.should.equal '{"counter"=>1}'
-    pool.pool.size.should.be 1
+    pool.pool.size.should.equal 1
 
     res1 = req.get("/", "HTTP_COOKIE" => cookie)
     res1["Set-Cookie"][session_match].should.equal session
     res1.body.should.equal '{"counter"=>2}'
-    pool.pool.size.should.be 1
+    pool.pool.size.should.equal 1
 
     res2 = dreq.get("/", "HTTP_COOKIE" => cookie)
     res2["Set-Cookie"].should.equal nil
     res2.body.should.equal '{"counter"=>3}'
-    pool.pool.size.should.be 0
+    pool.pool.size.should.equal 0
 
     res3 = req.get("/", "HTTP_COOKIE" => cookie)
     res3["Set-Cookie"][session_match].should.not.equal session
     res3.body.should.equal '{"counter"=>1}'
-    pool.pool.size.should.be 1
+    pool.pool.size.should.equal 1
   end
 
-  specify "provides new session id with :renew option" do
+  it "provides new session id with :renew option" do
     pool = Rack::Session::Pool.new(incrementor)
     req = Rack::MockRequest.new(pool)
     renew = Rack::Utils::Context.new(pool, renew_session)
@@ -86,27 +87,27 @@ context "Rack::Session::Pool" do
     res0 = req.get("/")
     session = (cookie = res0["Set-Cookie"])[session_match]
     res0.body.should.equal '{"counter"=>1}'
-    pool.pool.size.should.be 1
+    pool.pool.size.should.equal 1
 
     res1 = req.get("/", "HTTP_COOKIE" => cookie)
     res1["Set-Cookie"][session_match].should.equal session
     res1.body.should.equal '{"counter"=>2}'
-    pool.pool.size.should.be 1
+    pool.pool.size.should.equal 1
 
     res2 = rreq.get("/", "HTTP_COOKIE" => cookie)
     new_cookie = res2["Set-Cookie"]
     new_session = new_cookie[session_match]
     new_session.should.not.equal session
     res2.body.should.equal '{"counter"=>3}'
-    pool.pool.size.should.be 1
+    pool.pool.size.should.equal 1
 
     res3 = req.get("/", "HTTP_COOKIE" => new_cookie)
     res3["Set-Cookie"][session_match].should.equal new_session
     res3.body.should.equal '{"counter"=>4}'
-    pool.pool.size.should.be 1
+    pool.pool.size.should.equal 1
   end
 
-  specify "omits cookie with :defer option" do
+  it "omits cookie with :defer option" do
     pool = Rack::Session::Pool.new(incrementor)
     req = Rack::MockRequest.new(pool)
     defer = Rack::Utils::Context.new(pool, defer_session)
@@ -115,27 +116,31 @@ context "Rack::Session::Pool" do
     res0 = req.get("/")
     session = (cookie = res0["Set-Cookie"])[session_match]
     res0.body.should.equal '{"counter"=>1}'
-    pool.pool.size.should.be 1
+    pool.pool.size.should.equal 1
 
     res1 = req.get("/", "HTTP_COOKIE" => cookie)
     res1["Set-Cookie"][session_match].should.equal session
     res1.body.should.equal '{"counter"=>2}'
-    pool.pool.size.should.be 1
+    pool.pool.size.should.equal 1
 
     res2 = dreq.get("/", "HTTP_COOKIE" => cookie)
     res2["Set-Cookie"].should.equal nil
     res2.body.should.equal '{"counter"=>3}'
-    pool.pool.size.should.be 1
+    pool.pool.size.should.equal 1
 
     res3 = req.get("/", "HTTP_COOKIE" => cookie)
     res3["Set-Cookie"][session_match].should.equal session
     res3.body.should.equal '{"counter"=>4}'
-    pool.pool.size.should.be 1
+    pool.pool.size.should.equal 1
   end
 
   # anyone know how to do this better?
-  specify "multithread: should merge sessions" do
-    next unless $DEBUG
+  it "should merge sessions when multithreaded" do
+    unless $DEBUG
+      1.should.equal 1
+      next
+    end
+
     warn 'Running multithread tests for Session::Pool'
     pool = Rack::Session::Pool.new(incrementor)
     req = Rack::MockRequest.new(pool)
@@ -166,7 +171,7 @@ context "Rack::Session::Pool" do
     end
 
     session = pool.pool[sess_id]
-    session.size.should.be tnum+1 # counter
-    session['counter'].should.be 2 # meeeh
+    session.size.should.equal tnum+1 # counter
+    session['counter'].should.equal 2 # meeeh
   end
 end

data/spec/spec_showexceptions.rb

@@ -0,0 +1,23 @@
+require 'rack/showexceptions'
+require 'rack/mock'
+
+describe Rack::ShowExceptions do
+  it "catches exceptions" do
+    res = nil
+
+    req = Rack::MockRequest.new(
+      Rack::ShowExceptions.new(
+        lambda{|env| raise RuntimeError }
+    ))
+
+    lambda{
+      res = req.get("/")
+    }.should.not.raise
+
+    res.should.be.a.server_error
+    res.status.should.equal 500
+
+    res.should =~ /RuntimeError/
+    res.should =~ /ShowExceptions/
+  end
+end

data/spec/spec_showstatus.rb

@@ -0,0 +1,79 @@
+require 'rack/showstatus'
+require 'rack/mock'
+
+describe Rack::ShowStatus do
+  should "provide a default status message" do
+    req = Rack::MockRequest.new(
+      Rack::ShowStatus.new(lambda{|env|
+        [404, {"Content-Type" => "text/plain", "Content-Length" => "0"}, []]
+    }))
+
+    res = req.get("/", :lint => true)
+    res.should.be.not_found
+    res.should.be.not.empty
+
+    res["Content-Type"].should.equal("text/html")
+    res.should =~ /404/
+    res.should =~ /Not Found/
+  end
+
+  should "let the app provide additional information" do
+    req = Rack::MockRequest.new(
+      Rack::ShowStatus.new(
+        lambda{|env|
+          env["rack.showstatus.detail"] = "gone too meta."
+          [404, {"Content-Type" => "text/plain", "Content-Length" => "0"}, []]
+    }))
+
+    res = req.get("/", :lint => true)
+    res.should.be.not_found
+    res.should.be.not.empty
+
+    res["Content-Type"].should.equal("text/html")
+    res.should =~ /404/
+    res.should =~ /Not Found/
+    res.should =~ /too meta/
+  end
+
+  should "not replace existing messages" do
+    req = Rack::MockRequest.new(
+      Rack::ShowStatus.new(
+        lambda{|env|
+          [404, {"Content-Type" => "text/plain", "Content-Length" => "4"}, ["foo!"]]
+    }))
+
+    res = req.get("/", :lint => true)
+    res.should.be.not_found
+
+    res.body.should == "foo!"
+  end
+
+  should "pass on original headers" do
+    headers = {"WWW-Authenticate" => "Basic blah"}
+
+    req = Rack::MockRequest.new(
+      Rack::ShowStatus.new(lambda{|env| [401, headers, []] }))
+    res = req.get("/", :lint => true)
+
+    res["WWW-Authenticate"].should.equal("Basic blah")
+  end
+
+  should "replace existing messages if there is detail" do
+    req = Rack::MockRequest.new(
+      Rack::ShowStatus.new(
+        lambda{|env|
+          env["rack.showstatus.detail"] = "gone too meta."
+          [404, {"Content-Type" => "text/plain", "Content-Length" => "4"}, ["foo!"]]
+    }))
+
+    res = req.get("/", :lint => true)
+    res.should.be.not_found
+    res.should.be.not.empty
+
+    res["Content-Type"].should.equal("text/html")
+    res["Content-Length"].should.not.equal("4")
+    res.should =~ /404/
+    res.should =~ /too meta/
+    res.body.should.not =~ /foo/
+  end
+end

data/{test/spec_rack_static.rb → spec/spec_static.rb}

@@ -1,5 +1,3 @@
-require 'test/spec'
-
 require 'rack/static'
 require 'rack/mock'
 
@@ -9,26 +7,24 @@ class DummyApp
   end
 end
 
-context "Rack::Static" do
+describe Rack::Static do
   root = File.expand_path(File.dirname(__FILE__))
   OPTIONS = {:urls => ["/cgi"], :root => root}
 
-  setup do
-    @request = Rack::MockRequest.new(Rack::Static.new(DummyApp.new, OPTIONS))
-  end
+  @request = Rack::MockRequest.new(Rack::Static.new(DummyApp.new, OPTIONS))
 
-  specify "serves files" do
+  it "serves files" do
     res = @request.get("/cgi/test")
     res.should.be.ok
     res.body.should =~ /ruby/
   end
 
-  specify "404s if url root is known but it can't find the file" do
+  it "404s if url root is known but it can't find the file" do
     res = @request.get("/cgi/foo")
     res.should.be.not_found
   end
 
-  specify "calls down the chain if url root is not known" do
+  it "calls down the chain if url root is not known" do
     res = @request.get("/something/else")
     res.should.be.ok
     res.body.should == "Hello World"

data/{test/spec_rack_thin.rb → spec/spec_thin.rb}

@@ -1,34 +1,31 @@
-require 'test/spec'
-
 begin
 require 'rack/handler/thin'
-require 'testrequest'
+require File.expand_path('../testrequest', __FILE__)
 require 'timeout'
-  
-context "Rack::Handler::Thin" do
-  include TestRequest::Helpers
-  
-  setup do
-    @app = Rack::Lint.new(TestRequest.new)
-    @server = nil
-    Thin::Logging.silent = true
-    @thread = Thread.new do
-      Rack::Handler::Thin.run(@app, :Host => @host='0.0.0.0', :Port => @port=9204) do |server|
-        @server = server
-      end
+
+describe Rack::Handler::Thin do
+  extend TestRequest::Helpers
+
+  @app = Rack::Lint.new(TestRequest.new)
+  @server = nil
+  Thin::Logging.silent = true
+
+  @thread = Thread.new do
+    Rack::Handler::Thin.run(@app, :Host => @host='0.0.0.0', :Port => @port=9204) do |server|
+      @server = server
     end
-    Thread.pass until @server && @server.running?
   end
 
-  specify "should respond" do
-    lambda {
-      GET("/")
-    }.should.not.raise
+  Thread.pass until @server && @server.running?
+
+  should "respond" do
+    GET("/")
+    response.should.not.be.nil
   end
 
-  specify "should be a Thin" do
+  should "be a Thin" do
     GET("/")
-    status.should.be 200
+    status.should.equal 200
     response["SERVER_SOFTWARE"].should =~ /thin/
     response["HTTP_VERSION"].should.equal "HTTP/1.1"
     response["SERVER_PROTOCOL"].should.equal "HTTP/1.1"
@@ -36,15 +33,15 @@ context "Rack::Handler::Thin" do
     response["SERVER_NAME"].should.equal "0.0.0.0"
   end
 
-  specify "should have rack headers" do
+  should "have rack headers" do
     GET("/")
-    response["rack.version"].should.equal [0,3]
-    response["rack.multithread"].should.be false
-    response["rack.multiprocess"].should.be false
-    response["rack.run_once"].should.be false
+    response["rack.version"].should.equal [1,0]
+    response["rack.multithread"].should.equal false
+    response["rack.multiprocess"].should.equal false
+    response["rack.run_once"].should.equal false
   end
 
-  specify "should have CGI headers on GET" do
+  should "have CGI headers on GET" do
     GET("/")
     response["REQUEST_METHOD"].should.equal "GET"
     response["REQUEST_PATH"].should.equal "/"
@@ -59,7 +56,7 @@ context "Rack::Handler::Thin" 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("/", {"rack-form-data" => "23"}, {'X-test-header' => '42'})
     status.should.equal 200
     response["REQUEST_METHOD"].should.equal "POST"
@@ -69,21 +66,19 @@ context "Rack::Handler::Thin" 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
 
-  teardown do
-    @server.stop!
-    @thread.kill
-  end
+  @server.stop!
+  @thread.kill
 end
 
 rescue LoadError

data/{test/spec_rack_urlmap.rb → spec/spec_urlmap.rb}

@@ -1,10 +1,8 @@
-require 'test/spec'
-
 require 'rack/urlmap'
 require 'rack/mock'
 
-context "Rack::URLMap" do
-  specify "dispatches paths correctly" do
+describe Rack::URLMap do
+  it "dispatches paths correctly" do
     app = lambda { |env|
       [200, {
         'X-ScriptName' => env['SCRIPT_NAME'],
@@ -67,7 +65,7 @@ context "Rack::URLMap" do
   end
 
 
-  specify "dispatches hosts correctly" do
+  it "dispatches hosts correctly" do
     map = Rack::URLMap.new("http://foo.org/" => lambda { |env|
                              [200,
                               { "Content-Type" => "text/plain",
@@ -125,7 +123,7 @@ context "Rack::URLMap" do
     res["X-Position"].should.equal "default.org"
   end
 
-  specify "should be nestable" do
+  should "be nestable" do
     map = Rack::URLMap.new("/foo" =>
       Rack::URLMap.new("/bar" =>
         Rack::URLMap.new("/quux" =>  lambda { |env|
@@ -147,7 +145,7 @@ context "Rack::URLMap" do
     res["X-ScriptName"].should.equal "/foo/bar/quux"
   end
 
-  specify "should route root apps correctly" do
+  should "route root apps correctly" do
     map = Rack::URLMap.new("/" => lambda { |env|
                              [200,
                               { "Content-Type" => "text/plain",
@@ -189,7 +187,7 @@ context "Rack::URLMap" do
     res["X-ScriptName"].should.equal ""
   end
 
-  specify "should not squeeze slashes" do
+  should "not squeeze slashes" do
     map = Rack::URLMap.new("/" => lambda { |env|
                              [200,
                               { "Content-Type" => "text/plain",