sinatra 0.3.3 → 0.9.0

data/compat/filter_test.rb

@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/helper'
+
+context "before filters" do
+
+  setup do
+    Sinatra.application = nil
+    @app = Sinatra.application
+  end
+
+  specify "should be executed in the order defined" do
+    invoked = 0x0
+    @app.before { invoked = 0x01 }
+    @app.before { invoked |= 0x02 }
+    @app.get('/') { 'Hello World' }
+    get_it '/'
+    should.be.ok
+    body.should.be == 'Hello World'
+    invoked.should.be == 0x03
+  end
+
+  specify "should be capable of modifying the request" do
+    @app.get('/foo') { 'foo' }
+    @app.get('/bar') { 'bar' }
+    @app.before { request.path_info = '/bar' }
+    get_it '/foo'
+    should.be.ok
+    body.should.be == 'bar'
+  end
+
+end

data/compat/haml_test.rb

@@ -0,0 +1,233 @@
+require File.dirname(__FILE__) + '/helper'
+
+context "Haml" do
+
+  setup do
+    Sinatra.application = nil
+  end
+
+  context "without layouts" do
+
+    setup do
+      Sinatra.application = nil
+    end
+
+    specify "should render" do
+
+      get '/no_layout' do
+        haml '== #{1+1}'
+      end
+
+      get_it '/no_layout'
+      should.be.ok
+      body.should == "2\n"
+
+    end
+  end
+
+  context "with layouts" do
+
+    setup do
+      Sinatra.application = nil
+    end
+
+    specify "can be inline" do
+
+      layout do
+        '== This is #{yield}!'
+      end
+
+      get '/lay' do
+        haml 'Blake'
+      end
+
+      get_it '/lay'
+      should.be.ok
+      body.should.equal "This is Blake\n!\n"
+
+    end
+
+    specify "can use named layouts" do
+
+      layout :pretty do
+        '%h1== #{yield}'
+      end
+
+      get '/pretty' do
+        haml 'Foo', :layout => :pretty
+      end
+
+      get '/not_pretty' do
+        haml 'Bar'
+      end
+
+      get_it '/pretty'
+      body.should.equal "<h1>Foo</h1>\n"
+
+      get_it '/not_pretty'
+      body.should.equal "Bar\n"
+
+    end
+
+    specify "can be read from a file if they're not inlined" do
+
+      get '/foo' do
+        @title = 'Welcome to the Hello Program'
+        haml 'Blake', :layout => :foo_layout,
+                      :views_directory => File.dirname(__FILE__) + "/views"
+      end
+
+      get_it '/foo'
+      body.should.equal "Welcome to the Hello Program\nHi Blake\n"
+
+    end
+
+    specify "can be read from file and layout from text" do
+      get '/foo' do
+        haml 'Test', :layout => '== Foo #{yield}'
+      end
+
+      get_it '/foo'
+
+      body.should.equal "Foo Test\n"
+    end
+
+  end
+
+  context "Templates (in general)" do
+
+    setup do
+      Sinatra.application = nil
+    end
+
+    specify "are read from files if Symbols" do
+
+      get '/from_file' do
+        @name = 'Alena'
+        haml :foo, :views_directory => File.dirname(__FILE__) + "/views"
+      end
+
+      get_it '/from_file'
+
+      body.should.equal "You rock Alena!\n"
+
+    end
+
+    specify "use layout.ext by default if available" do
+
+      get '/' do
+        haml :foo, :views_directory => File.dirname(__FILE__) + "/views/layout_test"
+      end
+
+      get_it '/'
+      should.be.ok
+      body.should.equal "x This is foo!\n x\n"
+
+    end
+
+    specify "renders without layout" do
+
+      get '/' do
+        haml :no_layout, :views_directory => File.dirname(__FILE__) + "/views/no_layout"
+      end
+
+      get_it '/'
+      should.be.ok
+      body.should.equal "<h1>No Layout!</h1>\n"
+
+    end
+
+    specify "can render with no layout" do
+      layout do
+        "X\n= yield\nX"
+      end
+
+      get '/' do
+        haml 'blake', :layout => false
+      end
+
+      get_it '/'
+
+      body.should.equal "blake\n"
+    end
+
+    specify "raises error if template not found" do
+      get '/' do
+        haml :not_found
+      end
+
+      lambda { get_it '/' }.should.raise(Errno::ENOENT)
+    end
+
+    specify "use layout.ext by default if available" do
+
+      template :foo do
+        'asdf'
+      end
+
+      get '/' do
+        haml :foo, :layout => false,
+                   :views_directory => File.dirname(__FILE__) + "/views/layout_test"
+      end
+
+      get_it '/'
+      should.be.ok
+      body.should.equal "asdf\n"
+
+    end
+
+  end
+
+  describe 'Options passed to the HAML interpreter' do
+    setup do
+      Sinatra.application = nil
+    end
+
+    specify 'are empty be default' do
+
+      get '/' do
+        haml 'foo'
+      end
+
+      Haml::Engine.expects(:new).with('foo', {}).returns(stub(:render => 'foo'))
+
+      get_it '/'
+      should.be.ok
+
+    end
+
+    specify 'can be configured by passing :options to haml' do
+
+      get '/' do
+        haml 'foo', :options => {:format => :html4}
+      end
+
+      Haml::Engine.expects(:new).with('foo', {:format => :html4}).returns(stub(:render => 'foo'))
+
+      get_it '/'
+      should.be.ok
+
+    end
+
+    specify 'can be configured using set_option :haml' do
+
+      configure do
+        set_option :haml, :format       => :html4,
+                          :escape_html  => true
+      end
+
+      get '/' do
+        haml 'foo'
+      end
+
+      Haml::Engine.expects(:new).with('foo', {:format => :html4,
+        :escape_html => true}).returns(stub(:render => 'foo'))
+
+      get_it '/'
+      should.be.ok
+
+    end
+
+  end
+
+end

data/compat/helper.rb

@@ -0,0 +1,30 @@
+require 'rubygems'
+require 'mocha'
+
+# disable warnings in compat specs.
+$VERBOSE = nil
+
+$:.unshift File.dirname(File.dirname(__FILE__)) + "/lib"
+
+ENV['RACK_ENV'] ||= 'test'
+
+require 'sinatra'
+require 'sinatra/test'
+require 'sinatra/test/unit'
+require 'sinatra/test/spec'
+
+module Sinatra::Test
+  # we need to remove the new test helper methods since they conflict with
+  # the top-level methods of the same name.
+  %w(get head post put delete).each do |verb|
+    remove_method verb
+  end
+  include Sinatra::Delegator
+end
+
+class Test::Unit::TestCase
+  include Sinatra::Test
+  def setup
+    @app = lambda { |env| Sinatra::Application.call(env) }
+  end
+end

data/compat/mapped_error_test.rb

@@ -0,0 +1,72 @@
+require File.dirname(__FILE__) + '/helper'
+
+class FooError < RuntimeError; end
+
+context "Mapped errors" do
+
+  setup do
+    Sinatra.application = nil
+    Sinatra.application.options.raise_errors = false
+  end
+
+  specify "are rescued and run in context" do
+
+    error FooError do
+      'MAPPED ERROR!'
+    end
+
+    get '/' do
+      raise FooError
+    end
+
+    get_it '/'
+
+    should.be.server_error
+    body.should.equal 'MAPPED ERROR!'
+
+  end
+
+  specify "renders empty if no each method on result" do
+
+    error FooError do
+      nil
+    end
+
+    get '/' do
+      raise FooError
+    end
+
+    get_it '/'
+
+    should.be.server_error
+    body.should.be.empty
+
+  end
+
+  specify "doesn't override status if set" do
+
+    error FooError do
+      status(200)
+    end
+
+    get '/' do
+      raise FooError
+    end
+
+    get_it '/'
+
+    should.be.ok
+
+  end
+
+  specify "raises errors when the raise_errors option is set" do
+    Sinatra.application.options.raise_errors = true
+    error FooError do
+    end
+    get '/' do
+      raise FooError
+    end
+    assert_raises(FooError) { get_it('/') }
+  end
+
+end

data/{test → compat}/pipeline_test.rb

@@ -23,24 +23,29 @@ context "Middleware Pipelines" do
     Sinatra.application = nil
   end
 
-  specify "includes default middleware with options set" do
+  # Sessions and logging are tested elsewhere. This is a bad test because it
+  # asserts things about the implementation and not the effect.
+  xspecify "includes default middleware with options set" do
     @app.set_options :sessions => true, :logging => true
     @app.send(:optional_middleware).should.include([Rack::Session::Cookie, [], nil])
     @app.send(:optional_middleware).should.include([Rack::CommonLogger, [], nil])
   end
 
-  specify "does not include default middleware with options unset" do
+  # Bad test.
+  xspecify "does not include default middleware with options unset" do
     @app.set_options :sessions => false, :logging => false
     @app.send(:optional_middleware).should.not.include([Rack::Session::Cookie, [], nil])
     @app.send(:optional_middleware).should.not.include([Rack::CommonLogger, [], nil])
   end
 
-  specify "includes only optional middleware when no explicit middleware added" do
+  # Bad test.
+  xspecify "includes only optional middleware when no explicit middleware added" do
     @app.set_options :sessions => true, :logging => true
     @app.send(:middleware).should.equal @app.send(:optional_middleware)
   end
 
-  specify "should clear middleware before reload" do
+  # Bad test.
+  xspecify "should clear middleware before reload" do
     @app.clearables.should.include(@app.send(:explicit_middleware))
   end
 

data/compat/sass_test.rb

@@ -0,0 +1,57 @@
+require File.dirname(__FILE__) + '/helper'
+
+context "Sass" do
+
+  setup do
+    Sinatra.application = nil
+  end
+
+  context "Templates (in general)" do
+
+    setup do
+      Sinatra.application = nil
+    end
+
+    specify "are read from files if Symbols" do
+
+      get '/from_file' do
+        sass :foo, :views_directory => File.dirname(__FILE__) + "/views"
+      end
+
+      get_it '/from_file'
+      should.be.ok
+      body.should.equal "#sass {\n  background_color: #FFF; }\n"
+
+    end
+
+    specify "raise an error if template not found" do
+      get '/' do
+        sass :not_found
+      end
+
+      lambda { get_it '/' }.should.raise(Errno::ENOENT)
+    end
+
+    specify "ignore default layout file with .sass extension" do
+      get '/' do
+        sass :foo, :views_directory => File.dirname(__FILE__) + "/views/layout_test"
+      end
+
+      get_it '/'
+      should.be.ok
+      body.should.equal "#sass {\n  background_color: #FFF; }\n"
+    end
+
+    specify "ignore explicitly specified layout file" do
+      get '/' do
+        sass :foo, :layout => :layout, :views_directory => File.dirname(__FILE__) + "/views/layout_test"
+      end
+
+      get_it '/'
+      should.be.ok
+      body.should.equal "#sass {\n  background_color: #FFF; }\n"
+    end
+
+  end
+
+end