cuba 2.0.0.rc2 → 2.0.0.rc3

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Michel Martens, Damian Janowski and Cyril David
+Copyright (c) 2010, 2011 Michel Martens, Damian Janowski and Cyril David
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/cuba.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name              = "cuba"
-  s.version           = "2.0.0.rc2"
+  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.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/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/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

@@ -69,11 +69,6 @@ module Cuba
       }.render(self, locals)
     end
 
-    # Basic wrapper for using Rack session.
-    def session
-      @session ||= env['rack.session']
-    end
-
     # The heart of the path / verb / any condition matching.
     #
     # @example
@@ -115,14 +110,20 @@ module Cuba
         #    on true, "signup"
         return unless args.all? { |arg| match(arg) }
 
-        # The captures we yield here were generated and assembled
-        # by evaluating each of the `arg`s above. Most of these
-        # are carried out by #consume.
-        yield *captures
+        begin
+          # The captures we yield here were generated and assembled
+          # by evaluating each of the `arg`s above. Most of these
+          # are carried out by #consume.
+          yield *captures
+
+        ensure
+          # Regardless of what happens in the `yield`, we should ensure that
+          # we successfully set `@matched` to true.
 
-        # At this point, we've successfully matched with some corresponding
-        # matcher, so we can skip all other matchers defined.
-        @matched = true
+          # At this point, we've successfully matched with some corresponding
+          # matcher, so we can skip all other matchers defined.
+          @matched = true
+        end
       end
     end
 
@@ -134,7 +135,7 @@ module Cuba
       yield
 
     ensure
-      env["SCRIPT_NAME"], env["PATH_INFO"] = script, path
+      env["SCRIPT_NAME"], env["PATH_INFO"] = script, path unless @matched
     end
     private :try
 

data/lib/cuba/version.rb

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

data/test/composition.rb

@@ -0,0 +1,21 @@
+require File.expand_path("helper", File.dirname(__FILE__))
+
+test "composing on top of a PATH" do
+  Services = Cuba::Ron.new {
+    on "services/:id" do |id|
+      res.write "View #{id}"
+    end
+  }
+
+  Cuba.define do
+    on "provider" do
+      run Services
+    end
+  end
+
+  env = { "SCRIPT_NAME" => "/", "PATH_INFO" => "/provider/services/101" }
+
+   _, _, resp = Cuba.call(env)
+
+   assert_equal ["View 101"], resp.body
+end

data/test/on.rb

@@ -24,27 +24,6 @@ test "executes on non-false" do
   assert_equal ["+1"], resp.body
 end
 
-test "restores SCRIPT_NAME and PATH_INFO" do
-  Cuba.define do
-    on true do
-      env["SCRIPT_NAME"] = "foo"
-      env["PATH_INFO"] = "/hello"
-
-      raise "Something went wrong"
-    end
-  end
-
-  env = { "SCRIPT_NAME" => "/", "PATH_INFO" => "/hello" }
-
-  begin
-    _, _, resp = Cuba.call(env)
-  rescue
-  end
-
-  assert_equal "/", env["SCRIPT_NAME"]
-  assert_equal "/hello", env["PATH_INFO"]
-end
-
 test "ensures SCRIPT_NAME and PATH_INFO are reverted" do
   Cuba.define do
     on lambda { env["SCRIPT_NAME"] = "/hello"; false } do
@@ -100,4 +79,19 @@ test "finds first match available" do
   _, _, resp = Cuba.call({})
 
   assert_equal ["bar"], resp.body
+end
+
+test "reverts a half-met matcher" do
+  Cuba.define do
+    on "post", false do
+      res.write "Should be unmet"
+    end
+  end
+
+  env = { "PATH_INFO" => "/post", "SCRIPT_NAME" => "/" }
+  _, _, resp = Cuba.call(env)
+
+  assert_equal [], resp.body
+  assert_equal "/post", env["PATH_INFO"]
+  assert_equal "/", env["SCRIPT_NAME"]
 end

data/test/path.rb

@@ -14,7 +14,6 @@ test "one level path" do |env|
   _, _, resp = Cuba.call(env)
 
   assert_equal ["About"], resp.body
-  assert_equal({ "SCRIPT_NAME" => "/", "PATH_INFO" => "/about" }, env)
 end
 
 test "two level nested paths" do |env|

metadata

@@ -2,7 +2,7 @@
 name: cuba
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.rc2
+  version: 2.0.0.rc3
 platform: ruby
 authors: 
 - Michel Martens
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 -03:00
+date: 2011-03-03 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,6 +77,7 @@ files:
 - cuba.gemspec
 - test/accept.rb
 - test/captures.rb
+- test/composition.rb
 - test/extension.rb
 - test/helper.rb
 - test/host.rb
@@ -111,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Rum based microframework for web applications.