cuba 3.0.0 → 3.0.1.rc1

data/README.md

@@ -148,6 +148,33 @@ Cuba.define do
 end
 ```
 
+Security
+--------
+
+The favorite security layer for Cuba is
+[Rack::Protection](https://github.com/rkh/rack-protection). It is not
+included by default because there are legitimate uses for plain Cuba
+(for instance, when designing an API).
+
+If you are building a web application, by all means make sure to
+include a security layer. As it is the convention for unsafe
+operations, only POST, PUT and DELETE requests are monitored.
+
+``` ruby
+require "cuba"
+require "rack/protection"
+
+Cuba.use Rack::Session::Cookie
+Cuba.use Rack::Protection
+Cuba.use Rack::Protection::RemoteReferrer
+
+Cuba.define do
+
+  # Now your app is protected against a wide range of attacks.
+  ...
+end
+```
+
 HTTP Verbs
 ----------
 
@@ -177,7 +204,7 @@ Captures
 You may have noticed that some matchers yield a value to the block. The rules
 for determining if a matcher will yield a value are simple:
 
-1. Regex captures: `"posts/(\d+)-(.*)"` will yield two values, corresponding to each capture.
+1. Regex captures: `"posts/(\\d+)-(.*)"` will yield two values, corresponding to each capture.
 2. Placeholders: `"users/:id"` will yield the value in the position of :id.
 3. Symbols: `:foobar` will yield if a segment is available.
 4. File extensions: `extension("css")` will yield the basename of the matched file.

data/cuba.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "cuba"
-  s.version           = "3.0.0"
+  s.version           = "3.0.1.rc1"
   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,7 @@ class Cuba
 
     attr :headers
 
-    def initialize(status = 200, headers = { "Content-Type" => "text/html" })
+    def initialize(status = 200, headers = { "Content-Type" => "text/html; charset=utf-8" })
       @status  = status
       @headers = headers
       @body    = []
@@ -88,9 +88,6 @@ class Cuba
     child.settings.replace(settings)
   end
 
-  attr :env
-  attr :req
-  attr :res
   attr :captures
 
   def initialize(&blk)
@@ -106,10 +103,22 @@ class Cuba
     dup.call!(env)
   end
 
+  def req
+    Thread.current[:_cuba_req]
+  end
+
+  def res
+    Thread.current[:_cuba_res]
+  end
+
+  def env
+    Thread.current[:_cuba_env]
+  end
+
   def call!(env)
-    @env = env
-    @req = Rack::Request.new(env)
-    @res = Cuba::Response.new
+    Thread.current[:_cuba_env] = env
+    Thread.current[:_cuba_req] = Rack::Request.new(env)
+    Thread.current[:_cuba_res] = Cuba::Response.new
 
     # This `catch` statement will either receive a
     # rack response tuple via a `halt`, or will

data/test/captures.rb

@@ -123,3 +123,40 @@ test "consumes a slash if needed" do
 
   assert_response resp, ["foo/bar.css"]
 end
+
+test "regex captures in string format" do
+  Cuba.define do
+    on get, "posts/(\\d+)-(.*)" do |id, slug|
+      res.write id
+      res.write slug
+    end
+  end
+
+
+  env = { "REQUEST_METHOD" => "GET",
+          "PATH_INFO" => "/posts/123-postal-service",
+          "SCRIPT_NAME" => "/" }
+
+  _, _, resp = Cuba.call(env)
+
+
+  assert_response resp, ["123", "postal-service"]
+end
+
+test "regex captures in regex format" do
+  Cuba.define do
+    on get, %r{posts/(\d+)-(.*)} do |id, slug|
+      res.write id
+      res.write slug
+    end
+  end
+
+  env = { "REQUEST_METHOD" => "GET",
+          "PATH_INFO" => "/posts/123-postal-service",
+          "SCRIPT_NAME" => "/" }
+
+  _, _, resp = Cuba.call(env)
+
+
+  assert_response resp, ["123", "postal-service"]
+end

data/test/integration.rb

@@ -78,7 +78,7 @@ test "reset and use" do
   status, headers, resp = Cuba.call(env)
 
   assert 200 == status
-  assert "text/html" == headers["Content-Type"]
+  assert "text/html; charset=utf-8" == headers["Content-Type"]
   assert_response resp, ["2nd Default"]
 
   assert "1" == env["m.first"]

data/test/redirect.rb

@@ -16,6 +16,8 @@ test "redirect" do
   status, headers, body = Cuba.call(env)
 
   assert_equal status, 302
-  assert_equal headers, {"Content-Type"=>"text/html", "Location"=>"/hello"}
+  assert_equal headers, {
+    "Content-Type" => "text/html; charset=utf-8",
+    "Location" => "/hello" }
   assert_response body, []
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: cuba
 version: !ruby/object:Gem::Version
-  version: 3.0.0
-  prerelease: 
+  version: 3.0.1.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Michel Martens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2151873280 !ruby/object:Gem::Requirement
+  requirement: &2151841840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151873280
+  version_requirements: *2151841840
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &2151872600 !ruby/object:Gem::Requirement
+  requirement: &2151838760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151872600
+  version_requirements: *2151838760
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2151870140 !ruby/object:Gem::Requirement
+  requirement: &2151837240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151870140
+  version_requirements: *2151837240
 description: Cuba is a microframework for web applications.
 email:
 - michel@soveran.com
@@ -96,12 +96,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Microframework for web applications.