rack 1.4.7 → 1.5.0.beta.1

data/rack.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = "rack"
-  s.version         = "1.4.7"
+  s.version         = "1.5.0.beta.1"
   s.platform        = Gem::Platform::RUBY
   s.summary         = "a modular Ruby webserver interface"
 
@@ -29,9 +29,4 @@ EOF
 
   s.add_development_dependency 'bacon'
   s.add_development_dependency 'rake'
-
-  s.add_development_dependency 'ruby-fcgi'
-  s.add_development_dependency 'memcache-client'
-  s.add_development_dependency 'mongrel', '>= 1.2.0.pre2'
-  s.add_development_dependency 'thin'
 end

data/test/spec_builder.rb

@@ -204,4 +204,11 @@ describe Rack::Builder do
       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_cgi.rb

@@ -43,7 +43,7 @@ describe Rack::Handler::CGI do
 
   should "have rack headers" do
     GET("/test")
-    response["rack.version"].should.equal([1,1])
+    response["rack.version"].should.equal([1,2])
     response["rack.multithread"].should.be.false
     response["rack.multiprocess"].should.be.true
     response["rack.run_once"].should.be.true

data/test/spec_chunked.rb

@@ -3,18 +3,16 @@ require 'rack/lint'
 require 'rack/mock'
 
 describe Rack::Chunked do
-  ::Enumerator = ::Enumerable::Enumerator unless Object.const_defined?(:Enumerator)
-
   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] = Enumerator.new(response[2]).to_a
+      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')
@@ -43,7 +41,7 @@ describe Rack::Chunked do
     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"
+    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

data/test/spec_content_length.rb

@@ -1,19 +1,16 @@
-require 'enumerator'
 require 'rack/content_length'
 require 'rack/lint'
 require 'rack/mock'
 
 describe Rack::ContentLength do
-  ::Enumerator = ::Enumerable::Enumerator unless Object.const_defined?(:Enumerator)
-
   def content_length(app)
     Rack::Lint.new Rack::ContentLength.new(app)
   end
-  
+
   def request
     Rack::MockRequest.env_for
   end
-  
+
   should "set Content-Length on Array bodies if none is set" do
     app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, ["Hello, World!"]] }
     response = content_length(app).call(request)
@@ -81,6 +78,6 @@ describe Rack::ContentLength do
     response = content_length(app).call(request)
     expected = %w[one two three]
     response[1]['Content-Length'].should.equal expected.join.size.to_s
-    Enumerator.new(response[2]).to_a.should.equal expected
+    response[2].to_enum.to_a.should.equal expected
   end
 end

data/test/spec_deflater.rb

@@ -1,4 +1,3 @@
-require 'enumerator'
 require 'stringio'
 require 'time'  # for Time#httpdate
 require 'rack/deflater'
@@ -7,12 +6,10 @@ require 'rack/mock'
 require 'zlib'
 
 describe Rack::Deflater do
-  ::Enumerator = ::Enumerable::Enumerator unless Object.const_defined?(:Enumerator)
-
   def deflater(app)
     Rack::Lint.new Rack::Deflater.new(app)
   end
-  
+
   def build_response(status, body, accept_encoding, headers = {})
     body = [body]  if body.respond_to? :to_str
     app = lambda do |env|
@@ -129,7 +126,7 @@ describe Rack::Deflater do
 
     response[0].should.equal(200)
     response[1].should.equal({ "Vary" => "Accept-Encoding", "Content-Type" => "text/plain" })
-    Enumerator.new(response[2]).to_a.should.equal(["Hello world!"])
+    response[2].to_enum.to_a.should.equal(["Hello world!"])
   end
 
   should "be able to skip when there is no response entity body" do
@@ -137,19 +134,19 @@ describe Rack::Deflater do
 
     response[0].should.equal(304)
     response[1].should.equal({})
-    Enumerator.new(response[2]).to_a.should.equal([])
+    response[2].to_enum.to_a.should.equal([])
   end
 
   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"})
-    Enumerator.new(response1[2]).to_a.should.equal(["An acceptable encoding for the requested resource / could not be found."])
+    response1[2].to_enum.to_a.should.equal(["An acceptable encoding for the requested resource / could not be found."])
 
     response2 = build_response(200, "Hello world!", "identity;q=0", "SCRIPT_NAME" => "/foo", "PATH_INFO" => "/bar")
     response2[0].should.equal(406)
     response2[1].should.equal({"Content-Type" => "text/plain", "Content-Length" => "78"})
-    Enumerator.new(response2[2]).to_a.should.equal(["An acceptable encoding for the requested resource /foo/bar could not be found."])
+    response2[2].to_enum.to_a.should.equal(["An acceptable encoding for the requested resource /foo/bar could not be found."])
   end
 
   should "handle gzip response with Last-Modified header" do
@@ -182,6 +179,26 @@ describe Rack::Deflater do
 
     response[0].should.equal(200)
     response[1].should.not.include "Content-Encoding"
-    Enumerator.new(response[2]).to_a.join.should.equal("Hello World!")
+    response[2].to_enum.to_a.join.should.equal("Hello World!")
+  end
+
+  should "do nothing when Content-Encoding already present" do
+    app = lambda { |env| [200, {'Content-Type' => 'text/plain', 'Content-Encoding' => 'gzip'}, ['Hello World!']] }
+    request = Rack::MockRequest.env_for("", "HTTP_ACCEPT_ENCODING" => "gzip")
+    response = deflater(app).call(request)
+
+    response[0].should.equal(200)
+    response[2].to_enum.to_a.join.should.equal("Hello World!")
+  end
+
+  should "deflate when Content-Encoding is identity" do
+    app = lambda { |env| [200, {'Content-Type' => 'text/plain', 'Content-Encoding' => 'identity'}, ['Hello World!']] }
+    request = Rack::MockRequest.env_for("", "HTTP_ACCEPT_ENCODING" => "deflate")
+    response = deflater(app).call(request)
+
+    response[0].should.equal(200)
+    buf = ''
+    response[2].each { |part| buf << part }
+    inflate(buf).should.equal("Hello World!")
   end
 end

data/test/spec_fastcgi.rb

@@ -48,7 +48,7 @@ describe Rack::Handler::FastCGI do
 
   should "have rack headers" do
     GET("/test.fcgi")
-    response["rack.version"].should.equal [1,1]
+    response["rack.version"].should.equal [1,2]
     response["rack.multithread"].should.be.false
     response["rack.multiprocess"].should.be.true
     response["rack.run_once"].should.be.false

data/test/spec_file.rb

@@ -65,13 +65,13 @@ describe Rack::File do
   should "not allow unsafe directory traversal" do
     req = Rack::MockRequest.new(file(DOCROOT))
 
-    res = req.get("/../README")
+    res = req.get("/../README.rdoc")
     res.should.be.client_error
 
-    res = req.get("../test")
+    res = req.get("../test/spec_file.rb")
     res.should.be.client_error
 
-    res = req.get("..")
+    res = req.get("../README.rdoc")
     res.should.be.client_error
 
     res.should.be.not_found
@@ -145,14 +145,6 @@ describe Rack::File do
     res["Content-Range"].should.equal "bytes */193"
   end
 
-  should "support legacy cache control options provided as string" do
-    env = Rack::MockRequest.env_for("/cgi/test")
-    status, heads, _ = file(DOCROOT, 'public, max-age=38').call(env)
-
-    status.should.equal 200
-    heads['Cache-Control'].should.equal 'public, max-age=38'
-  end
-
   should "support custom http headers" do
     env = Rack::MockRequest.env_for("/cgi/test")
     status, heads, _ = file(DOCROOT, 'Cache-Control' => 'public, max-age=38',
@@ -197,4 +189,25 @@ describe Rack::File do
     res['Content-Length'].should.equal "193"
   end
 
+  should "default to a mime type of text/plain" do
+    req = Rack::MockRequest.new(Rack::Lint.new(Rack::File.new(DOCROOT)))
+    res = req.get "/cgi/test"
+    res.should.be.successful
+    res['Content-Type'].should.equal "text/plain"
+  end
+
+  should "allow the default mime type to be set" do
+    req = Rack::MockRequest.new(Rack::Lint.new(Rack::File.new(DOCROOT, nil, 'application/octet-stream')))
+    res = req.get "/cgi/test"
+    res.should.be.successful
+    res['Content-Type'].should.equal "application/octet-stream"
+  end
+
+  should "not set Content-Type if the mime type is not set" do
+    req = Rack::MockRequest.new(Rack::Lint.new(Rack::File.new(DOCROOT, nil, nil)))
+    res = req.get "/cgi/test"
+    res.should.be.successful
+    res['Content-Type'].should.equal nil
+  end
+
 end

data/test/spec_head.rb

@@ -1,4 +1,3 @@
-require 'enumerator'
 require 'rack/head'
 require 'rack/lint'
 require 'rack/mock'
@@ -16,17 +15,13 @@ describe Rack::Head do
     return response, body
   end
 
-  def enum
-    defined?(Enumerator) ? Enumerator : Enumerable::Enumerator
-  end
-
   should "pass GET, POST, PUT, DELETE, OPTIONS, TRACE requests" do
     %w[GET POST PUT DELETE OPTIONS TRACE].each do |type|
       resp, _ = test_response("REQUEST_METHOD" => type)
 
       resp[0].should.equal(200)
       resp[1].should.equal({"Content-type" => "test/plain", "Content-length" => "3"})
-      enum.new(resp[2]).to_a.should.equal(["foo"])
+      resp[2].to_enum.to_a.should.equal(["foo"])
     end
   end
 
@@ -35,14 +30,14 @@ describe Rack::Head do
 
     resp[0].should.equal(200)
     resp[1].should.equal({"Content-type" => "test/plain", "Content-length" => "3"})
-    enum.new(resp[2]).to_a.should.equal([])
+    resp[2].to_enum.to_a.should.equal([])
   end
 
   should "close the body when it is removed" do
     resp, body = test_response("REQUEST_METHOD" => "HEAD")
     resp[0].should.equal(200)
     resp[1].should.equal({"Content-type" => "test/plain", "Content-length" => "3"})
-    enum.new(resp[2]).to_a.should.equal([])
+    resp[2].to_enum.to_a.should.equal([])
     body.should.be.closed
   end
 end

data/test/spec_lint.rb

@@ -234,12 +234,12 @@ describe Rack::Lint do
   end
 
   should "notice content-type errors" do
-    lambda {
-      Rack::Lint.new(lambda { |env|
-                       [200, {"Content-length" => "0"}, []]
-                     }).call(env({}))
-    }.should.raise(Rack::Lint::LintError).
-      message.should.match(/No Content-Type/)
+    # lambda {
+    #   Rack::Lint.new(lambda { |env|
+    #                    [200, {"Content-length" => "0"}, []]
+    #                  }).call(env({}))
+    # }.should.raise(Rack::Lint::LintError).
+    #   message.should.match(/No Content-Type/)
 
     [100, 101, 204, 205, 304].each do |status|
       lambda {

data/test/spec_lock.rb

@@ -1,4 +1,3 @@
-require 'enumerator'
 require 'rack/lint'
 require 'rack/lock'
 require 'rack/mock'
@@ -36,13 +35,11 @@ module LockHelpers
 end
 
 describe Rack::Lock do
-  ::Enumerator = ::Enumerable::Enumerator unless Object.const_defined?(:Enumerator)
-  
   extend LockHelpers
-  
+
   describe 'Proxy' do
     extend LockHelpers
-    
+
     should 'delegate each' do
       env      = Rack::MockRequest.env_for("/")
       response = Class.new {
@@ -115,11 +112,11 @@ describe Rack::Lock do
     env  = Rack::MockRequest.env_for("/")
     body = [200, {"Content-Type" => "text/plain"}, %w{ hi mom }]
     app  = lock_app(lambda { |inner_env| body })
-    
+
     res = app.call(env)
     res[0].should.equal body[0]
     res[1].should.equal body[1]
-    Enumerator.new(res[2]).to_a.should.equal ["hi", "mom"]
+    res[2].to_enum.to_a.should.equal ["hi", "mom"]
   end
 
   should "call synchronize on lock" do

data/test/spec_methodoverride.rb

@@ -65,7 +65,10 @@ EOF
                       "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
                       "CONTENT_LENGTH" => input.size.to_s,
                       :method => "POST", :input => input)
-    app.call env
+    begin
+      app.call env
+    rescue EOFError
+    end
 
     env["REQUEST_METHOD"].should.equal "POST"
   end

data/test/spec_mime.rb

@@ -0,0 +1,51 @@
+require 'rack/mime'
+
+describe Rack::Mime do
+
+  it "should return the fallback mime-type for files with no extension" do
+    fallback = 'image/jpg'
+    Rack::Mime.mime_type(File.extname('no_ext'), fallback).should == fallback
+  end
+
+  it "should always return 'application/octet-stream' for unknown file extensions" do
+    unknown_ext = File.extname('unknown_ext.abcdefg')
+    Rack::Mime.mime_type(unknown_ext).should == 'application/octet-stream'
+  end
+
+  it "should return the mime-type for a given extension" do
+    # sanity check. it would be infeasible test every single mime-type.
+    Rack::Mime.mime_type(File.extname('image.jpg')).should == 'image/jpeg'
+  end
+
+  it "should support null fallbacks" do
+    Rack::Mime.mime_type('.nothing', nil).should == nil
+  end
+
+  it "should match exact mimes" do
+    Rack::Mime.match?('text/html', 'text/html').should == true
+    Rack::Mime.match?('text/html', 'text/meme').should == false
+    Rack::Mime.match?('text', 'text').should == true
+    Rack::Mime.match?('text', 'binary').should == false
+  end
+
+  it "should match class wildcard mimes" do
+    Rack::Mime.match?('text/html', 'text/*').should == true
+    Rack::Mime.match?('text/plain', 'text/*').should == true
+    Rack::Mime.match?('application/json', 'text/*').should == false
+    Rack::Mime.match?('text/html', 'text').should == true
+  end
+
+  it "should match full wildcards" do
+    Rack::Mime.match?('text/html', '*').should == true
+    Rack::Mime.match?('text/plain', '*').should == true
+    Rack::Mime.match?('text/html', '*/*').should == true
+    Rack::Mime.match?('text/plain', '*/*').should == true
+  end
+
+  it "should match type wildcard mimes" do
+    Rack::Mime.match?('text/html', '*/html').should == true
+    Rack::Mime.match?('text/plain', '*/plain').should == true
+  end
+
+end
+

data/test/spec_mongrel.rb

@@ -36,7 +36,7 @@ describe Rack::Handler::Mongrel do
 
   should "have rack headers" do
     GET("/test")
-    response["rack.version"].should.equal [1,1]
+    response["rack.version"].should.equal [1,2]
     response["rack.multithread"].should.be.true
     response["rack.multiprocess"].should.be.false
     response["rack.run_once"].should.be.false

data/test/spec_multipart.rb

@@ -364,56 +364,22 @@ Content-Type: image/jpeg\r
   end
 
   it "builds complete params with the chunk size of 16384 slicing exactly on boundary" do
-    begin
-      previous_limit = Rack::Utils.multipart_part_limit
-      Rack::Utils.multipart_part_limit = 256
-
-      data = File.open(multipart_file("fail_16384_nofile"), 'rb') { |f| f.read }.gsub(/\n/, "\r\n")
-      options = {
-        "CONTENT_TYPE" => "multipart/form-data; boundary=----WebKitFormBoundaryWsY0GnpbI5U7ztzo",
-        "CONTENT_LENGTH" => data.length.to_s,
-        :input => StringIO.new(data)
-      }
-      env = Rack::MockRequest.env_for("/", options)
-      params = Rack::Multipart.parse_multipart(env)
-
-      params.should.not.equal nil
-      params.keys.should.include "AAAAAAAAAAAAAAAAAAA"
-      params["AAAAAAAAAAAAAAAAAAA"].keys.should.include "PLAPLAPLA_MEMMEMMEMM_ATTRATTRER"
-      params["AAAAAAAAAAAAAAAAAAA"]["PLAPLAPLA_MEMMEMMEMM_ATTRATTRER"].keys.should.include "new"
-      params["AAAAAAAAAAAAAAAAAAA"]["PLAPLAPLA_MEMMEMMEMM_ATTRATTRER"]["new"].keys.should.include "-2"
-      params["AAAAAAAAAAAAAAAAAAA"]["PLAPLAPLA_MEMMEMMEMM_ATTRATTRER"]["new"]["-2"].keys.should.include "ba_unit_id"
-      params["AAAAAAAAAAAAAAAAAAA"]["PLAPLAPLA_MEMMEMMEMM_ATTRATTRER"]["new"]["-2"]["ba_unit_id"].should.equal "1017"
-    ensure
-      Rack::Utils.multipart_part_limit = previous_limit
-    end
-  end
-
- should "not reach a multi-part limit" do
-    begin
-      previous_limit = Rack::Utils.multipart_part_limit
-      Rack::Utils.multipart_part_limit = 4
-
-      env = Rack::MockRequest.env_for '/', multipart_fixture(:three_files_three_fields)
-      params = Rack::Multipart.parse_multipart(env)
-      params['reply'].should.equal 'yes'
-      params['to'].should.equal 'people'
-      params['from'].should.equal 'others'
-    ensure
-      Rack::Utils.multipart_part_limit = previous_limit
-    end
-  end
-
-  should "reach a multipart limit" do
-    begin
-      previous_limit = Rack::Utils.multipart_part_limit
-      Rack::Utils.multipart_part_limit = 3
+    data = File.open(multipart_file("fail_16384_nofile")) { |f| f.read }.gsub(/\n/, "\r\n")
+    options = {
+      "CONTENT_TYPE" => "multipart/form-data; boundary=----WebKitFormBoundaryWsY0GnpbI5U7ztzo",
+      "CONTENT_LENGTH" => data.length.to_s,
+      :input => StringIO.new(data)
+    }
+    env = Rack::MockRequest.env_for("/", options)
+    params = Rack::Multipart.parse_multipart(env)
 
-      env = Rack::MockRequest.env_for '/', multipart_fixture(:three_files_three_fields)
-      lambda { Rack::Multipart.parse_multipart(env) }.should.raise(Rack::Multipart::MultipartLimitError)
-    ensure
-      Rack::Utils.multipart_part_limit = previous_limit
-    end
+    params.should.not.equal nil
+    params.keys.should.include "AAAAAAAAAAAAAAAAAAA"
+    params["AAAAAAAAAAAAAAAAAAA"].keys.should.include "PLAPLAPLA_MEMMEMMEMM_ATTRATTRER"
+    params["AAAAAAAAAAAAAAAAAAA"]["PLAPLAPLA_MEMMEMMEMM_ATTRATTRER"].keys.should.include "new"
+    params["AAAAAAAAAAAAAAAAAAA"]["PLAPLAPLA_MEMMEMMEMM_ATTRATTRER"]["new"].keys.should.include "-2"
+    params["AAAAAAAAAAAAAAAAAAA"]["PLAPLAPLA_MEMMEMMEMM_ATTRATTRER"]["new"]["-2"].keys.should.include "ba_unit_id"
+    params["AAAAAAAAAAAAAAAAAAA"]["PLAPLAPLA_MEMMEMMEMM_ATTRATTRER"]["new"]["-2"]["ba_unit_id"].should.equal "1017"
   end
 
   should "return nil if no UploadedFiles were used" do