cuba 3.0.0.rc2 → 3.0.0.rc3

data/cuba.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "cuba"
-  s.version           = "3.0.0.rc2"
+  s.version           = "3.0.0.rc3"
   s.summary           = "Microframework for web applications."
   s.description       = "Cuba is a microframework for web applications."
   s.authors           = ["Michel Martens"]

data/lib/cuba.rb

@@ -1,8 +1,55 @@
 require "rack"
+require "time"
 
 class Cuba
   class RedefinitionError < StandardError; end
 
+  class Response
+    attr_accessor :status
+
+    attr :headers
+
+    def initialize(status = 200, headers = { "Content-Type" => "text/html" })
+      @status  = status
+      @headers = headers
+      @body    = []
+      @length  = 0
+    end
+
+    def [](key)
+      @headers[key]
+    end
+
+    def []=(key, value)
+      @headers[key] = value
+    end
+
+    def write(str)
+      s = str.to_s
+
+      @length += s.bytesize
+      @headers["Content-Length"] = @length.to_s
+      @body << s
+    end
+
+    def redirect(path, status = 302)
+      @headers = { "Location" => path }
+      @status  = status
+    end
+
+    def finish
+      [@status, @headers, @body]
+    end
+
+    def set_cookie(key, value)
+      Rack::Utils.set_cookie_header!(@headers, key, value)
+    end
+
+    def delete_cookie(key, value = {})
+      Rack::Utils.delete_cookie_header!(@headers, key, value)
+    end
+  end
+
   @@methods = []
 
   class << self
@@ -74,7 +121,7 @@ class Cuba
   def call!(env)
     @env = env
     @req = Rack::Request.new(env)
-    @res = Rack::Response.new
+    @res = Cuba::Response.new
 
     # This `catch` statement will either receive a
     # rack response tuple via a `halt`, or will

data/test/accept.rb

@@ -7,12 +7,12 @@ test "accept mimetypes" do
     end
   end
 
-  env = { "HTTP_ACCEPT" => "application/xml", 
+  env = { "HTTP_ACCEPT" => "application/xml",
           "SCRIPT_NAME" => "/", "PATH_INFO" => "/post" }
 
-   _, _, resp = Cuba.call(env)
+   _, _, body = Cuba.call(env)
 
-  assert_equal ["application/xml"], resp.body
+  assert_response body, ["application/xml"]
 end
 
 test "tests don't fail when you don't specify an accept type" do
@@ -26,7 +26,7 @@ test "tests don't fail when you don't specify an accept type" do
     end
   end
 
-  _, _, resp = Cuba.call({})
+  _, _, body = Cuba.call({})
 
-  assert_equal ["Default action"], resp.body
+  assert_response body, ["Default action"]
 end

data/test/captures.rb

@@ -11,7 +11,7 @@ test "doesn't yield HOST" do
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["0"], resp.body
+  assert_response resp, ["0"]
 end
 
 test "doesn't yield the verb" do
@@ -25,7 +25,7 @@ test "doesn't yield the verb" do
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["0"], resp.body
+  assert_response resp, ["0"]
 end
 
 test "doesn't yield the path" do
@@ -40,7 +40,7 @@ test "doesn't yield the path" do
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["0"], resp.body
+  assert_response resp, ["0"]
 end
 
 test "yields the segment" do
@@ -55,7 +55,7 @@ test "yields the segment" do
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["johndoe"], resp.body
+  assert_response resp, ["johndoe"]
 end
 
 test "yields a number" do
@@ -70,7 +70,7 @@ test "yields a number" do
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["101"], resp.body
+  assert_response resp, ["101"]
 end
 
 test "yield a file name with a matching extension" do
@@ -85,7 +85,7 @@ test "yield a file name with a matching extension" do
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["app"], resp.body
+  assert_response resp, ["app"]
 end
 
 test "yields a segment per nested block" do
@@ -106,7 +106,7 @@ test "yields a segment per nested block" do
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["one", "two", "three"], resp.body
+  assert_response resp, ["one", "two", "three"]
 end
 
 test "consumes a slash if needed" do
@@ -121,5 +121,5 @@ test "consumes a slash if needed" do
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["foo/bar.css"], resp.body
+  assert_response resp, ["foo/bar.css"]
 end

data/test/composition.rb

@@ -17,5 +17,5 @@ test "composing on top of a PATH" do
 
    _, _, resp = Cuba.call(env)
 
-   assert_equal ["View 101"], resp.body
-end
+   assert_response resp, ["View 101"]
+end

data/test/cookie.rb

@@ -0,0 +1,34 @@
+require File.expand_path("helper", File.dirname(__FILE__))
+
+test "set cookie" do
+  Cuba.define do
+    on default do
+      res.set_cookie("foo", "bar")
+      res.set_cookie("bar", "baz")
+      res.write "Hello"
+    end
+  end
+
+  env = { "SCRIPT_NAME" => "/", "PATH_INFO" => "/" }
+
+   _, headers, body = Cuba.call(env)
+
+   assert_equal "foo=bar\nbar=baz", headers["Set-Cookie"]
+end
+
+test "delete cookie" do
+  Cuba.define do
+    on default do
+      res.set_cookie("foo", "bar")
+      res.delete_cookie("foo")
+      res.write "Hello"
+    end
+  end
+
+  env = { "SCRIPT_NAME" => "/", "PATH_INFO" => "/" }
+
+   _, headers, body = Cuba.call(env)
+
+   assert_equal "foo=; expires=Thu, 01-Jan-1970 00:00:00 GMT",
+     headers["Set-Cookie"]
+end

data/test/extension.rb

@@ -17,5 +17,5 @@ test "/styles/reset.css" do |env|
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["reset"], resp.body
+  assert_response resp, ["reset"]
 end

data/test/helper.rb

@@ -7,5 +7,5 @@ def assert_response(body, expected)
   arr = []
   body.each { |line| arr << line }
 
-  assert_equal arr, expected
-end
+  flunk "#{arr.inspect} != #{expected.inspect}" unless arr == expected
+end

data/test/host.rb

@@ -11,7 +11,7 @@ test "matches a host" do
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["worked"], resp.body
+  assert_response resp, ["worked"]
 end
 
 test "matches a host with a regexp" do
@@ -25,5 +25,5 @@ test "matches a host with a regexp" do
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["worked"], resp.body
+  assert_response resp, ["worked"]
 end

data/test/integration.rb

@@ -79,14 +79,9 @@ test "reset and use" do
 
   assert 200 == status
   assert "text/html" == headers["Content-Type"]
-  assert ["2nd Default"] == resp.body
+  assert_response resp, ["2nd Default"]
 
   assert "1" == env["m.first"]
   assert "2" == env["m.second"]
   assert "3" == env["m.block"]
 end
-
-test "examples" do
-  `cd example && rake -I../lib`
-  assert $?.exitstatus == 0
-end

data/test/match.rb

@@ -13,7 +13,7 @@ test "text-book example" do |env|
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["123"], resp.body
+  assert_response resp, ["123"]
 end
 
 test "multi-param" do |env|
@@ -28,7 +28,7 @@ test "multi-param" do |env|
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["jdoe", "123"], resp.body
+  assert_response resp, ["jdoe", "123"]
 end
 
 test "regex nesting" do |env|
@@ -46,7 +46,7 @@ test "regex nesting" do |env|
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["jdoe", "123"], resp.body
+  assert_response resp, ["jdoe", "123"]
 end
 
 test "regex nesting colon param style" do |env|
@@ -64,7 +64,7 @@ test "regex nesting colon param style" do |env|
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["jdoe", "123"], resp.body
+  assert_response resp, ["jdoe", "123"]
 end
 
 test "symbol matching" do |env|
@@ -82,5 +82,5 @@ test "symbol matching" do |env|
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["jdoe", "123"], resp.body
+  assert_response resp, ["jdoe", "123"]
 end

data/test/middleware.rb

@@ -8,7 +8,10 @@ class Shrimp
   def call(env)
     status, headers, resp = @app.call(env)
 
-    [status, headers, resp.body.reverse]
+    arr = []
+    resp.each { |e| arr << e }
+
+    [status, headers, arr.reverse]
   end
 end
 

data/test/number.rb

@@ -16,7 +16,7 @@ test "paths and numbers" do |env|
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["1", "2"], resp.body
+  assert_response resp, ["1", "2"]
 end
 
 test "paths and decimals" do |env|
@@ -32,5 +32,5 @@ test "paths and decimals" do |env|
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal [], resp.body
+  assert_response resp, []
 end

data/test/on.rb

@@ -9,7 +9,7 @@ test "executes on true" do
 
   _, _, resp = Cuba.call({})
 
-  assert_equal ["+1"], resp.body
+  assert_response resp, ["+1"]
 end
 
 test "executes on non-false" do
@@ -21,7 +21,7 @@ test "executes on non-false" do
 
   _, _, resp = Cuba.call({ "PATH_INFO" => "/123", "SCRIPT_NAME" => "/" })
 
-  assert_equal ["+1"], resp.body
+  assert_response resp, ["+1"]
 end
 
 test "ensures SCRIPT_NAME and PATH_INFO are reverted" do
@@ -37,7 +37,7 @@ test "ensures SCRIPT_NAME and PATH_INFO are reverted" do
 
   assert_equal "/", env["SCRIPT_NAME"]
   assert_equal "/hello", env["PATH_INFO"]
-  assert_equal [], resp.body
+  assert_response resp, []
 end
 
 test "skips consecutive matches" do
@@ -60,7 +60,7 @@ test "skips consecutive matches" do
   _, _, resp = Cuba.call(env)
 
   assert_equal "foo", env["foo"]
-  assert_equal ["foo"], resp.body
+  assert_response resp, ["foo"]
 
   assert ! env["bar"]
 end
@@ -78,7 +78,7 @@ test "finds first match available" do
 
   _, _, resp = Cuba.call({})
 
-  assert_equal ["bar"], resp.body
+  assert_response resp, ["bar"]
 end
 
 test "reverts a half-met matcher" do
@@ -91,7 +91,7 @@ test "reverts a half-met matcher" do
   env = { "PATH_INFO" => "/post", "SCRIPT_NAME" => "/" }
   _, _, resp = Cuba.call(env)
 
-  assert_equal [], resp.body
+  assert_response resp, []
   assert_equal "/post", env["PATH_INFO"]
   assert_equal "/", env["SCRIPT_NAME"]
-end
+end

data/test/param.rb

@@ -20,7 +20,7 @@ test "yields a param" do
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["john@doe.com"], resp.body
+  assert_response resp, ["john@doe.com"]
 end
 
 test "doesn't yield a missing param" do
@@ -30,7 +30,7 @@ test "doesn't yield a missing param" do
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["No email"], resp.body
+  assert_response resp, ["No email"]
 end
 
 test "doesn't yield an empty param" do
@@ -40,5 +40,5 @@ test "doesn't yield an empty param" do
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["No email"], resp.body
+  assert_response resp, ["No email"]
 end

data/test/path.rb

@@ -13,7 +13,7 @@ test "one level path" do |env|
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["About"], resp.body
+  assert_response resp, ["About"]
 end
 
 test "two level nested paths" do |env|
@@ -33,13 +33,13 @@ test "two level nested paths" do |env|
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["+1"], resp.body
+  assert_response resp, ["+1"]
 
   env["PATH_INFO"] = "/about/2"
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["+2"], resp.body
+  assert_response resp, ["+2"]
 end
 
 test "two level inlined paths" do |env|
@@ -54,7 +54,7 @@ test "two level inlined paths" do |env|
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["a", "b"], resp.body
+  assert_response resp, ["a", "b"]
 end
 
 test "a path with some regex captures" do |env|
@@ -68,7 +68,7 @@ test "a path with some regex captures" do |env|
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["123"], resp.body
+  assert_response resp, ["123"]
 end
 
 test "matching the root" do |env|
@@ -82,5 +82,5 @@ test "matching the root" do |env|
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["Home"], resp.body
-end
+  assert_response resp, ["Home"]
+end

data/test/render.rb

@@ -90,5 +90,5 @@ test "simple layout support" do
 
   _, _, resp = Cuba.call({})
 
-  assert_equal ["Header\nThis is the actual content.\nFooter\n"], resp.body
+  assert_response resp, ["Header\nThis is the actual content.\nFooter\n"]
 end

data/test/root.rb

@@ -14,7 +14,7 @@ test "matching an empty segment" do
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["/"], resp.body
+  assert_response resp, ["/"]
 end
 
 test "nested empty segments" do
@@ -36,5 +36,5 @@ test "nested empty segments" do
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["IT WORKS!", "///1"], resp.body
-end
+  assert_response resp, ["IT WORKS!", "///1"]
+end

data/test/run.rb

@@ -15,9 +15,9 @@ test "redirect canonical example" do
 
   env = { "SCRIPT_NAME" => "/", "PATH_INFO" => "/account" }
 
-   _, _, resp = Cuba.call(env)
+  status, headers, resp = Cuba.call(env)
 
-  assert_equal "/login", resp["Location"]
-  assert_equal 307, resp.status
-  assert_equal [], resp.body
-end
+  assert_equal "/login", headers["Location"]
+  assert_equal 307, status
+  assert_response resp, []
+end

data/test/segment.rb

@@ -17,7 +17,7 @@ test "matches numeric ids" do |env|
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["1"], resp.body
+  assert_response resp, ["1"]
 end
 
 test "matches decimal numbers" do |env|
@@ -25,7 +25,7 @@ test "matches decimal numbers" do |env|
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["1.1"], resp.body
+  assert_response resp, ["1.1"]
 end
 
 test "matches slugs" do |env|
@@ -33,7 +33,7 @@ test "matches slugs" do |env|
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["my-blog-post-about-cuba"], resp.body
+  assert_response resp, ["my-blog-post-about-cuba"]
 end
 
 test "matches only the first segment available" do |env|
@@ -41,5 +41,5 @@ test "matches only the first segment available" do |env|
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["one"], resp.body
-end
+  assert_response resp, ["one"]
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cuba
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc2
+  version: 3.0.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-19 00:00:00.000000000 Z
+date: 2012-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2152217600 !ruby/object:Gem::Requirement
+  requirement: &2151932460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152217600
+  version_requirements: *2151932460
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &2152216880 !ruby/object:Gem::Requirement
+  requirement: &2151931380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152216880
+  version_requirements: *2151931380
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2152216340 !ruby/object:Gem::Requirement
+  requirement: &2151929200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152216340
+  version_requirements: *2151929200
 description: Cuba is a microframework for web applications.
 email:
 - michel@soveran.com
@@ -62,6 +62,7 @@ files:
 - test/accept.rb
 - test/captures.rb
 - test/composition.rb
+- test/cookie.rb
 - test/extension.rb
 - test/helper.rb
 - test/host.rb