sinatra 1.0 → 1.1.a

data/test/less_test.rb

@@ -2,20 +2,44 @@ require File.dirname(__FILE__) + '/helper'
 require 'less'
 
 class LessTest < Test::Unit::TestCase
-  def less_app(&block)
+  def less_app(options = {}, &block)
     mock_app {
       set :views, File.dirname(__FILE__) + '/views'
+      set options
       get '/', &block
     }
     get '/'
   end
 
   it 'renders inline Less strings' do
-    less_app { less "@white_color: #fff; #main { background-color: @white_color }"}
+    less_app { less "@white_color: #fff; #main { background-color: @white_color }" }
     assert ok?
     assert_equal "#main { background-color: #ffffff; }\n", body
   end
 
+  it 'defaults content type to css' do
+    less_app { less "@white_color: #fff; #main { background-color: @white_color }" }
+    assert ok?
+    assert_equal "text/css;charset=utf-8", response['Content-Type']
+  end
+
+  it 'defaults allows setting content type per route' do
+    less_app do
+      content_type :html
+      less "@white_color: #fff; #main { background-color: @white_color }"
+    end
+    assert ok?
+    assert_equal "text/html;charset=utf-8", response['Content-Type']
+  end
+
+  it 'defaults allows setting content type globally' do
+    less_app(:less => { :content_type => 'html' }) do
+      less "@white_color: #fff; #main { background-color: @white_color }"
+    end
+    assert ok?
+    assert_equal "text/html;charset=utf-8", response['Content-Type']
+  end
+
   it 'renders .less files in views path' do
     less_app { less :hello }
     assert ok?

data/test/liquid_test.rb

@@ -0,0 +1,58 @@
+require File.dirname(__FILE__) + '/helper'
+
+begin
+require 'liquid'
+
+class LiquidTest < Test::Unit::TestCase
+  def liquid_app(&block)
+    mock_app do
+      set :views, File.dirname(__FILE__) + '/views'
+      get '/', &block
+    end
+    get '/'
+  end
+
+  it 'renders inline liquid strings' do
+    liquid_app { liquid '<h1>Hiya</h1>' }
+    assert ok?
+    assert_equal "<h1>Hiya</h1>", body
+  end
+
+  it 'renders .liquid files in views path' do
+    liquid_app { liquid :hello }
+    assert ok?
+    assert_equal "<h1>Hello From Liquid</h1>\n", body
+  end
+
+  it "renders with inline layouts" do
+    mock_app do
+      layout { "<h1>THIS. IS. {{ yield }}</h1>" }
+      get('/') { liquid '<EM>SPARTA</EM>' }
+    end
+    get '/'
+    assert ok?
+    assert_equal "<h1>THIS. IS. <EM>SPARTA</EM></h1>", body
+  end
+
+  it "renders with file layouts" do
+    liquid_app { liquid 'Hello World', :layout => :layout2 }
+    assert ok?
+    assert_equal "<h1>Liquid Layout!</h1>\n<p>Hello World</p>\n", body
+  end
+
+  it "raises error if template not found" do
+    mock_app { get('/') { liquid :no_such_template } }
+    assert_raise(Errno::ENOENT) { get('/') }
+  end
+  
+  it "allows passing locals" do
+    liquid_app do
+      liquid '{{ value }}', :locals => { :value => 'foo' }
+    end
+    assert ok?
+    assert_equal 'foo', body
+  end
+end
+rescue
+  warn "#{$!.to_s}: skipping liquid tests"
+end

data/test/markaby_test.rb

@@ -0,0 +1,58 @@
+require File.dirname(__FILE__) + '/helper'
+
+begin
+require 'markaby'
+
+class MarkabyTest < Test::Unit::TestCase
+  def markaby_app(&block)
+    mock_app do
+      set :views, File.dirname(__FILE__) + '/views'
+      get '/', &block
+    end
+    get '/'
+  end
+
+  it 'renders inline markaby strings' do
+    markaby_app { markaby 'h1 "Hiya"' }
+    assert ok?
+    assert_equal "<h1>Hiya</h1>", body
+  end
+
+  it 'renders .markaby files in views path' do
+    markaby_app { markaby :hello }
+    assert ok?
+    assert_equal "<h1>Hello From Markaby</h1>", body
+  end
+
+  it "renders with inline layouts" do
+    mock_app do
+      layout { 'h1 { text "THIS. IS. "; yield }' }
+      get('/') { markaby 'em "SPARTA"' }
+    end
+    get '/'
+    assert ok?
+    assert_equal "<h1>THIS. IS. <em>SPARTA</em></h1>", body
+  end
+
+  it "renders with file layouts" do
+    markaby_app { markaby 'text "Hello World"', :layout => :layout2 }
+    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('/') }
+  end
+  
+  it "allows passing locals" do
+    markaby_app do
+      markaby 'text value', :locals => { :value => 'foo' }
+    end
+    assert ok?
+    assert_equal 'foo', body
+  end
+end
+rescue
+  warn "#{$!.to_s}: skipping markaby tests"
+end

data/test/markdown_test.rb

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/helper'
+
+begin
+fail "rdiscount not available" if defined? JRuby
+require 'rdiscount'
+
+class MarkdownTest < Test::Unit::TestCase
+  def markdown_app(&block)
+    mock_app do
+      set :views, File.dirname(__FILE__) + '/views'
+      get '/', &block
+    end
+    get '/'
+  end
+
+  it 'renders inline markdown strings' do
+    markdown_app { markdown '# Hiya' }
+    assert ok?
+    assert_equal "<h1>Hiya</h1>\n", body
+  end
+
+  it 'renders .markdown files in views path' do
+    markdown_app { markdown :hello }
+    assert ok?
+    assert_equal "<h1>Hello From Markdown</h1>\n", body
+  end
+
+  it "raises error if template not found" do
+    mock_app { get('/') { markdown :no_such_template } }
+    assert_raise(Errno::ENOENT) { get('/') }
+  end
+end
+rescue
+  warn "#{$!.to_s}: skipping markdown tests"
+end

data/test/nokogiri_test.rb

@@ -0,0 +1,69 @@
+require File.dirname(__FILE__) + '/helper'
+
+begin
+require 'nokogiri'
+
+class NokogiriTest < Test::Unit::TestCase
+  def nokogiri_app(&block)
+    mock_app do
+      set :views, File.dirname(__FILE__) + '/views'
+      get '/', &block
+    end
+    get '/'
+  end
+
+  it 'renders inline Nokogiri strings' do
+    nokogiri_app { nokogiri 'xml' }
+    assert ok?
+    assert_equal %{<?xml version="1.0"?>\n}, body
+  end
+
+  it 'renders inline blocks' do
+    nokogiri_app do
+      @name = "Frank & Mary"
+      nokogiri do |xml|
+        xml.couple @name
+      end
+    end
+    assert ok?
+    assert_equal "<?xml version=\"1.0\"?>\n<couple>Frank &amp; Mary</couple>\n", body
+  end
+
+  it 'renders .nokogiri files in views path' do
+    nokogiri_app do
+      @name = "Blue"
+      nokogiri :hello
+    end
+    assert ok?
+    assert_equal %(<?xml version="1.0"?>\n<exclaim>You're my boy, Blue!</exclaim>\n), body
+  end
+
+  it "renders with inline layouts" do
+    next if Tilt::VERSION <= "1.1"
+    mock_app do
+      layout { %(xml.layout { xml << yield }) }
+      get('/') { nokogiri %(xml.em 'Hello World') }
+    end
+    get '/'
+    assert ok?
+    assert_equal "<?xml version=\"1.0\"?>\n<layout>\n  <em>Hello World</em>\n</layout>\n", body
+  end
+
+  it "renders with file layouts" do
+    next if Tilt::VERSION <= "1.1"
+    nokogiri_app do
+      @name = "Blue"
+      nokogiri %(xml.em 'Hello World'), :layout => :layout2
+    end
+    assert ok?
+    assert_equal "<?xml version=\"1.0\"?>\n<layout>\n  <em>Hello World</em>\n</layout>\n", body
+  end
+
+  it "raises error if template not found" do
+    mock_app { get('/') { nokogiri :no_such_template } }
+    assert_raise(Errno::ENOENT) { get('/') }
+  end
+end
+rescue
+  warn "#{$!.to_s}: skipping nokogiri tests"
+end

data/test/radius_test.rb

@@ -0,0 +1,59 @@
+require File.dirname(__FILE__) + '/helper'
+
+begin
+fail 'Radius broken on 1.9.' if RUBY_VERSION >= '1.9.1'
+require 'radius'
+
+class RadiusTest < Test::Unit::TestCase
+  def radius_app(&block)
+    mock_app do
+      set :views, File.dirname(__FILE__) + '/views'
+      get '/', &block
+    end
+    get '/'
+  end
+
+  it 'renders inline radius strings' do
+    radius_app { radius '<h1>Hiya</h1>' }
+    assert ok?
+    assert_equal "<h1>Hiya</h1>", body
+  end
+
+  it 'renders .radius files in views path' do
+    radius_app { radius :hello }
+    assert ok?
+    assert_equal "<h1>Hello From Radius</h1>\n", body
+  end
+
+  it "renders with inline layouts" do
+    mock_app do
+      layout { "<h1>THIS. IS. <r:yield /></h1>" }
+      get('/') { radius '<EM>SPARTA</EM>' }
+    end
+    get '/'
+    assert ok?
+    assert_equal "<h1>THIS. IS. <EM>SPARTA</EM></h1>", body
+  end
+
+  it "renders with file layouts" do
+    radius_app { radius 'Hello World', :layout => :layout2 }
+    assert ok?
+    assert_equal "<h1>Radius Layout!</h1>\n<p>Hello World</p>\n", body
+  end
+
+  it "raises error if template not found" do
+    mock_app { get('/') { radius :no_such_template } }
+    assert_raise(Errno::ENOENT) { get('/') }
+  end
+  
+  it "allows passing locals" do
+    radius_app do
+      radius '<r:value />', :locals => { :value => 'foo' }
+    end
+    assert ok?
+    assert_equal 'foo', body
+  end
+end
+rescue
+  warn "#{$!.to_s}: skipping radius tests"
+end

data/test/rdoc_test.rb

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

data/test/request_test.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/helper'
+require 'stringio'
 
 class RequestTest < Test::Unit::TestCase
   it 'responds to #user_agent' do
@@ -30,4 +31,15 @@ class RequestTest < Test::Unit::TestCase
     request = Sinatra::Request.new('HTTP_X_FORWARDED_PROTO' => 'https')
     assert request.secure?
   end
+
+  it 'is possible to marshal params' do
+    request = Sinatra::Request.new(
+      'REQUEST_METHOD' => 'PUT',
+      'CONTENT_TYPE' => 'application/x-www-form-urlencoded',
+      'rack.input' => StringIO.new('foo=bar')
+    )
+    params = Sinatra::Base.new.send(:indifferent_hash).replace(request.params)
+    dumped = Marshal.dump(request.params)
+    assert_equal 'bar', Marshal.load(dumped)['foo']
+  end
 end

data/test/routing_test.rb

@@ -80,10 +80,22 @@ class RoutingTest < Test::Unit::TestCase
 
     get '/foo'
     assert_equal 404, status
-    assert_equal 'text/html', response["Content-Type"]
+    assert_equal 'text/html;charset=utf-8', response["Content-Type"]
     assert_equal "<h1>Not Found</h1>", response.body
   end
 
+  it 'matches empty PATH_INFO to "/"' do
+    mock_app {
+      get '/' do
+        'worked'
+      end
+    }
+
+    get '/', {}, "PATH_INFO" => ""
+    assert ok?
+    assert_equal 'worked', body
+  end
+
   it 'takes multiple definitions of a route' do
     mock_app {
       user_agent(/Foo/)
@@ -344,6 +356,18 @@ class RoutingTest < Test::Unit::TestCase
     assert_equal 'looks good', body
   end
 
+  it "matches paths that include ampersands" do
+    mock_app {
+      get '/:name' do
+        'looks good'
+      end
+    }
+
+    get '/foo&bar'
+    assert ok?
+    assert_equal 'looks good', body
+  end
+
   it "URL decodes named parameters and splats" do
     mock_app {
       get '/:foo/*' do
@@ -595,6 +619,9 @@ class RoutingTest < Test::Unit::TestCase
       get '/', :provides => :xml do
         request.env['HTTP_ACCEPT']
       end
+      get '/foo', :provides => :html do
+        request.env['HTTP_ACCEPT']
+      end
     }
 
     get '/', {}, { 'HTTP_ACCEPT' => 'application/xml' }
@@ -604,6 +631,13 @@ class RoutingTest < Test::Unit::TestCase
 
     get '/', {}, { :accept => 'text/html' }
     assert !ok?
+
+    get '/foo', {}, { 'HTTP_ACCEPT' => 'text/html;q=0.9' }
+    assert ok?
+    assert_equal 'text/html;q=0.9', body
+
+    get '/foo', {}, { 'HTTP_ACCEPT' => '' }
+    assert !ok?
   end
 
   it "allows multiple mime types for accept header" do