rack 1.1.0 → 1.2.0

data/spec/multipart/file1.txt

@@ -0,0 +1 @@
+contents

data/spec/multipart/filename_and_modification_param

@@ -0,0 +1,7 @@
+--AaB03x
+Content-Type: image/jpeg
+Content-Disposition: attachment; name="files"; filename=genome.jpeg; modification-date="Wed, 12 Feb 1997 16:29:51 -0500";
+Content-Description: a complete map of the human genome
+
+contents
+--AaB03x--

data/spec/multipart/filename_with_escaped_quotes

@@ -0,0 +1,6 @@
+--AaB03x
+Content-Disposition: form-data; name="files"; filename="escape \"quotes"
+Content-Type: application/octet-stream
+
+contents
+--AaB03x--

data/spec/multipart/filename_with_escaped_quotes_and_modification_param

@@ -0,0 +1,7 @@
+--AaB03x
+Content-Type: image/jpeg
+Content-Disposition: attachment; name="files"; filename=""human" genome.jpeg"; modification-date="Wed, 12 Feb 1997 16:29:51 -0500";
+Content-Description: a complete map of the human genome
+
+contents
+--AaB03x--

data/spec/multipart/filename_with_percent_escaped_quotes

@@ -0,0 +1,6 @@
+--AaB03x
+Content-Disposition: form-data; name="files"; filename="escape %22quotes"
+Content-Type: application/octet-stream
+
+contents
+--AaB03x--

data/spec/multipart/filename_with_unescaped_quotes

@@ -0,0 +1,6 @@
+--AaB03x
+Content-Disposition: form-data; name="files"; filename="escape "quotes"
+Content-Type: application/octet-stream
+
+contents
+--AaB03x--

data/spec/multipart/ie

@@ -0,0 +1,6 @@
+--AaB03x
+Content-Disposition: form-data; name="files"; filename="C:\Documents and Settings\Administrator\Desktop\file1.txt"
+Content-Type: text/plain
+
+contents
+--AaB03x--

data/spec/multipart/nested

@@ -0,0 +1,10 @@
+--AaB03x
+Content-Disposition: form-data; name="foo[submit-name]"
+
+Larry
+--AaB03x
+Content-Disposition: form-data; name="foo[files]"; filename="file1.txt"
+Content-Type: text/plain
+
+contents
+--AaB03x--

data/spec/multipart/none

@@ -0,0 +1,9 @@
+--AaB03x
+Content-Disposition: form-data; name="submit-name"
+
+Larry
+--AaB03x
+Content-Disposition: form-data; name="files"; filename=""
+
+
+--AaB03x--

data/spec/multipart/semicolon

@@ -0,0 +1,6 @@
+--AaB03x
+Content-Disposition: form-data; name="files"; filename="fi;le1.txt"
+Content-Type: text/plain
+
+contents
+--AaB03x--

data/spec/multipart/text

@@ -0,0 +1,10 @@
+--AaB03x
+Content-Disposition: form-data; name="submit-name"
+
+Larry
+--AaB03x
+Content-Disposition: form-data; name="files"; filename="file1.txt"
+Content-Type: text/plain
+
+contents
+--AaB03x--

data/spec/rackup/config.ru

@@ -0,0 +1,31 @@
+require "#{File.dirname(__FILE__)}/../testrequest"
+
+$stderr = File.open("#{File.dirname(__FILE__)}/log_output", "w")
+
+class EnvMiddleware
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    # provides a way to test that lint is present
+    if env["PATH_INFO"] == "/broken_lint"
+      return [200, {}, ["Broken Lint"]]
+    # provides a way to kill the process without knowing the pid
+    elsif env["PATH_INFO"] == "/die"
+      exit!
+    end
+
+    env["test.$DEBUG"]      = $DEBUG
+    env["test.$EVAL"]       = BUKKIT if defined?(BUKKIT)
+    env["test.$VERBOSE"]    = $VERBOSE
+    env["test.$LOAD_PATH"]  = $LOAD_PATH
+    env["test.stderr"]      = File.expand_path($stderr.path)
+    env["test.Ping"]        = defined?(Ping)
+    env["test.pid"]         = Process.pid
+    @app.call(env)
+  end
+end
+
+use EnvMiddleware
+run TestRequest.new

data/{test/spec_rack_auth_basic.rb → spec/spec_auth_basic.rb}

@@ -1,25 +1,22 @@
-require 'test/spec'
-
 require 'rack/auth/basic'
 require 'rack/mock'
 
-context 'Rack::Auth::Basic' do
-
+describe Rack::Auth::Basic do
   def realm
     'WallysWorld'
   end
-  
+
   def unprotected_app
     lambda { |env| [ 200, {'Content-Type' => 'text/plain'}, ["Hi #{env['REMOTE_USER']}"] ] }
   end
-  
+
   def protected_app
     app = Rack::Auth::Basic.new(unprotected_app) { |username, password| 'Boss' == username }
     app.realm = realm
     app
   end
 
-  setup do
+  before do
     @request = Rack::MockRequest.new(protected_app)
   end
 
@@ -39,26 +36,26 @@ context 'Rack::Auth::Basic' do
     response.body.should.be.empty
   end
 
-  specify 'should challenge correctly when no credentials are specified' do
+  should 'challenge correctly when no credentials are specified' do
     request do |response|
       assert_basic_auth_challenge response
     end
   end
 
-  specify 'should rechallenge if incorrect credentials are specified' do
+  should 'rechallenge if incorrect credentials are specified' do
     request_with_basic_auth 'joe', 'password' do |response|
       assert_basic_auth_challenge response
     end
   end
 
-  specify 'should return application output if correct credentials are specified' do
+  should 'return application output if correct credentials are specified' do
     request_with_basic_auth 'Boss', 'password' do |response|
       response.status.should.equal 200
       response.body.to_s.should.equal 'Hi Boss'
     end
   end
-  
-  specify 'should return 400 Bad Request if different auth scheme used' do
+
+  should 'return 400 Bad Request if different auth scheme used' do
     request 'HTTP_AUTHORIZATION' => 'Digest params' do |response|
       response.should.be.a.client_error
       response.status.should.equal 400
@@ -66,8 +63,8 @@ context 'Rack::Auth::Basic' do
     end
   end
 
-  specify 'realm as optional constructor arg' do
+  it 'takes realm as optional constructor arg' do
     app = Rack::Auth::Basic.new(unprotected_app, realm) { true }
-    assert_equal realm, app.realm
+    realm.should == app.realm
   end
 end

data/{test/spec_rack_auth_digest.rb → spec/spec_auth_digest.rb}

@@ -1,10 +1,7 @@
-require 'test/spec'
-
 require 'rack/auth/digest/md5'
 require 'rack/mock'
 
-context 'Rack::Auth::Digest::MD5' do
-
+describe Rack::Auth::Digest::MD5 do
   def realm
     'WallysWorld'
   end
@@ -45,7 +42,7 @@ context 'Rack::Auth::Digest::MD5' do
     Rack::MethodOverride.new(protected_app)
   end
 
-  setup do
+  before do
     @request = Rack::MockRequest.new(protected_app)
   end
 
@@ -117,20 +114,20 @@ context 'Rack::Auth::Digest::MD5' do
     response.should.not.include 'WWW-Authenticate'
   end
 
-  specify 'should challenge when no credentials are specified' do
+  should 'challenge when no credentials are specified' do
     request 'GET', '/' do |response|
       assert_digest_auth_challenge response
     end
   end
 
-  specify 'should return application output if correct credentials given' do
+  should 'return application output if correct credentials given' do
     request_with_digest_auth 'GET', '/', 'Alice', 'correct-password' do |response|
       response.status.should.equal 200
       response.body.to_s.should.equal 'Hi Alice'
     end
   end
 
-  specify 'should return application output if correct credentials given (hashed passwords)' do
+  should 'return application output if correct credentials given (hashed passwords)' do
     @request = Rack::MockRequest.new(protected_app_with_hashed_passwords)
 
     request_with_digest_auth 'GET', '/', 'Alice', 'correct-password' do |response|
@@ -139,19 +136,19 @@ context 'Rack::Auth::Digest::MD5' do
     end
   end
 
-  specify 'should rechallenge if incorrect username given' do
+  should 'rechallenge if incorrect username given' do
     request_with_digest_auth 'GET', '/', 'Bob', 'correct-password' do |response|
       assert_digest_auth_challenge response
     end
   end
 
-  specify 'should rechallenge if incorrect password given' do
+  should 'rechallenge if incorrect password given' do
     request_with_digest_auth 'GET', '/', 'Alice', 'wrong-password' do |response|
       assert_digest_auth_challenge response
     end
   end
 
-  specify 'should rechallenge with stale parameter if nonce is stale' do
+  should 'rechallenge with stale parameter if nonce is stale' do
     begin
       Rack::Auth::Digest::Nonce.time_limit = 1
 
@@ -164,39 +161,39 @@ context 'Rack::Auth::Digest::MD5' do
     end
   end
 
-  specify 'should return 400 Bad Request if incorrect qop given' do
+  should 'return 400 Bad Request if incorrect qop given' do
     request_with_digest_auth 'GET', '/', 'Alice', 'correct-password', 'qop' => 'auth-int' do |response|
       assert_bad_request response
     end
   end
 
-  specify 'should return 400 Bad Request if incorrect uri given' do
+  should 'return 400 Bad Request if incorrect uri given' do
     request_with_digest_auth 'GET', '/', 'Alice', 'correct-password', 'uri' => '/foo' do |response|
       assert_bad_request response
     end
   end
 
-  specify 'should return 400 Bad Request if different auth scheme used' do
+  should 'return 400 Bad Request if different auth scheme used' do
     request 'GET', '/', 'HTTP_AUTHORIZATION' => 'Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==' do |response|
       assert_bad_request response
     end
   end
 
-  specify 'should not require credentials for unprotected path' do
+  should 'not require credentials for unprotected path' do
     @request = Rack::MockRequest.new(partially_protected_app)
     request 'GET', '/' do |response|
       response.should.be.ok
     end
   end
 
-  specify 'should challenge when no credentials are specified for protected path' do
+  should 'challenge when no credentials are specified for protected path' do
     @request = Rack::MockRequest.new(partially_protected_app)
     request 'GET', '/protected' do |response|
       assert_digest_auth_challenge response
     end
   end
 
-  specify 'should return application output if correct credentials given for protected path' do
+  should 'return application output if correct credentials given for protected path' do
     @request = Rack::MockRequest.new(partially_protected_app)
     request_with_digest_auth 'GET', '/protected', 'Alice', 'correct-password' do |response|
       response.status.should.equal 200
@@ -204,14 +201,14 @@ context 'Rack::Auth::Digest::MD5' do
     end
   end
 
-  specify 'should return application output if correct credentials given for POST' do
+  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
       response.body.to_s.should.equal 'Hi Alice'
     end
   end
 
-  specify 'should return application output if correct credentials given for PUT (using method override of POST)' do
+  should 'return application output if correct credentials given for PUT (using method override of POST)' do
     @request = Rack::MockRequest.new(protected_app_with_method_override)
     request_with_digest_auth 'POST', '/', 'Alice', 'correct-password', :input => "_method=put" do |response|
       response.status.should.equal 200
@@ -219,8 +216,8 @@ context 'Rack::Auth::Digest::MD5' do
     end
   end
 
-  specify 'realm as optional constructor arg' do
+  it 'takes realm as optional constructor arg' do
     app = Rack::Auth::Digest::MD5.new(unprotected_app, realm) { true }
-    assert_equal realm, app.realm
+    realm.should == app.realm
   end
 end

data/{test/spec_rack_builder.rb → spec/spec_builder.rb}

@@ -1,12 +1,51 @@
-require 'test/spec'
-
 require 'rack/builder'
 require 'rack/mock'
 require 'rack/showexceptions'
-require 'rack/auth/basic'
+require 'rack/urlmap'
+
+class NothingMiddleware
+  def initialize(app)
+    @app = app
+  end
+  def call(env)
+    @@env = env
+    response = @app.call(env)
+    response
+  end
+  def self.env
+    @@env
+  end
+end
+
+describe Rack::Builder do
+  it "supports mapping" do
+    app = Rack::Builder.new do
+      map '/' do |outer_env|
+        run lambda { |inner_env| [200, {}, ['root']] }
+      end
+      map '/sub' do
+        run lambda { |inner_env| [200, {}, ['sub']] }
+      end
+    end.to_app
+    Rack::MockRequest.new(app).get("/").body.to_s.should.equal 'root'
+    Rack::MockRequest.new(app).get("/sub").body.to_s.should.equal 'sub'
+  end
+
+  it "doesn't dupe env even when mapping" do
+    app = Rack::Builder.new do
+      use NothingMiddleware
+      map '/' do |outer_env|
+        run lambda { |inner_env|
+          inner_env['new_key'] = 'new_value'
+          [200, {}, ['root']]
+        }
+      end
+    end.to_app
+    Rack::MockRequest.new(app).get("/").body.to_s.should.equal 'root'
+    NothingMiddleware.env['new_key'].should.equal 'new_value'
+  end
 
-context "Rack::Builder" do
-  specify "chains apps by default" do
+  it "chains apps by default" do
     app = Rack::Builder.new do
       use Rack::ShowExceptions
       run lambda { |env| raise "bzzzt" }
@@ -17,7 +56,7 @@ context "Rack::Builder" do
     Rack::MockRequest.new(app).get("/").should.be.server_error
   end
 
-  specify "has implicit #to_app" do
+  it "has implicit #to_app" do
     app = Rack::Builder.new do
       use Rack::ShowExceptions
       run lambda { |env| raise "bzzzt" }
@@ -28,7 +67,7 @@ context "Rack::Builder" do
     Rack::MockRequest.new(app).get("/").should.be.server_error
   end
 
-  specify "supports blocks on use" do
+  it "supports blocks on use" do
     app = Rack::Builder.new do
       use Rack::ShowExceptions
       use Rack::Auth::Basic do |username, password|
@@ -43,13 +82,13 @@ context "Rack::Builder" do
     response.status.should.equal 401
 
     # with auth...
-    response = Rack::MockRequest.new(app).get("/", 
+    response = Rack::MockRequest.new(app).get("/",
         'HTTP_AUTHORIZATION' => 'Basic ' + ["joe:secret"].pack("m*"))
     response.status.should.equal 200
     response.body.to_s.should.equal 'Hi Boss'
   end
 
-  specify "has explicit #to_app" do
+  it "has explicit #to_app" do
     app = Rack::Builder.app do
       use Rack::ShowExceptions
       run lambda { |env| raise "bzzzt" }
@@ -60,7 +99,7 @@ context "Rack::Builder" do
     Rack::MockRequest.new(app).get("/").should.be.server_error
   end
 
-  specify "apps are initialized once" do
+  should "initialize apps once" do
     app = Rack::Builder.new do
       class AppClass
         def initialize

data/{test/spec_rack_cascade.rb → spec/spec_cascade.rb}

@@ -1,12 +1,9 @@
-require 'test/spec'
-
 require 'rack/cascade'
-require 'rack/mock'
-
-require 'rack/urlmap'
 require 'rack/file'
+require 'rack/urlmap'
+require 'rack/mock'
 
-context "Rack::Cascade" do
+describe Rack::Cascade do
   docroot = File.expand_path(File.dirname(__FILE__))
   app1 = Rack::File.new(docroot)
 
@@ -15,7 +12,7 @@ context "Rack::Cascade" do
   app3 = Rack::URLMap.new("/foo" => lambda { |env|
                             [200, { "Content-Type" => "text/plain"}, [""]]})
 
-  specify "should dispatch onward on 404 by default" do
+  should "dispatch onward on 404 by default" do
     cascade = Rack::Cascade.new([app1, app2, app3])
     Rack::MockRequest.new(cascade).get("/cgi/test").should.be.ok
     Rack::MockRequest.new(cascade).get("/foo").should.be.ok
@@ -23,16 +20,16 @@ context "Rack::Cascade" do
     Rack::MockRequest.new(cascade).get("/cgi/../bla").should.be.forbidden
   end
 
-  specify "should dispatch onward on whatever is passed" do
+  should "dispatch onward on whatever is passed" do
     cascade = Rack::Cascade.new([app1, app2, app3], [404, 403])
     Rack::MockRequest.new(cascade).get("/cgi/../bla").should.be.not_found
   end
 
-  specify "should return 404 if empty" do
+  should "return 404 if empty" do
     Rack::MockRequest.new(Rack::Cascade.new([])).get('/').should.be.not_found
   end
 
-  specify "should append new app" do
+  should "append new app" do
     cascade = Rack::Cascade.new([], [404, 403])
     Rack::MockRequest.new(cascade).get('/').should.be.not_found
     cascade << app2

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.equal ""
+    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