adamwiggins-sinatra 0.8.9

data/test/middleware_test.rb

@@ -0,0 +1,63 @@
+require 'test/spec'
+require 'sinatra/base'
+require 'sinatra/test'
+
+describe "Middleware" do
+  include Sinatra::Test
+
+  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'
+    response.should.be.ok
+    body.should.equal '/HELLO-WORLD'
+  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'
+    body.should.equal "/foo"
+    response['X-Tests'].should.equal "UpcaseMiddleware, DowncaseMiddleware"
+  end
+
+  specify "resets the prebuilt pipeline when new middleware is added" do
+    @app.use UpcaseMiddleware
+    get '/Foo'
+    body.should.equal "/FOO"
+    @app.use DowncaseMiddleware
+    get '/Foo'
+    body.should.equal '/foo'
+    response['X-Tests'].should.equal "UpcaseMiddleware, DowncaseMiddleware"
+  end
+
+end

data/test/options_test.rb

@@ -0,0 +1,103 @@
+require 'test/spec'
+require 'sinatra/base'
+require 'sinatra/test'
+
+describe 'Options' do
+  include Sinatra::Test
+
+  before do
+    @app = Class.new(Sinatra::Base)
+  end
+
+  it 'sets options to literal values' do
+    @app.set(:foo, 'bar')
+    @app.should.respond_to? :foo
+    @app.foo.should.equal 'bar'
+  end
+
+  it 'sets options to Procs' do
+    @app.set(:foo, Proc.new { 'baz' })
+    @app.should.respond_to? :foo
+    @app.foo.should.equal 'baz'
+  end
+
+  it "sets multiple options with a Hash" do
+    @app.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'
+  end
+
+  it 'inherits option methods when subclassed' do
+    @app.set :foo, 'bar'
+    @app.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'
+  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'
+    sub.foo.should.equal 'bling'
+    @app.foo.should.equal 'bar'
+  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'
+  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
+  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'
+    @app.foo.should.equal 'oops'
+  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
+  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
+  end
+
+  it 'enables MethodOverride middleware when :methodoverride is enabled' do
+    @app.set :methodoverride, true
+    @app.put('/') { 'okay' }
+    post '/', {'_method'=>'PUT'}, {}
+    status.should.equal 200
+    body.should.equal 'okay'
+  end
+end

data/test/reload_test.rb

@@ -0,0 +1,65 @@
+require 'test/spec'
+require 'sinatra/base'
+require 'sinatra/test'
+
+$reload_count = 0
+$reload_app = nil
+
+describe "Reloading" do
+  include Sinatra::Test
+
+  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
+    @app.reload.should.be true
+    @app.reload?.should.be true
+  end
+
+  it 'is disabled by default when running in non-development environment' do
+    @app.set :app_file, __FILE__
+    @app.set :environment, :test
+    @app.reload.should.not.be true
+    @app.reload?.should.be false
+  end
+
+  it 'is disabled by default when no app_file is available' do
+    @app.set :app_file, nil
+    @app.set :environment, :development
+    @app.reload.should.not.be true
+    @app.reload?.should.be false
+  end
+
+  it 'can be turned off explicitly' do
+    @app.set :app_file, __FILE__
+    @app.set :environment, :development
+    @app.reload.should.be true
+    @app.set :reload, false
+    @app.reload.should.be false
+    @app.reload?.should.be false
+  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 '/'
+    status.should.equal 200
+    body.should.equal 'Hello from reload file'
+    $reload_count.should.equal 1
+
+    get '/'
+    status.should.equal 200
+    body.should.equal 'Hello from reload file'
+    $reload_count.should.equal 2
+  end
+end

data/test/request_test.rb

@@ -0,0 +1,11 @@
+require 'test/spec'
+require 'sinatra/base'
+require 'sinatra/test'
+
+describe 'Sinatra::Request' do
+  it 'responds to #user_agent' do
+    request = Sinatra::Request.new({'HTTP_USER_AGENT' => 'Test'})
+    request.should.respond_to :user_agent
+    request.user_agent.should.equal 'Test'
+  end
+end

data/test/result_test.rb

@@ -0,0 +1,92 @@
+require 'test/spec'
+require 'sinatra/base'
+require 'sinatra/test'
+
+describe 'Result Handling' do
+  include Sinatra::Test
+
+  it "sets response.body when result is a String" do
+    mock_app {
+      get '/' do
+        'Hello World'
+      end
+    }
+
+    get '/'
+    should.be.ok
+    body.should.equal 'Hello World'
+  end
+
+  it "sets response.body when result is an Array of Strings" do
+    mock_app {
+      get '/' do
+        ['Hello', 'World']
+      end
+    }
+
+    get '/'
+    should.be.ok
+    body.should.equal 'HelloWorld'
+  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 '/'
+    should.be.ok
+    body.should.equal 'Hello World'
+  end
+
+  it "sets response.body to [] when result is nil" do
+    mock_app {
+      get '/' do
+        nil
+      end
+    }
+
+    get '/'
+    should.be.ok
+    body.should.equal ''
+  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 '/'
+    status.should.equal 205
+    response['Content-Type'].should.equal 'foo/bar'
+    body.should.equal 'Hello World'
+  end
+
+  it "sets status and body when result is a two-tuple" do
+    mock_app {
+      get '/' do
+        [409, 'formula of']
+      end
+    }
+
+    get '/'
+    status.should.equal 409
+    body.should.equal 'formula of'
+  end
+
+  it "sets status when result is a Fixnum status code" do
+    mock_app {
+      get('/') { 205 }
+    }
+
+    get '/'
+    status.should.equal 205
+    body.should.be.empty
+  end
+end

data/test/routing_test.rb

@@ -0,0 +1,338 @@
+require 'test/spec'
+require 'sinatra/base'
+require 'sinatra/test'
+
+describe "Routing" do
+  include Sinatra::Test
+
+  %w[get put post delete head].each do |verb|
+    it "defines #{verb.upcase} request handlers with #{verb}" do
+      mock_app {
+        send verb, '/hello' do
+          'Hello World'
+        end
+      }
+
+      request = Rack::MockRequest.new(@app)
+      response = request.request(verb.upcase, '/hello', {})
+      response.should.be.ok
+      response.body.should.equal 'Hello World'
+    end
+  end
+
+  it "404s when no route satisfies the request" do
+    mock_app {
+      get('/foo') { }
+    }
+    get '/bar'
+    status.should.equal 404
+  end
+
+  it "exposes params with indifferent hash" do
+    mock_app {
+      get '/:foo' do
+        params['foo'].should.equal 'bar'
+        params[:foo].should.equal 'bar'
+        'well, alright'
+      end
+    }
+    get '/bar'
+    body.should.equal 'well, alright'
+  end
+
+  it "merges named params and query string params in params" do
+    mock_app {
+      get '/:foo' do
+        params['foo'].should.equal 'bar'
+        params['baz'].should.equal 'biz'
+      end
+    }
+    get '/bar?baz=biz'
+    should.be.ok
+  end
+
+  it "supports named params like /hello/:person" do
+    mock_app {
+      get '/hello/:person' do
+        "Hello #{params['person']}"
+      end
+    }
+    get '/hello/Frank'
+    body.should.equal 'Hello Frank'
+  end
+
+  it "supports optional named params like /?:foo?/?:bar?" do
+    mock_app {
+      get '/?:foo?/?:bar?' do
+        "foo=#{params[:foo]};bar=#{params[:bar]}"
+      end
+    }
+
+    get '/hello/world'
+    should.be.ok
+    body.should.equal "foo=hello;bar=world"
+
+    get '/hello'
+    should.be.ok
+    body.should.equal "foo=hello;bar="
+
+    get '/'
+    should.be.ok
+    body.should.equal "foo=;bar="
+  end
+
+  it "supports single splat params like /*" do
+    mock_app {
+      get '/*' do
+        params['splat'].should.be.kind_of Array
+        params['splat'].join "\n"
+      end
+    }
+
+    get '/foo'
+    body.should.equal "foo"
+
+    get '/foo/bar/baz'
+    body.should.equal "foo/bar/baz"
+  end
+
+  it "supports mixing multiple splat params like /*/foo/*/*" do
+    mock_app {
+      get '/*/foo/*/*' do
+        params['splat'].should.be.kind_of Array
+        params['splat'].join "\n"
+      end
+    }
+
+    get '/bar/foo/bling/baz/boom'
+    body.should.equal "bar\nbling\nbaz/boom"
+
+    get '/bar/foo/baz'
+    should.be.not_found
+  end
+
+  it "supports mixing named and splat params like /:foo/*" do
+    mock_app {
+      get '/:foo/*' do
+        params['foo'].should.equal 'foo'
+        params['splat'].should.equal ['bar/baz']
+      end
+    }
+
+    get '/foo/bar/baz'
+    should.be.ok
+  end
+
+  it "supports paths that include spaces" do
+    mock_app {
+      get '/path with spaces' do
+        'looks good'
+      end
+    }
+
+    get '/path%20with%20spaces'
+    should.be.ok
+    body.should.equal 'looks good'
+  end
+
+  it "URL decodes named parameters and splats" do
+    mock_app {
+      get '/:foo/*' do
+        params['foo'].should.equal 'hello world'
+        params['splat'].should.equal ['how are you']
+        nil
+      end
+    }
+
+    get '/hello%20world/how%20are%20you'
+    should.be.ok
+  end
+
+  it 'supports regular expressions' do
+    mock_app {
+      get(/^\/foo...\/bar$/) do
+        'Hello World'
+      end
+    }
+
+    get '/foooom/bar'
+    should.be.ok
+    body.should.equal 'Hello World'
+  end
+
+  it 'makes regular expression captures available in params[:captures]' do
+    mock_app {
+      get(/^\/fo(.*)\/ba(.*)/) do
+        params[:captures].should.equal ['orooomma', 'f']
+        'right on'
+      end
+    }
+
+    get '/foorooomma/baf'
+    should.be.ok
+    body.should.equal 'right on'
+  end
+
+  it "returns response immediately on halt" do
+    mock_app {
+      get '/' do
+        halt 'Hello World'
+        'Boo-hoo World'
+      end
+    }
+
+    get '/'
+    should.be.ok
+    body.should.equal 'Hello World'
+  end
+
+  it "transitions to the next matching route on pass" do
+    mock_app {
+      get '/:foo' do
+        pass
+        'Hello Foo'
+      end
+
+      get '/*' do
+        params.should.not.include 'foo'
+        'Hello World'
+      end
+    }
+
+    get '/bar'
+    should.be.ok
+    body.should.equal 'Hello World'
+  end
+
+  it "transitions to 404 when passed and no subsequent route matches" do
+    mock_app {
+      get '/:foo' do
+        pass
+        'Hello Foo'
+      end
+    }
+
+    get '/bar'
+    should.be.not_found
+  end
+
+  it "passes when matching condition returns false" do
+    mock_app {
+      condition { params[:foo] == 'bar' }
+      get '/:foo' do
+        'Hello World'
+      end
+    }
+
+    get '/bar'
+    should.be.ok
+    body.should.equal 'Hello World'
+
+    get '/foo'
+    should.be.not_found
+  end
+
+  it "does not pass when matching condition returns nil" do
+    mock_app {
+      condition { nil }
+      get '/:foo' do
+        'Hello World'
+      end
+    }
+
+    get '/bar'
+    should.be.ok
+    body.should.equal 'Hello World'
+  end
+
+  it "passes to next route when condition calls pass explicitly" do
+    mock_app {
+      condition { pass unless params[:foo] == 'bar' }
+      get '/:foo' do
+        'Hello World'
+      end
+    }
+
+    get '/bar'
+    should.be.ok
+    body.should.equal 'Hello World'
+
+    get '/foo'
+    should.be.not_found
+  end
+
+  it "passes to the next route when host_name does not match" do
+    mock_app {
+      host_name 'example.com'
+      get '/foo' do
+        'Hello World'
+      end
+    }
+    get '/foo'
+    should.be.not_found
+
+    get '/foo', :env => { 'HTTP_HOST' => 'example.com' }
+    status.should.equal 200
+    body.should.equal 'Hello World'
+  end
+
+  it "passes to the next route when user_agent does not match" do
+    mock_app {
+      user_agent(/Foo/)
+      get '/foo' do
+        'Hello World'
+      end
+    }
+    get '/foo'
+    should.be.not_found
+
+    get '/foo', :env => { 'HTTP_USER_AGENT' => 'Foo Bar' }
+    status.should.equal 200
+    body.should.equal 'Hello World'
+  end
+
+  it "makes captures in user agent pattern available in params[:agent]" do
+    mock_app {
+      user_agent(/Foo (.*)/)
+      get '/foo' do
+        'Hello ' + params[:agent].first
+      end
+    }
+    get '/foo', :env => { 'HTTP_USER_AGENT' => 'Foo Bar' }
+    status.should.equal 200
+    body.should.equal 'Hello Bar'
+  end
+
+  it "filters by accept header" do
+    mock_app {
+      get '/', :provides => :xml do
+        request.env['HTTP_ACCEPT']
+      end
+    }
+
+    get '/', :env => { :accept => 'application/xml' }
+    should.be.ok
+    body.should.equal 'application/xml'
+    response.headers['Content-Type'].should.equal 'application/xml'
+
+    get '/', :env => { :accept => 'text/html' }
+    should.not.be.ok
+  end
+
+  it "allows multiple mime types for accept header" do
+    types = ['image/jpeg', 'image/pjpeg']
+
+    mock_app {
+      get '/', :provides => types do
+        request.env['HTTP_ACCEPT']
+      end
+    }
+
+    types.each do |type|
+      get '/', :env => { :accept => type }
+      should.be.ok
+      body.should.equal type
+      response.headers['Content-Type'].should.equal type
+    end
+  end
+end

data/test/sass_test.rb

@@ -0,0 +1,40 @@
+require 'test/spec'
+require 'sinatra/base'
+require 'sinatra/test'
+
+describe "Sass Templates" do
+  include Sinatra::Test
+
+  def sass_app(&block)
+    mock_app {
+      set :views, File.dirname(__FILE__) + '/views'
+      get '/', &block
+    }
+    get '/'
+  end
+
+  it 'renders inline Sass strings' do
+    sass_app { sass "#sass\n  :background-color #FFF\n" }
+    should.be.ok
+    body.should.equal "#sass {\n  background-color: #FFF; }\n"
+  end
+
+  it 'renders .sass files in views path' do
+    sass_app { sass :hello }
+    should.be.ok
+    body.should.equal "#sass {\n  background-color: #FFF; }\n"
+  end
+
+  it 'ignores the layout option' do
+    sass_app { sass :hello, :layout => :layout2 }
+    should.be.ok
+    body.should.equal "#sass {\n  background-color: #FFF; }\n"
+  end
+
+  it "raises error if template not found" do
+    mock_app {
+      get('/') { sass :no_such_template }
+    }
+    lambda { get('/') }.should.raise(Errno::ENOENT)
+  end
+end