sinatra 0.9.6 → 1.0.a

data/compat/events_test.rb

@@ -1,78 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-
-context "Simple Events" do
-  def simple_request_hash(method, path)
-    Rack::Request.new({
-      'REQUEST_METHOD' => method.to_s.upcase,
-      'PATH_INFO' => path
-    })
-  end
-
-  class MockResult < Struct.new(:block, :params)
-  end
-
-  def invoke_simple(path, request_path, &b)
-    params = nil
-    get path do
-      params = self.params
-      b.call if b
-    end
-    get_it request_path
-    MockResult.new(b, params)
-  end
-
-  setup { Sinatra.application = nil }
-
-  specify "return last value" do
-    block = Proc.new { 'Simple' }
-    result = invoke_simple('/', '/', &block)
-    result.should.not.be.nil
-    result.block.should.be block
-    result.params.should.equal Hash.new
-  end
-
-  specify "takes params in path" do
-    result = invoke_simple('/:foo/:bar', '/a/b')
-    result.should.not.be.nil
-    result.params.should.equal "foo" => 'a', "bar" => 'b'
-
-    # unscapes
-    Sinatra.application = nil
-    result = invoke_simple('/:foo/:bar', '/a/blake%20mizerany')
-    result.should.not.be.nil
-    result.params.should.equal "foo" => 'a', "bar" => 'blake mizerany'
-  end
-
-  specify "takes optional params in path" do
-    result = invoke_simple('/?:foo?/?:bar?', '/a/b')
-    result.should.not.be.nil
-    result.params.should.equal "foo" => 'a', "bar" => 'b'
-
-    Sinatra.application = nil
-    result = invoke_simple('/?:foo?/?:bar?', '/a/')
-    result.should.not.be.nil
-    result.params.should.equal "foo" => 'a', "bar" => nil
-
-    Sinatra.application = nil
-    result = invoke_simple('/?:foo?/?:bar?', '/a')
-    result.should.not.be.nil
-    result.params.should.equal "foo" => 'a', "bar" => nil
-
-    Sinatra.application = nil
-    result = invoke_simple('/:foo?/?:bar?', '/')
-    result.should.not.be.nil
-    result.params.should.equal "foo" => nil, "bar" => nil
-  end
-
-  specify "ignores to many /'s" do
-    result = invoke_simple('/x/y', '/x//y')
-    result.should.not.be.nil
-  end
-
-  specify "understands splat" do
-    invoke_simple('/foo/*', '/foo/bar').should.not.be.nil
-    invoke_simple('/foo/*', '/foo/bar/baz').should.not.be.nil
-    invoke_simple('/foo/*', '/foo/baz').should.not.be.nil
-  end
-
-end

data/compat/filter_test.rb

@@ -1,30 +0,0 @@
-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

@@ -1,237 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-
-context "Haml" do
-  include Mocha::API
-
-  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 'default to filename and line of caller' do
-
-      get '/' do
-        haml 'foo'
-      end
-
-      Haml::Engine.expects(:new).with('foo', {:filename => __FILE__,
-        :line => (__LINE__-4)}).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', {:filename => __FILE__,
-        :line => (__LINE__-4), :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', {:filename => __FILE__,
-        :line => (__LINE__-4), :format => :html4,
-        :escape_html => true}).returns(stub(:render => 'foo'))
-
-      get_it '/'
-      should.be.ok
-
-    end
-
-  end
-
-end

data/compat/helper.rb

@@ -1,34 +0,0 @@
-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 Mocha::API
-  include Sinatra::Test
-
-  PASSTHROUGH_EXCEPTIONS = [] unless const_defined?(:PASSTHROUGH_EXCEPTIONS)
-
-  def setup
-    @app = lambda { |env| Sinatra::Application.call(env) }
-    mocha_teardown
-  end
-end

data/compat/mapped_error_test.rb

@@ -1,72 +0,0 @@
-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