sinatra 0.3.3 → 0.9.0

data/test/mapped_error_test.rb

@@ -1,72 +1,160 @@
 require File.dirname(__FILE__) + '/helper'
 
-class FooError < RuntimeError; end
-
-context "Mapped errors" do
-
-  setup do
-    Sinatra.application = nil
-    Sinatra.application.options.raise_errors = false
+describe 'Exception Mappings' do
+  class FooError < RuntimeError
   end
 
-  specify "are rescued and run in context" do
-
-    error FooError do
-      'MAPPED ERROR!'
-    end
-
-    get '/' do
-      raise FooError
-    end
-
-    get_it '/'
-
-    should.be.server_error
-    body.should.equal 'MAPPED ERROR!'
-
+  it 'invokes handlers registered with ::error when raised' do
+    mock_app {
+      set :raise_errors, false
+      error(FooError) { 'Foo!' }
+      get '/' do
+        raise FooError
+      end
+    }
+    get '/'
+    assert_equal 500, status
+    assert_equal 'Foo!', body
   end
 
-  specify "renders empty if no each method on result" do
+  it 'uses the Exception handler if no matching handler found' do
+    mock_app {
+      set :raise_errors, false
+      error(Exception) { 'Exception!' }
+      get '/' do
+        raise FooError
+      end
+    }
+    get '/'
+    assert_equal 500, status
+    assert_equal 'Exception!', body
+  end
 
-    error FooError do
-      nil
-    end
+  it "sets env['sinatra.error'] to the rescued exception" do
+    mock_app {
+      set :raise_errors, false
+      error(FooError) {
+        assert env.include?('sinatra.error')
+        assert env['sinatra.error'].kind_of?(FooError)
+        'looks good'
+      }
+      get '/' do
+        raise FooError
+      end
+    }
+    get '/'
+    assert_equal 'looks good', body
+  end
 
-    get '/' do
-      raise FooError
-    end
+  it 'dumps errors to rack.errors when dump_errors is enabled' do
+    mock_app {
+      set :raise_errors, false
+      set :dump_errors, true
+      get('/') { raise FooError, 'BOOM!' }
+    }
 
-    get_it '/'
+    get '/'
+    assert_equal 500, status
+    assert @response.errors =~ /FooError - BOOM!:/
+  end
 
-    should.be.server_error
-    body.should.be.empty
+  it "raises without calling the handler when the raise_errors options is set" do
+    mock_app {
+      set :raise_errors, true
+      error(FooError) { "she's not there." }
+      get '/' do
+        raise FooError
+      end
+    }
+    assert_raise(FooError) { get '/' }
+  end
 
+  it "never raises Sinatra::NotFound beyond the application" do
+    mock_app {
+      set :raise_errors, true
+      get '/' do
+        raise Sinatra::NotFound
+      end
+    }
+    assert_nothing_raised { get '/' }
+    assert_equal 404, status
   end
 
-  specify "doesn't override status if set" do
+  class FooNotFound < Sinatra::NotFound
+  end
 
-    error FooError do
-      status(200)
-    end
+  it "cascades for subclasses of Sinatra::NotFound" do
+    mock_app {
+      set :raise_errors, true
+      error(FooNotFound) { "foo! not found." }
+      get '/' do
+        raise FooNotFound
+      end
+    }
+    assert_nothing_raised { get '/' }
+    assert_equal 404, status
+    assert_equal 'foo! not found.', body
+  end
 
-    get '/' do
-      raise FooError
-    end
+  it 'has a not_found method for backwards compatibility' do
+    mock_app {
+      not_found do
+        "Lost, are we?"
+      end
+    }
 
-    get_it '/'
+    get '/test'
+    assert_equal 404, status
+    assert_equal "Lost, are we?", body
+  end
+end
 
-    should.be.ok
+describe 'Custom Error Pages' do
+  it 'allows numeric status code mappings to be registered with ::error' do
+    mock_app {
+      set :raise_errors, false
+      error(500) { 'Foo!' }
+      get '/' do
+        [500, {}, 'Internal Foo Error']
+      end
+    }
+    get '/'
+    assert_equal 500, status
+    assert_equal 'Foo!', body
+  end
 
+  it 'allows ranges of status code mappings to be registered with :error' do
+    mock_app {
+      set :raise_errors, false
+      error(500..550) { "Error: #{response.status}" }
+      get '/' do
+        [507, {}, 'A very special error']
+      end
+    }
+    get '/'
+    assert_equal 507, status
+    assert_equal 'Error: 507', body
   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('/') }
+  class FooError < RuntimeError
   end
 
+  it 'runs after exception mappings and overwrites body' do
+    mock_app {
+      set :raise_errors, false
+      error FooError do
+        response.status = 502
+        'from exception mapping'
+      end
+      error(500) { 'from 500 handler' }
+      error(502) { 'from custom error page' }
+
+      get '/' do
+        raise FooError
+      end
+    }
+    get '/'
+    assert_equal 502, status
+    assert_equal 'from custom error page', body
+  end
 end

data/test/middleware_test.rb

@@ -0,0 +1,58 @@
+require File.dirname(__FILE__) + '/helper'
+
+describe "Middleware" do
+  before do
+    @app = mock_app(Sinatra::Default) {
+      get '/*' do
+        response.headers['X-Tests'] = env['test.ran'].join(', ')
+        env['PATH_INFO']
+      end
+    }
+  end
+
+  class MockMiddleware < Struct.new(:app)
+    def call(env)
+      (env['test.ran'] ||= []) << self.class.to_s
+      app.call(env)
+    end
+  end
+
+  class UpcaseMiddleware < MockMiddleware
+    def call(env)
+      env['PATH_INFO'] = env['PATH_INFO'].upcase
+      super
+    end
+  end
+
+  it "is added with Sinatra::Application.use" do
+    @app.use UpcaseMiddleware
+    get '/hello-world'
+    assert ok?
+    assert_equal '/HELLO-WORLD', body
+  end
+
+  class DowncaseMiddleware < MockMiddleware
+    def call(env)
+      env['PATH_INFO'] = env['PATH_INFO'].downcase
+      super
+    end
+  end
+
+  specify "runs in the order defined" do
+    @app.use UpcaseMiddleware
+    @app.use DowncaseMiddleware
+    get '/Foo'
+    assert_equal "/foo", body
+    assert_equal "UpcaseMiddleware, DowncaseMiddleware", response['X-Tests']
+  end
+
+  specify "resets the prebuilt pipeline when new middleware is added" do
+    @app.use UpcaseMiddleware
+    get '/Foo'
+    assert_equal "/FOO", body
+    @app.use DowncaseMiddleware
+    get '/Foo'
+    assert_equal '/foo', body
+    assert_equal "UpcaseMiddleware, DowncaseMiddleware", response['X-Tests']
+  end
+end

data/test/options_test.rb

@@ -0,0 +1,97 @@
+require File.dirname(__FILE__) + '/helper'
+
+describe 'Options' do
+  before { @app = Class.new(Sinatra::Base) }
+
+  it 'sets options to literal values' do
+    @app.set(:foo, 'bar')
+    assert @app.respond_to?(:foo)
+    assert_equal 'bar', @app.foo
+  end
+
+  it 'sets options to Procs' do
+    @app.set(:foo, Proc.new { 'baz' })
+    assert @app.respond_to?(:foo)
+    assert_equal 'baz', @app.foo
+  end
+
+  it "sets multiple options with a Hash" do
+    @app.set :foo => 1234,
+        :bar => 'Hello World',
+        :baz => Proc.new { 'bizzle' }
+    assert_equal 1234, @app.foo
+    assert_equal 'Hello World', @app.bar
+    assert_equal 'bizzle', @app.baz
+  end
+
+  it 'inherits option methods when subclassed' do
+    @app.set :foo, 'bar'
+    @app.set :biz, Proc.new { 'baz' }
+
+    sub = Class.new(@app)
+    assert sub.respond_to?(:foo)
+    assert_equal 'bar', sub.foo
+    assert sub.respond_to?(:biz)
+    assert_equal 'baz', sub.biz
+  end
+
+  it 'overrides options in subclass' do
+    @app.set :foo, 'bar'
+    @app.set :biz, Proc.new { 'baz' }
+    sub = Class.new(@app)
+    sub.set :foo, 'bling'
+    assert_equal 'bling', sub.foo
+    assert_equal 'bar', @app.foo
+  end
+
+  it 'creates setter methods when first defined' do
+    @app.set :foo, 'bar'
+    assert @app.respond_to?('foo=')
+    @app.foo = 'biz'
+    assert_equal 'biz', @app.foo
+  end
+
+  it 'creates predicate methods when first defined' do
+    @app.set :foo, 'hello world'
+    assert @app.respond_to?(:foo?)
+    assert @app.foo?
+    @app.set :foo, nil
+    assert !@app.foo?
+  end
+
+  it 'uses existing setter methods if detected' do
+    class << @app
+      def foo
+        @foo
+      end
+      def foo=(value)
+        @foo = 'oops'
+      end
+    end
+
+    @app.set :foo, 'bam'
+    assert_equal 'oops', @app.foo
+  end
+
+  it "sets multiple options to true with #enable" do
+    @app.enable :sessions, :foo, :bar
+    assert @app.sessions
+    assert @app.foo
+    assert @app.bar
+  end
+
+  it "sets multiple options to false with #disable" do
+    @app.disable :sessions, :foo, :bar
+    assert !@app.sessions
+    assert !@app.foo
+    assert !@app.bar
+  end
+
+  it 'enables MethodOverride middleware when :methodoverride is enabled' do
+    @app.set :methodoverride, true
+    @app.put('/') { 'okay' }
+    post '/', {'_method'=>'PUT'}, {}
+    assert_equal 200, status
+    assert_equal 'okay', body
+  end
+end

data/test/reload_test.rb

@@ -0,0 +1,61 @@
+require File.dirname(__FILE__) + '/helper'
+
+$reload_count = 0
+$reload_app = nil
+
+describe "Reloading" do
+  before {
+    @app = mock_app(Sinatra::Default)
+    $reload_app = @app
+  }
+
+  after {
+    $reload_app = nil
+  }
+
+  it 'is enabled by default when in development and the app_file is set' do
+    @app.set :app_file, __FILE__
+    @app.set :environment, :development
+    assert_same true, @app.reload
+    assert_same true, @app.reload?
+  end
+
+  it 'is disabled by default when running in non-development environment' do
+    @app.set :app_file, __FILE__
+    @app.set :environment, :test
+    assert !@app.reload
+    assert_same false, @app.reload?
+  end
+
+  it 'is disabled by default when no app_file is available' do
+    @app.set :app_file, nil
+    @app.set :environment, :development
+    assert !@app.reload
+    assert_same false, @app.reload?
+  end
+
+  it 'can be turned off explicitly' do
+    @app.set :app_file, __FILE__
+    @app.set :environment, :development
+    assert_same true, @app.reload
+    @app.set :reload, false
+    assert_same false, @app.reload
+    assert_same false, @app.reload?
+  end
+
+  it 'reloads the app_file each time a request is made' do
+    @app.set :app_file, File.dirname(__FILE__) + '/data/reload_app_file.rb'
+    @app.set :reload, true
+    @app.get('/') { 'Hello World' }
+
+    get '/'
+    assert_equal 200, status
+    assert_equal 'Hello from reload file', body
+    assert_equal 1, $reload_count
+
+    get '/'
+    assert_equal 200, status
+    assert_equal 'Hello from reload file', body
+    assert_equal 2, $reload_count
+  end
+end

data/test/request_test.rb

@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/helper'
+
+describe 'Sinatra::Request' do
+  it 'responds to #user_agent' do
+    request = Sinatra::Request.new({'HTTP_USER_AGENT' => 'Test'})
+    assert request.respond_to?(:user_agent)
+    assert_equal 'Test', request.user_agent
+  end
+
+  it 'parses POST params when Content-Type is form-dataish' do
+    request = Sinatra::Request.new(
+      'REQUEST_METHOD' => 'PUT',
+      'CONTENT_TYPE' => 'application/x-www-form-urlencoded',
+      'rack.input' => StringIO.new('foo=bar')
+    )
+    assert_equal 'bar', request.params['foo']
+  end
+end

data/test/result_test.rb

@@ -0,0 +1,88 @@
+require File.dirname(__FILE__) + '/helper'
+
+describe 'Result Handling' do
+  it "sets response.body when result is a String" do
+    mock_app {
+      get '/' do
+        'Hello World'
+      end
+    }
+
+    get '/'
+    assert ok?
+    assert_equal 'Hello World', body
+  end
+
+  it "sets response.body when result is an Array of Strings" do
+    mock_app {
+      get '/' do
+        ['Hello', 'World']
+      end
+    }
+
+    get '/'
+    assert ok?
+    assert_equal 'HelloWorld', body
+  end
+
+  it "sets response.body when result responds to #each" do
+    mock_app {
+      get '/' do
+        res = lambda { 'Hello World' }
+        def res.each ; yield call ; end
+        res
+      end
+    }
+
+    get '/'
+    assert ok?
+    assert_equal 'Hello World', body
+  end
+
+  it "sets response.body to [] when result is nil" do
+    mock_app {
+      get '/' do
+        nil
+      end
+    }
+
+    get '/'
+    assert ok?
+    assert_equal '', body
+  end
+
+  it "sets status, headers, and body when result is a Rack response tuple" do
+    mock_app {
+      get '/' do
+        [205, {'Content-Type' => 'foo/bar'}, 'Hello World']
+      end
+    }
+
+    get '/'
+    assert_equal 205, status
+    assert_equal 'foo/bar', response['Content-Type']
+    assert_equal 'Hello World', body
+  end
+
+  it "sets status and body when result is a two-tuple" do
+    mock_app {
+      get '/' do
+        [409, 'formula of']
+      end
+    }
+
+    get '/'
+    assert_equal 409, status
+    assert_equal 'formula of', body
+  end
+
+  it "sets status when result is a Fixnum status code" do
+    mock_app {
+      get('/') { 205 }
+    }
+
+    get '/'
+    assert_equal 205, status
+    assert_equal '', body
+  end
+end