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

adamwiggins-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 (78) hide show

data/AUTHORS +40 -0
data/CHANGES +167 -0
data/LICENSE +22 -0
data/README.rdoc +529 -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 +75 -0
data/compat/filter_test.rb +30 -0
data/compat/haml_test.rb +233 -0
data/compat/helper.rb +21 -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/rspec.rb +2 -0
data/lib/sinatra/test/spec.rb +2 -0
data/lib/sinatra/test/unit.rb +11 -0
data/lib/sinatra/test.rb +112 -0
data/lib/sinatra.rb +3 -0
data/sinatra.gemspec +107 -0
data/test/base_test.rb +72 -0
data/test/builder_test.rb +68 -0
data/test/data/reload_app_file.rb +3 -0
data/test/erb_test.rb +55 -0
data/test/filter_test.rb +39 -0
data/test/haml_test.rb +72 -0
data/test/helpers_test.rb +368 -0
data/test/mapped_error_test.rb +164 -0
data/test/middleware_test.rb +63 -0
data/test/options_test.rb +103 -0
data/test/reload_test.rb +65 -0
data/test/request_test.rb +11 -0
data/test/result_test.rb +92 -0
data/test/routing_test.rb +338 -0
data/test/sass_test.rb +40 -0
data/test/sinatra_test.rb +15 -0
data/test/static_test.rb +60 -0
data/test/templates_test.rb +92 -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 +159 -0

data/test/erb_test.rb ADDED Viewed

@@ -0,0 +1,55 @@
+require 'test/spec'
+require 'sinatra/base'
+require 'sinatra/test'
+describe "ERB Templates" do
+  include Sinatra::Test
+  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 %>' }
+    should.be.ok
+    body.should.equal '2'
+  end
+  it 'renders .erb files in views path' do
+    erb_app { erb :hello }
+    should.be.ok
+    body.should.equal "Hello World\n"
+  end
+  it 'takes a :locals option' do
+    erb_app {
+      locals = {:foo => 'Bar'}
+      erb '<%= foo %>', :locals => locals
+    }
+    should.be.ok
+    body.should.equal 'Bar'
+  end
+  it "renders with inline layouts" do
+    mock_app {
+      layout { 'THIS. IS. <%= yield.upcase %>!' }
+      get('/') { erb 'Sparta' }
+    }
+    get '/'
+    should.be.ok
+    body.should.equal 'THIS. IS. SPARTA!'
+  end
+  it "renders with file layouts" do
+    erb_app {
+      erb 'Hello World', :layout => :layout2
+    }
+    should.be.ok
+    body.should.equal "ERB Layout!\nHello World\n"
+  end
+end

data/test/filter_test.rb ADDED Viewed

@@ -0,0 +1,39 @@
+require 'test/spec'
+require 'sinatra/base'
+require 'sinatra/test'
+describe "Filters" do
+  include Sinatra::Test
+  it "executes filters in the order defined" do
+    count = 0
+    mock_app do
+      get('/') { 'Hello World' }
+      before {
+        count.should.be 0
+        count = 1
+      }
+      before {
+        count.should.be 1
+        count = 2
+      }
+    end
+    get '/'
+    should.be.ok
+    count.should.be 2
+    body.should.equal 'Hello World'
+  end
+  it "allows filters to modify the request" do
+    mock_app {
+      get('/foo') { 'foo' }
+      get('/bar') { 'bar' }
+      before { request.path_info = '/bar' }
+    }
+    get '/foo'
+    should.be.ok
+    body.should.be == 'bar'
+  end
+end

data/test/haml_test.rb ADDED Viewed

@@ -0,0 +1,72 @@
+require 'test/spec'
+require 'sinatra/base'
+require 'sinatra/test'
+describe "HAML Templates" do
+  include Sinatra::Test
+  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' }
+    should.be.ok
+    body.should.equal "<h1>Hiya</h1>\n"
+  end
+  it 'renders .haml files in views path' do
+    haml_app { haml :hello }
+    should.be.ok
+    body.should.equal "<h1>Hello From Haml</h1>\n"
+  end
+  it "renders with inline layouts" do
+    mock_app {
+      layout { %q(%h1= 'THIS. IS. ' + yield.upcase) }
+      get('/') { haml '%em Sparta' }
+    }
+    get '/'
+    should.be.ok
+    body.should.equal "<h1>THIS. IS. <EM>SPARTA</EM></h1>\n"
+  end
+  it "renders with file layouts" do
+    haml_app {
+      haml 'Hello World', :layout => :layout2
+    }
+    should.be.ok
+    body.should.equal "<h1>HAML Layout!</h1>\n<p>Hello World</p>\n"
+  end
+  it "raises error if template not found" do
+    mock_app {
+      get('/') { haml :no_such_template }
+    }
+    lambda { get('/') }.should.raise(Errno::ENOENT)
+  end
+  it "passes HAML options to the Haml engine" do
+    haml_app {
+      haml "!!!\n%h1 Hello World", :options => {:format => :html5}
+    }
+    should.be.ok
+    body.should.equal "<!DOCTYPE html>\n<h1>Hello World</h1>\n"
+  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 '/'
+    should.be.ok
+    body.should.equal "<!DOCTYPE html>\n<h1>Hello World</h1>\n"
+  end
+end

data/test/helpers_test.rb ADDED Viewed

@@ -0,0 +1,368 @@
+require 'test/spec'
+require 'sinatra/base'
+require 'sinatra/test'
+class Test::Unit::TestCase
+  include Sinatra::Test
+end
+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 '/'
+      response.status.should.equal 207
+    end
+  end
+  describe '#body' do
+    it 'takes a block for defered body generation' do
+      mock_app {
+        get '/' do
+          body { 'Hello World' }
+        end
+      }
+      get '/'
+      body.should.equal 'Hello World'
+    end
+    it 'takes a String, Array, or other object responding to #each' do
+      mock_app {
+        get '/' do
+          body 'Hello World'
+        end
+      }
+      get '/'
+      body.should.equal 'Hello World'
+    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 '/'
+      status.should.equal 302
+      body.should.be.empty
+      response['Location'].should.equal '/foo'
+    end
+    it 'uses the code given when specified' do
+      mock_app {
+        get '/' do
+          redirect '/foo', 301
+          fail 'redirect should halt'
+        end
+      }
+      get '/'
+      status.should.equal 301
+      body.should.be.empty
+      response['Location'].should.equal '/foo'
+    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 '/'
+      status.should.equal 501
+      body.should.be.empty
+    end
+    it 'takes an optional body' do
+      mock_app {
+        get '/' do
+          error 501, 'FAIL'
+          fail 'error should halt'
+        end
+      }
+      get '/'
+      status.should.equal 501
+      body.should.equal 'FAIL'
+    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 '/'
+      status.should.equal 500
+      body.should.equal 'FAIL'
+    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 '/'
+      status.should.equal 404
+      body.should.be.empty
+    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' } }
+      body.should.equal 'bar'
+    end
+    it 'creates a new session when none provided' do
+      mock_app {
+        get '/' do
+          session.should.be.empty
+          session[:foo] = 'bar'
+          'Hi'
+        end
+      }
+      get '/'
+      body.should.equal 'Hi'
+    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'
+      media_type('foo').should.equal 'application/foo'
+      media_type('.foo').should.equal 'application/foo'
+      media_type(:foo).should.equal 'application/foo'
+    end
+    it 'returns nil when given nil' do
+      media_type(nil).should.be.nil
+    end
+    it 'returns nil when media type not registered' do
+      media_type(:bizzle).should.be.nil
+    end
+    it 'returns the argument when given a media type string' do
+      media_type('text/plain').should.equal '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 '/'
+      response['Content-Type'].should.equal 'text/plain'
+      body.should.equal 'Hello World'
+    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 '/'
+      should.be.ok
+      response['Content-Type'].should.equal 'text/html;charset=utf-8'
+      body.should.equal "<h1>Hello, World</h1>"
+    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'
+      should.be.ok
+      response['Content-Type'].should.equal 'application/foo'
+      body.should.equal 'I AM FOO'
+    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
+      }
+      lambda { get '/foo.xml' }.should.raise RuntimeError
+    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'
+      should.be.ok
+      body.should.equal 'Hello World'
+    end
+    it 'sets the Content-Type response header if a mime-type can be located' do
+      send_file_app
+      get '/file.txt'
+      response['Content-Type'].should.equal 'text/plain'
+    end
+    it 'sets the Content-Length response header' do
+      send_file_app
+      get '/file.txt'
+      response['Content-Length'].should.equal 'Hello World'.length.to_s
+    end
+    it 'sets the Last-Modified response header' do
+      send_file_app
+      get '/file.txt'
+      response['Last-Modified'].should.equal File.mtime(@file).httpdate
+    end
+    it "returns a 404 when not found" do
+      mock_app {
+        get '/' do
+          send_file 'this-file-does-not-exist.txt'
+        end
+      }
+      get '/'
+      should.be.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 '/'
+      response['Last-Modified'].should.equal @now.httpdate
+    end
+    it 'returns a body when conditional get misses' do
+      get '/'
+      status.should.be 200
+      body.should.equal 'Boo!'
+    end
+    it 'halts when a conditional GET matches' do
+      get '/', :env => { 'HTTP_IF_MODIFIED_SINCE' => @now.httpdate }
+      status.should.be 304
+      body.should.be.empty
+    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 '/'
+      response['ETag'].should.equal '"FOO"'
+    end
+    it 'returns a body when conditional get misses' do
+      get '/'
+      status.should.be 200
+      body.should.equal 'Boo!'
+    end
+    it 'halts when a conditional GET matches' do
+      get '/', :env => { 'HTTP_IF_NONE_MATCH' => '"FOO"' }
+      status.should.be 304
+      body.should.be.empty
+    end
+    it 'should handle multiple ETag values in If-None-Match header' do
+      get '/', :env => { 'HTTP_IF_NONE_MATCH' => '"BAR", *' }
+      status.should.be 304
+      body.should.be.empty
+    end
+    it 'uses a weak etag with the :weak option' do
+      mock_app {
+        get '/' do
+          etag 'FOO', :weak
+          "that's weak, dude."
+        end
+      }
+      get '/'
+      response['ETag'].should.equal 'W/"FOO"'
+    end
+  end
+end

data/test/mapped_error_test.rb ADDED Viewed

@@ -0,0 +1,164 @@
+require 'test/spec'
+require 'sinatra/base'
+require 'sinatra/test'
+describe 'Exception Mappings' do
+  include Sinatra::Test
+  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 '/'
+    status.should.equal 500
+    body.should.equal 'Foo!'
+  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 '/'
+    status.should.equal 500
+    body.should.equal 'Exception!'
+  end
+  it "sets env['sinatra.error'] to the rescued exception" do
+    mock_app {
+      set :raise_errors, false
+      error(FooError) {
+        env.should.include 'sinatra.error'
+        env['sinatra.error'].should.be.kind_of FooError
+        'looks good'
+      }
+      get '/' do
+        raise FooError
+      end
+    }
+    get '/'
+    body.should.equal 'looks good'
+  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 '/'
+    status.should.equal 500
+    @response.errors.should.match(/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
+    }
+    lambda { get '/' }.should.raise FooError
+  end
+  it "never raises Sinatra::NotFound beyond the application" do
+    mock_app {
+      set :raise_errors, true
+      get '/' do
+        raise Sinatra::NotFound
+      end
+    }
+    lambda { get '/' }.should.not.raise Sinatra::NotFound
+    status.should.equal 404
+  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
+    }
+    lambda { get '/' }.should.not.raise FooNotFound
+    status.should.equal 404
+    body.should.equal 'foo! not found.'
+  end
+  it 'has a not_found method for backwards compatibility' do
+    mock_app {
+      not_found do
+        "Lost, are we?"
+      end
+    }
+    get '/test'
+    status.should.equal 404
+    body.should.equal "Lost, are we?"
+  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 '/'
+    status.should.equal 500
+    body.should.equal 'Foo!'
+  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 '/'
+    status.should.equal 507
+    body.should.equal 'Error: 507'
+  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 '/'
+    status.should.equal 502
+    body.should.equal 'from custom error page'
+  end
+end