rack 0.4.0 → 0.9.0

data/test/spec_rack_response.rb

@@ -1,4 +1,5 @@
 require 'test/spec'
+require 'set'
 
 require 'rack/response'
 
@@ -7,7 +8,7 @@ context "Rack::Response" do
     response = Rack::Response.new
     status, header, body = response.finish
     status.should.equal 200
-    header.should.equal "Content-Type" => "text/html"
+    header.should.equal "Content-Type" => "text/html", "Content-Length" => "0"
     body.each { |part|
       part.should.equal ""
     }
@@ -15,7 +16,7 @@ context "Rack::Response" do
     response = Rack::Response.new
     status, header, body = *response
     status.should.equal 200
-    header.should.equal "Content-Type" => "text/html"
+    header.should.equal "Content-Type" => "text/html", "Content-Length" => "0"
     body.each { |part|
       part.should.equal ""
     }
@@ -62,6 +63,12 @@ context "Rack::Response" do
       /expires=..., \d\d-...-\d\d\d\d \d\d:\d\d:\d\d .../)
   end
 
+  specify "can set secure cookies" do
+    response = Rack::Response.new
+    response.set_cookie "foo", {:value => "bar", :secure => true}
+    response["Set-Cookie"].should.equal "foo=bar; secure"
+  end
+
   specify "can delete cookies" do
     response = Rack::Response.new
     response.set_cookie "foo", "bar"
@@ -82,7 +89,7 @@ context "Rack::Response" do
     str = ""; body.each { |part| str << part }
     str.should.equal "foobar"
 
-    r = Rack::Response.new({"foo", "bar"})
+    r = Rack::Response.new(["foo", "bar"].to_set)
     r.write "foo"
     status, header, body = r.finish
     str = ""; body.each { |part| str << part }

data/test/spec_rack_session_cookie.rb

@@ -46,4 +46,37 @@ context "Rack::Session::Cookie" do
         get("/", :fatal => true)
     }.should.raise(Rack::MockRequest::FatalWarning)
   end
+  
+  specify "creates a new cookie with integrity hash" do
+    res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor, :secret => 'test')).get("/")
+    if RUBY_VERSION < "1.9"
+      res["Set-Cookie"].should.match("rack.session=BAh7BiIMY291bnRlcmkG%0A--1439b4d37b9d4b04c603848382f712d6fcd31088")
+    else
+      res["Set-Cookie"].should.match("rack.session=BAh7BkkiDGNvdW50ZXIGOg1lbmNvZGluZyINVVMtQVNDSUlpBg%3D%3D%0A--d7a6637b94d2728194a96c18484e1f7ed9074a83")
+    end
+  end
+  
+  specify "loads from a cookie wih integrity hash" do
+    res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor, :secret => 'test')).get("/")
+    cookie = res["Set-Cookie"]
+    res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor, :secret => 'test')).
+      get("/", "HTTP_COOKIE" => cookie)
+    res.body.should.equal '{"counter"=>2}'
+    cookie = res["Set-Cookie"]
+    res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor, :secret => 'test')).
+      get("/", "HTTP_COOKIE" => cookie)
+    res.body.should.equal '{"counter"=>3}'
+  end
+  
+  specify "ignores tampered with session cookies" do
+    app = Rack::Session::Cookie.new(incrementor, :secret => 'test')
+    response1 = Rack::MockRequest.new(app).get("/")
+    _, digest = response1["Set-Cookie"].split("--")
+    tampered_with_cookie = "hackerman-was-here" + "--" + digest
+    response2 = Rack::MockRequest.new(app).get("/", "HTTP_COOKIE" =>
+                                               tampered_with_cookie)
+    
+    # The tampered-with cookie is ignored, so we get back an identical Set-Cookie
+    response2["Set-Cookie"].should.equal(response1["Set-Cookie"])
+  end
 end

data/test/spec_rack_thin.rb

@@ -0,0 +1,90 @@
+require 'test/spec'
+
+begin
+require 'rack/handler/thin'
+require 'testrequest'
+require 'timeout'
+  
+context "Rack::Handler::Thin" do
+  include TestRequest::Helpers
+  
+  setup do
+    @app = Rack::Lint.new(TestRequest.new)
+    Thin::Logging.silent = true
+    @thread = Thread.new do
+      Rack::Handler::Thin.run(@app, :Host => @host='0.0.0.0', :Port => @port=9201) do |server|
+        @server = server
+      end
+    end
+    Thread.pass until @server && @server.running?
+  end
+
+  specify "should respond" do
+    lambda {
+      GET("/")
+    }.should.not.raise
+  end
+
+  specify "should be a Thin" do
+    GET("/")
+    status.should.be 200
+    response["SERVER_SOFTWARE"].should =~ /thin/
+    response["HTTP_VERSION"].should.equal "HTTP/1.1"
+    response["SERVER_PROTOCOL"].should.equal "HTTP/1.1"
+    response["SERVER_PORT"].should.equal "9201"
+    response["SERVER_NAME"].should.equal "0.0.0.0"
+  end
+
+  specify "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
+  end
+
+  specify "should have CGI headers on GET" do
+    GET("/")
+    response["REQUEST_METHOD"].should.equal "GET"
+    response["REQUEST_PATH"].should.equal "/"
+    response["PATH_INFO"].should.be.equal "/"
+    response["QUERY_STRING"].should.equal ""
+    response["test.postdata"].should.equal ""
+
+    GET("/test/foo?quux=1")
+    response["REQUEST_METHOD"].should.equal "GET"
+    response["REQUEST_PATH"].should.equal "/test/foo"
+    response["PATH_INFO"].should.equal "/test/foo"
+    response["QUERY_STRING"].should.equal "quux=1"
+  end
+
+  specify "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"
+    response["REQUEST_PATH"].should.equal "/"
+    response["QUERY_STRING"].should.equal ""
+    response["HTTP_X_TEST_HEADER"].should.equal "42"
+    response["test.postdata"].should.equal "rack-form-data=23"
+  end
+
+  specify "should support HTTP auth" do
+    GET("/test", {:user => "ruth", :passwd => "secret"})
+    response["HTTP_AUTHORIZATION"].should.equal "Basic cnV0aDpzZWNyZXQ="
+  end
+
+  specify "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
+end
+
+rescue LoadError
+  $stderr.puts "Skipping Rack::Handler::Thin tests (Thin is required). `gem install thin` and try again."
+end

data/test/spec_rack_utils.rb

@@ -65,28 +65,30 @@ context "Rack::Utils" do
 end
 
 context "Rack::Utils::HeaderHash" do
-  specify "should capitalize on all accesses" do
-    h = Rack::Utils::HeaderHash.new("foo" => "bar")
-    h["foo"].should.equal "bar"
-    h["Foo"].should.equal "bar"
-    h["FOO"].should.equal "bar"
-
-    h.to_hash.should.equal "Foo" => "bar"
-
-    h["bar-zzle"] = "quux"
+  specify "should retain header case" do
+    h = Rack::Utils::HeaderHash.new("Content-MD5" => "d5ff4e2a0 ...")
+    h['ETag'] = 'Boo!'
+    h.to_hash.should.equal "Content-MD5" => "d5ff4e2a0 ...", "ETag" => 'Boo!'
+  end
 
-    h.to_hash.should.equal "Foo" => "bar", "Bar-Zzle" => "quux"
+  specify "should check existence of keys case insensitively" do
+    h = Rack::Utils::HeaderHash.new("Content-MD5" => "d5ff4e2a0 ...")
+    h.should.include 'content-md5'
+    h.should.not.include 'ETag'
   end
 
-  specify "should capitalize correctly" do
-    h = Rack::Utils::HeaderHash.new
+  specify "should merge case-insensitively" do
+    h = Rack::Utils::HeaderHash.new("ETag" => 'HELLO', "content-length" => '123')
+    merged = h.merge("Etag" => 'WORLD', 'Content-Length' => '321', "Foo" => 'BAR')
+    merged.should.equal "Etag"=>'WORLD', "Content-Length"=>'321', "Foo"=>'BAR'
+  end
 
-    h.capitalize("foo").should.equal "Foo"
-    h.capitalize("foo-bar").should.equal "Foo-Bar"
-    h.capitalize("foo_bar").should.equal "Foo_Bar"
-    h.capitalize("foo bar").should.equal "Foo Bar"
-    h.capitalize("foo-bar-quux").should.equal "Foo-Bar-Quux"
-    h.capitalize("foo-bar-2quux").should.equal "Foo-Bar-2quux"
+  specify "should overwrite case insensitively and assume the new key's case" do
+    h = Rack::Utils::HeaderHash.new("Foo-Bar" => "baz")
+    h["foo-bar"] = "bizzle"
+    h["FOO-BAR"].should.equal "bizzle"
+    h.length.should.equal 1
+    h.to_hash.should.equal "foo-bar" => "bizzle"
   end
 
   specify "should be converted to real Hash" do

data/test/spec_rack_webrick.rb

@@ -2,6 +2,7 @@ require 'test/spec'
 
 require 'rack/handler/webrick'
 require 'rack/lint'
+require 'rack/response'
 require 'testrequest'
 
 Thread.abort_on_exception = true
@@ -83,6 +84,22 @@ context "Rack::Handler::WEBrick" do
     response["rack.url_scheme"].should.equal "http"
   end
 
+  specify "should correctly set cookies" do
+    @server.mount "/cookie-test", Rack::Handler::WEBrick,
+    Rack::Lint.new(lambda { |req|
+                     res = Rack::Response.new
+                     res.set_cookie "one", "1"
+                     res.set_cookie "two", "2"
+                     res.finish
+                   })
+
+    Net::HTTP.start(@host, @port) { |http|
+      res = http.get("/cookie-test")
+      res.code.to_i.should.equal 200
+      res.get_fields("set-cookie").should.equal ["one=1", "two=2"]
+    }
+  end
+
   specify "should provide a .run" do
     block_ran = false
     catch(:done) {

data/test/testrequest.rb

@@ -43,3 +43,15 @@ class TestRequest
     end
   end
 end
+
+class StreamingRequest
+  def self.call(env)
+    [200, {"Content-Type" => "text/plain"}, new]
+  end
+
+  def each
+    yield "hello there!\n"
+    sleep 5
+    yield "that is all.\n"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Christian Neukirchen
@@ -9,10 +9,79 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-21 00:00:00 +02:00
+date: 2009-01-06 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: test-spec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: camping
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: fcgi
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: memcache-client
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mongrel
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: ruby-openid
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: thin
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Rack provides minimal, modular and adaptable interface for developing web applications in Ruby.  By wrapping HTTP requests and responses in the simplest way possible, it unifies and distills the API for web servers, web frameworks, and software in between (the so-called middleware) into a single method call.  Also see http://rack.rubyforge.org.
 email: chneukirchen@gmail.com
 executables: 
@@ -48,6 +117,8 @@ files:
 - lib/rack/builder.rb
 - lib/rack/cascade.rb
 - lib/rack/commonlogger.rb
+- lib/rack/conditionalget.rb
+- lib/rack/content_length.rb
 - lib/rack/deflater.rb
 - lib/rack/directory.rb
 - lib/rack/file.rb
@@ -58,9 +129,14 @@ files:
 - lib/rack/handler/lsws.rb
 - lib/rack/handler/mongrel.rb
 - lib/rack/handler/scgi.rb
+- lib/rack/handler/swiftiplied_mongrel.rb
+- lib/rack/handler/thin.rb
 - lib/rack/handler/webrick.rb
+- lib/rack/head.rb
 - lib/rack/lint.rb
 - lib/rack/lobster.rb
+- lib/rack/methodoverride.rb
+- lib/rack/mime.rb
 - lib/rack/mock.rb
 - lib/rack/recursive.rb
 - lib/rack/reloader.rb
@@ -87,13 +163,17 @@ files:
 - test/spec_rack_cascade.rb
 - test/spec_rack_cgi.rb
 - test/spec_rack_commonlogger.rb
+- test/spec_rack_conditionalget.rb
+- test/spec_rack_content_length.rb
 - test/spec_rack_deflater.rb
 - test/spec_rack_directory.rb
 - test/spec_rack_fastcgi.rb
 - test/spec_rack_file.rb
 - test/spec_rack_handler.rb
+- test/spec_rack_head.rb
 - test/spec_rack_lint.rb
 - test/spec_rack_lobster.rb
+- test/spec_rack_methodoverride.rb
 - test/spec_rack_mock.rb
 - test/spec_rack_mongrel.rb
 - test/spec_rack_recursive.rb
@@ -105,6 +185,7 @@ files:
 - test/spec_rack_showexceptions.rb
 - test/spec_rack_showstatus.rb
 - test/spec_rack_static.rb
+- test/spec_rack_thin.rb
 - test/spec_rack_urlmap.rb
 - test/spec_rack_utils.rb
 - test/spec_rack_webrick.rb
@@ -133,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rack
-rubygems_version: 1.0.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: a modular Ruby webserver interface
@@ -146,13 +227,17 @@ test_files:
 - test/spec_rack_cascade.rb
 - test/spec_rack_cgi.rb
 - test/spec_rack_commonlogger.rb
+- test/spec_rack_conditionalget.rb
+- test/spec_rack_content_length.rb
 - test/spec_rack_deflater.rb
 - test/spec_rack_directory.rb
 - test/spec_rack_fastcgi.rb
 - test/spec_rack_file.rb
 - test/spec_rack_handler.rb
+- test/spec_rack_head.rb
 - test/spec_rack_lint.rb
 - test/spec_rack_lobster.rb
+- test/spec_rack_methodoverride.rb
 - test/spec_rack_mock.rb
 - test/spec_rack_mongrel.rb
 - test/spec_rack_recursive.rb
@@ -164,6 +249,7 @@ test_files:
 - test/spec_rack_showexceptions.rb
 - test/spec_rack_showstatus.rb
 - test/spec_rack_static.rb
+- test/spec_rack_thin.rb
 - test/spec_rack_urlmap.rb
 - test/spec_rack_utils.rb
 - test/spec_rack_webrick.rb