RubyGems - sinatra-sinatra - Versions diffs - 0.8.9 - Mend

sinatra-sinatra 0.8.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (80) hide show

data/AUTHORS +40 -0
data/CHANGES +174 -0
data/LICENSE +22 -0
data/README.rdoc +545 -0
data/Rakefile +180 -0
data/compat/app_test.rb +300 -0
data/compat/application_test.rb +334 -0
data/compat/builder_test.rb +101 -0
data/compat/custom_error_test.rb +62 -0
data/compat/erb_test.rb +136 -0
data/compat/events_test.rb +78 -0
data/compat/filter_test.rb +30 -0
data/compat/haml_test.rb +233 -0
data/compat/helper.rb +30 -0
data/compat/mapped_error_test.rb +72 -0
data/compat/pipeline_test.rb +71 -0
data/compat/public/foo.xml +1 -0
data/compat/sass_test.rb +57 -0
data/compat/sessions_test.rb +39 -0
data/compat/streaming_test.rb +121 -0
data/compat/sym_params_test.rb +19 -0
data/compat/template_test.rb +30 -0
data/compat/use_in_file_templates_test.rb +47 -0
data/compat/views/foo.builder +1 -0
data/compat/views/foo.erb +1 -0
data/compat/views/foo.haml +1 -0
data/compat/views/foo.sass +2 -0
data/compat/views/foo_layout.erb +2 -0
data/compat/views/foo_layout.haml +2 -0
data/compat/views/layout_test/foo.builder +1 -0
data/compat/views/layout_test/foo.erb +1 -0
data/compat/views/layout_test/foo.haml +1 -0
data/compat/views/layout_test/foo.sass +2 -0
data/compat/views/layout_test/layout.builder +3 -0
data/compat/views/layout_test/layout.erb +1 -0
data/compat/views/layout_test/layout.haml +1 -0
data/compat/views/layout_test/layout.sass +2 -0
data/compat/views/no_layout/no_layout.builder +1 -0
data/compat/views/no_layout/no_layout.haml +1 -0
data/lib/sinatra/base.rb +818 -0
data/lib/sinatra/compat.rb +239 -0
data/lib/sinatra/images/404.png +0 -0
data/lib/sinatra/images/500.png +0 -0
data/lib/sinatra/main.rb +48 -0
data/lib/sinatra/test/bacon.rb +17 -0
data/lib/sinatra/test/rspec.rb +9 -0
data/lib/sinatra/test/spec.rb +9 -0
data/lib/sinatra/test/unit.rb +11 -0
data/lib/sinatra/test.rb +109 -0
data/lib/sinatra.rb +4 -0
data/sinatra.gemspec +109 -0
data/test/base_test.rb +68 -0
data/test/builder_test.rb +64 -0
data/test/data/reload_app_file.rb +3 -0
data/test/erb_test.rb +50 -0
data/test/filter_test.rb +35 -0
data/test/haml_test.rb +68 -0
data/test/helper.rb +20 -0
data/test/helpers_test.rb +361 -0
data/test/mapped_error_test.rb +160 -0
data/test/middleware_test.rb +58 -0
data/test/options_test.rb +97 -0
data/test/reload_test.rb +61 -0
data/test/request_test.rb +9 -0
data/test/result_test.rb +88 -0
data/test/routing_test.rb +334 -0
data/test/sass_test.rb +36 -0
data/test/sinatra_test.rb +13 -0
data/test/static_test.rb +57 -0
data/test/templates_test.rb +88 -0
data/test/views/hello.builder +1 -0
data/test/views/hello.erb +1 -0
data/test/views/hello.haml +1 -0
data/test/views/hello.sass +2 -0
data/test/views/hello.test +1 -0
data/test/views/layout2.builder +3 -0
data/test/views/layout2.erb +2 -0
data/test/views/layout2.haml +2 -0
data/test/views/layout2.test +1 -0
metadata +161 -0

data/test/data/reload_app_file.rb ADDED Viewed

@@ -0,0 +1,3 @@
+$reload_count += 1
+$reload_app.get('/') { 'Hello from reload file' }

data/test/erb_test.rb ADDED Viewed

@@ -0,0 +1,50 @@
+require File.dirname(__FILE__) + '/helper'
+describe "ERB Templates" do
+  def erb_app(&block)
+    mock_app {
+      set :views, File.dirname(__FILE__) + '/views'
+      get '/', &block
+    }
+    get '/'
+  end
+  it 'renders inline ERB strings' do
+    erb_app { erb '<%= 1 + 1 %>' }
+    assert ok?
+    assert_equal '2', body
+  end
+  it 'renders .erb files in views path' do
+    erb_app { erb :hello }
+    assert ok?
+    assert_equal "Hello World\n", body
+  end
+  it 'takes a :locals option' do
+    erb_app {
+      locals = {:foo => 'Bar'}
+      erb '<%= foo %>', :locals => locals
+    }
+    assert ok?
+    assert_equal 'Bar', body
+  end
+  it "renders with inline layouts" do
+    mock_app {
+      layout { 'THIS. IS. <%= yield.upcase %>!' }
+      get('/') { erb 'Sparta' }
+    }
+    get '/'
+    assert ok?
+    assert_equal 'THIS. IS. SPARTA!', body
+  end
+  it "renders with file layouts" do
+    erb_app {
+      erb 'Hello World', :layout => :layout2
+    }
+    assert ok?
+    assert_equal "ERB Layout!\nHello World\n", body
+  end
+end

data/test/filter_test.rb ADDED Viewed

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/helper'
+describe "Filters" do
+  it "executes filters in the order defined" do
+    count = 0
+    mock_app do
+      get('/') { 'Hello World' }
+      before {
+        fail 'count != 0' if count != 0
+        count = 1
+      }
+      before {
+        fail 'count != 1' if count != 1
+        count = 2
+      }
+    end
+    get '/'
+    assert ok?
+    assert_equal 2, count
+    assert_equal 'Hello World', body
+  end
+  it "allows filters to modify the request" do
+    mock_app {
+      get('/foo') { 'foo' }
+      get('/bar') { 'bar' }
+      before { request.path_info = '/bar' }
+    }
+    get '/foo'
+    assert ok?
+    assert_equal 'bar', body
+  end
+end

data/test/haml_test.rb ADDED Viewed

@@ -0,0 +1,68 @@
+require File.dirname(__FILE__) + '/helper'
+describe "HAML Templates" do
+  def haml_app(&block)
+    mock_app {
+      set :views, File.dirname(__FILE__) + '/views'
+      get '/', &block
+    }
+    get '/'
+  end
+  it 'renders inline HAML strings' do
+    haml_app { haml '%h1 Hiya' }
+    assert ok?
+    assert_equal "<h1>Hiya</h1>\n", body
+  end
+  it 'renders .haml files in views path' do
+    haml_app { haml :hello }
+    assert ok?
+    assert_equal "<h1>Hello From Haml</h1>\n", body
+  end
+  it "renders with inline layouts" do
+    mock_app {
+      layout { %q(%h1= 'THIS. IS. ' + yield.upcase) }
+      get('/') { haml '%em Sparta' }
+    }
+    get '/'
+    assert ok?
+    assert_equal "<h1>THIS. IS. <EM>SPARTA</EM></h1>\n", body
+  end
+  it "renders with file layouts" do
+    haml_app {
+      haml 'Hello World', :layout => :layout2
+    }
+    assert ok?
+    assert_equal "<h1>HAML Layout!</h1>\n<p>Hello World</p>\n", body
+  end
+  it "raises error if template not found" do
+    mock_app {
+      get('/') { haml :no_such_template }
+    }
+    assert_raise(Errno::ENOENT) { get('/') }
+  end
+  it "passes HAML options to the Haml engine" do
+    haml_app {
+      haml "!!!\n%h1 Hello World", :options => {:format => :html5}
+    }
+    assert ok?
+    assert_equal "<!DOCTYPE html>\n<h1>Hello World</h1>\n", body
+  end
+  it "passes default HAML options to the Haml engine" do
+    mock_app {
+      set :haml, {:format => :html5}
+      get '/' do
+        haml "!!!\n%h1 Hello World"
+      end
+    }
+    get '/'
+    assert ok?
+    assert_equal "<!DOCTYPE html>\n<h1>Hello World</h1>\n", body
+  end
+end

data/test/helper.rb ADDED Viewed

@@ -0,0 +1,20 @@
+begin
+  require 'test/spec'
+rescue LoadError
+  require 'rubygems'
+  require 'test/spec'
+end
+$:.unshift File.dirname(File.dirname(__FILE__)) + '/lib'
+require 'sinatra/base'
+require 'sinatra/test'
+require 'sinatra/test/spec'
+module Sinatra::Test
+  # Sets up a Sinatra::Base subclass defined with the block
+  # given. Used in setup or individual spec methods to establish
+  # the application.
+  def mock_app(base=Sinatra::Base, &block)
+    @app = Sinatra.new(base, &block)
+  end
+end

data/test/helpers_test.rb ADDED Viewed

@@ -0,0 +1,361 @@
+require File.dirname(__FILE__) + '/helper'
+describe 'Sinatra::Helpers' do
+  describe '#status' do
+    setup do
+      mock_app {
+        get '/' do
+          status 207
+          nil
+        end
+      }
+    end
+    it 'sets the response status code' do
+      get '/'
+      assert_equal 207, response.status
+    end
+  end
+  describe '#body' do
+    it 'takes a block for defered body generation' do
+      mock_app {
+        get '/' do
+          body { 'Hello World' }
+        end
+      }
+      get '/'
+      assert_equal 'Hello World', body
+    end
+    it 'takes a String, Array, or other object responding to #each' do
+      mock_app {
+        get '/' do
+          body 'Hello World'
+        end
+      }
+      get '/'
+      assert_equal 'Hello World', body
+    end
+  end
+  describe '#redirect' do
+    it 'uses a 302 when only a path is given' do
+      mock_app {
+        get '/' do
+          redirect '/foo'
+          fail 'redirect should halt'
+        end
+      }
+      get '/'
+      assert_equal 302, status
+      assert_equal '', body
+      assert_equal '/foo', response['Location']
+    end
+    it 'uses the code given when specified' do
+      mock_app {
+        get '/' do
+          redirect '/foo', 301
+          fail 'redirect should halt'
+        end
+      }
+      get '/'
+      assert_equal 301, status
+      assert_equal '', body
+      assert_equal '/foo', response['Location']
+    end
+  end
+  describe '#error' do
+    it 'sets a status code and halts' do
+      mock_app {
+        get '/' do
+          error 501
+          fail 'error should halt'
+        end
+      }
+      get '/'
+      assert_equal 501, status
+      assert_equal '', body
+    end
+    it 'takes an optional body' do
+      mock_app {
+        get '/' do
+          error 501, 'FAIL'
+          fail 'error should halt'
+        end
+      }
+      get '/'
+      assert_equal 501, status
+      assert_equal 'FAIL', body
+    end
+    it 'uses a 500 status code when first argument is a body' do
+      mock_app {
+        get '/' do
+          error 'FAIL'
+          fail 'error should halt'
+        end
+      }
+      get '/'
+      assert_equal 500, status
+      assert_equal 'FAIL', body
+    end
+  end
+  describe '#not_found' do
+    it 'halts with a 404 status' do
+      mock_app {
+        get '/' do
+          not_found
+          fail 'not_found should halt'
+        end
+      }
+      get '/'
+      assert_equal 404, status
+      assert_equal '', body
+    end
+  end
+  describe '#session' do
+    it 'uses the existing rack.session' do
+      mock_app {
+        get '/' do
+          session[:foo]
+        end
+      }
+      get '/', :env => { 'rack.session' => { :foo => 'bar' } }
+      assert_equal 'bar', body
+    end
+    it 'creates a new session when none provided' do
+      mock_app {
+        get '/' do
+          fail "session != {}" unless session.empty?
+          session[:foo] = 'bar'
+          'Hi'
+        end
+      }
+      get '/'
+      assert_equal 'Hi', body
+    end
+  end
+  describe '#media_type' do
+    include Sinatra::Helpers
+    it "looks up media types in Rack's MIME registry" do
+      Rack::Mime::MIME_TYPES['.foo'] = 'application/foo'
+      assert_equal 'application/foo', media_type('foo')
+      assert_equal 'application/foo', media_type('.foo')
+      assert_equal 'application/foo', media_type(:foo)
+    end
+    it 'returns nil when given nil' do
+      assert media_type(nil).nil?
+    end
+    it 'returns nil when media type not registered' do
+      assert media_type(:bizzle).nil?
+    end
+    it 'returns the argument when given a media type string' do
+      assert_equal 'text/plain', media_type('text/plain')
+    end
+  end
+  describe '#content_type' do
+    it 'sets the Content-Type header' do
+      mock_app {
+        get '/' do
+          content_type 'text/plain'
+          'Hello World'
+        end
+      }
+      get '/'
+      assert_equal 'text/plain', response['Content-Type']
+      assert_equal 'Hello World', body
+    end
+    it 'takes media type parameters (like charset=)' do
+      mock_app {
+        get '/' do
+          content_type 'text/html', :charset => 'utf-8'
+          "<h1>Hello, World</h1>"
+        end
+      }
+      get '/'
+      assert ok?
+      assert_equal 'text/html;charset=utf-8', response['Content-Type']
+      assert_equal "<h1>Hello, World</h1>", body
+    end
+    it "looks up symbols in Rack's mime types dictionary" do
+      Rack::Mime::MIME_TYPES['.foo'] = 'application/foo'
+      mock_app {
+        get '/foo.xml' do
+          content_type :foo
+          "I AM FOO"
+        end
+      }
+      get '/foo.xml'
+      assert ok?
+      assert_equal 'application/foo', response['Content-Type']
+      assert_equal 'I AM FOO', body
+    end
+    it 'fails when no mime type is registered for the argument provided' do
+      mock_app {
+        get '/foo.xml' do
+          content_type :bizzle
+          "I AM FOO"
+        end
+      }
+      assert_raise(RuntimeError) { get '/foo.xml' }
+    end
+  end
+  describe '#send_file' do
+    before {
+      @file = File.dirname(__FILE__) + '/file.txt'
+      File.open(@file, 'wb') { |io| io.write('Hello World') }
+    }
+    after {
+      File.unlink @file
+      @file = nil
+    }
+    def send_file_app
+      path = @file
+      mock_app {
+        get '/file.txt' do
+          send_file path
+        end
+      }
+    end
+    it "sends the contents of the file" do
+      send_file_app
+      get '/file.txt'
+      assert ok?
+      assert_equal 'Hello World', body
+    end
+    it 'sets the Content-Type response header if a mime-type can be located' do
+      send_file_app
+      get '/file.txt'
+      assert_equal 'text/plain', response['Content-Type']
+    end
+    it 'sets the Content-Length response header' do
+      send_file_app
+      get '/file.txt'
+      assert_equal 'Hello World'.length.to_s, response['Content-Length']
+    end
+    it 'sets the Last-Modified response header' do
+      send_file_app
+      get '/file.txt'
+      assert_equal File.mtime(@file).httpdate, response['Last-Modified']
+    end
+    it "returns a 404 when not found" do
+      mock_app {
+        get '/' do
+          send_file 'this-file-does-not-exist.txt'
+        end
+      }
+      get '/'
+      assert not_found?
+    end
+  end
+  describe '#last_modified' do
+    before do
+      now = Time.now
+      mock_app {
+        get '/' do
+          body { 'Hello World' }
+          last_modified now
+          'Boo!'
+        end
+      }
+      @now = now
+    end
+    it 'sets the Last-Modified header to a valid RFC 2616 date value' do
+      get '/'
+      assert_equal @now.httpdate, response['Last-Modified']
+    end
+    it 'returns a body when conditional get misses' do
+      get '/'
+      assert_equal 200, status
+      assert_equal 'Boo!', body
+    end
+    it 'halts when a conditional GET matches' do
+      get '/', :env => { 'HTTP_IF_MODIFIED_SINCE' => @now.httpdate }
+      assert_equal 304, status
+      assert_equal '', body
+    end
+  end
+  describe '#etag' do
+    before do
+      mock_app {
+        get '/' do
+          body { 'Hello World' }
+          etag 'FOO'
+          'Boo!'
+        end
+      }
+    end
+    it 'sets the ETag header' do
+      get '/'
+      assert_equal '"FOO"', response['ETag']
+    end
+    it 'returns a body when conditional get misses' do
+      get '/'
+      assert_equal 200, status
+      assert_equal 'Boo!', body
+    end
+    it 'halts when a conditional GET matches' do
+      get '/', :env => { 'HTTP_IF_NONE_MATCH' => '"FOO"' }
+      assert_equal 304, status
+      assert_equal '', body
+    end
+    it 'should handle multiple ETag values in If-None-Match header' do
+      get '/', :env => { 'HTTP_IF_NONE_MATCH' => '"BAR", *' }
+      assert_equal 304, status
+      assert_equal '', body
+    end
+    it 'uses a weak etag with the :weak option' do
+      mock_app {
+        get '/' do
+          etag 'FOO', :weak
+          "that's weak, dude."
+        end
+      }
+      get '/'
+      assert_equal 'W/"FOO"', response['ETag']
+    end
+  end
+end

data/test/mapped_error_test.rb ADDED Viewed

@@ -0,0 +1,160 @@
+require File.dirname(__FILE__) + '/helper'
+describe 'Exception Mappings' do
+  class FooError < RuntimeError
+  end
+  it 'invokes handlers registered with ::error when raised' do
+    mock_app {
+      set :raise_errors, false
+      error(FooError) { 'Foo!' }
+      get '/' do
+        raise FooError
+      end
+    }
+    get '/'
+    assert_equal 500, status
+    assert_equal 'Foo!', body
+  end
+  it 'uses the Exception handler if no matching handler found' do
+    mock_app {
+      set :raise_errors, false
+      error(Exception) { 'Exception!' }
+      get '/' do
+        raise FooError
+      end
+    }
+    get '/'
+    assert_equal 500, status
+    assert_equal 'Exception!', body
+  end
+  it "sets env['sinatra.error'] to the rescued exception" do
+    mock_app {
+      set :raise_errors, false
+      error(FooError) {
+        fail "!env.include?('sinatra.error')" if !env.include?('sinatra.error')
+        fail unless env['sinatra.error'].kind_of?(FooError)
+        'looks good'
+      }
+      get '/' do
+        raise FooError
+      end
+    }
+    get '/'
+    assert_equal 'looks good', body
+  end
+  it 'dumps errors to rack.errors when dump_errors is enabled' do
+    mock_app {
+      set :raise_errors, false
+      set :dump_errors, true
+      get('/') { raise FooError, 'BOOM!' }
+    }
+    get '/'
+    assert_equal 500, status
+    assert @response.errors =~ /FooError - BOOM!:/
+  end
+  it "raises without calling the handler when the raise_errors options is set" do
+    mock_app {
+      set :raise_errors, true
+      error(FooError) { "she's not there." }
+      get '/' do
+        raise FooError
+      end
+    }
+    assert_raise(FooError) { get '/' }
+  end
+  it "never raises Sinatra::NotFound beyond the application" do
+    mock_app {
+      set :raise_errors, true
+      get '/' do
+        raise Sinatra::NotFound
+      end
+    }
+    assert_nothing_raised { get '/' }
+    assert_equal 404, status
+  end
+  class FooNotFound < Sinatra::NotFound
+  end
+  it "cascades for subclasses of Sinatra::NotFound" do
+    mock_app {
+      set :raise_errors, true
+      error(FooNotFound) { "foo! not found." }
+      get '/' do
+        raise FooNotFound
+      end
+    }
+    assert_nothing_raised { get '/' }
+    assert_equal 404, status
+    assert_equal 'foo! not found.', body
+  end
+  it 'has a not_found method for backwards compatibility' do
+    mock_app {
+      not_found do
+        "Lost, are we?"
+      end
+    }
+    get '/test'
+    assert_equal 404, status
+    assert_equal "Lost, are we?", body
+  end
+end
+describe 'Custom Error Pages' do
+  it 'allows numeric status code mappings to be registered with ::error' do
+    mock_app {
+      set :raise_errors, false
+      error(500) { 'Foo!' }
+      get '/' do
+        [500, {}, 'Internal Foo Error']
+      end
+    }
+    get '/'
+    assert_equal 500, status
+    assert_equal 'Foo!', body
+  end
+  it 'allows ranges of status code mappings to be registered with :error' do
+    mock_app {
+      set :raise_errors, false
+      error(500..550) { "Error: #{response.status}" }
+      get '/' do
+        [507, {}, 'A very special error']
+      end
+    }
+    get '/'
+    assert_equal 507, status
+    assert_equal 'Error: 507', body
+  end
+  class FooError < RuntimeError
+  end
+  it 'runs after exception mappings and overwrites body' do
+    mock_app {
+      set :raise_errors, false
+      error FooError do
+        response.status = 502
+        'from exception mapping'
+      end
+      error(500) { 'from 500 handler' }
+      error(502) { 'from custom error page' }
+      get '/' do
+        raise FooError
+      end
+    }
+    get '/'
+    assert_equal 502, status
+    assert_equal 'from custom error page', body
+  end
+end