sinatra-sinatra 0.9.1.2 → 0.9.1.3

data/test/render_backtrace_test.rb

@@ -0,0 +1,145 @@
+require File.dirname(__FILE__) + '/helper'
+
+require 'sass/error'
+
+class RenderBacktraceTest < Test::Unit::TestCase
+  VIEWS = File.dirname(__FILE__) + '/views'
+
+  def assert_raise_at(filename, line, exception = RuntimeError)
+    f, l = nil
+    assert_raise(exception) do
+      begin
+        get('/')
+      rescue => e
+        f, l = e.backtrace.first.split(':')
+        raise
+      end
+    end
+    assert_equal(filename, f, "expected #{exception.name} in #{filename}, was #{f}")
+    assert_equal(line, l.to_i, "expected #{exception.name} in #{filename} at line #{line}, was at line #{l}")
+  end
+
+  def backtrace_app(&block)
+    mock_app {
+      use_in_file_templates!
+      set :views, RenderBacktraceTest::VIEWS
+      template :builder_template do
+        'raise "error"'
+      end
+      template :erb_template do
+        '<% raise "error" %>'
+      end
+      template :haml_template do
+        '%h1= raise "error"'
+      end
+      template :sass_template do
+        '+syntax-error'
+      end
+      get '/', &block
+    }
+  end
+
+  it "provides backtrace for Builder template" do
+    backtrace_app { builder :error }
+    assert_raise_at(File.join(VIEWS,'error.builder'), 2)
+  end
+
+  it "provides backtrace for ERB template" do
+    backtrace_app { erb :error }
+    assert_raise_at(File.join(VIEWS,'error.erb'), 2)
+  end
+
+  it "provides backtrace for HAML template" do
+    backtrace_app { haml :error }
+    assert_raise_at(File.join(VIEWS,'error.haml'), 2)
+  end
+
+  it "provides backtrace for Sass template" do
+    backtrace_app { sass :error }
+    assert_raise_at(File.join(VIEWS,'error.sass'), 2, Sass::SyntaxError)
+  end
+
+  it "provides backtrace for ERB template with locals" do
+    backtrace_app { erb :error, {}, :french => true }
+    assert_raise_at(File.join(VIEWS,'error.erb'), 3)
+  end
+
+  it "provides backtrace for HAML template with locals" do
+    backtrace_app { haml :error, {}, :french => true }
+    assert_raise_at(File.join(VIEWS,'error.haml'), 3)
+  end
+
+  it "provides backtrace for inline Builder string" do
+    backtrace_app { builder "raise 'Ack! Thbbbt!'"}
+    assert_raise_at(__FILE__, (__LINE__-1))
+  end
+
+  it "provides backtrace for inline ERB string" do
+    backtrace_app { erb "<% raise 'bidi-bidi-bidi' %>" }
+    assert_raise_at(__FILE__, (__LINE__-1))
+  end
+
+  it "provides backtrace for inline HAML string" do
+    backtrace_app { haml "%h1= raise 'Lions and tigers and bears! Oh, my!'" }
+    assert_raise_at(__FILE__, (__LINE__-1))
+  end
+
+  # it "provides backtrace for inline Sass string" do
+  #   backtrace_app { sass '+buh-bye' }
+  #   assert_raise_at(__FILE__, (__LINE__-1), Sass::SyntaxError)
+  # end
+
+  it "provides backtrace for named Builder template" do
+    backtrace_app { builder :builder_template }
+    assert_raise_at(__FILE__, (__LINE__-68))
+  end
+
+  it "provides backtrace for named ERB template" do
+    backtrace_app { erb :erb_template }
+    assert_raise_at(__FILE__, (__LINE__-70))
+  end
+
+  it "provides backtrace for named HAML template" do
+    backtrace_app { haml :haml_template }
+    assert_raise_at(__FILE__, (__LINE__-72))
+  end
+
+  # it "provides backtrace for named Sass template" do
+  #   backtrace_app { sass :sass_template }
+  #   assert_raise_at(__FILE__, (__LINE__-74), Sass::SyntaxError)
+  # end
+
+  it "provides backtrace for in file Builder template" do
+    backtrace_app { builder :builder_in_file }
+    assert_raise_at(__FILE__, (__LINE__+22))
+  end
+
+  it "provides backtrace for in file ERB template" do
+    backtrace_app { erb :erb_in_file }
+    assert_raise_at(__FILE__, (__LINE__+20))
+  end
+
+  it "provides backtrace for in file HAML template" do
+    backtrace_app { haml :haml_in_file }
+    assert_raise_at(__FILE__, (__LINE__+18))
+  end
+
+  # it "provides backtrace for in file Sass template" do
+  #   backtrace_app { sass :sass_in_file }
+  #   assert_raise_at(__FILE__, (__LINE__+16), Sass::SyntaxError)
+  # end
+end
+
+__END__
+
+@@ builder_in_file
+raise "bif"
+
+@@ erb_in_file
+<% raise "bam" %>
+
+@@ haml_in_file
+%h1= raise "pow"
+
+@@ sass_in_file
++blam

data/test/request_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-describe 'Sinatra::Request' do
+class RequestTest < Test::Unit::TestCase
   it 'responds to #user_agent' do
     request = Sinatra::Request.new({'HTTP_USER_AGENT' => 'Test'})
     assert request.respond_to?(:user_agent)

data/test/response_test.rb

@@ -2,8 +2,8 @@
 
 require File.dirname(__FILE__) + '/helper'
 
-describe 'Sinatra::Response' do
-  before do
+class ResponseTest < Test::Unit::TestCase
+  setup do
     @response = Sinatra::Response.new
   end
 

data/test/result_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-describe 'Result Handling' do
+class ResultTest < Test::Unit::TestCase
   it "sets response.body when result is a String" do
     mock_app {
       get '/' do

data/test/route_added_hook_test.rb

@@ -0,0 +1,59 @@
+require File.dirname(__FILE__) + '/helper'
+
+module RouteAddedTest
+  @routes, @procs = [], []
+  def self.routes ; @routes ; end
+  def self.procs ; @procs ; end
+  def self.route_added(verb, path, proc)
+    @routes << [verb, path]
+    @procs << proc
+  end
+end
+
+class RouteAddedHookTest < Test::Unit::TestCase
+  setup { 
+    RouteAddedTest.routes.clear
+    RouteAddedTest.procs.clear
+  }
+
+  it "should be notified of an added route" do
+    mock_app(Class.new(Sinatra::Base)) {
+      register RouteAddedTest
+      get('/') {}
+    }
+
+    assert_equal [["GET", "/"], ["HEAD", "/"]],
+      RouteAddedTest.routes
+  end
+
+  it "should include hooks from superclass" do
+    a = Class.new(Class.new(Sinatra::Base))
+    b = Class.new(a)
+
+    a.register RouteAddedTest
+    b.class_eval { post("/sub_app_route") {} }
+
+    assert_equal [["POST", "/sub_app_route"]],
+      RouteAddedTest.routes
+  end
+
+  it "should only run once per extension" do
+    mock_app(Class.new(Sinatra::Base)) {
+      register RouteAddedTest
+      register RouteAddedTest
+      get('/') {}
+    }
+
+    assert_equal [["GET", "/"], ["HEAD", "/"]],
+      RouteAddedTest.routes
+  end
+  
+  it "should pass route blocks as an argument" do
+    mock_app(Class.new(Sinatra::Base)) {
+      register RouteAddedTest
+      get('/') {}
+    }
+
+    assert_kind_of Proc, RouteAddedTest.procs.first    
+  end
+end

data/test/routing_test.rb

@@ -5,7 +5,7 @@ def route_def(pattern)
   mock_app { get(pattern) { } }
 end
 
-describe "Routing" do
+class RoutingTest < Test::Unit::TestCase
   %w[get put post delete].each do |verb|
     it "defines #{verb.upcase} request handlers with #{verb}" do
       mock_app {
@@ -44,6 +44,17 @@ describe "Routing" do
     assert_equal 404, status
   end
 
+  it "sets the content-type to text/html in the default 404 handler" do
+    mock_app {
+      before { content_type 'text/plain' }
+    }
+
+    get '/foo'
+    assert_equal 404, status
+    assert_equal 'text/html', response["Content-Type"]
+    assert body.include?("Sinatra doesn't know this ditty")
+  end
+
   it 'takes multiple definitions of a route' do
     mock_app {
       user_agent(/Foo/)

data/test/sass_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-describe "Sass Templates" do
+class SassTest < Test::Unit::TestCase
   def sass_app(&block)
     mock_app {
       set :views, File.dirname(__FILE__) + '/views'
@@ -33,4 +33,46 @@ describe "Sass Templates" do
     }
     assert_raise(Errno::ENOENT) { get('/') }
   end
+
+  it "passes SASS options to the Sass engine" do
+    sass_app {
+      sass "#sass\n  :background-color #FFF\n  :color #000\n", :style => :compact
+    }
+    assert ok?
+    assert_equal "#sass { background-color: #FFF; color: #000; }\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"
+      end
+    }
+    get '/'
+    assert ok?
+    assert_equal "#sass { background-color: #FFF; color: #000; }\n", body
+  end
+
+  it "merges the default SASS options with the overrides and passes them to the Sass engine" do
+    mock_app {
+      set :sass, {:style => :compact, :attribute_syntax => :alternate } # default Sass attribute_syntax is :normal (with : in front)
+      get '/' do
+        sass "#sass\n  background-color: #FFF\n  color: #000\n"
+      end
+      get '/raised' do
+        sass "#sass\n  :background-color #FFF\n  :color #000\n", :style => :expanded # retains global attribute_syntax settings
+      end
+      get '/expanded_normal' do
+        sass "#sass\n  :background-color #FFF\n  :color #000\n", :style => :expanded, :attribute_syntax => :normal
+      end
+    }
+    get '/'
+    assert ok?
+    assert_equal "#sass { background-color: #FFF; color: #000; }\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
+  end
 end

data/test/server_test.rb

@@ -14,8 +14,8 @@ class Rack::Handler::Mock
   end
 end
 
-describe 'Sinatra::Base.run!' do
-  before do
+class ServerTest < Test::Unit::TestCase
+  setup do
     mock_app {
       set :server, 'mock'
       set :host, 'foo.local'
@@ -24,7 +24,9 @@ describe 'Sinatra::Base.run!' do
     $stdout = File.open('/dev/null', 'wb')
   end
 
-  after { $stdout = STDOUT }
+  def teardown
+    $stdout = STDOUT
+  end
 
   it "locates the appropriate Rack handler and calls ::run" do
     @app.run!

data/test/sinatra_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-describe 'Sinatra' do
+class SinatraTest < Test::Unit::TestCase
   it 'creates a new Sinatra::Base subclass on new' do
     app =
       Sinatra.new do

data/test/static_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/helper'
 
-describe 'Static' do
-  before do
+class StaticTest < Test::Unit::TestCase
+  setup do
     mock_app {
       set :static, true
       set :public, File.dirname(__FILE__)

data/test/templates_test.rb

@@ -1,9 +1,9 @@
 require File.dirname(__FILE__) + '/helper'
 
-describe 'Templating' do
+class TemplatesTest < Test::Unit::TestCase
   def render_app(&block)
     mock_app {
-      def render_test(template, data, options, &block)
+      def render_test(template, data, options, locals, &block)
         inner = block ? block.call : ''
         data + inner
       end
@@ -72,11 +72,23 @@ describe 'Templating' do
     mock_app {
       use_in_file_templates!
     }
-    assert_equal "this is foo\n\n", @app.templates[:foo]
-    assert_equal "X\n= yield\nX\n", @app.templates[:layout]
+    assert_equal "this is foo\n\n", @app.templates[:foo][:template]
+    assert_equal "X\n= yield\nX\n", @app.templates[:layout][:template]
+  end
+
+  test 'use_in_file_templates simply ignores IO errors' do
+    assert_nothing_raised {
+      mock_app {
+        use_in_file_templates!('/foo/bar')
+      }
+    }
+
+    assert @app.templates.empty?
   end
 end
 
+# __END__ : this is not the real end of the script.
+
 __END__
 
 @@ foo

data/test/test_test.rb

@@ -1,7 +1,7 @@
 require 'yaml'
 require File.dirname(__FILE__) + '/helper'
 
-describe 'Sinatra::Test' do
+class TestTest < Test::Unit::TestCase
   def request
     YAML.load(body)
   end
@@ -14,7 +14,7 @@ describe 'Sinatra::Test' do
     YAML.load(request['test.params'])
   end
 
-  before do
+  setup do
     mock_app {
       %w[get head post put delete].each { |verb|
         send(verb, '/') do
@@ -45,8 +45,8 @@ describe 'Sinatra::Test' do
     assert_equal('DELETE', request['REQUEST_METHOD'])
 
     head '/'
-    assert_equal('596', response.headers['Content-Length'])
     assert_equal('', response.body)
+    assert response.headers['Content-Length'].to_i > 0
   end
 
   it 'allows to specify a body' do
@@ -92,8 +92,8 @@ describe 'Sinatra::Test' do
     get '/', :env => { :host => '1.2.3.4' }
     assert_equal '1.2.3.4', request['HTTP_HOST']
 
-    get '/', :env => { :session => 'foo' }
-    assert_equal 'foo', request['rack.session']
+    get '/', :env => { :session => {'foo' => 'bar'} }
+    assert_equal({'foo' => 'bar'}, request['rack.session'])
 
     get '/', :env => { :cookies => 'foo' }
     assert_equal 'foo', request['HTTP_COOKIE']

data/test/views/error.builder

@@ -0,0 +1,3 @@
+xml.error do
+  raise "goodbye"
+end

data/test/views/error.erb

@@ -0,0 +1,3 @@
+Hello <%= 'World' %>
+<% raise 'Goodbye' unless defined?(french) && french %>
+<% raise 'Au revoir' if defined?(french) && french %>

data/test/views/error.haml

@@ -0,0 +1,3 @@
+%h1 Hello From Haml
+= raise 'goodbye' unless defined?(french) && french
+= raise 'au revoir' if defined?(french) && french