rack 1.1.6 → 1.6.9

data/test/spec_builder.rb

@@ -0,0 +1,223 @@
+require 'rack/builder'
+require 'rack/lint'
+require 'rack/mock'
+require 'rack/showexceptions'
+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
+  def builder(&block)
+    Rack::Lint.new Rack::Builder.new(&block)
+  end
+  
+  def builder_to_app(&block)
+    Rack::Lint.new Rack::Builder.new(&block).to_app
+  end
+  
+  it "supports mapping" do
+    app = builder_to_app do
+      map '/' do |outer_env|
+        run lambda { |inner_env| [200, {"Content-Type" => "text/plain"}, ['root']] }
+      end
+      map '/sub' do
+        run lambda { |inner_env| [200, {"Content-Type" => "text/plain"}, ['sub']] }
+      end
+    end
+    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 = builder_to_app do
+      use NothingMiddleware
+      map '/' do |outer_env|
+        run lambda { |inner_env|
+          inner_env['new_key'] = 'new_value'
+          [200, {"Content-Type" => "text/plain"}, ['root']]
+        }
+      end
+    end
+    Rack::MockRequest.new(app).get("/").body.to_s.should.equal 'root'
+    NothingMiddleware.env['new_key'].should.equal 'new_value'
+  end
+
+  it "chains apps by default" do
+    app = builder_to_app do
+      use Rack::ShowExceptions
+      run lambda { |env| raise "bzzzt" }
+    end
+
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+  end
+
+  it "has implicit #to_app" do
+    app = builder do
+      use Rack::ShowExceptions
+      run lambda { |env| raise "bzzzt" }
+    end
+
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+  end
+
+  it "supports blocks on use" do
+    app = builder do
+      use Rack::ShowExceptions
+      use Rack::Auth::Basic do |username, password|
+        'secret' == password
+      end
+
+      run lambda { |env| [200, {"Content-Type" => "text/plain"}, ['Hi Boss']] }
+    end
+
+    response = Rack::MockRequest.new(app).get("/")
+    response.should.be.client_error
+    response.status.should.equal 401
+
+    # with auth...
+    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
+
+  it "has explicit #to_app" do
+    app = builder do
+      use Rack::ShowExceptions
+      run lambda { |env| raise "bzzzt" }
+    end
+
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+  end
+
+  it "can mix map and run for endpoints" do
+    app = builder do
+      map '/sub' do
+        run lambda { |inner_env| [200, {"Content-Type" => "text/plain"}, ['sub']] }
+      end
+      run lambda { |inner_env| [200, {"Content-Type" => "text/plain"}, ['root']] }
+    end
+
+    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 "accepts middleware-only map blocks" do
+    app = builder do
+      map('/foo') { use Rack::ShowExceptions }
+      run lambda { |env| raise "bzzzt" }
+    end
+
+    proc { Rack::MockRequest.new(app).get("/") }.should.raise(RuntimeError)
+    Rack::MockRequest.new(app).get("/foo").should.be.server_error
+  end
+
+  it "yields the generated app to a block for warmup" do
+    warmed_up_app = nil
+
+    app = Rack::Builder.new do
+      warmup { |a| warmed_up_app = a }
+      run lambda { |env| [200, {}, []] }
+    end.to_app
+
+    warmed_up_app.should.equal app
+  end
+
+  should "initialize apps once" do
+    app = builder do
+      class AppClass
+        def initialize
+          @called = 0
+        end
+        def call(env)
+          raise "bzzzt"  if @called > 0
+        @called += 1
+          [200, {'Content-Type' => 'text/plain'}, ['OK']]
+        end
+      end
+
+      use Rack::ShowExceptions
+      run AppClass.new
+    end
+
+    Rack::MockRequest.new(app).get("/").status.should.equal 200
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+  end
+
+  it "allows use after run" do
+    app = builder do
+      run lambda { |env| raise "bzzzt" }
+      use Rack::ShowExceptions
+    end
+
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+  end
+
+  it 'complains about a missing run' do
+    proc do
+      Rack::Lint.new Rack::Builder.app { use Rack::ShowExceptions }
+    end.should.raise(RuntimeError)
+  end
+
+  describe "parse_file" do
+    def config_file(name)
+      File.join(File.dirname(__FILE__), 'builder', name)
+    end
+
+    it "parses commented options" do
+      app, options = Rack::Builder.parse_file config_file('options.ru')
+      options[:debug].should.be.true
+      Rack::MockRequest.new(app).get("/").body.to_s.should.equal 'OK'
+    end
+
+    it "removes __END__ before evaluating app" do
+      app, _ = Rack::Builder.parse_file config_file('end.ru')
+      Rack::MockRequest.new(app).get("/").body.to_s.should.equal 'OK'
+    end
+
+    it "supports multi-line comments" do
+      lambda {
+        Rack::Builder.parse_file config_file('comment.ru')
+      }.should.not.raise(SyntaxError)
+    end
+
+    it "requires anything not ending in .ru" do
+      $: << File.dirname(__FILE__)
+      app, * = Rack::Builder.parse_file 'builder/anything'
+      Rack::MockRequest.new(app).get("/").body.to_s.should.equal 'OK'
+      $:.pop
+    end
+
+    it "sets __LINE__ correctly" do
+      app, _ = Rack::Builder.parse_file config_file('line.ru')
+      Rack::MockRequest.new(app).get("/").body.to_s.should.equal '1'
+    end
+  end
+
+  describe 'new_from_string' do
+    it "builds a rack app from string" do
+      app, = Rack::Builder.new_from_string "run lambda{|env| [200, {'Content-Type' => 'text/plane'}, ['OK']] }"
+      Rack::MockRequest.new(app).get("/").body.to_s.should.equal 'OK'
+    end
+  end
+end

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

@@ -1,12 +1,14 @@
-require 'test/spec'
-
 require 'rack/cascade'
-require 'rack/mock'
-
-require 'rack/urlmap'
 require 'rack/file'
+require 'rack/lint'
+require 'rack/urlmap'
+require 'rack/mock'
 
-context "Rack::Cascade" do
+describe Rack::Cascade do
+  def cascade(*args)
+    Rack::Lint.new Rack::Cascade.new(*args)
+  end
+  
   docroot = File.expand_path(File.dirname(__FILE__))
   app1 = Rack::File.new(docroot)
 
@@ -15,24 +17,27 @@ 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
-    cascade = Rack::Cascade.new([app1, app2, app3])
+  should "dispatch onward on 404 and 405 by default" do
+    cascade = cascade([app1, app2, app3])
     Rack::MockRequest.new(cascade).get("/cgi/test").should.be.ok
     Rack::MockRequest.new(cascade).get("/foo").should.be.ok
     Rack::MockRequest.new(cascade).get("/toobad").should.be.not_found
-    Rack::MockRequest.new(cascade).get("/cgi/../bla").should.be.forbidden
+    Rack::MockRequest.new(cascade).get("/cgi/../..").should.be.client_error
+
+    # Put is not allowed by Rack::File so it'll 405.
+    Rack::MockRequest.new(cascade).put("/foo").should.be.ok
   end
 
-  specify "should dispatch onward on whatever is passed" do
-    cascade = Rack::Cascade.new([app1, app2, app3], [404, 403])
+  should "dispatch onward on whatever is passed" do
+    cascade = cascade([app1, app2, app3], [404, 403])
     Rack::MockRequest.new(cascade).get("/cgi/../bla").should.be.not_found
   end
 
-  specify "should return 404 if empty" do
-    Rack::MockRequest.new(Rack::Cascade.new([])).get('/').should.be.not_found
+  should "return 404 if empty" do
+    Rack::MockRequest.new(cascade([])).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
@@ -40,9 +45,17 @@ context "Rack::Cascade" do
     Rack::MockRequest.new(cascade).get('/cgi/../bla').should.be.not_found
     cascade << app1
     Rack::MockRequest.new(cascade).get('/cgi/test').should.be.ok
-    Rack::MockRequest.new(cascade).get('/cgi/../bla').should.be.forbidden
+    Rack::MockRequest.new(cascade).get('/cgi/../..').should.be.client_error
     Rack::MockRequest.new(cascade).get('/foo').should.be.not_found
     cascade << app3
     Rack::MockRequest.new(cascade).get('/foo').should.be.ok
   end
+
+  should "close the body on cascade" do
+    body = StringIO.new
+    closer = lambda { |env| [404, {}, body] }
+    cascade = Rack::Cascade.new([closer, app3], [404])
+    Rack::MockRequest.new(cascade).get("/foo").should.be.ok
+    body.should.be.closed
+  end
 end

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

@@ -1,53 +1,60 @@
-require 'test/spec'
-require 'testrequest'
+begin
+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
+  @host = '127.0.0.1'
+  @port = 9203
+
+  if `which lighttpd` && !$?.success?
+    raise "lighttpd not found"
   end
 
   # 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,3])
+    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 +66,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 +77,26 @@ 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
+
+rescue RuntimeError
+  $stderr.puts "Skipping Rack::Handler::CGI tests (lighttpd is required). Install lighttpd and try again."
+rescue NotImplementedError
+  $stderr.puts "Your Ruby implemenation or platform does not support fork. Skipping Rack::Handler::CGI tests."
+end

data/test/spec_chunked.rb

@@ -0,0 +1,101 @@
+require 'rack/chunked'
+require 'rack/lint'
+require 'rack/mock'
+
+describe Rack::Chunked do
+  def chunked(app)
+    proc do |env|
+      app = Rack::Chunked.new(app)
+      response = Rack::Lint.new(app).call(env)
+      # we want to use body like an array, but it only has #each
+      response[2] = response[2].to_enum.to_a
+      response
+    end
+  end
+
+  before do
+    @env = Rack::MockRequest.
+      env_for('/', 'HTTP_VERSION' => '1.1', 'REQUEST_METHOD' => 'GET')
+  end
+
+  should 'chunk responses with no Content-Length' do
+    app = lambda { |env| [200, {"Content-Type" => "text/plain"}, ['Hello', ' ', 'World!']] }
+    response = Rack::MockResponse.new(*chunked(app).call(@env))
+    response.headers.should.not.include 'Content-Length'
+    response.headers['Transfer-Encoding'].should.equal 'chunked'
+    response.body.should.equal "5\r\nHello\r\n1\r\n \r\n6\r\nWorld!\r\n0\r\n\r\n"
+  end
+
+  should 'chunks empty bodies properly' do
+    app = lambda { |env| [200, {"Content-Type" => "text/plain"}, []] }
+    response = Rack::MockResponse.new(*chunked(app).call(@env))
+    response.headers.should.not.include 'Content-Length'
+    response.headers['Transfer-Encoding'].should.equal 'chunked'
+    response.body.should.equal "0\r\n\r\n"
+  end
+
+  should 'chunks encoded bodies properly' do
+    body = ["\uFFFEHello", " ", "World"].map {|t| t.encode("UTF-16LE") }
+    app  = lambda { |env| [200, {"Content-Type" => "text/plain"}, body] }
+    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.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".force_encoding("BINARY")
+  end if RUBY_VERSION >= "1.9"
+
+  should 'not modify response when Content-Length header present' do
+    app = lambda { |env|
+      [200, {"Content-Type" => "text/plain", 'Content-Length'=>'12'}, ['Hello', ' ', 'World!']]
+    }
+    status, headers, body = chunked(app).call(@env)
+    status.should.equal 200
+    headers.should.not.include 'Transfer-Encoding'
+    headers.should.include 'Content-Length'
+    body.join.should.equal 'Hello World!'
+  end
+
+  should 'not modify response when client is HTTP/1.0' do
+    app = lambda { |env| [200, {"Content-Type" => "text/plain"}, ['Hello', ' ', 'World!']] }
+    @env['HTTP_VERSION'] = 'HTTP/1.0'
+    status, headers, body = chunked(app).call(@env)
+    status.should.equal 200
+    headers.should.not.include 'Transfer-Encoding'
+    body.join.should.equal 'Hello World!'
+  end
+
+  should 'not modify response when client is ancient, pre-HTTP/1.0' do
+    app = lambda { |env| [200, {"Content-Type" => "text/plain"}, ['Hello', ' ', 'World!']] }
+    check = lambda do
+      status, headers, body = chunked(app).call(@env.dup)
+      status.should.equal 200
+      headers.should.not.include 'Transfer-Encoding'
+      body.join.should.equal 'Hello World!'
+    end
+
+    @env.delete('HTTP_VERSION') # unicorn will do this on pre-HTTP/1.0 requests
+    check.call
+
+    @env['HTTP_VERSION'] = 'HTTP/0.9' # not sure if this happens in practice
+    check.call
+  end
+
+  should 'not modify response when Transfer-Encoding header already present' do
+    app = lambda { |env|
+      [200, {"Content-Type" => "text/plain", 'Transfer-Encoding' => 'identity'}, ['Hello', ' ', 'World!']]
+    }
+    status, headers, body = chunked(app).call(@env)
+    status.should.equal 200
+    headers['Transfer-Encoding'].should.equal 'identity'
+    body.join.should.equal 'Hello World!'
+  end
+
+  [100, 204, 205, 304].each do |status_code|
+    should "not modify response when status code is #{status_code}" do
+      app = lambda { |env| [status_code, {}, []] }
+      status, headers, _ = chunked(app).call(@env)
+      status.should.equal status_code
+      headers.should.not.include 'Transfer-Encoding'
+    end
+  end
+end

data/test/spec_commonlogger.rb

@@ -0,0 +1,93 @@
+require 'rack/commonlogger'
+require 'rack/lint'
+require 'rack/mock'
+
+require 'logger'
+
+describe Rack::CommonLogger do
+  obj = 'foobar'
+  length = obj.size
+
+  app = Rack::Lint.new lambda { |env|
+    [200,
+     {"Content-Type" => "text/html", "Content-Length" => length.to_s},
+     [obj]]}
+  app_without_length = Rack::Lint.new lambda { |env|
+    [200,
+     {"Content-Type" => "text/html"},
+     []]}
+  app_with_zero_length = Rack::Lint.new lambda { |env|
+    [200,
+     {"Content-Type" => "text/html", "Content-Length" => "0"},
+     []]}
+
+  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
+
+  should "log to anything with +write+" do
+    log = StringIO.new
+    Rack::MockRequest.new(Rack::CommonLogger.new(app, log)).get("/")
+
+    log.string.should =~ /"GET \/ " 200 #{length} /
+  end
+
+  should "work with standartd library logger" do
+    logdev = StringIO.new
+    log = Logger.new(logdev)
+    Rack::MockRequest.new(Rack::CommonLogger.new(app, log)).get("/")
+
+    logdev.string.should =~ /"GET \/ " 200 #{length} /
+  end
+
+  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
+
+  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 with_mock_time(t = 0)
+    mc = class <<Time; self; end
+    mc.send :alias_method, :old_now, :now
+    mc.send :define_method, :now do
+      at(t)
+    end
+    yield
+  ensure
+    mc.send :alias_method, :now, :old_now
+  end
+
+  should "log in common log format" do
+    log = StringIO.new
+    with_mock_time do
+      Rack::MockRequest.new(Rack::CommonLogger.new(app, log)).get("/")
+    end
+
+    md = /- - - \[([^\]]+)\] "(\w+) \/ " (\d{3}) \d+ ([\d\.]+)/.match(log.string)
+    md.should.not.equal nil
+    time, method, status, duration = *md.captures
+    time.should.equal Time.at(0).strftime("%d/%b/%Y:%H:%M:%S %z")
+    method.should.equal "GET"
+    status.should.equal "200"
+    (0..1).should.include?(duration.to_f)
+  end
+
+  def length
+    123
+  end
+
+  def self.obj
+    "hello world"
+  end
+end