rtomayko-sinatra 0.9.0 → 0.9.0.2

data/test/middleware_test.rb

@@ -1,10 +1,6 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
 describe "Middleware" do
-  include Sinatra::Test
-
   before do
     @app = mock_app(Sinatra::Default) {
       get '/*' do
@@ -31,8 +27,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
@@ -46,18 +42,17 @@ describe "Middleware" 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
     @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
-
 end

data/test/options_test.rb

@@ -1,33 +1,27 @@
-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)
-  end
+  before { @app = Class.new(Sinatra::Base) }
 
   it 'sets options to literal values' do
     @app.set(:foo, 'bar')
-    @app.should.respond_to? :foo
-    @app.foo.should.equal 'bar'
+    assert @app.respond_to?(:foo)
+    assert_equal 'bar', @app.foo
   end
 
   it 'sets options to Procs' do
     @app.set(:foo, Proc.new { 'baz' })
-    @app.should.respond_to? :foo
-    @app.foo.should.equal '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' }
-    @app.foo.should.equal 1234
-    @app.bar.should.equal 'Hello World'
-    @app.baz.should.equal '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
@@ -35,10 +29,10 @@ describe 'Options' do
     @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'
+    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
@@ -46,23 +40,23 @@ describe 'Options' do
     @app.set :biz, Proc.new { 'baz' }
     sub = Class.new(@app)
     sub.set :foo, 'bling'
-    sub.foo.should.equal 'bling'
-    @app.foo.should.equal 'bar'
+    assert_equal 'bling', sub.foo
+    assert_equal 'bar', @app.foo
   end
 
   it 'creates setter methods when first defined' do
     @app.set :foo, 'bar'
-    @app.should.respond_to 'foo='
+    assert @app.respond_to?('foo=')
     @app.foo = 'biz'
-    @app.foo.should.equal 'biz'
+    assert_equal 'biz', @app.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
+    assert @app.respond_to?(:foo?)
+    assert @app.foo?
     @app.set :foo, nil
-    @app.foo?.should.be false
+    assert !@app.foo?
   end
 
   it 'uses existing setter methods if detected' do
@@ -76,28 +70,28 @@ describe 'Options' do
     end
 
     @app.set :foo, 'bam'
-    @app.foo.should.equal 'oops'
+    assert_equal 'oops', @app.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
+    assert @app.sessions
+    assert @app.foo
+    assert @app.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
+    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'}, {}
-    status.should.equal 200
-    body.should.equal 'okay'
+    assert_equal 200, status
+    assert_equal 'okay', body
   end
 end

data/test/reload_test.rb

@@ -1,13 +1,9 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
 $reload_count = 0
 $reload_app = nil
 
 describe "Reloading" do
-  include Sinatra::Test
-
   before {
     @app = mock_app(Sinatra::Default)
     $reload_app = @app
@@ -20,31 +16,31 @@ describe "Reloading" do
   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
+    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
-    @app.reload.should.not.be true
-    @app.reload?.should.be false
+    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
-    @app.reload.should.not.be true
-    @app.reload?.should.be false
+    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
-    @app.reload.should.be true
+    assert_same true, @app.reload
     @app.set :reload, false
-    @app.reload.should.be false
-    @app.reload?.should.be false
+    assert_same false, @app.reload
+    assert_same false, @app.reload?
   end
 
   it 'reloads the app_file each time a request is made' do
@@ -53,13 +49,13 @@ describe "Reloading" do
     @app.get('/') { 'Hello World' }
 
     get '/'
-    status.should.equal 200
-    body.should.equal 'Hello from reload file'
-    $reload_count.should.equal 1
+    assert_equal 200, status
+    assert_equal 'Hello from reload file', body
+    assert_equal 1, $reload_count
 
     get '/'
-    status.should.equal 200
-    body.should.equal 'Hello from reload file'
-    $reload_count.should.equal 2
+    assert_equal 200, status
+    assert_equal 'Hello from reload file', body
+    assert_equal 2, $reload_count
   end
 end

data/test/request_test.rb

@@ -1,11 +1,18 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
 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'
+    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

@@ -1,10 +1,6 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
 describe 'Result Handling' do
-  include Sinatra::Test
-
   it "sets response.body when result is a String" do
     mock_app {
       get '/' do
@@ -13,8 +9,8 @@ describe 'Result Handling' do
     }
 
     get '/'
-    should.be.ok
-    body.should.equal 'Hello World'
+    assert ok?
+    assert_equal 'Hello World', body
   end
 
   it "sets response.body when result is an Array of Strings" do
@@ -25,8 +21,8 @@ describe 'Result Handling' do
     }
 
     get '/'
-    should.be.ok
-    body.should.equal 'HelloWorld'
+    assert ok?
+    assert_equal 'HelloWorld', body
   end
 
   it "sets response.body when result responds to #each" do
@@ -39,8 +35,8 @@ describe 'Result Handling' do
     }
 
     get '/'
-    should.be.ok
-    body.should.equal 'Hello World'
+    assert ok?
+    assert_equal 'Hello World', body
   end
 
   it "sets response.body to [] when result is nil" do
@@ -51,8 +47,8 @@ describe 'Result Handling' do
     }
 
     get '/'
-    should.be.ok
-    body.should.equal ''
+    assert ok?
+    assert_equal '', body
   end
 
   it "sets status, headers, and body when result is a Rack response tuple" do
@@ -63,9 +59,9 @@ describe 'Result Handling' do
     }
 
     get '/'
-    status.should.equal 205
-    response['Content-Type'].should.equal 'foo/bar'
-    body.should.equal 'Hello World'
+    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
@@ -76,8 +72,8 @@ describe 'Result Handling' do
     }
 
     get '/'
-    status.should.equal 409
-    body.should.equal 'formula of'
+    assert_equal 409, status
+    assert_equal 'formula of', body
   end
 
   it "sets status when result is a Fixnum status code" do
@@ -86,7 +82,7 @@ describe 'Result Handling' do
     }
 
     get '/'
-    status.should.equal 205
-    body.should.be.empty
+    assert_equal 205, status
+    assert_equal '', body
   end
 end

data/test/routing_test.rb

@@ -1,10 +1,6 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
 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 {
@@ -15,8 +11,8 @@ describe "Routing" do
 
       request = Rack::MockRequest.new(@app)
       response = request.request(verb.upcase, '/hello', {})
-      response.should.be.ok
-      response.body.should.equal 'Hello World'
+      assert response.ok?
+      assert_equal 'Hello World', response.body
     end
   end
 
@@ -25,30 +21,30 @@ describe "Routing" do
       get('/foo') { }
     }
     get '/bar'
-    status.should.equal 404
+    assert_equal 404, status
   end
 
   it "exposes params with indifferent hash" do
     mock_app {
       get '/:foo' do
-        params['foo'].should.equal 'bar'
-        params[:foo].should.equal 'bar'
+        assert_equal 'bar', params['foo']
+        assert_equal 'bar', params[:foo]
         'well, alright'
       end
     }
     get '/bar'
-    body.should.equal 'well, alright'
+    assert_equal 'well, alright', body
   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'
+        assert_equal 'bar', params['foo']
+        assert_equal 'biz', params['baz']
       end
     }
     get '/bar?baz=biz'
-    should.be.ok
+    assert ok?
   end
 
   it "supports named params like /hello/:person" do
@@ -58,7 +54,7 @@ describe "Routing" do
       end
     }
     get '/hello/Frank'
-    body.should.equal 'Hello Frank'
+    assert_equal 'Hello Frank', body
   end
 
   it "supports optional named params like /?:foo?/?:bar?" do
@@ -69,58 +65,115 @@ describe "Routing" do
     }
 
     get '/hello/world'
-    should.be.ok
-    body.should.equal "foo=hello;bar=world"
+    assert ok?
+    assert_equal "foo=hello;bar=world", body
 
     get '/hello'
-    should.be.ok
-    body.should.equal "foo=hello;bar="
+    assert ok?
+    assert_equal "foo=hello;bar=", body
 
     get '/'
-    should.be.ok
-    body.should.equal "foo=;bar="
+    assert ok?
+    assert_equal "foo=;bar=", body
   end
 
   it "supports single splat params like /*" do
     mock_app {
       get '/*' do
-        params['splat'].should.be.kind_of Array
+        assert params['splat'].kind_of?(Array)
         params['splat'].join "\n"
       end
     }
 
     get '/foo'
-    body.should.equal "foo"
+    assert_equal "foo", body
 
     get '/foo/bar/baz'
-    body.should.equal "foo/bar/baz"
+    assert_equal "foo/bar/baz", body
   end
 
   it "supports mixing multiple splat params like /*/foo/*/*" do
     mock_app {
       get '/*/foo/*/*' do
-        params['splat'].should.be.kind_of Array
+        assert params['splat'].kind_of?(Array)
         params['splat'].join "\n"
       end
     }
 
     get '/bar/foo/bling/baz/boom'
-    body.should.equal "bar\nbling\nbaz/boom"
+    assert_equal "bar\nbling\nbaz/boom", body
 
     get '/bar/foo/baz'
-    should.be.not_found
+    assert 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']
+        assert_equal 'foo', params['foo']
+        assert_equal ['bar/baz'], params['splat']
       end
     }
 
     get '/foo/bar/baz'
-    should.be.ok
+    assert ok?
+  end
+
+  it "supports basic nested params" do
+    mock_app {
+      get '/hi' do
+        params["person"]["name"]
+      end
+    }
+
+    get "/hi?person[name]=John+Doe"
+    assert ok?
+    assert_equal "John Doe", body
+  end
+
+  it "exposes nested params with indifferent hash" do
+    mock_app {
+      get '/testme' do
+        assert_equal 'baz', params['bar']['foo']
+        assert_equal 'baz', params['bar'][:foo]
+        'well, alright'
+      end
+    }
+    get '/testme?bar[foo]=baz'
+    assert_equal 'well, alright', body
+  end
+
+  it "supports deeply nested params" do
+    input = {
+      'browser[chrome][engine][name]' => 'V8',
+      'browser[chrome][engine][version]' => '1.0',
+      'browser[firefox][engine][name]' => 'spidermonkey',
+      'browser[firefox][engine][version]' => '1.7.0',
+      'emacs[map][goto-line]' => 'M-g g',
+      'emacs[version]' => '22.3.1',
+      'paste[name]' => 'hello world',
+      'paste[syntax]' => 'ruby'
+    }
+    expected = {
+      "emacs" => {
+        "map"     => { "goto-line" => "M-g g" },
+        "version" => "22.3.1"
+      },
+      "browser" => {
+        "firefox" => {"engine" => {"name"=>"spidermonkey", "version"=>"1.7.0"}},
+        "chrome"  => {"engine" => {"name"=>"V8", "version"=>"1.0"}}
+      },
+      "paste" => {"name"=>"hello world", "syntax"=>"ruby"}
+    }
+    mock_app {
+      get '/foo' do
+        assert_equal expected, params
+        'looks good'
+      end
+    }
+    get "/foo?#{build_query(input)}"
+    assert ok?
+    assert_equal 'looks good', body
   end
 
   it "supports paths that include spaces" do
@@ -131,21 +184,21 @@ describe "Routing" do
     }
 
     get '/path%20with%20spaces'
-    should.be.ok
-    body.should.equal 'looks good'
+    assert ok?
+    assert_equal 'looks good', body
   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']
+        assert_equal 'hello world', params['foo']
+        assert_equal ['how are you'], params['splat']
         nil
       end
     }
 
     get '/hello%20world/how%20are%20you'
-    should.be.ok
+    assert ok?
   end
 
   it 'supports regular expressions' do
@@ -156,21 +209,21 @@ describe "Routing" do
     }
 
     get '/foooom/bar'
-    should.be.ok
-    body.should.equal 'Hello World'
+    assert ok?
+    assert_equal 'Hello World', body
   end
 
   it 'makes regular expression captures available in params[:captures]' do
     mock_app {
       get(/^\/fo(.*)\/ba(.*)/) do
-        params[:captures].should.equal ['orooomma', 'f']
+        assert_equal ['orooomma', 'f'], params[:captures]
         'right on'
       end
     }
 
     get '/foorooomma/baf'
-    should.be.ok
-    body.should.equal 'right on'
+    assert ok?
+    assert_equal 'right on', body
   end
 
   it "returns response immediately on halt" do
@@ -182,8 +235,8 @@ describe "Routing" do
     }
 
     get '/'
-    should.be.ok
-    body.should.equal 'Hello World'
+    assert ok?
+    assert_equal 'Hello World', body
   end
 
   it "transitions to the next matching route on pass" do
@@ -194,14 +247,14 @@ describe "Routing" do
       end
 
       get '/*' do
-        params.should.not.include 'foo'
+        assert !params.include?('foo')
         'Hello World'
       end
     }
 
     get '/bar'
-    should.be.ok
-    body.should.equal 'Hello World'
+    assert ok?
+    assert_equal 'Hello World', body
   end
 
   it "transitions to 404 when passed and no subsequent route matches" do
@@ -213,7 +266,7 @@ describe "Routing" do
     }
 
     get '/bar'
-    should.be.not_found
+    assert not_found?
   end
 
   it "passes when matching condition returns false" do
@@ -225,11 +278,11 @@ describe "Routing" do
     }
 
     get '/bar'
-    should.be.ok
-    body.should.equal 'Hello World'
+    assert ok?
+    assert_equal 'Hello World', body
 
     get '/foo'
-    should.be.not_found
+    assert not_found?
   end
 
   it "does not pass when matching condition returns nil" do
@@ -241,8 +294,8 @@ describe "Routing" do
     }
 
     get '/bar'
-    should.be.ok
-    body.should.equal 'Hello World'
+    assert ok?
+    assert_equal 'Hello World', body
   end
 
   it "passes to next route when condition calls pass explicitly" do
@@ -254,11 +307,11 @@ describe "Routing" do
     }
 
     get '/bar'
-    should.be.ok
-    body.should.equal 'Hello World'
+    assert ok?
+    assert_equal 'Hello World', body
 
     get '/foo'
-    should.be.not_found
+    assert not_found?
   end
 
   it "passes to the next route when host_name does not match" do
@@ -269,37 +322,70 @@ describe "Routing" do
       end
     }
     get '/foo'
-    should.be.not_found
+    assert not_found?
 
     get '/foo', :env => { 'HTTP_HOST' => 'example.com' }
-    status.should.equal 200
-    body.should.equal 'Hello World'
+    assert_equal 200, status
+    assert_equal 'Hello World', body
   end
 
   it "passes to the next route when user_agent does not match" do
     mock_app {
-      user_agent /Foo/
+      user_agent(/Foo/)
       get '/foo' do
         'Hello World'
       end
     }
     get '/foo'
-    should.be.not_found
+    assert not_found?
 
     get '/foo', :env => { 'HTTP_USER_AGENT' => 'Foo Bar' }
-    status.should.equal 200
-    body.should.equal 'Hello World'
+    assert_equal 200, status
+    assert_equal 'Hello World', body
   end
 
   it "makes captures in user agent pattern available in params[:agent]" do
     mock_app {
-      user_agent /Foo (.*)/
+      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'
+    assert_equal 200, status
+    assert_equal 'Hello Bar', body
+  end
+
+  it "filters by accept header" do
+    mock_app {
+      get '/', :provides => :xml do
+        request.env['HTTP_ACCEPT']
+      end
+    }
+
+    get '/', :env => { :accept => 'application/xml' }
+    assert ok?
+    assert_equal 'application/xml', body
+    assert_equal 'application/xml', response.headers['Content-Type']
+
+    get '/', :env => { :accept => 'text/html' }
+    assert !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 }
+      assert ok?
+      assert_equal type, body
+      assert_equal type, response.headers['Content-Type']
+    end
   end
 end