bmizerany-sinatra 0.9.0.4 → 0.9.0.5

data/test/routing_test.rb

@@ -484,4 +484,170 @@ describe "Routing" do
       assert_equal type, response.headers['Content-Type']
     end
   end
+
+  it 'degrades gracefully when optional accept header is not provided' do
+    mock_app {
+      get '/', :provides => :xml do
+        request.env['HTTP_ACCEPT']
+      end
+      get '/' do
+        'default'
+      end
+    }
+    get '/'
+    assert ok?
+    assert_equal 'default', body
+  end
+
+  it 'passes a single url param as block parameters when one param is specified' do
+    mock_app {
+      get '/:foo' do |foo|
+        assert_equal 'bar', foo
+      end
+    }
+
+    get '/bar'
+    assert ok?
+  end
+
+  it 'passes multiple params as block parameters when many are specified' do
+    mock_app {
+      get '/:foo/:bar/:baz' do |foo, bar, baz|
+        assert_equal 'abc', foo
+        assert_equal 'def', bar
+        assert_equal 'ghi', baz
+      end
+    }
+
+    get '/abc/def/ghi'
+    assert ok?
+  end
+
+  it 'passes regular expression captures as block parameters' do
+    mock_app {
+      get(/^\/fo(.*)\/ba(.*)/) do |foo, bar|
+        assert_equal 'orooomma', foo
+        assert_equal 'f', bar
+        'looks good'
+      end
+    }
+
+    get '/foorooomma/baf'
+    assert ok?
+    assert_equal 'looks good', body
+  end
+
+  it "supports mixing multiple splat params like /*/foo/*/* as block parameters" do
+    mock_app {
+      get '/*/foo/*/*' do |foo, bar, baz|
+        assert_equal 'bar', foo
+        assert_equal 'bling', bar
+        assert_equal 'baz/boom', baz
+        'looks good'
+      end
+    }
+
+    get '/bar/foo/bling/baz/boom'
+    assert ok?
+    assert_equal 'looks good', body
+  end
+
+  it 'raises an ArgumentError with block arity > 1 and too many values' do
+    mock_app {
+      get '/:foo/:bar/:baz' do |foo, bar|
+        'quux'
+      end
+    }
+
+    assert_raise(ArgumentError) { get '/a/b/c' }
+  end
+
+  it 'raises an ArgumentError with block param arity > 1 and too few values' do
+    mock_app {
+      get '/:foo/:bar' do |foo, bar, baz|
+        'quux'
+      end
+    }
+
+    assert_raise(ArgumentError) { get '/a/b' }
+  end
+
+  it 'succeeds if no block parameters are specified' do
+    mock_app {
+      get '/:foo/:bar' do
+        'quux'
+      end
+    }
+
+    get '/a/b'
+    assert ok?
+    assert_equal 'quux', body
+  end
+
+  it 'passes all params with block param arity -1 (splat args)' do
+    mock_app {
+      get '/:foo/:bar' do |*args|
+        args.join
+      end
+    }
+
+    get '/a/b'
+    assert ok?
+    assert_equal 'ab', body
+  end
+
+  # NOTE Block params behaves differently under 1.8 and 1.9. Under 1.8, block
+  # param arity is lax: declaring a mismatched number of block params results
+  # in a warning. Under 1.9, block param arity is strict: mismatched block
+  # arity raises an ArgumentError.
+
+  if RUBY_VERSION >= '1.9'
+
+    it 'raises an ArgumentError with block param arity 1 and no values' do
+      mock_app {
+        get '/foo' do |foo|
+          'quux'
+        end
+      }
+
+      assert_raise(ArgumentError) { get '/foo' }
+    end
+
+    it 'raises an ArgumentError with block param arity 1 and too many values' do
+      mock_app {
+        get '/:foo/:bar/:baz' do |foo|
+          'quux'
+        end
+      }
+
+      assert_raise(ArgumentError) { get '/a/b/c' }
+    end
+
+  else
+
+    it 'does not raise an ArgumentError with block param arity 1 and no values' do
+      mock_app {
+        get '/foo' do |foo|
+          'quux'
+        end
+      }
+
+      silence_warnings { get '/foo' }
+      assert ok?
+      assert_equal 'quux', body
+    end
+
+    it 'does not raise an ArgumentError with block param arity 1 and too many values' do
+      mock_app {
+        get '/:foo/:bar/:baz' do |foo|
+          'quux'
+        end
+      }
+
+      silence_warnings { get '/a/b/c' }
+      assert ok?
+      assert_equal 'quux', body
+    end
+
+  end
 end

data/test/server_test.rb

@@ -0,0 +1,41 @@
+require File.dirname(__FILE__) + '/helper'
+
+class Rack::Handler::Mock
+  extend Test::Unit::Assertions
+
+  def self.run(app, options={})
+    assert(app < Sinatra::Base)
+    assert_equal 9001, options[:Port]
+    assert_equal 'foo.local', options[:Host]
+    yield new
+  end
+
+  def stop
+  end
+end
+
+describe 'Sinatra::Base.run!' do
+  before do
+    mock_app {
+      set :server, 'mock'
+      set :host, 'foo.local'
+      set :port, 9001
+    }
+    $stdout = File.open('/dev/null', 'wb')
+  end
+
+  after { $stdout = STDOUT }
+
+  it "locates the appropriate Rack handler and calls ::run" do
+    @app.run!
+  end
+
+  it "sets options on the app before running" do
+    @app.run! :sessions => true
+    assert @app.sessions?
+  end
+
+  it "falls back on the next server handler when not found" do
+    @app.run! :server => %w[foo bar mock]
+  end
+end

data/test/static_test.rb

@@ -1,17 +1,15 @@
 require File.dirname(__FILE__) + '/helper'
 
 describe 'Static' do
-  F = ::File
-
   before do
     mock_app {
       set :static, true
-      set :public, F.dirname(__FILE__)
+      set :public, File.dirname(__FILE__)
     }
   end
 
   it 'serves GET requests for files in the public directory' do
-    get "/#{F.basename(__FILE__)}"
+    get "/#{File.basename(__FILE__)}"
     assert ok?
     assert_equal File.read(__FILE__), body
     assert_equal File.size(__FILE__).to_s, response['Content-Length']
@@ -19,7 +17,7 @@ describe 'Static' do
   end
 
   it 'produces a body that can be iterated over multiple times' do
-    env = Rack::MockRequest.env_for("/#{F.basename(__FILE__)}")
+    env = Rack::MockRequest.env_for("/#{File.basename(__FILE__)}")
     status, headers, body = @app.call(env)
     buf1, buf2 = [], []
     body.each { |part| buf1 << part }
@@ -29,7 +27,7 @@ describe 'Static' do
   end
 
   it 'serves HEAD requests for files in the public directory' do
-    head "/#{F.basename(__FILE__)}"
+    head "/#{File.basename(__FILE__)}"
     assert ok?
     assert_equal '', body
     assert_equal File.size(__FILE__).to_s, response['Content-Length']
@@ -37,8 +35,8 @@ describe 'Static' do
   end
 
   it 'serves files in preference to custom routes' do
-    @app.get("/#{F.basename(__FILE__)}") { 'Hello World' }
-    get "/#{F.basename(__FILE__)}"
+    @app.get("/#{File.basename(__FILE__)}") { 'Hello World' }
+    get "/#{File.basename(__FILE__)}"
     assert ok?
     assert body != 'Hello World'
   end
@@ -50,13 +48,13 @@ describe 'Static' do
 
   it 'passes to the next handler when the static option is disabled' do
     @app.set :static, false
-    get "/#{F.basename(__FILE__)}"
+    get "/#{File.basename(__FILE__)}"
     assert not_found?
   end
 
   it 'passes to the next handler when the public option is nil' do
     @app.set :public, nil
-    get "/#{F.basename(__FILE__)}"
+    get "/#{File.basename(__FILE__)}"
     assert not_found?
   end
 

data/test/test_test.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/helper'
+
+describe "Sinatra::Test" do
+  it "support nested parameters" do
+    mock_app {
+      get '/' do
+        params[:post][:title]
+      end
+
+      post '/' do
+        params[:post][:content]
+      end
+    }
+
+    get '/', :post => { :title => 'My Post Title' }
+    assert_equal 'My Post Title', body
+
+    post '/', :post => { :content => 'Post Content' }
+    assert_equal 'Post Content', body
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bmizerany-sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.9.0.4
+  version: 0.9.0.5
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-25 00:00:00 -08:00
+date: 2009-02-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,6 +39,7 @@ files:
 - compat/app_test.rb
 - compat/application_test.rb
 - compat/builder_test.rb
+- compat/compat_test.rb
 - compat/custom_error_test.rb
 - compat/erb_test.rb
 - compat/events_test.rb
@@ -86,6 +87,7 @@ files:
 - test/builder_test.rb
 - test/data/reload_app_file.rb
 - test/erb_test.rb
+- test/extensions_test.rb
 - test/filter_test.rb
 - test/haml_test.rb
 - test/helper.rb
@@ -95,12 +97,15 @@ files:
 - test/options_test.rb
 - test/reload_test.rb
 - test/request_test.rb
+- test/response_test.rb
 - test/result_test.rb
 - test/routing_test.rb
 - test/sass_test.rb
+- test/server_test.rb
 - test/sinatra_test.rb
 - test/static_test.rb
 - test/templates_test.rb
+- test/test_test.rb
 - test/views/hello.builder
 - test/views/hello.erb
 - test/views/hello.haml
@@ -145,6 +150,7 @@ test_files:
 - test/base_test.rb
 - test/builder_test.rb
 - test/erb_test.rb
+- test/extensions_test.rb
 - test/filter_test.rb
 - test/haml_test.rb
 - test/helpers_test.rb
@@ -153,9 +159,12 @@ test_files:
 - test/options_test.rb
 - test/reload_test.rb
 - test/request_test.rb
+- test/response_test.rb
 - test/result_test.rb
 - test/routing_test.rb
 - test/sass_test.rb
+- test/server_test.rb
 - test/sinatra_test.rb
 - test/static_test.rb
 - test/templates_test.rb
+- test/test_test.rb