sinatra-sinatra 0.9.0.1 → 0.9.0.2

data/lib/sinatra/base.rb

@@ -4,7 +4,7 @@ require 'rack'
 require 'rack/builder'
 
 module Sinatra
-  VERSION = '0.9.0.1'
+  VERSION = '0.9.0.2'
 
   class Request < Rack::Request
     def user_agent
@@ -328,7 +328,11 @@ module Sinatra
 
   private
     def dispatch!
-      self.class.filters.each { |block| invoke(block) }
+      self.class.filters.each do |block|
+        res = catch(:halt) { instance_eval(&block) ; :continue }
+        return unless res == :continue
+      end
+
       if routes = self.class.routes[@request.request_method]
         path = @request.path_info
         original_params = nested_params(@request.params)
@@ -408,6 +412,7 @@ module Sinatra
       when (100...599) === res
         @response.status = res
       end
+
       res
     end
 
@@ -522,7 +527,7 @@ module Sinatra
       end
 
       def before(&block)
-        @filters << lambda { instance_eval(&block) ; nil }
+        @filters << block
       end
 
       def condition(&block)

data/sinatra.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'sinatra'
-  s.version = '0.9.0.1'
+  s.version = '0.9.0.2'
   s.date = '2009-01-18'
 
   s.description = "Classy web-development dressed in a DSL"

data/test/filter_test.rb

@@ -33,15 +33,30 @@ describe "Filters" do
     assert_equal 'bar', body
   end
 
+  it "can modify instance variables available to routes" do
+    mock_app {
+      before { @foo = 'bar' }
+      get('/foo') { @foo }
+    }
+
+    get '/foo'
+    assert ok?
+    assert_equal 'bar', body
+  end
+
   it "allows redirects in filters" do
     mock_app {
       before { redirect '/bar' }
-      get('/foo') { 'ORLY?!' }
+      get('/foo') do
+        fail 'before block should have halted processing'
+        'ORLY?!'
+      end
     }
 
     get '/foo'
     assert redirect?
     assert_equal '/bar', response['Location']
+    assert_equal '', body
   end
 
   it "does not modify the response with its return value" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.9.0.1
+  version: 0.9.0.2
 platform: ruby
 authors: 
 - Blake Mizerany