sinatra 0.2.2 → 0.3.0

data/test/event_context_test.rb

@@ -3,13 +3,13 @@ require File.dirname(__FILE__) + '/helper'
 context "EventContext" do
 
   specify "DSLified setters" do
-    
+
     cx = Sinatra::EventContext.new(stub_everything, Rack::Response.new, {})
     lambda {
       cx.status 404
     }.should.not.raise(ArgumentError)
-    
+
   end
-  
+
 end
 

data/test/events_test.rb

@@ -1,7 +1,4 @@
-require File.dirname(__FILE__) + '/../lib/sinatra'
-
-require 'rubygems'
-require 'test/spec'
+require File.dirname(__FILE__) + '/helper'
 
 context "Simple Events" do
 
@@ -16,7 +13,7 @@ context "Simple Events" do
     event = Sinatra::Event.new(path, &b)
     event.invoke(simple_request_hash(:get, request_path))
   end
-  
+
   specify "return last value" do
     block = Proc.new { 'Simple' }
     result = invoke_simple('/', '/', &block)
@@ -24,27 +21,27 @@ context "Simple Events" do
     result.block.should.be block
     result.params.should.equal Hash.new
   end
-  
+
   specify "takes params in path" do
     result = invoke_simple('/:foo/:bar', '/a/b')
     result.should.not.be.nil
     result.params.should.equal "foo" => 'a', "bar" => 'b'
-    
+
     # unscapes
     result = invoke_simple('/:foo/:bar', '/a/blake%20mizerany')
     result.should.not.be.nil
     result.params.should.equal "foo" => 'a', "bar" => 'blake mizerany'
   end
-  
+
   specify "ignores to many /'s" do
     result = invoke_simple('/x/y', '/x//y')
     result.should.not.be.nil
   end
-  
+
   specify "understands splat" do
     invoke_simple('/foo/*', '/foo/bar').should.not.be.nil
     invoke_simple('/foo/*', '/foo/bar/baz').should.not.be.nil
     invoke_simple('/foo/*', '/foo/baz').should.not.be.nil
-  end  
-          
+  end
+
 end

data/test/filter_test.rb

@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/helper'
+
+context "before filters" do
+
+  setup do
+    Sinatra.application = nil
+    @app = Sinatra.application
+  end
+
+  specify "should be executed in the order defined" do
+    invoked = 0x0
+    @app.before { invoked = 0x01 }
+    @app.before { invoked |= 0x02 }
+    @app.get('/') { 'Hello World' }
+    get_it '/'
+    should.be.ok
+    body.should.be == 'Hello World'
+    invoked.should.be == 0x03
+  end
+
+  specify "should be capable of modifying the request" do
+    @app.get('/foo') { 'foo' }
+    @app.get('/bar') { 'bar' }
+    @app.before { request.path_info = '/bar' }
+    get_it '/foo'
+    should.be.ok
+    body.should.be == 'bar'
+  end
+
+end

data/test/haml_test.rb

@@ -5,95 +5,95 @@ context "Haml" do
   setup do
     Sinatra.application = nil
   end
-  
+
   context "without layouts" do
-    
+
     setup do
       Sinatra.application = nil
     end
-    
+
     specify "should render" do
-    
+
       get '/no_layout' do
         haml '== #{1+1}'
       end
-    
+
       get_it '/no_layout'
       should.be.ok
       body.should == "2\n"
 
     end
   end
-  
+
   context "with layouts" do
 
     setup do
       Sinatra.application = nil
     end
-    
+
     specify "can be inline" do
-    
+
       layout do
         '== This is #{yield}!'
       end
-    
+
       get '/lay' do
         haml 'Blake'
       end
-    
+
       get_it '/lay'
       should.be.ok
       body.should.equal "This is Blake\n!\n"
 
     end
-  
+
     specify "can use named layouts" do
-    
+
       layout :pretty do
         '%h1== #{yield}'
       end
-        
+
       get '/pretty' do
         haml 'Foo', :layout => :pretty
       end
-    
+
       get '/not_pretty' do
         haml 'Bar'
       end
-    
+
       get_it '/pretty'
       body.should.equal "<h1>Foo</h1>\n"
-    
+
       get_it '/not_pretty'
       body.should.equal "Bar\n"
-    
+
     end
-  
+
     specify "can be read from a file if they're not inlined" do
-    
+
       get '/foo' do
         @title = 'Welcome to the Hello Program'
         haml 'Blake', :layout => :foo_layout,
                       :views_directory => File.dirname(__FILE__) + "/views"
       end
-    
+
       get_it '/foo'
       body.should.equal "Welcome to the Hello Program\nHi Blake\n"
-    
+
     end
-    
+
     specify "can be read from file and layout from text" do
       get '/foo' do
         haml 'Test', :layout => '== Foo #{yield}'
       end
-      
+
       get_it '/foo'
-      
+
       body.should.equal "Foo Test\n"
     end
 
   end
-  
+
   context "Templates (in general)" do
 
     setup do
@@ -136,21 +136,21 @@ context "Haml" do
       body.should.equal "<h1>No Layout!</h1>\n"
 
     end
-    
+
     specify "can render with no layout" do
       layout do
         "X\n= yield\nX"
       end
-      
+
       get '/' do
         haml 'blake', :layout => false
       end
-      
+
       get_it '/'
-      
+
       body.should.equal "blake\n"
     end
-    
+
     specify "raises error if template not found" do
       get '/' do
         haml :not_found
@@ -175,7 +175,59 @@ context "Haml" do
       body.should.equal "asdf\n"
 
     end
-    
+
+  end
+
+  describe 'Options passed to the HAML interpreter' do
+    setup do
+      Sinatra.application = nil
+    end
+
+    specify 'are empty be default' do
+
+      get '/' do
+        haml 'foo'
+      end
+
+      Haml::Engine.expects(:new).with('foo', {}).returns(stub(:render => 'foo'))
+
+      get_it '/'
+      should.be.ok
+
+    end
+
+    specify 'can be configured by passing :options to haml' do
+
+      get '/' do
+        haml 'foo', :options => {:format => :html4}
+      end
+
+      Haml::Engine.expects(:new).with('foo', {:format => :html4}).returns(stub(:render => 'foo'))
+
+      get_it '/'
+      should.be.ok
+
+    end
+
+    specify 'can be configured using set_option :haml' do
+
+      configure do
+        set_option :haml, :format       => :html4,
+                          :escape_html  => true
+      end
+
+      get '/' do
+        haml 'foo'
+      end
+
+      Haml::Engine.expects(:new).with('foo', {:format => :html4,
+        :escape_html => true}).returns(stub(:render => 'foo'))
+
+      get_it '/'
+      should.be.ok
+
+    end
+
   end
 
 end

data/test/helper.rb

@@ -1,4 +1,7 @@
-require File.dirname(__FILE__) + "/../lib/sinatra"
-require File.dirname(__FILE__) + "/../lib/sinatra/test/spec"
+require 'rubygems'
+require 'mocha'
 
-require "mocha"
+$:.unshift File.dirname(File.dirname(__FILE__)) + "/lib"
+
+require 'sinatra'
+require 'sinatra/test/spec'

data/test/mapped_error_test.rb

@@ -3,59 +3,70 @@ require File.dirname(__FILE__) + '/helper'
 class FooError < RuntimeError; end
 
 context "Mapped errors" do
-  
+
   setup do
     Sinatra.application = nil
+    Sinatra.application.options.raise_errors = false
   end
-  
+
   specify "are rescued and run in context" do
-    
+
     error FooError do
       'MAPPED ERROR!'
     end
-    
+
     get '/' do
-      raise FooError.new
+      raise FooError
     end
-    
+
     get_it '/'
-    
+
     should.be.server_error
     body.should.equal 'MAPPED ERROR!'
-          
+
   end
 
   specify "renders empty if no each method on result" do
-    
+
     error FooError do
       nil
     end
-    
+
     get '/' do
-      raise FooError.new
+      raise FooError
     end
-    
+
     get_it '/'
-    
+
     should.be.server_error
     body.should.be.empty
-          
+
   end
 
   specify "doesn't override status if set" do
-    
+
     error FooError do
       status(200)
     end
-    
+
     get '/' do
-      raise FooError.new
+      raise FooError
     end
-    
+
     get_it '/'
-    
+
     should.be.ok
-          
+
+  end
+
+  specify "raises errors when the raise_errors option is set" do
+    Sinatra.application.options.raise_errors = true
+    error FooError do
+    end
+    get '/' do
+      raise FooError
+    end
+    assert_raises(FooError) { get_it('/') }
   end
-  
+
 end

data/test/pipeline_test.rb

@@ -0,0 +1,66 @@
+require File.dirname(__FILE__) + '/helper'
+
+class UpcaseMiddleware
+  def initialize(app, *args, &block)
+    @app = app
+    @args = args
+    @block = block
+  end
+  def call(env)
+    env['PATH_INFO'] = env['PATH_INFO'].to_s.upcase
+    @app.call(env)
+  end
+end
+
+context "Middleware Pipelines" do
+
+  setup do
+    Sinatra.application = nil
+    @app = Sinatra.application
+  end
+
+  teardown do
+    Sinatra.application = nil
+  end
+
+  specify "includes default middleware with options set" do
+    @app.set_options :sessions => true, :logging => true
+    @app.send(:optional_middleware).should.include([Rack::Session::Cookie, [], nil])
+    @app.send(:optional_middleware).should.include([Rack::CommonLogger, [], nil])
+  end
+
+  specify "does not include default middleware with options unset" do
+    @app.set_options :sessions => false, :logging => false
+    @app.send(:optional_middleware).should.not.include([Rack::Session::Cookie, [], nil])
+    @app.send(:optional_middleware).should.not.include([Rack::CommonLogger, [], nil])
+  end
+
+  specify "includes only optional middleware when no explicit middleware added" do
+    @app.set_options :sessions => true, :logging => true
+    @app.send(:middleware).should.equal @app.send(:optional_middleware)
+  end
+
+  specify "should clear middleware before reload" do
+    @app.clearables.should.include(@app.send(:explicit_middleware))
+  end
+
+  specify "should add middleware with use" do
+    block = Proc.new { |env| }
+    @app.use UpcaseMiddleware
+    @app.use UpcaseMiddleware, "foo", "bar"
+    @app.use UpcaseMiddleware, "foo", "bar", &block
+    @app.send(:middleware).should.include([UpcaseMiddleware, [], nil])
+    @app.send(:middleware).should.include([UpcaseMiddleware, ["foo", "bar"], nil])
+    @app.send(:middleware).should.include([UpcaseMiddleware, ["foo", "bar"], block])
+  end
+
+  specify "should run middleware added with use" do
+    get('/foo') { "FAIL!" }
+    get('/FOO') { "PASS!" }
+    use UpcaseMiddleware
+    get_it '/foo'
+    should.be.ok
+    body.should.equal "PASS!"
+  end
+
+end