sinatra 0.9.0.3 → 0.9.0.4

data/CHANGES

@@ -1,3 +1,12 @@
+= 0.9.0.4 / 2009-01-25
+
+ * Using halt with more than 1 args causes ArgumentError [#131]
+ * using halt in a before filter doesn't modify response [#127]
+ * Add deprecated Sinatra::EventContext to unbreak plugins [#130]
+ * Give access to GET/POST params in filters [#129]
+ * Preserve non-nested params in nested params hash [#117]
+ * Fix backtrace dump with Rack::Lint [#116]
+
 = 0.9.0.3 / 2009-01-21
 
  * Fall back on mongrel then webrick when thin not found. [#75]

data/compat/compat_test.rb

@@ -0,0 +1,12 @@
+require File.dirname(__FILE__) + '/helper'
+
+context "Compat" do
+  setup do
+    Sinatra.application = nil
+    @app = Sinatra.application
+  end
+
+  specify "makes EventContext available" do
+    assert_same Sinatra::Default, Sinatra::EventContext
+  end
+end

data/lib/sinatra/base.rb

@@ -4,7 +4,7 @@ require 'rack'
 require 'rack/builder'
 
 module Sinatra
-  VERSION = '0.9.0.3'
+  VERSION = '0.9.0.4'
 
   class Request < Rack::Request
     def user_agent
@@ -311,7 +311,11 @@ module Sinatra
       @request  = Request.new(env)
       @response = Response.new
       @params   = nil
-      error_detection { dispatch! }
+
+      invoke { dispatch! }
+      invoke { error_block!(response.status) }
+
+      @response.body = [] if @env['REQUEST_METHOD'] == 'HEAD'
       @response.finish
     end
 
@@ -320,7 +324,8 @@ module Sinatra
     end
 
     def halt(*response)
-      throw :halt, *response
+      response = response.first if response.length == 1
+      throw :halt, response
     end
 
     def pass
@@ -328,19 +333,21 @@ module Sinatra
     end
 
   private
-    def dispatch!
-      self.class.filters.each do |block|
-        res = catch(:halt) { instance_eval(&block) ; :continue }
-        return unless res == :continue
-      end
+    # Run before filters and then locate and run a matching route.
+    def route!
+      @params = nested_params(@request.params)
 
+      # before filters
+      self.class.filters.each { |block| instance_eval(&block) }
+
+      # routes
       if routes = self.class.routes[@request.request_method]
+        original_params = @params
         path = @request.path_info
-        original_params = nested_params(@request.params)
 
-        routes.each do |pattern, keys, conditions, method_name|
-          if pattern =~ path
-            values = $~.captures.map{|val| val && unescape(val) }
+        routes.each do |pattern, keys, conditions, block|
+          if match = pattern.match(path)
+            values = match.captures.map{|val| val && unescape(val) }
             params =
               if keys.any?
                 keys.zip(values).inject({}) do |hash,(k,v)|
@@ -358,14 +365,15 @@ module Sinatra
               end
             @params = original_params.merge(params)
 
-            catch(:pass) {
+            catch(:pass) do
               conditions.each { |cond|
                 throw :pass if instance_eval(&cond) == false }
-              return invoke(method_name)
-            }
+              throw :halt, instance_eval(&block)
+            end
           end
         end
       end
+
       raise NotFound
     end
 
@@ -376,6 +384,8 @@ module Sinatra
           splat = key.scan(/(^[^\[]+)|\[([^\]]+)\]/).flatten.compact
           head, last = splat[0..-2], splat[-1]
           head.inject(res){ |s,v| s[v] ||= indifferent_hash }[last] = val
+        else
+          res[key] = val
         end
         res
       end
@@ -385,7 +395,8 @@ module Sinatra
       Hash.new {|hash,key| hash[key.to_s] if Symbol === key }
     end
 
-    def invoke(block)
+    # Run the block with 'throw :halt' support and apply result to the response.
+    def invoke(&block)
       res = catch(:halt) { instance_eval(&block) }
       return if res.nil?
 
@@ -417,30 +428,38 @@ module Sinatra
       res
     end
 
-    def error_detection
-      errmap = self.class.errors
-      yield
+    # Dispatch a request with error handling.
+    def dispatch!
+      route!
     rescue NotFound => boom
       @env['sinatra.error'] = boom
       @response.status = 404
       @response.body = ['<h1>Not Found</h1>']
-      handler = errmap[boom.class] || errmap[NotFound]
-      invoke handler unless handler.nil?
+      error_block! boom.class, NotFound
+
     rescue ::Exception => boom
       @env['sinatra.error'] = boom
 
       if options.dump_errors?
         msg = ["#{boom.class} - #{boom.message}:", *boom.backtrace].join("\n ")
-        @env['rack.errors'] << msg
+        @env['rack.errors'].write msg
       end
 
       raise boom if options.raise_errors?
       @response.status = 500
-      invoke errmap[boom.class] || errmap[Exception]
-    ensure
-      if @response.status >= 400 && errmap.key?(response.status)
-        invoke errmap[response.status]
+      error_block! boom.class, Exception
+    end
+
+    # Find an custom error block for the key(s) specified.
+    def error_block!(*keys)
+      errmap = self.class.errors
+      keys.each do |key|
+        if block = errmap[key]
+          res = instance_eval(&block)
+          return res
+        end
       end
+      nil
     end
 
     @routes     = {}
@@ -570,7 +589,7 @@ module Sinatra
         route('GET', path, opts, &block)
 
         @conditions = conditions
-        head(path, opts) { invoke(block) ; [] }
+        route('HEAD', path, opts, &block)
       end
 
       def put(path, opts={}, &bk); route 'PUT', path, opts, &bk; end

data/lib/sinatra/compat.rb

@@ -51,6 +51,17 @@ module Sinatra
   module Compat
   end
 
+  # Make Sinatra::EventContext an alias for Sinatra::Default to unbreak plugins.
+  def self.const_missing(const_name)
+    if const_name == :EventContext
+      const_set :EventContext, Sinatra::Default
+      sinatra_warn 'Sinatra::EventContext is deprecated; use Sinatra::Default instead.'
+      Sinatra::Default
+    else
+      super
+    end
+  end
+
   # The ServerError exception is deprecated. Any exception is considered an
   # internal server error.
   class ServerError < RuntimeError
@@ -107,7 +118,7 @@ module Sinatra
     # Throwing halt with a Symbol and the to_result convention are
     # deprecated. Override the invoke method to detect those types of return
     # values.
-    def invoke(handler)
+    def invoke(&block)
       res = super
       case
       when res.kind_of?(Symbol)

data/sinatra.gemspec

@@ -3,8 +3,8 @@ 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.3'
-  s.date = '2009-01-21'
+  s.version = '0.9.0.4'
+  s.date = '2009-01-25'
 
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
     compat/app_test.rb
     compat/application_test.rb
     compat/builder_test.rb
+    compat/compat_test.rb
     compat/custom_error_test.rb
     compat/erb_test.rb
     compat/events_test.rb

data/test/filter_test.rb

@@ -72,4 +72,28 @@ describe "Filters" do
     assert ok?
     assert_equal 'cool', body
   end
+
+  it "does modify the response with halt" do
+    mock_app {
+      before { halt 302, 'Hi' }
+      get '/foo' do
+        "should not happen"
+      end
+    }
+
+    get '/foo'
+    assert_equal 302, response.status
+    assert_equal 'Hi', body
+  end
+
+  it "gives you access to params" do
+    mock_app {
+      before { @foo = params['foo'] }
+      get('/foo') { @foo }
+    }
+
+    get '/foo?foo=cool'
+    assert ok?
+    assert_equal 'cool', body
+  end
 end

data/test/routing_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/helper'
 
 describe "Routing" do
-  %w[get put post delete head].each do |verb|
+  %w[get put post delete].each do |verb|
     it "defines #{verb.upcase} request handlers with #{verb}" do
       mock_app {
         send verb, '/hello' do
@@ -16,6 +16,21 @@ describe "Routing" do
     end
   end
 
+  it "defines HEAD request handlers with HEAD" do
+    mock_app {
+      head '/hello' do
+        response['X-Hello'] = 'World!'
+        'remove me'
+      end
+    }
+
+    request = Rack::MockRequest.new(@app)
+    response = request.request('HEAD', '/hello', {})
+    assert response.ok?
+    assert_equal 'World!', response['X-Hello']
+    assert_equal '', response.body
+  end
+
   it "404s when no route satisfies the request" do
     mock_app {
       get('/foo') { }
@@ -176,6 +191,21 @@ describe "Routing" do
     assert_equal 'looks good', body
   end
 
+  it "preserves non-nested params" do
+    mock_app {
+      get '/foo' do
+        assert_equal "2", params["article_id"]
+        assert_equal "awesome", params['comment']['body']
+        assert_nil params['comment[body]']
+        'looks good'
+      end
+    }
+
+    get '/foo?article_id=2&comment[body]=awesome'
+    assert ok?
+    assert_equal 'looks good', body
+  end
+
   it "supports paths that include spaces" do
     mock_app {
       get '/path with spaces' do
@@ -239,6 +269,30 @@ describe "Routing" do
     assert_equal 'Hello World', body
   end
 
+  it "halts with a response tuple" do
+    mock_app {
+      get '/' do
+        halt 295, {'Content-Type' => 'text/plain'}, 'Hello World'
+      end
+    }
+
+    get '/'
+    assert_equal 295, status
+    assert_equal 'text/plain', response['Content-Type']
+    assert_equal 'Hello World', body
+  end
+
+  it "halts with an array of strings" do
+    mock_app {
+      get '/' do
+        halt %w[Hello World How Are You]
+      end
+    }
+
+    get '/'
+    assert_equal 'HelloWorldHowAreYou', body
+  end
+
   it "transitions to the next matching route on pass" do
     mock_app {
       get '/:foo' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.9.0.3
+  version: 0.9.0.4
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-21 00:00:00 -08:00
+date: 2009-01-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,6 +40,7 @@ files:
 - compat/app_test.rb
 - compat/application_test.rb
 - compat/builder_test.rb
+- compat/compat_test.rb
 - compat/custom_error_test.rb
 - compat/erb_test.rb
 - compat/events_test.rb