cuba 2.0.0.rc3 → 2.0.0

data/cuba.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name              = "cuba"
-  s.version           = "2.0.0.rc3"
-  s.summary           = "Rum based microframework for web applications."
-  s.description       = "Cuba is a light wrapper for Rum, a microframework for Rack applications."
+  s.version           = "2.0.0"
+  s.summary           = "Microframework for web applications."
+  s.description       = "Cuba is a microframework for web applications."
   s.authors           = ["Michel Martens"]
   s.email             = ["michel@soveran.com"]
   s.homepage          = "http://github.com/soveran/cuba"
-  s.files = ["LICENSE", "README.markdown", "Rakefile", "lib/cuba/ron.rb", "lib/cuba/test.rb", "lib/cuba/version.rb", "lib/cuba.rb", "cuba.gemspec", "test/accept.rb", "test/captures.rb", "test/composition.rb", "test/extension.rb", "test/helper.rb", "test/host.rb", "test/integration.rb", "test/match.rb", "test/number.rb", "test/on.rb", "test/path.rb", "test/run.rb", "test/segment.rb"]
+  s.files = ["LICENSE", "README.markdown", "Rakefile", "lib/cuba/ron.rb", "lib/cuba/test.rb", "lib/cuba/version.rb", "lib/cuba.rb", "cuba.gemspec", "test/accept.rb", "test/captures.rb", "test/composition.rb", "test/extension.rb", "test/helper.rb", "test/host.rb", "test/integration.rb", "test/match.rb", "test/number.rb", "test/on.rb", "test/param.rb", "test/path.rb", "test/run.rb", "test/segment.rb"]
   s.add_dependency "rack", "~> 1.2"
   s.add_dependency "tilt", "~> 1.2"
   s.add_development_dependency "cutest", "~> 1.0"

data/lib/cuba/ron.rb

@@ -151,7 +151,7 @@ module Cuba
     end
     private :consume
 
-    def match(matcher, segment = "([\\.a-zA-Z0-9\\-]+)")
+    def match(matcher, segment = "([^\\/]+)")
       case matcher
       when String then consume(matcher.gsub(/:\w+/, segment))
       when Regexp then consume(matcher)
@@ -181,12 +181,12 @@ module Cuba
     #   on "signup", param("user") do |atts|
     #     User.create(atts)
     #   end
-    def param(key, default = nil)
-      lambda { captures << (req[key] || default) }
+    def param(key)
+      lambda { captures << req[key] unless req[key].to_s.empty? }
     end
 
-    def header(key, default = nil)
-      lambda { env[key.upcase.tr("-","_")] || default }
+    def header(key)
+      lambda { env[key.upcase.tr("-","_")] }
     end
 
     # Useful for matching against the request host (i.e. HTTP_HOST).
@@ -209,7 +209,7 @@ module Cuba
     #   end
     def accept(mimetype)
       lambda do
-        env["HTTP_ACCEPT"].split(",").any? { |s| s.strip == mimetype } and
+        String(env["HTTP_ACCEPT"]).split(",").any? { |s| s.strip == mimetype } and
           res["Content-Type"] = mimetype
       end
     end

data/lib/cuba/version.rb

@@ -1,3 +1,3 @@
 module Cuba
-  VERSION = "2.0.0.rc3"
-end
+  VERSION = "2.0.0"
+end

data/test/accept.rb

@@ -14,3 +14,21 @@ test "accept mimetypes" do
 
   assert_equal ["application/xml"], resp.body
 end
+
+test "tests don't fail when you don't specify an accept type" do
+  Cuba.define do
+    on accept("application/xml") do
+      res.write res["Content-Type"]
+    end
+
+    on default do
+      res.write "Default action"
+    end
+  end
+
+  env = { "SCRIPT_NAME" => "/", "PATH_INFO" => "/post" }
+
+  _, _, resp = Cuba.call({})
+
+  assert_equal ["Default action"], resp.body
+end

data/test/captures.rb

@@ -1,5 +1,4 @@
 require File.expand_path("helper", File.dirname(__FILE__))
-require "stringio"
 
 test "doesn't yield HOST" do
   Cuba.define do
@@ -89,22 +88,6 @@ test "yield a file name with a matching extension" do
   assert_equal ["app"], resp.body
 end
 
-test "yields a param" do
-  Cuba.define do
-    on get, "signup", param("email") do |email|
-      res.write email
-    end
-  end
-
-  env = { "REQUEST_METHOD" => "GET", "PATH_INFO" => "/signup",
-          "SCRIPT_NAME" => "/", "rack.input" => StringIO.new,
-          "QUERY_STRING" => "email=john@doe.com" }
-
-  _, _, resp = Cuba.call(env)
-
-  assert_equal ["john@doe.com"], resp.body
-end
-
 test "yields a segment per nested block" do
   Cuba.define do
     on :one do |one|

data/test/param.rb

@@ -0,0 +1,44 @@
+require File.expand_path("helper", File.dirname(__FILE__))
+require "stringio"
+
+prepare do
+  Cuba.define do
+    on get, "signup", param("email") do |email|
+      res.write email
+    end
+
+    on default do
+      res.write "No email"
+    end
+  end
+end
+
+test "yields a param" do
+  env = { "REQUEST_METHOD" => "GET", "PATH_INFO" => "/signup",
+          "SCRIPT_NAME" => "/", "rack.input" => StringIO.new,
+          "QUERY_STRING" => "email=john@doe.com" }
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal ["john@doe.com"], resp.body
+end
+
+test "doesn't yield a missing param" do
+  env = { "REQUEST_METHOD" => "GET", "PATH_INFO" => "/signup",
+          "SCRIPT_NAME" => "/", "rack.input" => StringIO.new,
+          "QUERY_STRING" => "" }
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal ["No email"], resp.body
+end
+
+test "doesn't yield an empty param" do
+  env = { "REQUEST_METHOD" => "GET", "PATH_INFO" => "/signup",
+          "SCRIPT_NAME" => "/", "rack.input" => StringIO.new,
+          "QUERY_STRING" => "email=" }
+
+  _, _, resp = Cuba.call(env)
+
+  assert_equal ["No email"], resp.body
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: cuba
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 2.0.0.rc3
+  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors: 
 - Michel Martens
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 -03:00
+date: 2011-03-18 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,7 +57,7 @@ dependencies:
         version: "0.4"
   type: :development
   version_requirements: *id004
-description: Cuba is a light wrapper for Rum, a microframework for Rack applications.
+description: Cuba is a microframework for web applications.
 email: 
 - michel@soveran.com
 executables: []
@@ -85,6 +85,7 @@ files:
 - test/match.rb
 - test/number.rb
 - test/on.rb
+- test/param.rb
 - test/path.rb
 - test/run.rb
 - test/segment.rb
@@ -106,15 +107,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
 requirements: []
 
 rubyforge_project: 
 rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
-summary: Rum based microframework for web applications.
+summary: Microframework for web applications.
 test_files: []