rack 1.6.13 → 2.0.0.alpha

data/rack.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = "rack"
-  s.version         = "1.6.13"
+  s.version = File.read('lib/rack.rb')[/RELEASE += +([\"\'])([\d][\w\.]+)\1/, 2]
   s.platform        = Gem::Platform::RUBY
   s.summary         = "a modular Ruby webserver interface"
   s.license         = "MIT"
@@ -16,18 +16,22 @@ Also see http://rack.github.io/.
 EOF
 
   s.files           = Dir['{bin/*,contrib/*,example/*,lib/**/*,test/**/*}'] +
-                        %w(COPYING KNOWN-ISSUES rack.gemspec Rakefile README.rdoc SPEC)
+                        %w(COPYING rack.gemspec Rakefile README.rdoc SPEC)
   s.bindir          = 'bin'
   s.executables     << 'rackup'
   s.require_path    = 'lib'
-  s.extra_rdoc_files = ['README.rdoc', 'KNOWN-ISSUES', 'HISTORY.md']
+  s.extra_rdoc_files = ['README.rdoc', 'HISTORY.md']
   s.test_files      = Dir['test/spec_*.rb']
 
   s.author          = 'Christian Neukirchen'
   s.email           = 'chneukirchen@gmail.com'
   s.homepage        = 'http://rack.github.io/'
-  s.rubyforge_project = 'rack'
+  s.required_ruby_version = '>= 2.2.2'
 
-  s.add_development_dependency 'bacon'
+  s.add_dependency 'json'
+
+  s.add_development_dependency 'minitest', "~> 5.0"
+  s.add_development_dependency 'minitest-sprint'
+  s.add_development_dependency 'concurrent-ruby'
   s.add_development_dependency 'rake'
 end

data/test/builder/an_underscore_app.rb

@@ -0,0 +1,5 @@
+class AnUnderscoreApp
+  def self.call(env)
+    [200, {'Content-Type' => 'text/plain'}, ['OK']]
+  end
+end

data/test/builder/options.ru

@@ -1,2 +1,2 @@
-#\ -d
+#\ -d -p 2929 --env test
 run lambda { |env| [200, {'Content-Type' => 'text/plain'}, ['OK']] }

data/test/cgi/test.fcgi

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # -*- ruby -*-
 
+require 'uri'
 $:.unshift '../../lib'
 require 'rack'
 require '../testrequest'

data/test/helper.rb

@@ -0,0 +1,31 @@
+require 'minitest/autorun'
+
+module Rack
+  class TestCase < Minitest::Test
+    if `which lighttpd` && !$?.success?
+      begin
+        # Keep this first.
+        LIGHTTPD_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
+        }
+      rescue NotImplementedError
+        warn "Your Ruby doesn't support Kernel#fork. Skipping Rack::Handler::CGI and ::FastCGI tests."
+      else
+        Minitest.after_run do
+          Process.kill 15, LIGHTTPD_PID
+          Process.wait LIGHTTPD_PID
+        end
+      end
+    else
+      warn "Lighttpd isn't installed. Skipping Rack::Handler::CGI and FastCGI tests. Install lighttpd to run them."
+    end
+  end
+end

data/test/multipart/filename_with_encoded_words

@@ -0,0 +1,7 @@
+--AaB03x
+Content-Type: image/jpeg
+Content-Disposition: attachment; name="files"; filename*=utf-8''%D1%84%D0%B0%D0%B9%D0%BB
+Content-Description: a complete map of the human genome
+
+contents
+--AaB03x--

data/test/multipart/{filename_with_null_byte → filename_with_single_quote}

@@ -1,6 +1,6 @@
 --AaB03x
 Content-Type: image/jpeg
-Content-Disposition: attachment; name="files"; filename="flowers.exe%00.jpg"
+Content-Disposition: attachment; name="files"; filename="bob's flowers.jpg"
 Content-Description: a complete map of the human genome
 
 contents

data/test/multipart/quoted

@@ -0,0 +1,15 @@
+--AaB:03x
+Content-Disposition: form-data; name="submit-name"
+
+Larry
+--AaB:03x
+Content-Disposition: form-data; name="submit-name-with-content"
+Content-Type: text/plain
+
+Berry
+--AaB:03x
+Content-Disposition: form-data; name="files"; filename="file1.txt"
+Content-Type: text/plain
+
+contents
+--AaB:03x--

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

@@ -5,4 +5,4 @@ module Rack
 
     register :registering_myself, RegisteringMyself
   end
-end
+end

data/test/spec_auth_basic.rb

@@ -1,3 +1,4 @@
+require 'minitest/autorun'
 require 'rack/auth/basic'
 require 'rack/lint'
 require 'rack/mock'
@@ -32,50 +33,50 @@ describe Rack::Auth::Basic do
   end
 
   def assert_basic_auth_challenge(response)
-    response.should.be.a.client_error
-    response.status.should.equal 401
-    response.should.include 'WWW-Authenticate'
-    response.headers['WWW-Authenticate'].should =~ /Basic realm="#{Regexp.escape(realm)}"/
-    response.body.should.be.empty
+    response.must_be :client_error?
+    response.status.must_equal 401
+    response.must_include 'WWW-Authenticate'
+    response.headers['WWW-Authenticate'].must_match(/Basic realm="#{Regexp.escape(realm)}"/)
+    response.body.must_be :empty?
   end
 
-  should 'challenge correctly when no credentials are specified' do
+  it 'challenge correctly when no credentials are specified' do
     request do |response|
       assert_basic_auth_challenge response
     end
   end
 
-  should 'rechallenge if incorrect credentials are specified' do
+  it 'rechallenge if incorrect credentials are specified' do
     request_with_basic_auth 'joe', 'password' do |response|
       assert_basic_auth_challenge response
     end
   end
 
-  should 'return application output if correct credentials are specified' do
+  it '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'
+      response.status.must_equal 200
+      response.body.to_s.must_equal 'Hi Boss'
     end
   end
 
-  should 'return 400 Bad Request if different auth scheme used' do
+  it '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
-      response.should.not.include 'WWW-Authenticate'
+      response.must_be :client_error?
+      response.status.must_equal 400
+      response.wont_include 'WWW-Authenticate'
     end
   end
 
-  should 'return 400 Bad Request for a malformed authorization header' do
+  it 'return 400 Bad Request for a malformed authorization header' do
     request 'HTTP_AUTHORIZATION' => '' do |response|
-      response.should.be.a.client_error
-      response.status.should.equal 400
-      response.should.not.include 'WWW-Authenticate'
+      response.must_be :client_error?
+      response.status.must_equal 400
+      response.wont_include 'WWW-Authenticate'
     end
   end
 
   it 'takes realm as optional constructor arg' do
     app = Rack::Auth::Basic.new(unprotected_app, realm) { true }
-    realm.should == app.realm
+    realm.must_equal app.realm
   end
 end

data/test/spec_auth_digest.rb

@@ -1,3 +1,4 @@
+require 'minitest/autorun'
 require 'rack/auth/digest/md5'
 require 'rack/lint'
 require 'rack/mock'
@@ -100,160 +101,160 @@ describe Rack::Auth::Digest::MD5 do
   end
 
   def assert_digest_auth_challenge(response)
-    response.should.be.a.client_error
-    response.status.should.equal 401
-    response.should.include 'WWW-Authenticate'
-    response.headers['WWW-Authenticate'].should =~ /^Digest /
-    response.body.should.be.empty
+    response.must_be :client_error?
+    response.status.must_equal 401
+    response.must_include 'WWW-Authenticate'
+    response.headers['WWW-Authenticate'].must_match(/^Digest /)
+    response.body.must_be :empty?
   end
 
   def assert_bad_request(response)
-    response.should.be.a.client_error
-    response.status.should.equal 400
-    response.should.not.include 'WWW-Authenticate'
+    response.must_be :client_error?
+    response.status.must_equal 400
+    response.wont_include 'WWW-Authenticate'
   end
 
-  should 'challenge when no credentials are specified' do
+  it 'challenge when no credentials are specified' do
     request 'GET', '/' do |response|
       assert_digest_auth_challenge response
     end
   end
 
-  should 'return application output if correct credentials given' do
+  it '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'
+      response.status.must_equal 200
+      response.body.to_s.must_equal 'Hi Alice'
     end
   end
 
-  should 'return application output if correct credentials given (hashed passwords)' do
+  it '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|
-      response.status.should.equal 200
-      response.body.to_s.should.equal 'Hi Alice'
+      response.status.must_equal 200
+      response.body.to_s.must_equal 'Hi Alice'
     end
   end
 
-  should 'rechallenge if incorrect username given' do
+  it 'rechallenge if incorrect username given' do
     request_with_digest_auth 'GET', '/', 'Bob', 'correct-password' do |response|
       assert_digest_auth_challenge response
     end
   end
 
-  should 'rechallenge if incorrect password given' do
+  it 'rechallenge if incorrect password given' do
     request_with_digest_auth 'GET', '/', 'Alice', 'wrong-password' do |response|
       assert_digest_auth_challenge response
     end
   end
 
-  should 'rechallenge if incorrect user and blank password given' do
+  it 'rechallenge if incorrect user and blank password given' do
     request_with_digest_auth 'GET', '/', 'Bob', '' do |response|
       assert_digest_auth_challenge response
     end
   end
 
-  should 'not rechallenge if nonce is not stale' do
+  it 'not rechallenge if nonce is not stale' do
     begin
       Rack::Auth::Digest::Nonce.time_limit = 10
 
       request_with_digest_auth 'GET', '/', 'Alice', 'correct-password', :wait => 1 do |response|
-        response.status.should.equal 200
-        response.body.to_s.should.equal 'Hi Alice'
-        response.headers['WWW-Authenticate'].should.not =~ /\bstale=true\b/
+        response.status.must_equal 200
+        response.body.to_s.must_equal 'Hi Alice'
+        response.headers['WWW-Authenticate'].wont_match(/\bstale=true\b/)
       end
     ensure
       Rack::Auth::Digest::Nonce.time_limit = nil
     end
   end
 
-  should 'rechallenge with stale parameter if nonce is stale' do
+  it 'rechallenge with stale parameter if nonce is stale' do
     begin
       Rack::Auth::Digest::Nonce.time_limit = 1
 
       request_with_digest_auth 'GET', '/', 'Alice', 'correct-password', :wait => 2 do |response|
         assert_digest_auth_challenge response
-        response.headers['WWW-Authenticate'].should =~ /\bstale=true\b/
+        response.headers['WWW-Authenticate'].must_match(/\bstale=true\b/)
       end
     ensure
       Rack::Auth::Digest::Nonce.time_limit = nil
     end
   end
 
-  should 'return 400 Bad Request if incorrect qop given' do
+  it '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
 
-  should 'return 400 Bad Request if incorrect uri given' do
+  it '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
 
-  should 'return 400 Bad Request if different auth scheme used' do
+  it 'return 400 Bad Request if different auth scheme used' do
     request 'GET', '/', 'HTTP_AUTHORIZATION' => 'Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==' do |response|
       assert_bad_request response
     end
   end
 
-  should 'not require credentials for unprotected path' do
+  it 'not require credentials for unprotected path' do
     @request = Rack::MockRequest.new(partially_protected_app)
     request 'GET', '/' do |response|
-      response.should.be.ok
+      response.must_be :ok?
     end
   end
 
-  should 'challenge when no credentials are specified for protected path' do
+  it '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
 
-  should 'return application output if correct credentials given for protected path' do
+  it '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
-      response.body.to_s.should.equal 'Hi Alice'
+      response.status.must_equal 200
+      response.body.to_s.must_equal 'Hi Alice'
     end
   end
 
-  should 'return application output when used with a query string and path as uri' do
+  it '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'
+      response.status.must_equal 200
+      response.body.to_s.must_equal 'Hi Alice and Mike'
     end
   end
 
-  should 'return application output when used with a query string and fullpath as uri' do
+  it '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'
+      response.status.must_equal 200
+      response.body.to_s.must_equal 'Hi Alice and Mike'
     end
   end
 
-  should 'return application output if correct credentials given for POST' do
+  it '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'
+      response.status.must_equal 200
+      response.body.to_s.must_equal 'Hi Alice'
     end
   end
 
-  should 'return application output if correct credentials given for PUT (using method override of POST)' do
+  it '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
-      response.body.to_s.should.equal 'Hi Alice'
+      response.status.must_equal 200
+      response.body.to_s.must_equal 'Hi Alice'
     end
   end
 
   it 'takes realm as optional constructor arg' do
     app = Rack::Auth::Digest::MD5.new(unprotected_app, realm) { true }
-    realm.should == app.realm
+    realm.must_equal app.realm
   end
 end

data/test/spec_body_proxy.rb

@@ -1,85 +1,85 @@
+require 'minitest/autorun'
 require 'rack/body_proxy'
 require 'stringio'
-require 'ostruct'
 
 describe Rack::BodyProxy do
-  should 'call each on the wrapped body' do
+  it 'call each on the wrapped body' do
     called = false
     proxy  = Rack::BodyProxy.new(['foo']) { }
     proxy.each do |str|
       called = true
-      str.should.equal 'foo'
+      str.must_equal 'foo'
     end
-    called.should.equal true
+    called.must_equal true
   end
 
-  should 'call close on the wrapped body' do
+  it 'call close on the wrapped body' do
     body  = StringIO.new
     proxy = Rack::BodyProxy.new(body) { }
     proxy.close
-    body.should.be.closed
+    body.must_be :closed?
   end
 
-  should 'only call close on the wrapped body if it responds to close' do
+  it 'only call close on the wrapped body if it responds to close' do
     body  = []
     proxy = Rack::BodyProxy.new(body) { }
-    proc { proxy.close }.should.not.raise
+    proxy.close.must_be_nil
   end
 
-  should 'call the passed block on close' do
+  it 'call the passed block on close' do
     called = false
     proxy  = Rack::BodyProxy.new([]) { called = true }
-    called.should.equal false
+    called.must_equal false
     proxy.close
-    called.should.equal true
+    called.must_equal true
   end
 
-  should 'call the passed block on close even if there is an exception' do
+  it 'call the passed block on close even if there is an exception' do
     object = Object.new
     def object.close() raise "No!" end
     called = false
 
     begin
       proxy  = Rack::BodyProxy.new(object) { called = true }
-      called.should.equal false
+      called.must_equal false
       proxy.close
     rescue RuntimeError => e
     end
 
     raise "Expected exception to have been raised" unless e
-    called.should.equal true
+    called.must_equal true
   end
 
-  should 'allow multiple arguments in respond_to?' do
+  it 'allow multiple arguments in respond_to?' do
     body  = []
     proxy = Rack::BodyProxy.new(body) { }
-    proc { proxy.respond_to?(:foo, false) }.should.not.raise
+    proxy.respond_to?(:foo, false).must_equal false
   end
 
-  should 'not respond to :to_ary' do
-    body = OpenStruct.new(:to_ary => true)
-    body.respond_to?(:to_ary).should.equal true
+  it 'not respond to :to_ary' do
+    body = Object.new.tap { |o| def o.to_ary() end }
+    body.respond_to?(:to_ary).must_equal true
 
     proxy = Rack::BodyProxy.new(body) { }
-    proxy.respond_to?(:to_ary).should.equal false
-    proxy.respond_to?("to_ary").should.equal false
+    proxy.respond_to?(:to_ary).must_equal false
+    proxy.respond_to?("to_ary").must_equal false
   end
 
-  should 'not close more than one time' do
+  it 'not close more than one time' do
     count = 0
     proxy = Rack::BodyProxy.new([]) { count += 1; raise "Block invoked more than 1 time!" if count > 1 }
     2.times { proxy.close }
-    count.should.equal 1
+    count.must_equal 1
   end
 
-  should 'be closed when the callback is triggered' do
+  it 'be closed when the callback is triggered' do
     closed = false
     proxy = Rack::BodyProxy.new([]) { closed = proxy.closed? }
     proxy.close
-    closed.should.equal true
+    closed.must_equal true
   end
 
-  should 'provide an #each method' do
-    Rack::BodyProxy.method_defined?(:each).should.equal true
+  it 'provide an #each method' do
+    Rack::BodyProxy.method_defined?(:each).must_equal true
   end
 end