sinatra 1.1.4 → 1.2.0

data/test/filter_test.rb

@@ -274,7 +274,7 @@ class AfterFilterTest < Test::Unit::TestCase
     get '/foo/bar'
     assert_equal subpath, 'bar'
   end
-  
+
   it 'is possible to access url params from the route param' do
     ran = false
     mock_app do
@@ -287,4 +287,108 @@ class AfterFilterTest < Test::Unit::TestCase
     get '/foo/bar'
     assert ran
   end
+
+  it 'is possible to apply host_name conditions to before filters with no path' do
+    ran = false
+    mock_app do
+      before(:host_name => 'example.com') { ran = true }
+      get('/') { 'welcome' }
+    end
+    get '/', {}, { 'HTTP_HOST' => 'example.org' }
+    assert !ran
+    get '/', {}, { 'HTTP_HOST' => 'example.com' }
+    assert ran
+  end
+
+  it 'is possible to apply host_name conditions to before filters with a path' do
+    ran = false
+    mock_app do
+      before('/foo', :host_name => 'example.com') { ran = true }
+      get('/') { 'welcome' }
+    end
+    get '/', {}, { 'HTTP_HOST' => 'example.com' }
+    assert !ran
+    get '/foo', {}, { 'HTTP_HOST' => 'example.org' }
+    assert !ran
+    get '/foo', {}, { 'HTTP_HOST' => 'example.com' }
+    assert ran
+  end
+
+  it 'is possible to apply host_name conditions to after filters with no path' do
+    ran = false
+    mock_app do
+      after(:host_name => 'example.com') { ran = true }
+      get('/') { 'welcome' }
+    end
+    get '/', {}, { 'HTTP_HOST' => 'example.org' }
+    assert !ran
+    get '/', {}, { 'HTTP_HOST' => 'example.com' }
+    assert ran
+  end
+
+  it 'is possible to apply host_name conditions to after filters with a path' do
+    ran = false
+    mock_app do
+      after('/foo', :host_name => 'example.com') { ran = true }
+      get('/') { 'welcome' }
+    end
+    get '/', {}, { 'HTTP_HOST' => 'example.com' }
+    assert !ran
+    get '/foo', {}, { 'HTTP_HOST' => 'example.org' }
+    assert !ran
+    get '/foo', {}, { 'HTTP_HOST' => 'example.com' }
+    assert ran
+  end
+
+  it 'is possible to apply user_agent conditions to before filters with no path' do
+    ran = false
+    mock_app do
+      before(:user_agent => /foo/) { ran = true }
+      get('/') { 'welcome' }
+    end
+    get '/', {}, { 'HTTP_USER_AGENT' => 'bar' }
+    assert !ran
+    get '/', {}, { 'HTTP_USER_AGENT' => 'foo' }
+    assert ran
+  end
+
+  it 'is possible to apply user_agent conditions to before filters with a path' do
+    ran = false
+    mock_app do
+      before('/foo', :user_agent => /foo/) { ran = true }
+      get('/') { 'welcome' }
+    end
+    get '/', {}, { 'HTTP_USER_AGENT' => 'foo' }
+    assert !ran
+    get '/foo', {}, { 'HTTP_USER_AGENT' => 'bar' }
+    assert !ran
+    get '/foo', {}, { 'HTTP_USER_AGENT' => 'foo' }
+    assert ran
+  end
+
+  it 'is possible to apply user_agent conditions to after filters with no path' do
+    ran = false
+    mock_app do
+      after(:user_agent => /foo/) { ran = true }
+      get('/') { 'welcome' }
+    end
+    get '/', {}, { 'HTTP_USER_AGENT' => 'bar' }
+    assert !ran
+    get '/', {}, { 'HTTP_USER_AGENT' => 'foo' }
+    assert ran
+  end
+
+  it 'is possible to apply user_agent conditions to before filters with a path' do
+    ran = false
+    mock_app do
+      after('/foo', :user_agent => /foo/) { ran = true }
+      get('/') { 'welcome' }
+    end
+    get '/', {}, { 'HTTP_USER_AGENT' => 'foo' }
+    assert !ran
+    get '/foo', {}, { 'HTTP_USER_AGENT' => 'bar' }
+    assert !ran
+    get '/foo', {}, { 'HTTP_USER_AGENT' => 'foo' }
+    assert ran
+  end
 end

data/test/haml_test.rb

@@ -95,6 +95,7 @@ class HAMLTest < Test::Unit::TestCase
     assert_equal "bar\n", body
   end
 end
-rescue
+
+rescue LoadError
   warn "#{$!.to_s}: skipping haml tests"
 end

data/test/helper.rb

@@ -1,6 +1,8 @@
 ENV['RACK_ENV'] = 'test'
 Encoding.default_external = "UTF-8" if defined? Encoding
 
+RUBY_ENGINE = 'ruby' unless defined? RUBY_ENGINE
+
 begin
   require 'rack'
 rescue LoadError

data/test/helpers_test.rb

@@ -111,6 +111,18 @@ class HelpersTest < Test::Unit::TestCase
       response = request.get('/', 'SERVER_PORT' => '444')
       assert_equal 'http://example.org:444/foo', response['Location']
     end
+
+    it 'works behind a reverse proxy' do
+      mock_app do
+        get '/' do
+          redirect '/foo'
+        end
+      end
+
+      request = Rack::MockRequest.new(@app)
+      response = request.get('/', 'HTTP_X_FORWARDED_HOST' => 'example.com', 'SERVER_PORT' => '8080')
+      assert_equal 'http://example.com/foo', response['Location']
+    end
   end
 
   describe 'error' do
@@ -419,6 +431,13 @@ class HelpersTest < Test::Unit::TestCase
       assert_equal File.mtime(@file).httpdate, response['Last-Modified']
     end
 
+    it 'allows passing in a differen Last-Modified response header with :last_modified' do
+      time = Time.now
+      send_file_app :last_modified => time
+      get '/file.txt'
+      assert_equal time.httpdate, response['Last-Modified']
+    end
+
     it "returns a 404 when not found" do
       mock_app {
         get '/' do
@@ -441,6 +460,12 @@ class HelpersTest < Test::Unit::TestCase
       assert_equal 'attachment; filename="file.txt"', response['Content-Disposition']
     end
 
+    it "sets the Content-Disposition header when :disposition set to 'inline'" do
+      send_file_app :disposition => 'inline'
+      get '/file.txt'
+      assert_equal 'inline', response['Content-Disposition']
+    end
+
     it "sets the Content-Disposition header when :filename provided" do
       send_file_app :filename => 'foo.txt'
       get '/file.txt'
@@ -482,39 +507,67 @@ class HelpersTest < Test::Unit::TestCase
 
   describe 'cache_control' do
     setup do
-      mock_app {
-        get '/' do
+      mock_app do
+        get '/foo' do
           cache_control :public, :no_cache, :max_age => 60.0
           'Hello World'
         end
-      }
+
+        get '/bar' do
+          cache_control :public, :no_cache
+          'Hello World'
+        end
+      end
     end
 
     it 'sets the Cache-Control header' do
-      get '/'
+      get '/foo'
       assert_equal ['public', 'no-cache', 'max-age=60'], response['Cache-Control'].split(', ')
     end
+
+    it 'last argument does not have to be a hash' do
+      get '/bar'
+      assert_equal ['public', 'no-cache'], response['Cache-Control'].split(', ')
+    end
   end
 
   describe 'expires' do
     setup do
-      mock_app {
-        get '/' do
+      mock_app do
+        get '/foo' do
           expires 60, :public, :no_cache
           'Hello World'
         end
-      }
+
+        get '/bar' do
+          expires Time.now
+        end
+
+        get '/baz' do
+          expires Time.at(0)
+        end
+      end
     end
 
     it 'sets the Cache-Control header' do
-      get '/'
+      get '/foo'
       assert_equal ['public', 'no-cache', 'max-age=60'], response['Cache-Control'].split(', ')
     end
 
     it 'sets the Expires header' do
-      get '/'
+      get '/foo'
+      assert_not_nil response['Expires']
+    end
+
+    it 'allows passing time objects' do
+      get '/bar'
       assert_not_nil response['Expires']
     end
+
+    it 'allows passing time objects' do
+      get '/baz'
+      assert_equal 'Thu, 01 Jan 1970 00:00:00 GMT', response['Expires']
+    end
   end
 
   describe 'last_modified' do
@@ -527,17 +580,18 @@ class HelpersTest < Test::Unit::TestCase
       assert ! response['Last-Modified']
     end
 
-    [Time, DateTime].each do |klass|
-      describe "with #{klass.name}" do
+    [Time.now, DateTime.now, Date.today, Time.now.to_i,
+      Struct.new(:to_time).new(Time.now) ].each do |last_modified_time|
+      describe "with #{last_modified_time.class.name}" do
         setup do
-          last_modified_time = klass.now
           mock_app do
             get '/' do
               last_modified last_modified_time
               'Boo!'
             end
           end
-          @last_modified_time = Time.parse last_modified_time.to_s
+          wrapper = Object.new.extend Sinatra::Helpers
+          @last_modified_time = wrapper.send :time_for, last_modified_time
         end
 
         # fixes strange missing test error when running complete test suite.
@@ -687,6 +741,44 @@ class HelpersTest < Test::Unit::TestCase
     end
   end
 
+  describe 'uri' do
+    it 'generates absolute urls' do
+      mock_app { get('/') { uri }}
+      get '/'
+      assert_equal 'http://example.org/', body
+    end
+
+    it 'includes path_info' do
+      mock_app { get('/:name') { uri }}
+      get '/foo'
+      assert_equal 'http://example.org/foo', body
+    end
+
+    it 'allows passing an alternative to path_info' do
+      mock_app { get('/:name') { uri '/bar' }}
+      get '/foo'
+      assert_equal 'http://example.org/bar', body
+    end
+
+    it 'includes script_name' do
+      mock_app { get('/:name') { uri '/bar' }}
+      get '/foo', {}, { "SCRIPT_NAME" => '/foo' }
+      assert_equal 'http://example.org/foo/bar', body
+    end
+
+    it 'is aliased to #url' do
+      mock_app { get('/') { url }}
+      get '/'
+      assert_equal 'http://example.org/', body
+    end
+
+    it 'is aliased to #to' do
+      mock_app { get('/') { to }}
+      get '/'
+      assert_equal 'http://example.org/', body
+    end
+  end
+
   module ::HelperOne; def one; '1'; end; end
   module ::HelperTwo; def two; '2'; end; end
 

data/test/less_test.rb

@@ -1,4 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
+
+begin
 require 'less'
 
 class LessTest < Test::Unit::TestCase
@@ -59,3 +61,7 @@ class LessTest < Test::Unit::TestCase
     assert_raise(Errno::ENOENT) { get('/') }
   end
 end
+
+rescue LoadError
+  warn "#{$!.to_s}: skipping less tests"
+end

data/test/liquid_test.rb

@@ -53,6 +53,7 @@ class LiquidTest < Test::Unit::TestCase
     assert_equal 'foo', body
   end
 end
-rescue
+
+rescue LoadError
   warn "#{$!.to_s}: skipping liquid tests"
 end

data/test/markaby_test.rb

@@ -40,6 +40,27 @@ class MarkabyTest < Test::Unit::TestCase
     assert_equal "<h1>Markaby Layout!</h1><p>Hello World</p>", body
   end
 
+  it 'renders inline markaby blocks' do
+    markaby_app { markaby { h1 'Hiya' } }
+    assert ok?
+    assert_equal "<h1>Hiya</h1>", body
+  end
+
+  it 'renders inline markaby blocks with inline layouts' do
+    markaby_app do
+      settings.layout { 'h1 { text "THIS. IS. "; yield }' }
+      markaby { em 'SPARTA' }
+    end
+    assert ok?
+    assert_equal "<h1>THIS. IS. <em>SPARTA</em></h1>", body
+  end
+
+  it 'renders inline markaby blocks with file layouts' do    
+    markaby_app { markaby(:layout => :layout2) { text "Hello World" } }
+    assert ok?
+    assert_equal "<h1>Markaby Layout!</h1><p>Hello World</p>", body
+  end
+
   it "raises error if template not found" do
     mock_app { get('/') { markaby :no_such_template } }
     assert_raise(Errno::ENOENT) { get('/') }
@@ -53,6 +74,7 @@ class MarkabyTest < Test::Unit::TestCase
     assert_equal 'foo', body
   end
 end
-rescue
+
+rescue LoadError
   warn "#{$!.to_s}: skipping markaby tests"
 end

data/test/markdown_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/helper'
 
 begin
-fail "rdiscount not available" if defined? JRuby
+fail LoadError, "rdiscount not available" if defined? JRuby
 require 'rdiscount'
 
 class MarkdownTest < Test::Unit::TestCase
@@ -30,6 +30,7 @@ class MarkdownTest < Test::Unit::TestCase
     assert_raise(Errno::ENOENT) { get('/') }
   end
 end
-rescue
+
+rescue LoadError
   warn "#{$!.to_s}: skipping markdown tests"
 end

data/test/nokogiri_test.rb

@@ -64,6 +64,7 @@ class NokogiriTest < Test::Unit::TestCase
     assert_raise(Errno::ENOENT) { get('/') }
   end
 end
-rescue
+
+rescue LoadError
   warn "#{$!.to_s}: skipping nokogiri tests"
 end

data/test/radius_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/helper'
 
 begin
-fail 'Radius broken on 1.9.' if RUBY_VERSION >= '1.9.1'
+fail LoadError, 'Radius broken on 1.9.' if RUBY_VERSION >= '1.9.1'
 require 'radius'
 
 class RadiusTest < Test::Unit::TestCase
@@ -54,6 +54,7 @@ class RadiusTest < Test::Unit::TestCase
     assert_equal 'foo', body
   end
 end
-rescue
+
+rescue LoadError
   warn "#{$!.to_s}: skipping radius tests"
 end

data/test/rdoc_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/helper'
 
 begin
-require 'rdoc'
+require 'rdoc/markup/to_html'
 
 class RdocTest < Test::Unit::TestCase
   def rdoc_app(&block)
@@ -29,6 +29,7 @@ class RdocTest < Test::Unit::TestCase
     assert_raise(Errno::ENOENT) { get('/') }
   end
 end
-rescue
+
+rescue LoadError
   warn "#{$!.to_s}: skipping rdoc tests"
 end

data/test/routing_test.rb

@@ -23,7 +23,7 @@ class RegexpLookAlike
 end
 
 class RoutingTest < Test::Unit::TestCase
-  %w[get put post delete].each do |verb|
+  %w[get put post delete options].each do |verb|
     it "defines #{verb.upcase} request handlers with #{verb}" do
       mock_app {
         send verb, '/hello' do
@@ -179,6 +179,38 @@ class RoutingTest < Test::Unit::TestCase
     assert_equal "foo=;bar=", body
   end
 
+  it "supports named captures like %r{/hello/(?<person>[^/?#]+)} on Ruby >= 1.9" do
+    next if RUBY_VERSION < '1.9'
+    mock_app {
+      get Regexp.new('/hello/(?<person>[^/?#]+)') do
+        "Hello #{params['person']}"
+      end
+    }
+    get '/hello/Frank'
+    assert_equal 'Hello Frank', body
+  end
+
+  it "supports optional named captures like %r{/page(?<format>.[^/?#]+)?} on Ruby >= 1.9" do
+    next if RUBY_VERSION < '1.9'
+    mock_app {
+      get Regexp.new('/page(?<format>.[^/?#]+)?') do
+        "format=#{params[:format]}"
+      end
+    }
+
+    get '/page.html'
+    assert ok?
+    assert_equal "format=.html", body
+
+    get '/page.xml'
+    assert ok?
+    assert_equal "format=.xml", body
+
+    get '/page'
+    assert ok?
+    assert_equal "format=", body
+  end
+
   it "supports single splat params like /*" do
     mock_app {
       get '/*' do
@@ -746,6 +778,11 @@ class RoutingTest < Test::Unit::TestCase
   end
 
   it 'raises an ArgumentError with block arity > 1 and too many values' do
+    if RUBY_ENGINE == "rbx"
+      $stderr.puts "\npending test: #{__method__}, #{__FILE__}:#{__LINE__} "
+      next
+    end
+
     mock_app {
       get '/:foo/:bar/:baz' do |foo, bar|
         'quux'

data/test/sass_test.rb

@@ -110,6 +110,6 @@ class SassTest < Test::Unit::TestCase
   end
 end
 
-rescue
+rescue LoadError
   warn "#{$!.to_s}: skipping sass tests"
 end

data/test/scss_test.rb

@@ -83,6 +83,6 @@ class ScssTest < Test::Unit::TestCase
   end
 end
 
-rescue
+rescue LoadError
   warn "#{$!.to_s}: skipping scss tests"
 end

data/test/slim_test.rb

@@ -0,0 +1,98 @@
+require File.dirname(__FILE__) + '/helper'
+
+begin
+require 'slim'
+
+class SlimTest < Test::Unit::TestCase
+  def slim_app(&block)
+    mock_app {
+      set :views, File.dirname(__FILE__) + '/views'
+      get '/', &block
+    }
+    get '/'
+  end
+
+  it 'renders inline slim strings' do
+    slim_app { slim "h1 Hiya\n" }
+    assert ok?
+    assert_equal "<h1>Hiya</h1>", body
+  end
+  
+  it 'renders .slim files in views path' do
+    slim_app { slim :hello }
+    assert ok?
+    assert_equal "<h1>Hello From Slim</h1>", body
+  end
+  
+  it "renders with inline layouts" do
+    mock_app {
+      layout { %(h1\n  | THIS. IS. \n  == yield.upcase ) }
+      get('/') { slim 'em Sparta' }
+    }
+    get '/'
+    assert ok?
+    assert_equal "<h1>THIS. IS. <EM>SPARTA</EM></h1>", body
+  end
+  
+  it "renders with file layouts" do
+    slim_app {
+      slim '| Hello World', :layout => :layout2
+    }
+    assert ok?
+    assert_equal "<h1>Slim Layout!</h1><p>Hello World</p>", body
+  end
+  
+  it "raises error if template not found" do
+    mock_app {
+      get('/') { slim :no_such_template }
+    }
+    assert_raise(Errno::ENOENT) { get('/') }
+  end
+  
+  HTML4_DOCTYPE = "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">"
+  
+  it "passes slim options to the slim engine" do
+    mock_app {
+      get '/' do
+        slim "! doctype html\nh1 Hello World", :format => :html4
+      end
+    }
+    get '/'
+    assert ok?
+    assert_equal "#{HTML4_DOCTYPE}<h1>Hello World</h1>", body
+  end
+  
+  it "passes default slim options to the slim engine" do
+    mock_app {
+      set :slim, {:format => :html4}
+      get '/' do
+        slim "! doctype html\nh1 Hello World"
+      end
+    }
+    get '/'
+    assert ok?
+    assert_equal "#{HTML4_DOCTYPE}<h1>Hello World</h1>", body
+  end
+  
+  it "merges the default slim options with the overrides and passes them to the slim engine" do
+    mock_app {
+      set :slim, {:format => :html4}
+      get '/' do
+        slim "! doctype html\nh1.header Hello World"
+      end
+      get '/html5' do
+        slim "! doctype html\nh1.header Hello World", :format => :html5
+      end
+    }
+    get '/'
+    assert ok?
+    assert_match(/^#{HTML4_DOCTYPE}/, body)
+    get '/html5'
+    assert ok?
+    assert_equal "<!DOCTYPE html><h1 class=\"header\">Hello World</h1>", body
+  end
+end
+
+rescue LoadError
+  warn "#{$!.to_s}: skipping slim tests"
+end