cuba 2.1.0 → 2.2.0.rc1

data/lib/cuba.rb

@@ -70,15 +70,20 @@ class Cuba
     @env = env
     @req = Rack::Request.new(env)
     @res = Rack::Response.new
-    @matched = false
 
-    catch(:ron_run_next_app) do
+    # 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
+    # rack response tuple, which is exactly what we want.
+    catch(:halt) do
       instance_eval(&@blk)
 
-      @res.status = 404 unless @matched || !@res.empty?
-
-      return @res.finish
-    end.call(env)
+      res.status = 404
+      res.finish
+    end
   end
 
   # @private Used internally by #render to cache the
@@ -131,10 +136,6 @@ class Cuba
   #   end
   #
   def on(*args, &block)
-    # No use running any other matchers if we've already found a
-    # proper matcher.
-    return if @matched
-
     try do
       # For every block, we make sure to reset captures so that
       # nesting matchers won't mess with each other's captures.
@@ -151,20 +152,12 @@ class Cuba
       #    on true, "signup"
       return unless args.all? { |arg| match(arg) }
 
-      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
+      # 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
-      end
+      halt res.finish
     end
   end
 
@@ -292,7 +285,11 @@ class Cuba
   #     res.write "Super secure account info."
   #   end
   def run(app)
-    throw :ron_run_next_app, app
+    halt app.call(req.env)
+  end
+
+  def halt(response)
+    throw :halt, response
   end
 
   # In order to prevent people from overriding the standard Cuba

data/lib/cuba/version.rb

@@ -1,3 +1,3 @@
 class Cuba
-  VERSION = "2.1.0"
+  VERSION = "2.2.0.rc1"
 end

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: cuba
 version: !ruby/object:Gem::Version
-  version: 2.1.0
-  prerelease: 
+  version: 2.2.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Michel Martens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-23 00:00:00.000000000 -07:00
+date: 2011-10-19 00:00:00.000000000 -03:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2157644260 !ruby/object:Gem::Requirement
+  requirement: &2153812140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157644260
+  version_requirements: *2153812140
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &2157643840 !ruby/object:Gem::Requirement
+  requirement: &2153811720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157643840
+  version_requirements: *2153811720
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &2157643420 !ruby/object:Gem::Requirement
+  requirement: &2153811300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157643420
+  version_requirements: *2153811300
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2157643000 !ruby/object:Gem::Requirement
+  requirement: &2153849280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157643000
+  version_requirements: *2153849280
 description: Cuba is a microframework for web applications.
 email:
 - michel@soveran.com
@@ -104,9 +104,9 @@ 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.6.2