sinatra 1.3.6 → 1.4.0.a

data/test/extensions_test.rb

@@ -42,9 +42,7 @@ class ExtensionsTest < Test::Unit::TestCase
   end
 
   it 'allows extending by passing a block' do
-    Sinatra::Base.register {
-      def im_in_ur_anonymous_module; end
-    }
+    Sinatra::Base.register { def im_in_ur_anonymous_module; end }
     assert Sinatra::Base.respond_to?(:im_in_ur_anonymous_module)
   end
 

data/test/filter_test.rb

@@ -5,14 +5,14 @@ class BeforeFilterTest < Test::Unit::TestCase
     count = 0
     mock_app do
       get('/') { 'Hello World' }
-      before {
+      before do
         assert_equal 0, count
         count = 1
-      }
-      before {
+      end
+      before do
         assert_equal 1, count
         count = 2
-      }
+      end
     end
 
     get '/'
@@ -22,11 +22,11 @@ class BeforeFilterTest < Test::Unit::TestCase
   end
 
   it "can modify the request" do
-    mock_app {
+    mock_app do
       get('/foo') { 'foo' }
       get('/bar') { 'bar' }
       before { request.path_info = '/bar' }
-    }
+    end
 
     get '/foo'
     assert ok?
@@ -34,10 +34,10 @@ class BeforeFilterTest < Test::Unit::TestCase
   end
 
   it "can modify instance variables available to routes" do
-    mock_app {
+    mock_app do
       before { @foo = 'bar' }
       get('/foo') { @foo }
-    }
+    end
 
     get '/foo'
     assert ok?
@@ -45,13 +45,13 @@ class BeforeFilterTest < Test::Unit::TestCase
   end
 
   it "allows redirects" do
-    mock_app {
+    mock_app do
       before { redirect '/bar' }
       get('/foo') do
         fail 'before block should have halted processing'
         'ORLY?!'
       end
-    }
+    end
 
     get '/foo'
     assert redirect?
@@ -60,13 +60,13 @@ class BeforeFilterTest < Test::Unit::TestCase
   end
 
   it "does not modify the response with its return value" do
-    mock_app {
+    mock_app do
       before { 'Hello World!' }
-      get '/foo' do
+      get('/foo') do
         assert_equal [], response.body
         'cool'
       end
-    }
+    end
 
     get '/foo'
     assert ok?
@@ -74,12 +74,12 @@ class BeforeFilterTest < Test::Unit::TestCase
   end
 
   it "does modify the response with halt" do
-    mock_app {
+    mock_app do
       before { halt 302, 'Hi' }
       get '/foo' do
         "should not happen"
       end
-    }
+    end
 
     get '/foo'
     assert_equal 302, response.status
@@ -87,10 +87,10 @@ class BeforeFilterTest < Test::Unit::TestCase
   end
 
   it "gives you access to params" do
-    mock_app {
+    mock_app do
       before { @foo = params['foo'] }
       get('/foo') { @foo }
-    }
+    end
 
     get '/foo?foo=cool'
     assert ok?
@@ -98,10 +98,10 @@ class BeforeFilterTest < Test::Unit::TestCase
   end
 
   it "properly unescapes parameters" do
-    mock_app {
+    mock_app do
       before { @foo = params['foo'] }
       get('/foo') { @foo }
-    }
+    end
 
     get '/foo?foo=bar%3Abaz%2Fbend'
     assert ok?
@@ -112,9 +112,7 @@ class BeforeFilterTest < Test::Unit::TestCase
     base = Class.new(Sinatra::Base)
     base.before { @foo = 'hello from superclass' }
 
-    mock_app(base) {
-      get('/foo') { @foo }
-    }
+    mock_app(base) { get('/foo') { @foo } }
 
     get '/foo'
     assert_equal 'hello from superclass', body
@@ -122,11 +120,11 @@ class BeforeFilterTest < Test::Unit::TestCase
 
   it 'does not run before filter when serving static files' do
     ran_filter = false
-    mock_app {
+    mock_app do
       before { ran_filter = true }
       set :static, true
       set :public_folder, File.dirname(__FILE__)
-    }
+    end
     get "/#{File.basename(__FILE__)}"
     assert ok?
     assert_equal File.read(__FILE__), body
@@ -176,14 +174,14 @@ class AfterFilterTest < Test::Unit::TestCase
     count = 0
     mock_app do
       get('/') { 'Hello World' }
-      after {
+      after do
         assert_equal 0, count
         count = 1
-      }
-      after {
+      end
+      after do
         assert_equal 1, count
         count = 2
-      }
+      end
     end
 
     get '/'
@@ -193,10 +191,10 @@ class AfterFilterTest < Test::Unit::TestCase
   end
 
   it "allows redirects" do
-    mock_app {
+    mock_app do
       get('/foo') { 'ORLY' }
       after { redirect '/bar' }
-    }
+    end
 
     get '/foo'
     assert redirect?
@@ -205,10 +203,10 @@ class AfterFilterTest < Test::Unit::TestCase
   end
 
   it "does not modify the response with its return value" do
-    mock_app {
+    mock_app do
       get('/foo') { 'cool' }
       after { 'Hello World!' }
-    }
+    end
 
     get '/foo'
     assert ok?
@@ -216,12 +214,12 @@ class AfterFilterTest < Test::Unit::TestCase
   end
 
   it "does modify the response with halt" do
-    mock_app {
+    mock_app do
       get '/foo' do
         "should not be returned"
       end
       after { halt 302, 'Hi' }
-    }
+    end
 
     get '/foo'
     assert_equal 302, response.status
@@ -245,11 +243,11 @@ class AfterFilterTest < Test::Unit::TestCase
 
   it 'does not run after filter when serving static files' do
     ran_filter = false
-    mock_app {
+    mock_app do
       after { ran_filter = true }
       set :static, true
       set :public_folder, File.dirname(__FILE__)
-    }
+    end
     get "/#{File.basename(__FILE__)}"
     assert ok?
     assert_equal File.read(__FILE__), body
@@ -308,9 +306,9 @@ class AfterFilterTest < Test::Unit::TestCase
       before(:host_name => 'example.com') { ran = true }
       get('/') { 'welcome' }
     end
-    get '/', {}, { 'HTTP_HOST' => 'example.org' }
+    get('/', {}, { 'HTTP_HOST' => 'example.org' })
     assert !ran
-    get '/', {}, { 'HTTP_HOST' => 'example.com' }
+    get('/', {}, { 'HTTP_HOST' => 'example.com' })
     assert ran
   end
 
@@ -320,11 +318,11 @@ class AfterFilterTest < Test::Unit::TestCase
       before('/foo', :host_name => 'example.com') { ran = true }
       get('/') { 'welcome' }
     end
-    get '/', {}, { 'HTTP_HOST' => 'example.com' }
+    get('/', {}, { 'HTTP_HOST' => 'example.com' })
     assert !ran
-    get '/foo', {}, { 'HTTP_HOST' => 'example.org' }
+    get('/foo', {}, { 'HTTP_HOST' => 'example.org' })
     assert !ran
-    get '/foo', {}, { 'HTTP_HOST' => 'example.com' }
+    get('/foo', {}, { 'HTTP_HOST' => 'example.com' })
     assert ran
   end
 
@@ -334,9 +332,9 @@ class AfterFilterTest < Test::Unit::TestCase
       after(:host_name => 'example.com') { ran = true }
       get('/') { 'welcome' }
     end
-    get '/', {}, { 'HTTP_HOST' => 'example.org' }
+    get('/', {}, { 'HTTP_HOST' => 'example.org' })
     assert !ran
-    get '/', {}, { 'HTTP_HOST' => 'example.com' }
+    get('/', {}, { 'HTTP_HOST' => 'example.com' })
     assert ran
   end
 
@@ -346,11 +344,11 @@ class AfterFilterTest < Test::Unit::TestCase
       after('/foo', :host_name => 'example.com') { ran = true }
       get('/') { 'welcome' }
     end
-    get '/', {}, { 'HTTP_HOST' => 'example.com' }
+    get('/', {}, { 'HTTP_HOST' => 'example.com' })
     assert !ran
-    get '/foo', {}, { 'HTTP_HOST' => 'example.org' }
+    get('/foo', {}, { 'HTTP_HOST' => 'example.org' })
     assert !ran
-    get '/foo', {}, { 'HTTP_HOST' => 'example.com' }
+    get('/foo', {}, { 'HTTP_HOST' => 'example.com' })
     assert ran
   end
 
@@ -360,9 +358,9 @@ class AfterFilterTest < Test::Unit::TestCase
       before(:user_agent => /foo/) { ran = true }
       get('/') { 'welcome' }
     end
-    get '/', {}, { 'HTTP_USER_AGENT' => 'bar' }
+    get('/', {}, { 'HTTP_USER_AGENT' => 'bar' })
     assert !ran
-    get '/', {}, { 'HTTP_USER_AGENT' => 'foo' }
+    get('/', {}, { 'HTTP_USER_AGENT' => 'foo' })
     assert ran
   end
 
@@ -372,11 +370,11 @@ class AfterFilterTest < Test::Unit::TestCase
       before('/foo', :user_agent => /foo/) { ran = true }
       get('/') { 'welcome' }
     end
-    get '/', {}, { 'HTTP_USER_AGENT' => 'foo' }
+    get('/', {}, { 'HTTP_USER_AGENT' => 'foo' })
     assert !ran
-    get '/foo', {}, { 'HTTP_USER_AGENT' => 'bar' }
+    get('/foo', {}, { 'HTTP_USER_AGENT' => 'bar' })
     assert !ran
-    get '/foo', {}, { 'HTTP_USER_AGENT' => 'foo' }
+    get('/foo', {}, { 'HTTP_USER_AGENT' => 'foo' })
     assert ran
   end
 
@@ -406,9 +404,9 @@ class AfterFilterTest < Test::Unit::TestCase
       after(:user_agent => /foo/) { ran = true }
       get('/') { 'welcome' }
     end
-    get '/', {}, { 'HTTP_USER_AGENT' => 'bar' }
+    get('/', {}, { 'HTTP_USER_AGENT' => 'bar' })
     assert !ran
-    get '/', {}, { 'HTTP_USER_AGENT' => 'foo' }
+    get('/', {}, { 'HTTP_USER_AGENT' => 'foo' })
     assert ran
   end
 
@@ -418,11 +416,22 @@ class AfterFilterTest < Test::Unit::TestCase
       after('/foo', :user_agent => /foo/) { ran = true }
       get('/') { 'welcome' }
     end
-    get '/', {}, { 'HTTP_USER_AGENT' => 'foo' }
+    get('/', {}, { 'HTTP_USER_AGENT' => 'foo' })
     assert !ran
-    get '/foo', {}, { 'HTTP_USER_AGENT' => 'bar' }
+    get('/foo', {}, { 'HTTP_USER_AGENT' => 'bar' })
     assert !ran
-    get '/foo', {}, { 'HTTP_USER_AGENT' => 'foo' }
+    get('/foo', {}, { 'HTTP_USER_AGENT' => 'foo' })
     assert ran
   end
+
+  it 'only triggeres provides condition if conforms with current Content-Type' do
+    mock_app do
+      before(:provides => :txt)  { @type = 'txt' }
+      before(:provides => :html) { @type = 'html' }
+      get('/') { @type }
+    end
+
+    get('/', {}, { 'HTTP_ACCEPT' => '*/*' })
+    assert_body 'txt'
+  end
 end

data/test/haml_test.rb

@@ -5,10 +5,10 @@ require 'haml'
 
 class HAMLTest < Test::Unit::TestCase
   def haml_app(&block)
-    mock_app {
+    mock_app do
       set :views, File.dirname(__FILE__) + '/views'
-      get '/', &block
-    }
+      get('/', &block)
+    end
     get '/'
   end
 
@@ -25,35 +25,29 @@ class HAMLTest < Test::Unit::TestCase
   end
 
   it "renders with inline layouts" do
-    mock_app {
+    mock_app do
       layout { %q(%h1= 'THIS. IS. ' + yield.upcase) }
       get('/') { haml '%em Sparta' }
-    }
+    end
     get '/'
     assert ok?
     assert_equal "<h1>THIS. IS. <EM>SPARTA</EM></h1>\n", body
   end
 
   it "renders with file layouts" do
-    haml_app {
-      haml 'Hello World', :layout => :layout2
-    }
+    haml_app { haml 'Hello World', :layout => :layout2 }
     assert ok?
     assert_equal "<h1>HAML Layout!</h1>\n<p>Hello World</p>\n", body
   end
 
   it "raises error if template not found" do
-    mock_app {
-      get('/') { haml :no_such_template }
-    }
+    mock_app { get('/') { haml :no_such_template } }
     assert_raise(Errno::ENOENT) { get('/') }
   end
 
   it "passes HAML options to the Haml engine" do
     mock_app {
-      get '/' do
-        haml "!!!\n%h1 Hello World", :format => :html5
-      end
+      get('/') { haml "!!!\n%h1 Hello World", :format => :html5 }
     }
     get '/'
     assert ok?
@@ -61,27 +55,23 @@ class HAMLTest < Test::Unit::TestCase
   end
 
   it "passes default HAML options to the Haml engine" do
-    mock_app {
+    mock_app do
       set :haml, {:format => :html5}
-      get '/' do
-        haml "!!!\n%h1 Hello World"
-      end
-    }
+      get('/') { haml "!!!\n%h1 Hello World" }
+    end
     get '/'
     assert ok?
     assert_equal "<!DOCTYPE html>\n<h1>Hello World</h1>\n", body
   end
 
   it "merges the default HAML options with the overrides and passes them to the Haml engine" do
-    mock_app {
+    mock_app do
       set :haml, {:format => :html5, :attr_wrapper => '"'} # default HAML attr are <tag attr='single-quoted'>
-      get '/' do
-        haml "!!!\n%h1{:class => :header} Hello World"
-      end
-      get '/html4' do
+      get('/') { haml "!!!\n%h1{:class => :header} Hello World" }
+      get('/html4') {
         haml "!!!\n%h1{:class => 'header'} Hello World", :format => :html4
-      end
-    }
+      }
+    end
     get '/'
     assert ok?
     assert_equal "<!DOCTYPE html>\n<h1 class=\"header\">Hello World</h1>\n", body
@@ -94,6 +84,24 @@ class HAMLTest < Test::Unit::TestCase
     haml_app { haml "= foo", :locals => { :foo => 'bar' }}
     assert_equal "bar\n", body
   end
+
+  it "can rendere truly nested layouts by accepting a layout and a block with the contents" do
+    mock_app do
+      template(:main_outer_layout) { "%h1 Title\n= yield" }
+      template(:an_inner_layout) { "%h2 Subtitle\n= yield" }
+      template(:a_page) { "%p Contents." }
+      get('/') do
+        haml :main_outer_layout, :layout => false do
+          haml :an_inner_layout do
+            haml :a_page
+          end
+        end
+      end
+    end
+    get '/'
+    assert ok?
+    assert_body "<h1>Title</h1>\n<h2>Subtitle</h2>\n<p>Contents.</p>\n"
+  end
 end
 
 rescue LoadError