sinatra 0.9.0.5 → 0.9.1

data/test/mapped_error_test.rb

@@ -1,9 +1,12 @@
 require File.dirname(__FILE__) + '/helper'
 
-describe 'Exception Mappings' do
-  class FooError < RuntimeError
-  end
+class FooError < RuntimeError
+end
 
+class FooNotFound < Sinatra::NotFound
+end
+
+describe 'Exception Mappings' do
   it 'invokes handlers registered with ::error when raised' do
     mock_app {
       set :raise_errors, false
@@ -80,9 +83,6 @@ describe 'Exception Mappings' do
     assert_equal 404, status
   end
 
-  class FooNotFound < Sinatra::NotFound
-  end
-
   it "cascades for subclasses of Sinatra::NotFound" do
     mock_app {
       set :raise_errors, true

data/test/middleware_test.rb

@@ -4,7 +4,9 @@ describe "Middleware" do
   before 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
     }
@@ -38,7 +40,7 @@ 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'
@@ -46,7 +48,7 @@ describe "Middleware" do
     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'
     assert_equal "/FOO", body
@@ -55,4 +57,12 @@ describe "Middleware" do
     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,7 +1,10 @@
 require File.dirname(__FILE__) + '/helper'
 
 describe 'Options' do
-  before { @app = Class.new(Sinatra::Base) }
+  before do
+    restore_default_options
+    @app = Sinatra.new
+  end
 
   it 'sets options to literal values' do
     @app.set(:foo, 'bar')
@@ -95,3 +98,277 @@ describe 'Options' do
     assert_equal 'okay', body
   end
 end
+
+describe_option 'clean_trace' do
+  def clean_backtrace(trace)
+    @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
+    @base.set :clean_trace, false
+    assert_equal backtrace, 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_option 'run' do
+  it 'is disabled on Base' do
+    assert ! @base.run?
+  end
+
+  it 'is enabled on Default when not in test environment' do
+    assert @default.development?
+    assert @default.run?
+
+    @default.set :environment, :development
+    assert @default.run?
+  end
+
+  # TODO: it 'is enabled when $0 == app_file'
+end
+
+describe_option '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?, "disabled development"
+
+    @default.set(:environment, :production)
+    assert ! @default.raise_errors?
+
+    @default.set(:environment, :test)
+    assert @default.raise_errors?
+  end
+end
+
+describe_option '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
+    Sinatra::Default.disable(:raise_errors)
+
+    mock_app(Sinatra::Default) {
+      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_option '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_option '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_option '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_option '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_option 'port' do
+  it 'defaults to 4567' do
+    assert_equal 4567, @base.port
+    assert_equal 4567, @default.port
+  end
+end
+
+describe_option '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_option 'app_file' do
+  it 'is nil' do
+    assert @base.app_file.nil?
+    assert @default.app_file.nil?
+  end
+end
+
+describe_option '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_option '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_option '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_option 'reload' do
+  it 'is enabled when
+        app_file is set,
+        is not a rackup file,
+        and we are in development' do
+    @base.app_file = __FILE__
+    @base.set(:environment, :development)
+    assert @base.reload?
+
+    @default.app_file = __FILE__
+    @default.set(:environment, :development)
+    assert @default.reload?
+  end
+
+  it 'is disabled if app_file is not set' do
+    assert ! @base.reload?
+    assert ! @default.reload?
+  end
+
+  it 'is disabled if app_file is a rackup file' do
+    @base.app_file = 'config.ru'
+    assert ! @base.reload?
+
+    @default.app_file = 'config.ru'
+    assert ! @base.reload?
+  end
+
+  it 'is disabled if we are not in development' do
+    @base.set(:environment, :foo)
+    assert ! @base.reload
+
+    @default.set(:environment, :bar)
+    assert ! @default.reload
+  end
+end
+
+describe_option 'lock' do
+  it 'is enabled when reload is enabled' do
+    @base.enable(:reload)
+    assert @base.lock?
+
+    @default.enable(:reload)
+    assert @default.lock?
+  end
+
+  it 'is disabled when reload is disabled' do
+    @base.disable(:reload)
+    assert ! @base.lock?
+
+    @default.disable(:reload)
+    assert ! @default.lock?
+  end
+end

data/test/reload_test.rb

@@ -34,6 +34,13 @@ describe "Reloading" do
     assert_same false, @app.reload?
   end
 
+  it 'is disabled when app_file is a rackup (.ru) file' do
+    @app.set :app_file, __FILE__.sub(/\.rb$/, '.ru')
+    @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

data/test/response_test.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/helper'
+
+describe 'Sinatra::Response' do
+  before do
+    @response = Sinatra::Response.new
+  end
+
+  it "initializes with 200, text/html, and empty body" do
+    assert_equal 200, @response.status
+    assert_equal 'text/html', @response['Content-Type']
+    assert_equal [], @response.body
+  end
+
+  it 'uses case insensitive headers' do
+    @response['content-type'] = 'application/foo'
+    assert_equal 'application/foo', @response['Content-Type']
+    assert_equal 'application/foo', @response['CONTENT-TYPE']
+  end
+
+  it 'writes to body' do
+    @response.body = 'Hello'
+    @response.write ' World'
+    assert_equal 'Hello World', @response.body
+  end
+
+  [204, 304].each do |status_code|
+    it "removes the Content-Type header and body when response status is #{status_code}" do
+      @response.status = status_code
+      @response.body = ['Hello World']
+      assert_equal [status_code, {}, []], @response.finish
+    end
+  end
+
+  it 'Calculates the Content-Length using the bytesize of the body' do
+    @response.body = ['Hello', 'World!', '✈']
+    status, headers, body = @response.finish
+    assert_equal '14', headers['Content-Length']
+    assert_equal @response.body, body
+  end
+end

data/test/result_test.rb

@@ -76,6 +76,16 @@ describe 'Result Handling' do
     assert_equal 'formula of', body
   end
 
+  it "raises a TypeError when result is a non two or three tuple Array" do
+    mock_app {
+      get '/' do
+        [409, 'formula of', 'something else', 'even more']
+      end
+    }
+
+    assert_raise(TypeError) { get '/' }
+  end
+
   it "sets status when result is a Fixnum status code" do
     mock_app {
       get('/') { 205 }