sinatra-sinatra 0.9.0.2 → 0.9.0.4

data/test/middleware_test.rb

@@ -38,7 +38,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 +46,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

data/test/options_test.rb

@@ -95,3 +95,46 @@ describe 'Options' do
     assert_equal 'okay', body
   end
 end
+
+describe 'Backtrace Cleaning (clean_trace option)' do
+  before do
+    @app = Class.new(Sinatra::Base)
+  end
+
+  def clean_backtrace(trace)
+    @app.new.send(:clean_backtrace, trace)
+  end
+
+  it 'is enabled by default' do
+    assert @app.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
+    @app.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

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/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 }

data/test/routing_test.rb

@@ -1,7 +1,12 @@
 require File.dirname(__FILE__) + '/helper'
 
+# Helper method for easy route pattern matching testing
+def route_def(pattern)
+  mock_app { get(pattern) { } }
+end
+
 describe "Routing" do
-  %w[get put post delete head].each do |verb|
+  %w[get put post delete].each do |verb|
     it "defines #{verb.upcase} request handlers with #{verb}" do
       mock_app {
         send verb, '/hello' do
@@ -16,6 +21,21 @@ describe "Routing" do
     end
   end
 
+  it "defines HEAD request handlers with HEAD" do
+    mock_app {
+      head '/hello' do
+        response['X-Hello'] = 'World!'
+        'remove me'
+      end
+    }
+
+    request = Rack::MockRequest.new(@app)
+    response = request.request('HEAD', '/hello', {})
+    assert response.ok?
+    assert_equal 'World!', response['X-Hello']
+    assert_equal '', response.body
+  end
+
   it "404s when no route satisfies the request" do
     mock_app {
       get('/foo') { }
@@ -119,6 +139,38 @@ describe "Routing" do
     assert ok?
   end
 
+  it "literally matches . in paths" do
+    route_def '/test.bar'
+
+    get '/test.bar'
+    assert ok?
+    get 'test0bar'
+    assert not_found?
+  end
+
+  it "literally matches $ in paths" do
+    route_def '/test$/'
+
+    get '/test$/'
+    assert ok?
+  end
+
+  it "literally matches + in paths" do
+    route_def '/te+st/'
+
+    get '/te+st/'
+    assert ok?
+    get '/teeeeeeest/'
+    assert not_found?
+  end
+
+  it "literally matches () in paths" do
+    route_def '/test(bar)/'
+
+    get '/test(bar)/'
+    assert ok?
+  end
+
   it "supports basic nested params" do
     mock_app {
       get '/hi' do
@@ -171,7 +223,22 @@ describe "Routing" do
         'looks good'
       end
     }
-    get "/foo?#{param_string(input)}"
+    get "/foo?#{build_query(input)}"
+    assert ok?
+    assert_equal 'looks good', body
+  end
+
+  it "preserves non-nested params" do
+    mock_app {
+      get '/foo' do
+        assert_equal "2", params["article_id"]
+        assert_equal "awesome", params['comment']['body']
+        assert_nil params['comment[body]']
+        'looks good'
+      end
+    }
+
+    get '/foo?article_id=2&comment[body]=awesome'
     assert ok?
     assert_equal 'looks good', body
   end
@@ -226,6 +293,11 @@ describe "Routing" do
     assert_equal 'right on', body
   end
 
+  it 'raises a TypeError when pattern is not a String or Regexp' do
+    @app = mock_app
+    assert_raise(TypeError) { @app.get(42){} }
+  end
+
   it "returns response immediately on halt" do
     mock_app {
       get '/' do
@@ -239,6 +311,30 @@ describe "Routing" do
     assert_equal 'Hello World', body
   end
 
+  it "halts with a response tuple" do
+    mock_app {
+      get '/' do
+        halt 295, {'Content-Type' => 'text/plain'}, 'Hello World'
+      end
+    }
+
+    get '/'
+    assert_equal 295, status
+    assert_equal 'text/plain', response['Content-Type']
+    assert_equal 'Hello World', body
+  end
+
+  it "halts with an array of strings" do
+    mock_app {
+      get '/' do
+        halt %w[Hello World How Are You]
+      end
+    }
+
+    get '/'
+    assert_equal 'HelloWorldHowAreYou', body
+  end
+
   it "transitions to the next matching route on pass" do
     mock_app {
       get '/:foo' do

data/test/static_test.rb

@@ -18,6 +18,16 @@ describe 'Static' do
     assert response.headers.include?('Last-Modified')
   end
 
+  it 'produces a body that can be iterated over multiple times' do
+    env = Rack::MockRequest.env_for("/#{F.basename(__FILE__)}")
+    status, headers, body = @app.call(env)
+    buf1, buf2 = [], []
+    body.each { |part| buf1 << part }
+    body.each { |part| buf2 << part }
+    assert_equal buf1.join, buf2.join
+    assert_equal File.read(__FILE__), buf1.join
+  end
+
   it 'serves HEAD requests for files in the public directory' do
     head "/#{F.basename(__FILE__)}"
     assert ok?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.9.0.2
+  version: 0.9.0.4
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-18 00:00:00 -08:00
+date: 2009-01-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency