adamwiggins-sinatra 0.8.9 → 0.10.1

data/test/mapped_error_test.rb

@@ -1,164 +1,186 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
-describe 'Exception Mappings' do
-  include Sinatra::Test
-
-  class FooError < RuntimeError
-  end
+class FooError < RuntimeError
+end
 
-  it 'invokes handlers registered with ::error when raised' do
-    mock_app {
-      set :raise_errors, false
-      error(FooError) { 'Foo!' }
-      get '/' do
-        raise FooError
-      end
-    }
-    get '/'
-    status.should.equal 500
-    body.should.equal 'Foo!'
-  end
+class FooNotFound < Sinatra::NotFound
+end
 
-  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 '/'
-    status.should.equal 500
-    body.should.equal 'Exception!'
+class MappedErrorTest < Test::Unit::TestCase
+  def test_default
+    assert true
   end
 
-  it "sets env['sinatra.error'] to the rescued exception" do
-    mock_app {
-      set :raise_errors, false
-      error(FooError) {
-        env.should.include 'sinatra.error'
-        env['sinatra.error'].should.be.kind_of FooError
-        'looks good'
+  describe 'Exception Mappings' do
+    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
+
+    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 '/' do
-        raise FooError
-      end
-    }
-    get '/'
-    body.should.equal 'looks good'
-  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 '/'
-    status.should.equal 500
-    @response.errors.should.match(/FooError - BOOM!:/)
-  end
-
-  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
-    }
-    lambda { get '/' }.should.raise FooError
-  end
 
-  it "never raises Sinatra::NotFound beyond the application" do
-    mock_app {
-      set :raise_errors, true
-      get '/' do
-        raise Sinatra::NotFound
-      end
-    }
-    lambda { get '/' }.should.not.raise Sinatra::NotFound
-    status.should.equal 404
-  end
+      get '/'
+      assert_equal 500, status
+      assert_equal 'Exception!', body
+    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
+
+    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
+
+    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
+
+    it 'has a not_found method for backwards compatibility' do
+      mock_app {
+        not_found do
+          "Lost, are we?"
+        end
+      }
 
-  class FooNotFound < Sinatra::NotFound
-  end
+      get '/test'
+      assert_equal 404, status
+      assert_equal "Lost, are we?", body
+    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
-    }
-    lambda { get '/' }.should.not.raise FooNotFound
-    status.should.equal 404
-    body.should.equal 'foo! not found.'
-  end
+    it 'inherits error mappings from base class' do
+      base = Class.new(Sinatra::Base)
+      base.error(FooError) { 'base class' }
 
-  it 'has a not_found method for backwards compatibility' do
-    mock_app {
-      not_found do
-        "Lost, are we?"
-      end
-    }
+      mock_app(base) {
+        set :raise_errors, false
+        get '/' do
+          raise FooError
+        end
+      }
 
-    get '/test'
-    status.should.equal 404
-    body.should.equal "Lost, are we?"
-  end
-end
+      get '/'
+      assert_equal 'base class', body
+    end
 
-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 '/'
-    status.should.equal 500
-    body.should.equal 'Foo!'
-  end
+    it 'overrides error mappings in base class' do
+      base = Class.new(Sinatra::Base)
+      base.error(FooError) { 'base class' }
 
-  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 '/'
-    status.should.equal 507
-    body.should.equal 'Error: 507'
-  end
+      mock_app(base) {
+        set :raise_errors, false
+        error(FooError) { 'subclass' }
+        get '/' do
+          raise FooError
+        end
+      }
 
-  class FooError < RuntimeError
+      get '/'
+      assert_equal 'subclass', body
+    end
   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 '/'
-    status.should.equal 502
-    body.should.equal 'from custom error page'
+  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
+
+    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
 end

data/test/middleware_test.rb

@@ -1,14 +1,12 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
-describe "Middleware" do
-  include Sinatra::Test
-
-  before do
+class MiddlewareTest < Test::Unit::TestCase
+  setup do
     @app = mock_app(Sinatra::Default) {
       get '/*' do
-        response.headers['X-Tests'] = env['test.ran'].join(', ')
+        response.headers['X-Tests'] = env['test.ran'].
+          map { |n| n.split('::').last }.
+          join(', ')
         env['PATH_INFO']
       end
     }
@@ -31,8 +29,8 @@ describe "Middleware" do
   it "is added with Sinatra::Application.use" do
     @app.use UpcaseMiddleware
     get '/hello-world'
-    response.should.be.ok
-    body.should.equal '/HELLO-WORLD'
+    assert ok?
+    assert_equal '/HELLO-WORLD', body
   end
 
   class DowncaseMiddleware < MockMiddleware
@@ -42,22 +40,29 @@ describe "Middleware" do
     end
   end
 
-  specify "runs in the order defined" do
+  it "runs in the order defined" do
     @app.use UpcaseMiddleware
     @app.use DowncaseMiddleware
     get '/Foo'
-    body.should.equal "/foo"
-    response['X-Tests'].should.equal "UpcaseMiddleware, DowncaseMiddleware"
+    assert_equal "/foo", body
+    assert_equal "UpcaseMiddleware, DowncaseMiddleware", response['X-Tests']
   end
 
-  specify "resets the prebuilt pipeline when new middleware is added" do
+  it "resets the prebuilt pipeline when new middleware is added" do
     @app.use UpcaseMiddleware
     get '/Foo'
-    body.should.equal "/FOO"
+    assert_equal "/FOO", body
     @app.use DowncaseMiddleware
     get '/Foo'
-    body.should.equal '/foo'
-    response['X-Tests'].should.equal "UpcaseMiddleware, DowncaseMiddleware"
+    assert_equal '/foo', body
+    assert_equal "UpcaseMiddleware, DowncaseMiddleware", response['X-Tests']
   end
 
+  it "works when app is used as middleware" do
+    @app.use UpcaseMiddleware
+    @app = @app.new
+    get '/Foo'
+    assert_equal "/FOO", body
+    assert_equal "UpcaseMiddleware", response['X-Tests']
+  end
 end

data/test/options_test.rb

@@ -1,72 +1,71 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
-describe 'Options' do
-  include Sinatra::Test
-
-  before do
-    @app = Class.new(Sinatra::Base)
+class OptionsTest < Test::Unit::TestCase
+  setup do
+    @base    = Sinatra.new(Sinatra::Base)
+    @default = Sinatra.new(Sinatra::Default)
+    @base.set    :environment, :development
+    @default.set :environment, :development
   end
 
   it 'sets options to literal values' do
-    @app.set(:foo, 'bar')
-    @app.should.respond_to? :foo
-    @app.foo.should.equal 'bar'
+    @base.set(:foo, 'bar')
+    assert @base.respond_to?(:foo)
+    assert_equal 'bar', @base.foo
   end
 
   it 'sets options to Procs' do
-    @app.set(:foo, Proc.new { 'baz' })
-    @app.should.respond_to? :foo
-    @app.foo.should.equal 'baz'
+    @base.set(:foo, Proc.new { 'baz' })
+    assert @base.respond_to?(:foo)
+    assert_equal 'baz', @base.foo
   end
 
   it "sets multiple options with a Hash" do
-    @app.set :foo => 1234,
+    @base.set :foo => 1234,
         :bar => 'Hello World',
         :baz => Proc.new { 'bizzle' }
-    @app.foo.should.equal 1234
-    @app.bar.should.equal 'Hello World'
-    @app.baz.should.equal 'bizzle'
+    assert_equal 1234, @base.foo
+    assert_equal 'Hello World', @base.bar
+    assert_equal 'bizzle', @base.baz
   end
 
   it 'inherits option methods when subclassed' do
-    @app.set :foo, 'bar'
-    @app.set :biz, Proc.new { 'baz' }
+    @base.set :foo, 'bar'
+    @base.set :biz, Proc.new { 'baz' }
 
-    sub = Class.new(@app)
-    sub.should.respond_to :foo
-    sub.foo.should.equal 'bar'
-    sub.should.respond_to :biz
-    sub.biz.should.equal 'baz'
+    sub = Class.new(@base)
+    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)
+    @base.set :foo, 'bar'
+    @base.set :biz, Proc.new { 'baz' }
+    sub = Class.new(@base)
     sub.set :foo, 'bling'
-    sub.foo.should.equal 'bling'
-    @app.foo.should.equal 'bar'
+    assert_equal 'bling', sub.foo
+    assert_equal 'bar', @base.foo
   end
 
   it 'creates setter methods when first defined' do
-    @app.set :foo, 'bar'
-    @app.should.respond_to 'foo='
-    @app.foo = 'biz'
-    @app.foo.should.equal 'biz'
+    @base.set :foo, 'bar'
+    assert @base.respond_to?('foo=')
+    @base.foo = 'biz'
+    assert_equal 'biz', @base.foo
   end
 
   it 'creates predicate methods when first defined' do
-    @app.set :foo, 'hello world'
-    @app.should.respond_to :foo?
-    @app.foo?.should.be true
-    @app.set :foo, nil
-    @app.foo?.should.be false
+    @base.set :foo, 'hello world'
+    assert @base.respond_to?(:foo?)
+    assert @base.foo?
+    @base.set :foo, nil
+    assert !@base.foo?
   end
 
   it 'uses existing setter methods if detected' do
-    class << @app
+    class << @base
       def foo
         @foo
       end
@@ -75,29 +74,299 @@ describe 'Options' do
       end
     end
 
-    @app.set :foo, 'bam'
-    @app.foo.should.equal 'oops'
+    @base.set :foo, 'bam'
+    assert_equal 'oops', @base.foo
   end
 
   it "sets multiple options to true with #enable" do
-    @app.enable :sessions, :foo, :bar
-    @app.sessions.should.be true
-    @app.foo.should.be true
-    @app.bar.should.be true
+    @base.enable :sessions, :foo, :bar
+    assert @base.sessions
+    assert @base.foo
+    assert @base.bar
   end
 
   it "sets multiple options to false with #disable" do
-    @app.disable :sessions, :foo, :bar
-    @app.sessions.should.be false
-    @app.foo.should.be false
-    @app.bar.should.be false
+    @base.disable :sessions, :foo, :bar
+    assert !@base.sessions
+    assert !@base.foo
+    assert !@base.bar
   end
 
   it 'enables MethodOverride middleware when :methodoverride is enabled' do
-    @app.set :methodoverride, true
-    @app.put('/') { 'okay' }
+    @base.set :methodoverride, true
+    @base.put('/') { 'okay' }
+    @app = @base
     post '/', {'_method'=>'PUT'}, {}
-    status.should.equal 200
-    body.should.equal 'okay'
+    assert_equal 200, status
+    assert_equal 'okay', body
+  end
+
+  describe 'clean_trace' do
+    def clean_backtrace(trace)
+      Sinatra::Base.new.send(:clean_backtrace, trace)
+    end
+
+    it 'is enabled on Base' do
+      assert @base.clean_trace?
+    end
+
+    it 'is enabled on Default' do
+      assert @default.clean_trace?
+    end
+
+    it 'does nothing when disabled' do
+      backtrace = [
+        "./lib/sinatra/base.rb",
+        "./myapp:42",
+        ("#{Gem.dir}/some/lib.rb" if defined?(Gem))
+      ].compact
+
+      klass = Class.new(Sinatra::Base)
+      klass.disable :clean_trace
+
+      assert_equal backtrace, klass.new.send(:clean_backtrace, backtrace)
+    end
+
+    it 'removes sinatra lib paths from backtrace when enabled' do
+      backtrace = [
+        "./lib/sinatra/base.rb",
+        "./lib/sinatra/compat.rb:42",
+        "./lib/sinatra/main.rb:55 in `foo'"
+      ]
+      assert clean_backtrace(backtrace).empty?
+    end
+
+    it 'removes ./ prefix from backtrace paths when enabled' do
+      assert_equal ['myapp.rb:42'], clean_backtrace(['./myapp.rb:42'])
+    end
+
+    if defined?(Gem)
+      it 'removes gem lib paths from backtrace when enabled' do
+        assert clean_backtrace(["#{Gem.dir}/some/lib"]).empty?
+      end
+    end
+  end
+
+  describe 'run' do
+    it 'is disabled on Base' do
+      assert ! @base.run?
+    end
+
+    it 'is enabled on Default when not in test environment' do
+      @default.set :environment, :development
+      assert @default.development?
+      assert @default.run?
+
+      @default.set :environment, :development
+      assert @default.run?
+    end
+
+    # TODO: it 'is enabled when $0 == app_file'
+  end
+
+  describe 'raise_errors' do
+    it 'is enabled on Base' do
+      assert @base.raise_errors?
+    end
+
+    it 'is enabled on Default only in test' do
+      @default.set(:environment, :development)
+      assert @default.development?
+      assert ! @default.raise_errors?
+
+      @default.set(:environment, :production)
+      assert ! @default.raise_errors?
+
+      @default.set(:environment, :test)
+      assert @default.raise_errors?
+    end
+  end
+
+  describe 'show_exceptions' do
+    %w[development test production none].each do |environment|
+      it "is disabled on Base in #{environment} environments" do
+        @base.set(:environment, environment)
+        assert ! @base.show_exceptions?
+      end
+    end
+
+    it 'is enabled on Default only in development' do
+      @base.set(:environment, :development)
+      assert @default.development?
+      assert @default.show_exceptions?
+
+      @default.set(:environment, :test)
+      assert ! @default.show_exceptions?
+
+      @base.set(:environment, :production)
+      assert ! @base.show_exceptions?
+    end
+
+    it 'returns a friendly 500' do
+      klass = Sinatra.new(Sinatra::Default)
+      mock_app(klass) {
+        enable :show_exceptions
+
+        get '/' do
+          raise StandardError
+        end
+      }
+
+      get '/'
+      assert_equal 500, status
+      assert body.include?("StandardError")
+      assert body.include?("<code>show_exceptions</code> option")
+    end
+  end
+
+  describe 'dump_errors' do
+    it 'is disabled on Base' do
+      assert ! @base.dump_errors?
+    end
+
+    it 'is enabled on Default' do
+      assert @default.dump_errors?
+    end
+
+    it 'dumps exception with backtrace to rack.errors' do
+      klass = Sinatra.new(Sinatra::Default)
+
+      mock_app(klass) {
+        disable :raise_errors
+
+        error do
+          error = @env['rack.errors'].instance_variable_get(:@error)
+          error.rewind
+
+          error.read
+        end
+
+        get '/' do
+          raise
+        end
+      }
+
+      get '/'
+      assert body.include?("RuntimeError") && body.include?("options_test.rb")
+    end
+  end
+
+  describe 'sessions' do
+    it 'is disabled on Base' do
+      assert ! @base.sessions?
+    end
+
+    it 'is disabled on Default' do
+      assert ! @default.sessions?
+    end
+
+    # TODO: it 'uses Rack::Session::Cookie when enabled' do
+  end
+
+  describe 'logging' do
+    it 'is disabled on Base' do
+      assert ! @base.logging?
+    end
+
+    it 'is enabled on Default when not in test environment' do
+      assert @default.logging?
+
+      @default.set :environment, :test
+      assert ! @default.logging
+    end
+
+    # TODO: it 'uses Rack::CommonLogger when enabled' do
+  end
+
+  describe 'static' do
+    it 'is disabled on Base' do
+      assert ! @base.static?
+    end
+
+    it 'is enabled on Default' do
+      assert @default.static?
+    end
+
+    # TODO: it setup static routes if public is enabled
+    # TODO: however, that's already tested in static_test so...
+  end
+
+  describe 'host' do
+    it 'defaults to 0.0.0.0' do
+      assert_equal '0.0.0.0', @base.host
+      assert_equal '0.0.0.0', @default.host
+    end
+  end
+
+  describe 'port' do
+    it 'defaults to 4567' do
+      assert_equal 4567, @base.port
+      assert_equal 4567, @default.port
+    end
+  end
+
+  describe 'server' do
+    it 'is one of thin, mongrel, webrick' do
+      assert_equal %w[thin mongrel webrick], @base.server
+      assert_equal %w[thin mongrel webrick], @default.server
+    end
+  end
+
+  describe 'app_file' do
+    it 'is nil' do
+      assert @base.app_file.nil?
+      assert @default.app_file.nil?
+    end
+  end
+
+  describe 'root' do
+    it 'is nil if app_file is not set' do
+      assert @base.root.nil?
+      assert @default.root.nil?
+    end
+
+    it 'is equal to the expanded basename of app_file' do
+      @base.app_file = __FILE__
+      assert_equal File.expand_path(File.dirname(__FILE__)), @base.root
+
+      @default.app_file = __FILE__
+      assert_equal File.expand_path(File.dirname(__FILE__)), @default.root
+    end
+  end
+
+  describe 'views' do
+    it 'is nil if root is not set' do
+      assert @base.views.nil?
+      assert @default.views.nil?
+    end
+
+    it 'is set to root joined with views/' do
+      @base.root = File.dirname(__FILE__)
+      assert_equal File.dirname(__FILE__) + "/views", @base.views
+
+      @default.root = File.dirname(__FILE__)
+      assert_equal File.dirname(__FILE__) + "/views", @default.views
+    end
+  end
+
+  describe 'public' do
+    it 'is nil if root is not set' do
+      assert @base.public.nil?
+      assert @default.public.nil?
+    end
+
+    it 'is set to root joined with public/' do
+      @base.root = File.dirname(__FILE__)
+      assert_equal File.dirname(__FILE__) + "/public", @base.public
+
+      @default.root = File.dirname(__FILE__)
+      assert_equal File.dirname(__FILE__) + "/public", @default.public
+    end
+  end
+
+  describe 'lock' do
+    it 'is disabled by default' do
+      assert ! @base.lock?
+    end
   end
 end