rack 0.2.0 → 0.3.0

data/test/spec_rack_auth_basic.rb

@@ -1,6 +1,7 @@
 require 'test/spec'
-require 'base64'
-require 'rack'
+
+require 'rack/auth/basic'
+require 'rack/mock'
 
 context 'Rack::Auth::Basic' do
 
@@ -23,7 +24,7 @@ context 'Rack::Auth::Basic' do
   end
 
   def request_with_basic_auth(username, password, &block)
-    request 'HTTP_AUTHORIZATION' => 'Basic ' + Base64.encode64("#{username}:#{password}"), &block
+    request 'HTTP_AUTHORIZATION' => 'Basic ' + ["#{username}:#{password}"].pack("m*"), &block
   end
 
   def request(headers = {})

data/test/spec_rack_auth_digest.rb

@@ -1,5 +1,7 @@
 require 'test/spec'
-require 'rack'
+
+require 'rack/auth/digest/md5'
+require 'rack/mock'
 
 context 'Rack::Auth::Digest::MD5' do
 
@@ -164,4 +166,4 @@ context 'Rack::Auth::Digest::MD5' do
     end
   end
   
-end
+end

data/test/spec_rack_builder.rb

@@ -0,0 +1,50 @@
+require 'test/spec'
+
+require 'rack/builder'
+require 'rack/mock'
+
+context "Rack::Builder" do
+  specify "chains apps by default" do
+    app = Rack::Builder.new do
+      use Rack::ShowExceptions
+      run lambda { |env| raise "bzzzt" }
+    end.to_app
+
+    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
+
+  specify "has implicit #to_app" do
+    app = Rack::Builder.new 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
+
+  specify "supports blocks on use" do
+    app = Rack::Builder.new do
+      use Rack::ShowExceptions
+      use Rack::Auth::Basic do |username, password|
+        'secret' == password
+      end
+
+      run lambda { |env| [200, {}, '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
+
+end

data/test/spec_rack_cgi.rb

@@ -1,14 +1,6 @@
 require 'test/spec'
 require 'testrequest'
 
-pid = fork {
-  exec "cd #{File.join(File.dirname(__FILE__), 'cgi')} && lighttpd -D -f lighttpd.conf"
-}
-
-at_exit {
-  Process.kill 15, pid
-}
-
 context "Rack::Handler::CGI" do
   include TestRequest::Helpers
   
@@ -17,6 +9,14 @@ context "Rack::Handler::CGI" do
     @port = 9203
   end
 
+  # Keep this first.
+  specify "startup" do
+    $pid = fork {
+      Dir.chdir File.join(File.dirname(__FILE__), 'cgi')
+      exec "lighttpd -D -f lighttpd.conf"
+    }
+  end
+
   specify "should respond" do
     lambda {
       GET("/test")
@@ -79,4 +79,10 @@ context "Rack::Handler::CGI" do
     status.should.equal 403
     response["rack.url_scheme"].should.equal "http"
   end
+
+  # Keep this last.
+  specify "shutdown" do
+    Process.kill 15, $pid
+    Process.wait($pid).should.equal $pid
+  end
 end

data/test/spec_rack_fastcgi.rb

@@ -1,14 +1,6 @@
 require 'test/spec'
 require 'testrequest'
 
-pid = fork {
-  exec "cd #{File.join(File.dirname(__FILE__), 'cgi')} && lighttpd -D -f lighttpd.conf"
-}
-
-at_exit {
-  Process.kill 15, pid
-}
-
 context "Rack::Handler::FastCGI" do
   include TestRequest::Helpers
 
@@ -17,6 +9,14 @@ context "Rack::Handler::FastCGI" do
     @port = 9203
   end
 
+  # Keep this first.
+  specify "startup" do
+    $pid = fork {
+      Dir.chdir File.join(File.dirname(__FILE__), 'cgi')
+      exec "lighttpd -D -f lighttpd.conf"
+    }
+  end
+
   specify "should respond" do
     lambda {
       GET("/test.fcgi")
@@ -79,4 +79,10 @@ context "Rack::Handler::FastCGI" do
     status.should.equal 403
     response["rack.url_scheme"].should.equal "http"
   end
+
+  # Keep this last.
+  specify "shutdown" do
+    Process.kill 15, $pid
+    Process.wait($pid).should.equal $pid
+  end
 end

data/test/spec_rack_file.rb

@@ -15,6 +15,14 @@ context "Rack::File" do
     res.should.be.ok
     res.should =~ /ruby/
   end
+  
+  specify "serves files with URL encoded filenames" do
+    res = Rack::MockRequest.new(Rack::Lint.new(Rack::File.new(DOCROOT))).
+      get("/cgi/%74%65%73%74") # "/cgi/test"
+
+    res.should.be.ok
+    res.should =~ /ruby/
+  end
 
   specify "does not allow directory traversal" do
     res = Rack::MockRequest.new(Rack::Lint.new(Rack::File.new(DOCROOT))).

data/test/spec_rack_lint.rb

@@ -206,14 +206,14 @@ context "Rack::Lint" do
 
     lambda {
       Rack::Lint.new(lambda { |env|
-                       [201, {"Content-Type" => "text/plain"}, ""]
+                       [204, {"Content-Type" => "text/plain"}, ""]
                      }).call(env({}))
     }.should.raise(Rack::Lint::LintError).
       message.should.match(/Content-Type header found/)
 
     lambda {
       Rack::Lint.new(lambda { |env|
-                       [201, {"Content-type" => "text/plain"}, ""]
+                       [204, {"Content-type" => "text/plain"}, ""]
                      }).call(env({}))
     }.should.raise(Rack::Lint::LintError).
       message.should.match(/Content-Type header found/)
@@ -244,7 +244,7 @@ context "Rack::Lint" do
                        [201, {"Content-type" => "text/plain"}, ""]
                      }).call(env({}))
     }.should.raise(Rack::Lint::LintError).
-      message.should.match(/read called with too many arguments/)
+      message.should.match(/read called with non-integer argument/)
 
     weirdio = Object.new
     class << weirdio

data/test/spec_rack_request.rb

@@ -129,6 +129,12 @@ context "Rack::Request" do
     req.cookies.should.equal({})
   end
 
+  specify "parses cookies according to RFC 2109" do
+    req = Rack::Request.new \
+      Rack::MockRequest.env_for('', 'HTTP_COOKIE' => 'foo=bar;foo=car')
+    req.cookies.should.equal 'foo' => 'bar'
+  end
+
   specify "provides setters" do
     req = Rack::Request.new(e=Rack::MockRequest.env_for(""))
     req.script_name.should.equal ""
@@ -276,4 +282,30 @@ EOF
 
     lambda { req.POST }.should.raise(EOFError)
   end
+
+  specify "does conform to the Rack spec" do
+    app = lambda { |env|
+      content = Rack::Request.new(env).POST["file"].inspect
+      [200, {"Content-Type" => "text/html"}, content]
+    }
+
+    input = <<EOF
+--AaB03x\r
+content-disposition: form-data; name="reply"\r
+\r
+yes\r
+--AaB03x\r
+content-disposition: form-data; name="fileupload"; filename="dj.jpg"\r
+Content-Type: image/jpeg\r
+Content-Transfer-Encoding: base64\r
+\r
+/9j/4AAQSkZJRgABAQAAAQABAAD//gA+Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcg\r
+--AaB03x--\r
+EOF
+    res = Rack::MockRequest.new(Rack::Lint.new(app)).get "/",
+      "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
+      "CONTENT_LENGTH" => input.size.to_s, "rack.input" => StringIO.new(input)
+
+    res.should.be.ok
+  end
 end

data/test/spec_rack_response.rb

@@ -54,13 +54,21 @@ context "Rack::Response" do
     response["Set-Cookie"].should.equal ["foo=bar", "foo2=bar2", "foo3=bar3"]
   end
 
+  specify "formats the Cookie expiration date accordingly to RFC 2109" do
+    response = Rack::Response.new
+    
+    response.set_cookie "foo", {:value => "bar", :expires => Time.now+10}
+    response["Set-Cookie"].should.match(
+      /expires=..., \d\d-...-\d\d\d\d \d\d:\d\d:\d\d .../)
+  end
+
   specify "can delete cookies" do
     response = Rack::Response.new
     response.set_cookie "foo", "bar"
     response.set_cookie "foo2", "bar2"
     response.delete_cookie "foo"
     response["Set-Cookie"].should.equal ["foo2=bar2",
-                                  "foo=; expires=Thu, 01 Jan 1970 00:00:00 GMT"]
+                                  "foo=; expires=Thu, 01-Jan-1970 00:00:00 GMT"]
   end
 
   specify "has a useful constructor" do
@@ -96,7 +104,7 @@ context "Rack::Response" do
   end
  
   specify "doesn't return invalid responses" do
-    r = Rack::Response.new(["foo", "bar"], 201)
+    r = Rack::Response.new(["foo", "bar"], 204)
     status, header, body = r.finish
     str = ""; body.each { |part| str << part }
     str.should.be.empty

data/test/spec_rack_session_pool.rb

@@ -0,0 +1,37 @@
+require 'test/spec'
+
+require 'rack/session/pool'
+require 'rack/mock'
+require 'rack/response'
+
+context "Rack::Session::Pool" do
+  incrementor = lambda { |env|
+    env["rack.session"]["counter"] ||= 0
+    env["rack.session"]["counter"] += 1
+    Rack::Response.new(env["rack.session"].inspect).to_a
+  }
+
+  specify "creates a new cookie" do
+    pool = Rack::Session::Pool.new(incrementor)
+    res = Rack::MockRequest.new(pool).get("/")
+    res["Set-Cookie"].should.match("rack.session=")
+    res.body.should.equal '{"counter"=>1}'
+  end
+
+  specify "loads from a cookie" do
+    pool = Rack::Session::Pool.new(incrementor)
+    res = Rack::MockRequest.new(pool).get("/")
+    cookie = res["Set-Cookie"]
+    res = Rack::MockRequest.new(pool).get("/", "HTTP_COOKIE" => cookie)
+    res.body.should.equal '{"counter"=>2}'
+    res = Rack::MockRequest.new(pool).get("/", "HTTP_COOKIE" => cookie)
+    res.body.should.equal '{"counter"=>3}'
+  end
+
+  specify "survives broken cookies" do
+    pool = Rack::Session::Pool.new(incrementor)
+    res = Rack::MockRequest.new(pool).
+      get("/", "HTTP_COOKIE" => "rack.session=blarghfasel")
+    res.body.should.equal '{"counter"=>1}'
+  end
+end

data/test/spec_rack_urlmap.rb

@@ -11,17 +11,17 @@ context "Rack::URLMap" do
                                 "X-Position" => "/foo",
                                 "X-PathInfo" => env["PATH_INFO"],
                               }, [""]]},
-                           
+
                            "/bar" => lambda { |env|
                              [200,
                               { "Content-Type" => "text/plain",
                                 "X-Position" => "/bar",
                                 "X-PathInfo" => env["PATH_INFO"],
                               }, [""]]}
-                           
+
                            )
 
-    
+
     Rack::MockRequest.new(map).get("/").should.be.not_found
 
     res = Rack::MockRequest.new(map).get("/foo")
@@ -96,18 +96,24 @@ context "Rack::URLMap" do
 
   specify "should be nestable" do
     map = Rack::URLMap.new("/foo" =>
-                           Rack::URLMap.new("/bar" =>  lambda { |env|
-                                              [200,
-                                               { "Content-Type" => "text/plain",
-                                                 "X-Position" => "/foo/bar",
-                                                 "X-PathInfo" => env["PATH_INFO"],
-                                               }, [""]]}
-                                            )
-                           )
+      Rack::URLMap.new("/bar" =>
+        Rack::URLMap.new("/quux" =>  lambda { |env|
+                           [200,
+                            { "Content-Type" => "text/plain",
+                              "X-Position" => "/foo/bar/quux",
+                              "X-PathInfo" => env["PATH_INFO"],
+                              "X-ScriptName" => env["SCRIPT_NAME"],
+                            }, [""]]}
+                         )))
 
     res = Rack::MockRequest.new(map).get("/foo/bar")
+    res.should.be.not_found
+
+    res = Rack::MockRequest.new(map).get("/foo/bar/quux")
     res.should.be.ok
-    res["X-Position"].should.equal "/foo/bar"
+    res["X-Position"].should.equal "/foo/bar/quux"
+    res["X-PathInfo"].should.equal "/"
+    res["X-ScriptName"].should.equal "/foo/bar/quux"
   end
 
   specify "should route root apps correctly" do

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0.8
+rubygems_version: 0.9.4
 specification_version: 1
 name: rack
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2007-05-16 00:00:00 +02:00
+  version: 0.3.0
+date: 2008-02-26 00:00:00 +01:00
 summary: a modular Ruby webserver interface
 require_paths: 
 - lib
@@ -35,6 +35,7 @@ files:
 - COPYING
 - example/lobster.ru
 - example/protectedlobster.rb
+- example/protectedlobster.ru
 - KNOWN-ISSUES
 - lib/rack/adapter/camping.rb
 - lib/rack/auth/abstract/handler.rb
@@ -44,13 +45,16 @@ files:
 - lib/rack/auth/digest/nonce.rb
 - lib/rack/auth/digest/params.rb
 - lib/rack/auth/digest/request.rb
+- lib/rack/auth/openid.rb
 - lib/rack/builder.rb
 - lib/rack/cascade.rb
 - lib/rack/commonlogger.rb
 - lib/rack/file.rb
 - lib/rack/handler/cgi.rb
 - lib/rack/handler/fastcgi.rb
+- lib/rack/handler/lsws.rb
 - lib/rack/handler/mongrel.rb
+- lib/rack/handler/scgi.rb
 - lib/rack/handler/webrick.rb
 - lib/rack/lint.rb
 - lib/rack/lobster.rb
@@ -60,6 +64,7 @@ files:
 - lib/rack/request.rb
 - lib/rack/response.rb
 - lib/rack/session/cookie.rb
+- lib/rack/session/pool.rb
 - lib/rack/showexceptions.rb
 - lib/rack/showstatus.rb
 - lib/rack/static.rb
@@ -74,6 +79,7 @@ files:
 - test/cgi/test.ru
 - test/spec_rack_auth_basic.rb
 - test/spec_rack_auth_digest.rb
+- test/spec_rack_builder.rb
 - test/spec_rack_camping.rb
 - test/spec_rack_cascade.rb
 - test/spec_rack_cgi.rb
@@ -88,6 +94,7 @@ files:
 - test/spec_rack_request.rb
 - test/spec_rack_response.rb
 - test/spec_rack_session_cookie.rb
+- test/spec_rack_session_pool.rb
 - test/spec_rack_showexceptions.rb
 - test/spec_rack_showstatus.rb
 - test/spec_rack_static.rb
@@ -100,6 +107,7 @@ files:
 test_files: 
 - test/spec_rack_auth_basic.rb
 - test/spec_rack_auth_digest.rb
+- test/spec_rack_builder.rb
 - test/spec_rack_camping.rb
 - test/spec_rack_cascade.rb
 - test/spec_rack_cgi.rb
@@ -114,6 +122,7 @@ test_files:
 - test/spec_rack_request.rb
 - test/spec_rack_response.rb
 - test/spec_rack_session_cookie.rb
+- test/spec_rack_session_pool.rb
 - test/spec_rack_showexceptions.rb
 - test/spec_rack_showstatus.rb
 - test/spec_rack_static.rb