sinatra-sinatra 0.9.0 → 0.9.0.1

data/Rakefile

@@ -72,6 +72,7 @@ task 'publish:doc' => 'doc/api/index.html' do
   sh 'scp -rp doc/* rubyforge.org:/var/www/gforge-projects/sinatra/'
 end
 
+desc 'Publish gem and tarball to rubyforge'
 task 'publish:gem' => [package('.gem'), package('.tar.gz')] do |t|
   sh <<-end
     rubyforge add_release sinatra sinatra #{spec.version} #{package('.gem')} &&

data/lib/sinatra/base.rb

@@ -4,7 +4,7 @@ require 'rack'
 require 'rack/builder'
 
 module Sinatra
-  VERSION = '0.9.0'
+  VERSION = '0.9.0.1'
 
   class Request < Rack::Request
     def user_agent
@@ -328,7 +328,7 @@ module Sinatra
 
   private
     def dispatch!
-      self.class.filters.each {|block| instance_eval(&block)}
+      self.class.filters.each { |block| invoke(block) }
       if routes = self.class.routes[@request.request_method]
         path = @request.path_info
         original_params = nested_params(@request.params)
@@ -382,6 +382,8 @@ module Sinatra
 
     def invoke(block)
       res = catch(:halt) { instance_eval(&block) }
+      return if res.nil?
+
       case
       when res.respond_to?(:to_str)
         @response.body = [res]
@@ -405,8 +407,6 @@ module Sinatra
         @response.body = res
       when (100...599) === res
         @response.status = res
-      when res.nil?
-        @response.body = []
       end
       res
     end
@@ -522,7 +522,7 @@ module Sinatra
       end
 
       def before(&block)
-        @filters << block
+        @filters << lambda { instance_eval(&block) ; nil }
       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'
+  s.version = '0.9.0.1'
   s.date = '2009-01-18'
 
   s.description = "Classy web-development dressed in a DSL"

data/test/filter_test.rb

@@ -32,4 +32,29 @@ describe "Filters" do
     assert ok?
     assert_equal 'bar', body
   end
+
+  it "allows redirects in filters" do
+    mock_app {
+      before { redirect '/bar' }
+      get('/foo') { 'ORLY?!' }
+    }
+
+    get '/foo'
+    assert redirect?
+    assert_equal '/bar', response['Location']
+  end
+
+  it "does not modify the response with its return value" do
+    mock_app {
+      before { 'Hello World!' }
+      get '/foo' do
+        assert_equal [], response.body
+        'cool'
+      end
+    }
+
+    get '/foo'
+    assert ok?
+    assert_equal 'cool', body
+  end
 end

metadata

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