cuba 3.1.0.rc1 → 3.1.0.rc2

data/CHANGELOG

@@ -1,9 +1,11 @@
-3.1.0.rc1
+3.1.0.rc2
 
 * Do a deep clone of the settings object during inheritance.
 * Start namespacing plugins (i.e. settings[:render]).
-* Use rack/test when doing equire 'cuba/test'.
-* Capybara available via equire 'cuba/capybara'.
+* Use rack/test when doing `require 'cuba/test'`.
+* Capybara available via `require 'cuba/capybara'`.
+* Use a default hash for the render plugin.
+* Allow the use of custom Request and Response objects.
 
 3.0.0
 

data/README.md

@@ -198,6 +198,30 @@ on get, "api" do ... end
 Actually, `get` is syntax sugar for `req.get?`, which in turn is syntax sugar
 for `env["REQUEST_METHOD"] == "GET"`.
 
+Request and Response
+--------------------
+
+You may have noticed we use `req` and `res` a lot. Those variables are
+instances of [Rack::Request][request] and `Cuba::Response` respectively, and
+`Cuba::Response` is just an optimized version of
+[Rack::Response][response].
+
+[request]: http://rack.rubyforge.org/doc/classes/Rack/Request.html
+[response]: http://rack.rubyforge.org/doc/classes/Rack/Response.html
+
+Those objects are helpers for accessing the request and for building
+the response. Most of the time, you will just use `req.write`.
+
+If you want to use custom `Request` or `Response` objects, you can
+set the new values as follows:
+
+``` ruby
+Cuba.settings[:req] = MyRequest
+Cuba.settings[:res] = MyResponse
+```
+
+Make sure to provide classes compatible with those from Rack.
+
 Captures
 --------
 

data/cuba.gemspec

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

data/lib/cuba.rb

@@ -7,7 +7,9 @@ class Cuba
 
     attr :headers
 
-    def initialize(status = 200, headers = { "Content-Type" => "text/html; charset=utf-8" })
+    def initialize(status = 200,
+                   headers = { "Content-Type" => "text/html; charset=utf-8" })
+
       @status  = status
       @headers = headers
       @body    = []
@@ -112,15 +114,15 @@ class Cuba
 
   def call!(env)
     @env = env
-    @req = Rack::Request.new(env)
-    @res = Cuba::Response.new
+    @req = settings[:req].new(env)
+    @res = settings[:res].new
 
     # This `catch` statement will either receive a
     # rack response tuple via a `halt`, or will
     # fall back to issuing a 404.
     #
     # When it `catch`es a throw, the return value
-    # of this whole `_call` method will be the
+    # of this whole `call!` method will be the
     # rack response tuple, which is exactly what we want.
     catch(:halt) do
       instance_eval(&@blk)
@@ -195,12 +197,14 @@ class Cuba
   private :try
 
   def consume(pattern)
-    return unless match = env["PATH_INFO"].match(/\A\/(#{pattern})((?:\/|\z))/)
+    matchdata = env["PATH_INFO"].match(/\A\/(#{pattern})((?:\/|\z))/)
+
+    return false unless matchdata
 
-    path, *vars = match.captures
+    path, *vars = matchdata.captures
 
     env["SCRIPT_NAME"] += "/#{path}"
-    env["PATH_INFO"] = "#{vars.pop}#{match.post_match}"
+    env["PATH_INFO"] = "#{vars.pop}#{matchdata.post_match}"
 
     captures.push(*vars)
   end
@@ -264,8 +268,11 @@ class Cuba
   #   end
   def accept(mimetype)
     lambda do
-      String(env["HTTP_ACCEPT"]).split(",").any? { |s| s.strip == mimetype } and
+      accept = String(env["HTTP_ACCEPT"]).split(",")
+
+      if accept.any? { |s| s.strip == mimetype }
         res["Content-Type"] = mimetype
+      end
     end
   end
 
@@ -325,3 +332,6 @@ class Cuba
     throw :halt, response
   end
 end
+
+Cuba.settings[:req] = Rack::Request
+Cuba.settings[:res] = Cuba::Response

data/test/integration.rb

@@ -85,3 +85,30 @@ test "reset and use" do
   assert "2" == env["m.second"]
   assert "3" == env["m.block"]
 end
+
+test "custom response" do
+  class MyResponse < Cuba::Response
+    def foobar
+      write "Default"
+    end
+  end
+
+  Cuba.settings[:res] = MyResponse
+
+  Cuba.define do
+    on get do
+      on "hello" do
+        res.foobar
+      end
+    end
+  end
+
+  env = { "REQUEST_METHOD" => "GET", "PATH_INFO" => "/hello",
+          "SCRIPT_NAME" => "/" }
+
+  status, headers, resp = Cuba.call(env)
+
+  assert 200 == status
+  assert "text/html; charset=utf-8" == headers["Content-Type"]
+  assert_response resp, ["Default"]
+end

data/test/settings.rb

@@ -1,8 +1,8 @@
 require File.expand_path("helper", File.dirname(__FILE__))
 
-test "settings is an empty hash by default" do
-  assert Cuba.settings.kind_of?(Hash)
-  assert Cuba.settings.empty?
+test "settings contains request and response classes by default" do
+  assert_equal Cuba.settings[:req], Rack::Request
+  assert_equal Cuba.settings[:res], Cuba::Response
 end
 
 test "is inheritable and allows overriding" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cuba
 version: !ruby/object:Gem::Version
-  version: 3.1.0.rc1
+  version: 3.1.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-03 00:00:00.000000000 Z
+date: 2012-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2152007660 !ruby/object:Gem::Requirement
+  requirement: &2151834200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152007660
+  version_requirements: *2151834200
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &2152007040 !ruby/object:Gem::Requirement
+  requirement: &2151832280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152007040
+  version_requirements: *2151832280
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2152006120 !ruby/object:Gem::Requirement
+  requirement: &2151830340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152006120
+  version_requirements: *2151830340
 description: Cuba is a microframework for web applications.
 email:
 - michel@soveran.com