sinatra 1.0 → 1.1.a

data/test/sass_test.rb

@@ -4,30 +4,54 @@ begin
 require 'sass'
 
 class SassTest < Test::Unit::TestCase
-  def sass_app(&block)
+  def sass_app(options = {}, &block)
     mock_app {
       set :views, File.dirname(__FILE__) + '/views'
+      set options
       get '/', &block
     }
     get '/'
   end
 
   it 'renders inline Sass strings' do
-    sass_app { sass "#sass\n  :background-color #FFF\n" }
+    sass_app { sass "#sass\n  :background-color white\n" }
     assert ok?
-    assert_equal "#sass {\n  background-color: #FFF; }\n", body
+    assert_equal "#sass {\n  background-color: white; }\n", body
+  end
+
+  it 'defaults content type to css' do
+    sass_app { sass "#sass\n  :background-color white\n" }
+    assert ok?
+    assert_equal "text/css;charset=utf-8", response['Content-Type']
+  end
+
+  it 'defaults allows setting content type per route' do
+    sass_app do
+      content_type :html
+      sass "#sass\n  :background-color white\n"
+    end
+    assert ok?
+    assert_equal "text/html;charset=utf-8", response['Content-Type']
+  end
+
+  it 'defaults allows setting content type globally' do
+    sass_app(:sass => { :content_type => 'html' }) do
+      sass "#sass\n  :background-color white\n"
+    end
+    assert ok?
+    assert_equal "text/html;charset=utf-8", response['Content-Type']
   end
 
   it 'renders .sass files in views path' do
     sass_app { sass :hello }
     assert ok?
-    assert_equal "#sass {\n  background-color: #FFF; }\n", body
+    assert_equal "#sass {\n  background-color: white; }\n", body
   end
 
   it 'ignores the layout option' do
     sass_app { sass :hello, :layout => :layout2 }
     assert ok?
-    assert_equal "#sass {\n  background-color: #FFF; }\n", body
+    assert_equal "#sass {\n  background-color: white; }\n", body
   end
 
   it "raises error if template not found" do
@@ -39,44 +63,50 @@ class SassTest < Test::Unit::TestCase
 
   it "passes SASS options to the Sass engine" do
     sass_app {
-      sass "#sass\n  :background-color #FFF\n  :color #000\n", :style => :compact
+      sass "#sass\n  :background-color white\n  :color black\n",
+        :style => :compact
     }
     assert ok?
-    assert_equal "#sass { background-color: #FFF; color: #000; }\n", body
+    assert_equal "#sass { background-color: white; color: black; }\n", body
   end
 
   it "passes default SASS options to the Sass engine" do
     mock_app {
       set :sass, {:style => :compact} # default Sass style is :nested
       get '/' do
-        sass "#sass\n  :background-color #FFF\n  :color #000\n"
+        sass "#sass\n  :background-color white\n  :color black\n"
       end
     }
     get '/'
     assert ok?
-    assert_equal "#sass { background-color: #FFF; color: #000; }\n", body
+    assert_equal "#sass { background-color: white; color: black; }\n", body
   end
 
-  it "merges the default SASS options with the overrides and passes them to the Sass engine" do
+  it "merges the default SASS options with the overrides" do
     mock_app {
-      set :sass, {:style => :compact, :attribute_syntax => :alternate } # default Sass attribute_syntax is :normal (with : in front)
+      # default Sass attribute_syntax is :normal (with : in front)
+      set :sass, {:style => :compact, :attribute_syntax => :alternate }
       get '/' do
-        sass "#sass\n  background-color: #FFF\n  color: #000\n"
+        sass "#sass\n  background-color: white\n  color: black\n"
       end
       get '/raised' do
-        sass "#sass\n  :background-color #FFF\n  :color #000\n", :style => :expanded # retains global attribute_syntax settings
+        # retains global attribute_syntax settings
+        sass "#sass\n  :background-color white\n  :color black\n",
+          :style => :expanded
       end
       get '/expanded_normal' do
-        sass "#sass\n  :background-color #FFF\n  :color #000\n", :style => :expanded, :attribute_syntax => :normal
+        sass "#sass\n  :background-color white\n  :color black\n",
+          :style => :expanded, :attribute_syntax => :normal
       end
     }
     get '/'
     assert ok?
-    assert_equal "#sass { background-color: #FFF; color: #000; }\n", body
+    assert_equal "#sass { background-color: white; color: black; }\n", body
     assert_raise(Sass::SyntaxError) { get('/raised') }
     get '/expanded_normal'
     assert ok?
-    assert_equal "#sass {\n  background-color: #FFF;\n  color: #000;\n}\n", body
+    assert_equal "#sass {\n  background-color: white;\n  color: black;\n}\n",
+      body
   end
 end
 

data/test/scss_test.rb

@@ -0,0 +1,88 @@
+require File.dirname(__FILE__) + '/helper'
+
+begin
+require 'sass'
+
+class ScssTest < Test::Unit::TestCase
+  def scss_app(options = {}, &block)
+    mock_app {
+      set :views, File.dirname(__FILE__) + '/views'
+      set options
+      get '/', &block
+    }
+    get '/'
+  end
+
+  it 'renders inline Scss strings' do
+    scss_app { scss "#scss {\n  background-color: white; }\n" }
+    assert ok?
+    assert_equal "#scss {\n  background-color: white; }\n", body
+  end
+
+  it 'defaults content type to css' do
+    scss_app { scss "#scss {\n  background-color: white; }\n" }
+    assert ok?
+    assert_equal "text/css;charset=utf-8", response['Content-Type']
+  end
+
+  it 'defaults allows setting content type per route' do
+    scss_app do
+      content_type :html
+      scss "#scss {\n  background-color: white; }\n"
+    end
+    assert ok?
+    assert_equal "text/html;charset=utf-8", response['Content-Type']
+  end
+
+  it 'defaults allows setting content type globally' do
+    scss_app(:scss => { :content_type => 'html' }) do
+      scss "#scss {\n  background-color: white; }\n"
+    end
+    assert ok?
+    assert_equal "text/html;charset=utf-8", response['Content-Type']
+  end
+
+  it 'renders .scss files in views path' do
+    scss_app { scss :hello }
+    assert ok?
+    assert_equal "#scss {\n  background-color: white; }\n", body
+  end
+
+  it 'ignores the layout option' do
+    scss_app { scss :hello, :layout => :layout2 }
+    assert ok?
+    assert_equal "#scss {\n  background-color: white; }\n", body
+  end
+
+  it "raises error if template not found" do
+    mock_app {
+      get('/') { scss :no_such_template }
+    }
+    assert_raise(Errno::ENOENT) { get('/') }
+  end
+
+  it "passes scss options to the scss engine" do
+    scss_app {
+      scss "#scss {\n  background-color: white;\n  color: black\n}",
+        :style => :compact
+    }
+    assert ok?
+    assert_equal "#scss { background-color: white; color: black; }\n", body
+  end
+
+  it "passes default scss options to the scss engine" do
+    mock_app {
+      set :scss, {:style => :compact} # default scss style is :nested
+      get '/' do
+        scss "#scss {\n  background-color: white;\n  color: black;\n}"
+      end
+    }
+    get '/'
+    assert ok?
+    assert_equal "#scss { background-color: white; color: black; }\n", body
+  end
+end
+
+rescue
+  warn "#{$!.to_s}: skipping scss tests"
+end

data/test/settings_test.rb

@@ -43,6 +43,11 @@ class SettingsTest < Test::Unit::TestCase
     assert_equal 'bizzle', @base.baz
   end
 
+  it 'sets multiple settings using #each' do
+    @base.set [["foo", "bar"]]
+    assert_equal "bar", @base.foo
+  end
+
   it 'inherits settings methods when subclassed' do
     @base.set :foo, 'bar'
     @base.set :biz, Proc.new { 'baz' }
@@ -110,6 +115,10 @@ class SettingsTest < Test::Unit::TestCase
     assert_equal :foo, @base.new.settings.environment
   end
 
+  it 'is accessible from class via #settings' do
+    assert_equal :foo, @base.settings.environment
+  end
+
   describe 'methodoverride' do
     it 'is disabled on Base' do
       assert ! @base.method_override?
@@ -193,6 +202,29 @@ class SettingsTest < Test::Unit::TestCase
       assert body.include?("StandardError")
       assert body.include?("<code>show_exceptions</code> setting")
     end
+
+    it 'does not override app-specified error handling when set to :after_handler' do
+      klass = Sinatra.new(Sinatra::Application)
+      mock_app(klass) {
+        set :show_exceptions, :after_handler
+        
+        error RuntimeError do
+          'Big mistake !'
+        end
+        
+        get '/' do
+          raise RuntimeError
+        end  
+      }
+      
+      get '/'
+      assert_equal 500, status
+
+      assert ! body.include?("<code>")
+      assert body.include? "Big mistake !"
+      
+    end
+    
   end
 
   describe 'dump_errors' do

data/test/sinatra_test.rb

@@ -10,4 +10,8 @@ class SinatraTest < Test::Unit::TestCase
       end
     assert_same Sinatra::Base, app.superclass
   end
+  
+  it "responds to #template_cache" do
+    assert_kind_of Tilt::Cache, Sinatra::Base.new.template_cache
+  end
 end

data/test/static_test.rb

@@ -90,4 +90,68 @@ class StaticTest < Test::Unit::TestCase
     get "/../#{File.basename(__FILE__)}"
     assert not_found?
   end
+
+  def test_valid_range(http_range, range, path, file)
+    request = Rack::MockRequest.new(@app)
+    response = request.get("/#{File.basename(path)}", 'HTTP_RANGE' => http_range)
+
+    should_be = file[range]
+    expected_range = "bytes #{range.begin}-#{range.end}/#{file.length}"
+
+    assert_equal 206,response.status, "Should be HTTP/1.1 206 Partial content"
+    assert_equal should_be.length, response.body.length, "Unexpected response length for #{http_range}"
+    assert_equal should_be, response.body, "Unexpected response data for #{http_range}"
+    assert_equal should_be.length.to_s, response['Content-Length'], "Incorrect Content-Length for #{http_range}"
+    assert_equal expected_range, response['Content-Range'], "Incorrect Content-Range for #{http_range}"
+  end
+
+  it 'handles valid byte ranges correctly' do
+    # Use the biggest file in this dir so we can test ranges > 8k bytes. (StaticFile sends in 8k chunks.)
+    path = File.dirname(__FILE__) + '/helpers_test.rb'  # currently 16k bytes
+    file = File.read(path)
+    length = file.length
+    assert length > 9000, "The test file #{path} is too short (#{length} bytes) to run these tests"
+
+    [0..0, 42..88, 1234..1234, 100..9000, 0..(length-1), (length-1)..(length-1)].each do |range|
+      test_valid_range("bytes=#{range.begin}-#{range.end}", range, path, file)
+    end
+
+    [0, 100, length-100, length-1].each do |start|
+      test_valid_range("bytes=#{start}-", (start..length-1), path, file)
+    end
+
+    [1, 100, length-100, length-1, length].each do |range_length|
+      test_valid_range("bytes=-#{range_length}", (length-range_length..length-1), path, file)
+    end
+
+    # Some valid ranges that exceed the length of the file:
+    test_valid_range("bytes=100-999999", (100..length-1), path, file)
+    test_valid_range("bytes=100-#{length}", (100..length-1), path, file)
+    test_valid_range("bytes=-#{length}", (0..length-1), path, file)
+    test_valid_range("bytes=-#{length+1}", (0..length-1), path, file)
+    test_valid_range("bytes=-999999", (0..length-1), path, file)
+  end
+
+  it 'correctly ignores syntactically invalid range requests' do
+    # ...and also ignores multi-range requests, which aren't supported yet
+    ["bytes=45-40", "bytes=IV-LXVI", "octets=10-20", "bytes=-", "bytes=1-2,3-4"].each do |http_range|
+      request = Rack::MockRequest.new(@app)
+      response = request.get("/#{File.basename(__FILE__)}", 'HTTP_RANGE' => http_range)
+
+      assert_equal 200,response.status, "Invalid range '#{http_range}' should be ignored"
+      assert_equal nil,response['Content-Range'], "Invalid range '#{http_range}' should be ignored"
+    end
+  end
+
+  it 'returns error 416 for unsatisfiable range requests' do
+    # An unsatisfiable request is one that specifies a start that's at or past the end of the file.
+    length = File.read(__FILE__).length
+    ["bytes=888888-", "bytes=888888-999999", "bytes=#{length}-#{length}"].each do |http_range|
+      request = Rack::MockRequest.new(@app)
+      response = request.get("/#{File.basename(__FILE__)}", 'HTTP_RANGE' => http_range)
+
+      assert_equal 416,response.status, "Unsatisfiable range '#{http_range}' should return 416"
+      assert_equal "bytes */#{length}",response['Content-Range'], "416 response should include actual length"
+    end
+  end
 end

data/test/templates_test.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/helper'
+File.delete(File.dirname(__FILE__) + '/views/layout.test') rescue nil
 
 class TestTemplate < Tilt::Template
   def prepare
@@ -14,9 +15,11 @@ class TestTemplate < Tilt::Template
 end
 
 class TemplatesTest < Test::Unit::TestCase
-  def render_app(base=Sinatra::Base, &block)
+  def render_app(base=Sinatra::Base, options = {}, &block)
+    base, options = Sinatra::Base, base if base.is_a? Hash
     mock_app(base) {
       set :views, File.dirname(__FILE__) + '/views'
+      set options
       get '/', &block
       template(:layout3) { "Layout 3!\n" }
     }
@@ -77,12 +80,39 @@ class TemplatesTest < Test::Unit::TestCase
     assert_equal "Layout 3!\nHello World!\n", body
   end
 
+  it 'avoids wrapping layouts around nested templates' do
+    render_app { render :str, :nested, :layout => :layout2 }
+    assert ok?
+    assert_equal "<h1>String Layout!</h1>\n<content><h1>Hello From String</h1></content>", body
+  end
+
+  it 'allows explicitly wrapping layouts around nested templates' do
+    render_app { render :str, :explicitly_nested, :layout => :layout2 }
+    assert ok?
+    assert_equal "<h1>String Layout!</h1>\n<content><h1>String Layout!</h1>\n<h1>Hello From String</h1></content>", body
+  end
+
+  it 'two independent render calls do not disable layouts' do
+    render_app do
+      render :str, :explicitly_nested, :layout => :layout2
+      render :str, :nested, :layout => :layout2
+    end
+    assert ok?
+    assert_equal "<h1>String Layout!</h1>\n<content><h1>Hello From String</h1></content>", body
+  end
+
   it 'loads templates from source file' do
     mock_app { enable :inline_templates }
     assert_equal "this is foo\n\n", @app.templates[:foo][0]
     assert_equal "X\n= yield\nX\n", @app.templates[:layout][0]
   end
 
+  it 'ignores spaces after names of inline templates' do
+    mock_app { enable :inline_templates }
+    assert_equal "There's a space after 'bar'!\n\n", @app.templates[:bar][0]
+    assert_equal "this is not foo\n\n", @app.templates[:"foo bar"][0]
+  end
+
   it 'loads templates from given source file' do
     mock_app { set :inline_templates, __FILE__ }
     assert_equal "this is foo\n\n", @app.templates[:foo][0]
@@ -128,6 +158,24 @@ class TemplatesTest < Test::Unit::TestCase
     assert_equal 'bar', body
   end
 
+  it 'allows setting default content type per template engine' do
+    render_app(:str => { :content_type => :txt }) { render :str, 'foo' }
+    assert_equal 'text/plain;charset=utf-8', response['Content-Type']
+  end
+
+  it 'setting default content type does not affect other template engines' do
+    render_app(:str => { :content_type => :txt }) { render :test, 'foo' }
+    assert_equal 'text/html;charset=utf-8', response['Content-Type']
+  end
+
+  it 'setting default content type per template engine does not override content_type' do
+    render_app :str => { :content_type => :txt } do
+      content_type :html
+      render :str, 'foo'
+    end
+    assert_equal 'text/html;charset=utf-8', response['Content-Type']
+  end
+
   it 'uses templates in superclasses before subclasses' do
     base = Class.new(Sinatra::Base)
     base.template(:foo) { 'template in superclass' }
@@ -153,6 +201,12 @@ __END__
 @@ foo
 this is foo
 
+@@ bar 
+There's a space after 'bar'!
+
+@@ foo bar
+this is not foo
+
 @@ layout
 X
 = yield

data/test/textile_test.rb

@@ -0,0 +1,34 @@
+require File.dirname(__FILE__) + '/helper'
+
+begin
+require 'redcloth'
+
+class TextileTest < Test::Unit::TestCase
+  def textile_app(&block)
+    mock_app do
+      set :views, File.dirname(__FILE__) + '/views'
+      get '/', &block
+    end
+    get '/'
+  end
+
+  it 'renders inline textile strings' do
+    textile_app { textile 'h1. Hiya' }
+    assert ok?
+    assert_equal "<h1>Hiya</h1>", body
+  end
+
+  it 'renders .textile files in views path' do
+    textile_app { textile :hello }
+    assert ok?
+    assert_equal "<h1>Hello From Textile</h1>", body
+  end
+
+  it "raises error if template not found" do
+    mock_app { get('/') { textile :no_such_template } }
+    assert_raise(Errno::ENOENT) { get('/') }
+  end
+end
+rescue
+  warn "#{$!.to_s}: skipping textile tests"
+end