adamwiggins-sinatra 0.8.9 → 0.10.1

data/compat/helper.rb

@@ -1,21 +0,0 @@
-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'
-
-class Test::Unit::TestCase
-  def setup
-    @app = lambda { |env| Sinatra::Application.call(env) }
-  end
-  include Sinatra::Test
-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

data/compat/pipeline_test.rb

@@ -1,71 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-
-class UpcaseMiddleware
-  def initialize(app, *args, &block)
-    @app = app
-    @args = args
-    @block = block
-  end
-  def call(env)
-    env['PATH_INFO'] = env['PATH_INFO'].to_s.upcase
-    @app.call(env)
-  end
-end
-
-context "Middleware Pipelines" do
-
-  setup do
-    Sinatra.application = nil
-    @app = Sinatra.application
-  end
-
-  teardown do
-    Sinatra.application = nil
-  end
-
-  # 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
-
-  # 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
-
-  # 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
-
-  # Bad test.
-  xspecify "should clear middleware before reload" do
-    @app.clearables.should.include(@app.send(:explicit_middleware))
-  end
-
-  specify "should add middleware with use" do
-    block = Proc.new { |env| }
-    @app.use UpcaseMiddleware
-    @app.use UpcaseMiddleware, "foo", "bar"
-    @app.use UpcaseMiddleware, "foo", "bar", &block
-    @app.send(:middleware).should.include([UpcaseMiddleware, [], nil])
-    @app.send(:middleware).should.include([UpcaseMiddleware, ["foo", "bar"], nil])
-    @app.send(:middleware).should.include([UpcaseMiddleware, ["foo", "bar"], block])
-  end
-
-  specify "should run middleware added with use" do
-    get('/foo') { "FAIL!" }
-    get('/FOO') { "PASS!" }
-    use UpcaseMiddleware
-    get_it '/foo'
-    should.be.ok
-    body.should.equal "PASS!"
-  end
-
-end

data/compat/public/foo.xml

@@ -1 +0,0 @@
-<foo></foo>

data/compat/sass_test.rb

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

data/compat/sessions_test.rb

@@ -1,39 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-
-context "Sessions" do
-
-  setup { Sinatra.application = nil }
-
-  specify "should be off by default" do
-    get '/asdf' do
-      session[:test] = true
-      "asdf"
-    end
-
-    get '/test' do
-      session[:test] == true ? "true" : "false"
-    end
-
-    get_it '/asdf', {}, 'HTTP_HOST' => 'foo.sinatrarb.com'
-    assert ok?
-    assert !include?('Set-Cookie')
-  end
-
-  specify "should be able to store data accross requests" do
-    set_option :sessions, true
-
-    get '/foo' do
-      session[:test] = true
-      "asdf"
-    end
-
-    get '/bar' do
-      session[:test] == true ? "true" : "false"
-    end
-
-    get_it '/foo', :env => { :host => 'foo.sinatrarb.com' }
-    assert ok?
-    assert include?('Set-Cookie')
-  end
-
-end

data/compat/streaming_test.rb

@@ -1,121 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-
-context "Static files (by default)" do
-
-  setup do
-    Sinatra.application = nil
-    Sinatra.application.options.public = File.dirname(__FILE__) + '/public'
-  end
-
-  specify "are served from root/public" do
-    get_it '/foo.xml'
-    should.be.ok
-    headers['Content-Length'].should.equal '12'
-    headers['Content-Type'].should.equal 'application/xml'
-    body.should.equal "<foo></foo>\n"
-  end
-
-  specify "are not served when verb is not GET or HEAD" do
-    post_it '/foo.xml'
-    # these should actually be giving back a 405 Method Not Allowed but that
-    # complicates the routing logic quite a bit.
-    should.be.not_found
-    status.should.equal 404
-  end
-
-  specify "are served when verb is HEAD but missing a body" do
-    head_it '/foo.xml'
-    should.be.ok
-    headers['Content-Length'].should.equal '12'
-    headers['Content-Type'].should.equal 'application/xml'
-    body.should.equal ""
-  end
-
-  # static files override dynamic/internal events and ...
-  specify "are served when conflicting events exists" do
-    get '/foo.xml' do
-      'this is not foo.xml!'
-    end
-    get_it '/foo.xml'
-    should.be.ok
-    body.should.equal "<foo></foo>\n"
-  end
-
-  specify "are irrelevant when request_method is not GET/HEAD" do
-    put '/foo.xml' do
-      'putted!'
-    end
-    put_it '/foo.xml'
-    should.be.ok
-    body.should.equal 'putted!'
-
-    get_it '/foo.xml'
-    should.be.ok
-    body.should.equal "<foo></foo>\n"
-  end
-
-  specify "include a Last-Modified header" do
-    last_modified = File.mtime(Sinatra.application.options.public + '/foo.xml')
-    get_it('/foo.xml')
-    should.be.ok
-    body.should.not.be.empty
-    headers['Last-Modified'].should.equal last_modified.httpdate
-  end
-
-  # Deprecated. Use: ConditionalGet middleware.
-  specify "are not served when If-Modified-Since matches" do
-    last_modified = File.mtime(Sinatra.application.options.public + '/foo.xml')
-    @request = Rack::MockRequest.new(Sinatra.application)
-    @response = @request.get('/foo.xml', 'HTTP_IF_MODIFIED_SINCE' => last_modified.httpdate)
-    status.should.equal 304
-    body.should.be.empty
-  end
-
-  specify "should omit Content-Disposition headers" do
-    get_it('/foo.xml')
-    should.be.ok
-    headers['Content-Disposition'].should.be.nil
-    headers['Content-Transfer-Encoding'].should.be.nil
-  end
-
-  specify "should be served even if their path is url escaped" do
-	get_it('/fo%6f.xml')
-	should.be.ok
-    body.should.equal "<foo></foo>\n"
-  end
-
-end
-
-context "SendData" do
-
-  setup do
-    Sinatra.application = nil
-  end
-
-  # Deprecated. send_data is going away.
-  xspecify "should send the data with options" do
-    get '/' do
-      send_data 'asdf', :status => 500
-    end
-
-    get_it '/'
-
-    should.be.server_error
-    body.should.equal 'asdf'
-  end
-
-  # Deprecated. The Content-Disposition is no longer handled by sendfile.
-  specify "should include a Content-Disposition header" do
-    get '/' do
-      send_file File.dirname(__FILE__) + '/public/foo.xml'
-    end
-
-    get_it '/'
-
-    should.be.ok
-    headers['Content-Disposition'].should.not.be.nil
-    headers['Content-Disposition'].should.equal 'attachment; filename="foo.xml"'
-    headers['Content-Transfer-Encoding'].should.equal 'binary'
-  end
-
-end

data/compat/sym_params_test.rb

@@ -1,19 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-
-context "Symbol Params" do
-
-  setup do
-    Sinatra.application = nil
-  end
-
-  specify "should be accessable as Strings or Symbols" do
-    get '/' do
-      params[:foo] + params['foo']
-    end
-
-    get_it '/', :foo => "X"
-    assert_equal('XX', body)
-  end
-
-end
-

data/compat/template_test.rb

@@ -1,30 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-
-context "Templates" do
-
-  specify "are read from files if Symbols" do
-
-    get '/from_file' do
-      @name = 'Alena'
-      erb :foo, :views_directory => File.dirname(__FILE__) + "/views"
-    end
-
-    get_it '/from_file'
-
-    body.should.equal 'You rock Alena!'
-
-  end
-
-  specify "use layout.ext by default if available" do
-
-    get '/layout_from_file' do
-      erb :foo, :views_directory => File.dirname(__FILE__) + "/views/layout_test"
-    end
-
-    get_it '/layout_from_file'
-    should.be.ok
-    body.should.equal "x This is foo! x \n"
-
-  end
-
-end

data/compat/use_in_file_templates_test.rb

@@ -1,47 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-
-context "Rendering in file templates" do
-
-  setup do
-    Sinatra.application = nil
-    use_in_file_templates!
-  end
-
-  specify "should set template" do
-    assert Sinatra.application.templates[:foo]
-  end
-
-  specify "should set layout" do
-    assert Sinatra.application.templates[:layout]
-  end
-
-  specify "should render without layout if specified" do
-    get '/' do
-      haml :foo, :layout => false
-    end
-
-    get_it '/'
-    assert_equal "this is foo\n", body
-  end
-
-  specify "should render with layout if specified" do
-    get '/' do
-      haml :foo
-    end
-
-    get_it '/'
-    assert_equal "X\nthis is foo\nX\n", body
-  end
-
-end
-
-__END__
-
-@@ foo
-this is foo
-
-@@ layout
-X
-= yield
-X
-