RubyGems - sinatra - Versions diffs - 1.0 → 1.1.a - Mend

sinatra 1.0 → 1.1.a

Potentially problematic release.

This version of sinatra might be problematic. Click here for more details.

Files changed (57) hide show

data/CHANGES +108 -1
data/LICENSE +1 -1
data/README.de.rdoc +1024 -0
data/README.es.rdoc +1047 -0
data/README.fr.rdoc +1038 -0
data/README.hu.rdoc +607 -0
data/README.jp.rdoc +473 -15
data/README.rdoc +429 -41
data/Rakefile +17 -6
data/lib/sinatra/base.rb +357 -158
data/lib/sinatra/showexceptions.rb +9 -1
data/sinatra.gemspec +52 -9
data/test/builder_test.rb +25 -1
data/test/coffee_test.rb +88 -0
data/test/encoding_test.rb +18 -0
data/test/filter_test.rb +61 -2
data/test/hello.mab +1 -0
data/test/helper.rb +1 -0
data/test/helpers_test.rb +141 -37
data/test/less_test.rb +26 -2
data/test/liquid_test.rb +58 -0
data/test/markaby_test.rb +58 -0
data/test/markdown_test.rb +35 -0
data/test/nokogiri_test.rb +69 -0
data/test/radius_test.rb +59 -0
data/test/rdoc_test.rb +34 -0
data/test/request_test.rb +12 -0
data/test/routing_test.rb +35 -1
data/test/sass_test.rb +46 -16
data/test/scss_test.rb +88 -0
data/test/settings_test.rb +32 -0
data/test/sinatra_test.rb +4 -0
data/test/static_test.rb +64 -0
data/test/templates_test.rb +55 -1
data/test/textile_test.rb +34 -0
data/test/views/ascii.haml +2 -0
data/test/views/explicitly_nested.str +1 -0
data/test/views/hello.coffee +1 -0
data/test/views/hello.liquid +1 -0
data/test/views/hello.mab +1 -0
data/test/views/hello.md +1 -0
data/test/views/hello.nokogiri +1 -0
data/test/views/hello.radius +1 -0
data/test/views/hello.rdoc +1 -0
data/test/views/hello.sass +1 -1
data/test/views/hello.scss +3 -0
data/test/views/hello.str +1 -0
data/test/views/hello.textile +1 -0
data/test/views/layout2.liquid +2 -0
data/test/views/layout2.mab +2 -0
data/test/views/layout2.nokogiri +3 -0
data/test/views/layout2.radius +2 -0
data/test/views/layout2.str +2 -0
data/test/views/nested.str +1 -0
data/test/views/utf8.haml +2 -0
metadata +240 -33
data/lib/sinatra/tilt.rb +0 -746

data/lib/sinatra/showexceptions.rb CHANGED

@@ -1,12 +1,20 @@
 require 'rack/showexceptions'
 module Sinatra
+  # Sinatra::ShowExceptions catches all exceptions raised from the app it
+  # wraps. It shows a useful backtrace with the sourcefile and clickable
+  # context, the whole Rack environment and the request data.
+  #
+  # Be careful when you use this on public-facing sites as it could reveal
+  # information helpful to attackers.
   class ShowExceptions < Rack::ShowExceptions
     def initialize(app)
       @app      = app
       @template = ERB.new(TEMPLATE)
     end
+    private
     def frame_class(frame)
       if frame.filename =~ /lib\/sinatra.*\.rb/
         "framework"
@@ -18,7 +26,7 @@ module Sinatra
       end
     end
-TEMPLATE = <<HTML
+TEMPLATE = <<-HTML # :nodoc:
 <!DOCTYPE html>
 <html>
 <head>

data/sinatra.gemspec CHANGED

@@ -3,13 +3,13 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.name = 'sinatra'
-  s.version = '1.0'
-  s.date = '2010-03-23'
+  s.version = '1.1.a'
+  s.date = '2010-10-19'
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"
-  s.authors = ["Blake Mizerany", "Ryan Tomayko", "Simon Rozet"]
+  s.authors = ["Blake Mizerany", "Ryan Tomayko", "Simon Rozet", "Konstantin Haase"]
   s.email = "sinatrarb@googlegroups.com"
   # = MANIFEST =
@@ -17,6 +17,10 @@ Gem::Specification.new do |s|
     AUTHORS
     CHANGES
     LICENSE
+    README.de.rdoc
+    README.es.rdoc
+    README.fr.rdoc
+    README.hu.rdoc
     README.jp.rdoc
     README.rdoc
     Rakefile
@@ -26,64 +30,103 @@ Gem::Specification.new do |s|
     lib/sinatra/images/500.png
     lib/sinatra/main.rb
     lib/sinatra/showexceptions.rb
-    lib/sinatra/tilt.rb
     sinatra.gemspec
     test/base_test.rb
     test/builder_test.rb
+    test/coffee_test.rb
     test/contest.rb
+    test/encoding_test.rb
     test/erb_test.rb
     test/erubis_test.rb
     test/extensions_test.rb
     test/filter_test.rb
     test/haml_test.rb
+    test/hello.mab
     test/helper.rb
     test/helpers_test.rb
     test/less_test.rb
+    test/liquid_test.rb
     test/mapped_error_test.rb
+    test/markaby_test.rb
+    test/markdown_test.rb
     test/middleware_test.rb
+    test/nokogiri_test.rb
     test/public/favicon.ico
+    test/radius_test.rb
+    test/rdoc_test.rb
     test/request_test.rb
     test/response_test.rb
     test/result_test.rb
     test/route_added_hook_test.rb
     test/routing_test.rb
     test/sass_test.rb
+    test/scss_test.rb
     test/server_test.rb
     test/settings_test.rb
     test/sinatra_test.rb
     test/static_test.rb
     test/templates_test.rb
+    test/textile_test.rb
+    test/views/ascii.haml
     test/views/error.builder
     test/views/error.erb
     test/views/error.erubis
     test/views/error.haml
     test/views/error.sass
+    test/views/explicitly_nested.str
     test/views/foo/hello.test
     test/views/hello.builder
+    test/views/hello.coffee
     test/views/hello.erb
     test/views/hello.erubis
     test/views/hello.haml
     test/views/hello.less
+    test/views/hello.liquid
+    test/views/hello.mab
+    test/views/hello.md
+    test/views/hello.nokogiri
+    test/views/hello.radius
+    test/views/hello.rdoc
     test/views/hello.sass
+    test/views/hello.scss
+    test/views/hello.str
     test/views/hello.test
+    test/views/hello.textile
     test/views/layout2.builder
     test/views/layout2.erb
     test/views/layout2.erubis
     test/views/layout2.haml
+    test/views/layout2.liquid
+    test/views/layout2.mab
+    test/views/layout2.nokogiri
+    test/views/layout2.radius
+    test/views/layout2.str
     test/views/layout2.test
+    test/views/nested.str
+    test/views/utf8.haml
   ]
   # = MANIFEST =
   s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/}
-  s.extra_rdoc_files = %w[README.rdoc LICENSE]
-  s.add_dependency 'rack',    '>= 1.0'
-  s.add_development_dependency 'shotgun', '>= 0.6',   '< 1.0'
-  s.add_development_dependency 'rack-test', '>= 0.3.0'
-  s.add_development_dependency 'haml'
+  s.extra_rdoc_files = %w[README.rdoc README.de.rdoc README.jp.rdoc README.fr.rdoc README.es.rdoc README.hu.rdoc LICENSE]
+  s.add_dependency 'rack', '~> 1.1'
+  s.add_dependency 'tilt', '~> 1.1'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'shotgun', '~> 0.6'
+  s.add_development_dependency 'rack-test', '>= 0.5.6'
+  s.add_development_dependency 'haml', '>= 3.0'
   s.add_development_dependency 'builder'
   s.add_development_dependency 'erubis'
   s.add_development_dependency 'less'
+  s.add_development_dependency 'liquid'
+  s.add_development_dependency 'rdiscount'
+  s.add_development_dependency 'RedCloth'
+  s.add_development_dependency 'radius'
+  s.add_development_dependency 'markaby'
+  s.add_development_dependency 'coffee-script'
+  s.add_development_dependency 'rdoc'
+  s.add_development_dependency 'nokogiri'
   s.has_rdoc = true
   s.homepage = "http://sinatra.rubyforge.org"

data/test/builder_test.rb CHANGED

@@ -2,9 +2,10 @@ require File.dirname(__FILE__) + '/helper'
 require 'builder'
 class BuilderTest < Test::Unit::TestCase
-  def builder_app(&block)
+  def builder_app(options = {}, &block)
     mock_app {
       set :views, File.dirname(__FILE__) + '/views'
+      set options
       get '/', &block
     }
     get '/'
@@ -16,6 +17,29 @@ class BuilderTest < Test::Unit::TestCase
     assert_equal %{<?xml version="1.0" encoding="UTF-8"?>\n}, body
   end
+  it 'defaults content type to xml' do
+    builder_app { builder 'xml.instruct!' }
+    assert ok?
+    assert_equal "application/xml;charset=utf-8", response['Content-Type']
+  end
+  it 'defaults allows setting content type per route' do
+    builder_app do
+      content_type :html
+      builder 'xml.instruct!'
+    end
+    assert ok?
+    assert_equal "text/html;charset=utf-8", response['Content-Type']
+  end
+  it 'defaults allows setting content type globally' do
+    builder_app(:builder => { :content_type => 'html' }) do
+      builder 'xml.instruct!'
+    end
+    assert ok?
+    assert_equal "text/html;charset=utf-8", response['Content-Type']
+  end
   it 'renders inline blocks' do
     builder_app {
       @name = "Frank & Mary"

data/test/coffee_test.rb ADDED

@@ -0,0 +1,88 @@
+require File.dirname(__FILE__) + '/helper'
+begin
+require 'coffee-script'
+class CoffeeTest < Test::Unit::TestCase
+  def coffee_app(options = {}, &block)
+    mock_app {
+      set :views, File.dirname(__FILE__) + '/views'
+      set(options)
+      get '/', &block
+    }
+    get '/'
+  end
+  it 'renders inline Coffee strings' do
+    coffee_app { coffee "alert 'Aye!'\n" }
+    assert ok?
+    assert_equal "(function() {\n  alert('Aye!');\n})();\n", body
+  end
+  it 'defaults content type to javascript' do
+    coffee_app { coffee "alert 'Aye!'\n" }
+    assert ok?
+    assert_equal "application/javascript;charset=utf-8", response['Content-Type']
+  end
+  it 'defaults allows setting content type per route' do
+    coffee_app do
+      content_type :html
+      coffee "alert 'Aye!'\n"
+    end
+    assert ok?
+    assert_equal "text/html;charset=utf-8", response['Content-Type']
+  end
+  it 'defaults allows setting content type globally' do
+    coffee_app(:coffee => { :content_type => 'html' }) do
+      coffee "alert 'Aye!'\n"
+    end
+    assert ok?
+    assert_equal "text/html;charset=utf-8", response['Content-Type']
+  end
+  it 'renders .coffee files in views path' do
+    coffee_app { coffee :hello }
+    assert ok?
+    assert_equal "(function() {\n  alert(\"Aye!\");\n})();\n", body
+  end
+  it 'ignores the layout option' do
+    coffee_app { coffee :hello, :layout => :layout2 }
+    assert ok?
+    assert_equal "(function() {\n  alert(\"Aye!\");\n})();\n", body
+  end
+  it "raises error if template not found" do
+    mock_app {
+      get('/') { coffee :no_such_template }
+    }
+    assert_raise(Errno::ENOENT) { get('/') }
+  end
+  it "passes coffee options to the coffee engine" do
+    coffee_app {
+      coffee "alert 'Aye!'\n",
+        :no_wrap => true
+    }
+    assert ok?
+    assert_equal "alert('Aye!');", body
+  end
+  it "passes default coffee options to the coffee engine" do
+    mock_app {
+      set :coffee, :no_wrap => true # default coffee style is :nested
+      get '/' do
+        coffee "alert 'Aye!'\n"
+      end
+    }
+    get '/'
+    assert ok?
+    assert_equal "alert('Aye!');", body
+  end
+end
+rescue
+  warn "#{$!.to_s}: skipping coffee tests"
+end

data/test/encoding_test.rb ADDED

@@ -0,0 +1,18 @@
+# encoding: UTF-8
+require File.dirname(__FILE__) + '/helper'
+class BaseTest < Test::Unit::TestCase
+  setup do
+    @base = Sinatra.new(Sinatra::Base)
+    @base.set :views, File.dirname(__FILE__) + "/views"
+  end
+  it 'allows unicode strings in ascii templates per default (1.9)' do
+    @base.new.haml(:ascii, {}, :value => "åkej")
+  end
+  it 'allows ascii strings in unicode templates per default (1.9)' do
+    next unless defined? Encoding
+    @base.new.haml(:utf8, {}, :value => "Some Lyrics".encode("ASCII"))
+  end
+end

data/test/filter_test.rb CHANGED

@@ -55,7 +55,7 @@ class BeforeFilterTest < Test::Unit::TestCase
     get '/foo'
     assert redirect?
-    assert_equal '/bar', response['Location']
+    assert_equal 'http://example.org/bar', response['Location']
     assert_equal '', body
   end
@@ -121,6 +121,29 @@ class BeforeFilterTest < Test::Unit::TestCase
     assert_equal File.read(__FILE__), body
     assert !ran_filter
   end
+  it 'takes an optional route pattern' do
+    ran_filter = false
+    mock_app do
+      before("/b*") { ran_filter = true }
+      get('/foo') { }
+      get('/bar') { }
+    end
+    get '/foo'
+    assert !ran_filter
+    get '/bar'
+    assert ran_filter
+  end
+  it 'generates block arguments from route pattern' do
+    subpath = nil
+    mock_app do
+      before("/foo/:sub") { |s| subpath = s }
+      get('/foo/*') { }
+    end
+    get '/foo/bar'
+    assert_equal subpath, 'bar'
+  end
 end
 class AfterFilterTest < Test::Unit::TestCase
@@ -166,7 +189,7 @@ class AfterFilterTest < Test::Unit::TestCase
     get '/foo'
     assert redirect?
-    assert_equal '/bar', response['Location']
+    assert_equal 'http://example.org/bar', response['Location']
     assert_equal '', body
   end
@@ -218,4 +241,40 @@ class AfterFilterTest < Test::Unit::TestCase
     assert_equal File.read(__FILE__), body
     assert !ran_filter
   end
+  it 'takes an optional route pattern' do
+    ran_filter = false
+    mock_app do
+      after("/b*") { ran_filter = true }
+      get('/foo') { }
+      get('/bar') { }
+    end
+    get '/foo'
+    assert !ran_filter
+    get '/bar'
+    assert ran_filter
+  end
+  it 'generates block arguments from route pattern' do
+    subpath = nil
+    mock_app do
+      after("/foo/:sub") { |s| subpath = s }
+      get('/foo/*') { }
+    end
+    get '/foo/bar'
+    assert_equal subpath, 'bar'
+  end
+  it 'is possible to access url params from the route param' do
+    ran = false
+    mock_app do
+      get('/foo/*') { }
+      before('/foo/:sub') do
+        assert_equal params[:sub], 'bar'
+        ran = true
+      end
+    end
+    get '/foo/bar'
+    assert ran
+  end
 end

data/test/hello.mab ADDED

	@@ -0,0 +1 @@
1	+ h1 "Hello From Markaby"

data/test/helper.rb CHANGED

@@ -1,4 +1,5 @@
 ENV['RACK_ENV'] = 'test'
+Encoding.default_external = "UTF-8" if defined? Encoding
 begin
   require 'rack'

data/test/helpers_test.rb CHANGED

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/helper'
+require 'date'
 class HelpersTest < Test::Unit::TestCase
   def test_default
@@ -57,7 +58,7 @@ class HelpersTest < Test::Unit::TestCase
       get '/'
       assert_equal 302, status
       assert_equal '', body
-      assert_equal '/foo', response['Location']
+      assert_equal 'http://example.org/foo', response['Location']
     end
     it 'uses the code given when specified' do
@@ -71,7 +72,7 @@ class HelpersTest < Test::Unit::TestCase
       get '/'
       assert_equal 301, status
       assert_equal '', body
-      assert_equal '/foo', response['Location']
+      assert_equal 'http://example.org/foo', response['Location']
     end
     it 'redirects back to request.referer when passed back' do
@@ -84,7 +85,31 @@ class HelpersTest < Test::Unit::TestCase
       request = Rack::MockRequest.new(@app)
       response = request.get('/try_redirect', 'HTTP_REFERER' => '/foo')
       assert_equal 302, response.status
-      assert_equal '/foo', response['Location']
+      assert_equal 'http://example.org/foo', response['Location']
+    end
+    it 'redirects using a non-standard HTTP port' do
+      mock_app {
+        get '/' do
+          redirect '/foo'
+        end
+      }
+      request = Rack::MockRequest.new(@app)
+      response = request.get('/', 'SERVER_PORT' => '81')
+      assert_equal 'http://example.org:81/foo', response['Location']
+    end
+    it 'redirects using a non-standard HTTPS port' do
+      mock_app {
+        get '/' do
+          redirect '/foo'
+        end
+      }
+      request = Rack::MockRequest.new(@app)
+      response = request.get('/', 'SERVER_PORT' => '444')
+      assert_equal 'http://example.org:444/foo', response['Location']
     end
   end
@@ -266,21 +291,21 @@ class HelpersTest < Test::Unit::TestCase
       }
       get '/'
-      assert_equal 'text/plain', response['Content-Type']
+      assert_equal 'text/plain;charset=utf-8', 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'
+          content_type 'text/html', :charset => 'latin1'
           "<h1>Hello, World</h1>"
         end
       }
       get '/'
       assert ok?
-      assert_equal 'text/html;charset=utf-8', response['Content-Type']
+      assert_equal 'text/html;charset=latin1', response['Content-Type']
       assert_equal "<h1>Hello, World</h1>", body
     end
@@ -295,7 +320,7 @@ class HelpersTest < Test::Unit::TestCase
       get '/foo.xml'
       assert ok?
-      assert_equal 'application/foo', response['Content-Type']
+      assert_equal 'application/foo;charset=utf-8', response['Content-Type']
       assert_equal 'I AM FOO', body
     end
@@ -341,7 +366,19 @@ class HelpersTest < Test::Unit::TestCase
     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']
+      assert_equal 'text/plain;charset=utf-8', response['Content-Type']
+    end
+    it 'sets the Content-Type response header if type option is set to a file extesion' do
+      send_file_app :type => 'html'
+      get '/file.txt'
+      assert_equal 'text/html;charset=utf-8', response['Content-Type']
+    end
+    it 'sets the Content-Type response header if type option is set to a mime type' do
+      send_file_app :type => 'application/octet-stream'
+      get '/file.txt'
+      assert_equal 'application/octet-stream;charset=utf-8', response['Content-Type']
     end
     it 'sets the Content-Length response header' do
@@ -423,42 +460,109 @@ class HelpersTest < Test::Unit::TestCase
   end
   describe 'last_modified' do
-    setup do
-      now = Time.now
-      mock_app {
-        get '/' do
-          body { 'Hello World' }
-          last_modified now
-          'Boo!'
-        end
-      }
-      @now = now
-    end
+    it 'ignores nil' do
+      mock_app do
+        get '/' do last_modified nil; 200; end
+      end
-    it 'sets the Last-Modified header to a valid RFC 2616 date value' do
       get '/'
-      assert_equal @now.httpdate, response['Last-Modified']
+      assert ! response['Last-Modified']
     end
-    it 'returns a body when conditional get misses' do
-      get '/'
-      assert_equal 200, status
-      assert_equal 'Boo!', body
-    end
+    [Time, DateTime].each do |klass|
+      describe "with #{klass.name}" do
+        setup do
+          last_modified_time = klass.now
+          mock_app do
+            get '/' do
+              last_modified last_modified_time
+              'Boo!'
+            end
+          end
+          @last_modified_time = Time.parse last_modified_time.to_s
+        end
-    it 'halts when a conditional GET matches' do
-      get '/', {}, { 'HTTP_IF_MODIFIED_SINCE' => @now.httpdate }
-      assert_equal 304, status
-      assert_equal '', body
-    end
+        # fixes strange missing test error when running complete test suite.
+        it("does not complain about missing tests") { }
-    it 'ignores nil' do
-      mock_app {
-        get '/' do last_modified nil; 200; end
-      }
+        context "when there's no If-Modified-Since header" do
+          it 'sets the Last-Modified header to a valid RFC 2616 date value' do
+            get '/'
+            assert_equal @last_modified_time.httpdate, response['Last-Modified']
+          end
-      get '/'
-      assert ! response['Last-Modified']
+          it 'conditional GET misses and returns a body' do
+            get '/'
+            assert_equal 200, status
+            assert_equal 'Boo!', body
+          end
+        end
+        context "when there's an invalid If-Modified-Since header" do
+          it 'sets the Last-Modified header to a valid RFC 2616 date value' do
+            get '/', {}, { 'HTTP_IF_MODIFIED_SINCE' => 'a really weird date' }
+            assert_equal @last_modified_time.httpdate, response['Last-Modified']
+          end
+          it 'conditional GET misses and returns a body' do
+            get '/', {}, { 'HTTP_IF_MODIFIED_SINCE' => 'a really weird date' }
+            assert_equal 200, status
+            assert_equal 'Boo!', body
+          end
+        end
+        context "when the resource has been modified since the If-Modified-Since header date" do
+          it 'sets the Last-Modified header to a valid RFC 2616 date value' do
+            get '/', {}, { 'HTTP_IF_MODIFIED_SINCE' => (@last_modified_time - 1).httpdate }
+            assert_equal @last_modified_time.httpdate, response['Last-Modified']
+          end
+          it 'conditional GET misses and returns a body' do
+            get '/', {}, { 'HTTP_IF_MODIFIED_SINCE' => (@last_modified_time - 1).httpdate }
+            assert_equal 200, status
+            assert_equal 'Boo!', body
+          end
+          it 'does not rely on string comparison' do
+            mock_app do
+              get '/compare' do
+                last_modified "Mon, 18 Oct 2010 20:57:11 GMT"
+                "foo"
+              end
+            end
+            get '/compare', {}, { 'HTTP_IF_MODIFIED_SINCE' => 'Sun, 26 Sep 2010 23:43:52 GMT' }
+            assert_equal 200, status
+            assert_equal 'foo', body
+          end
+        end
+        context "when the resource has been modified on the exact If-Modified-Since header date" do
+          it 'sets the Last-Modified header to a valid RFC 2616 date value' do
+            get '/', {}, { 'HTTP_IF_MODIFIED_SINCE' => @last_modified_time.httpdate }
+            assert_equal @last_modified_time.httpdate, response['Last-Modified']
+          end
+          it 'conditional GET matches and halts' do
+            get '/', {}, { 'HTTP_IF_MODIFIED_SINCE' => @last_modified_time.httpdate }
+            assert_equal 304, status
+            assert_equal '', body
+          end
+        end
+        context "when the resource hasn't been modified since the If-Modified-Since header date" do
+          it 'sets the Last-Modified header to a valid RFC 2616 date value' do
+            get '/', {}, { 'HTTP_IF_MODIFIED_SINCE' => (@last_modified_time + 1).httpdate }
+            assert_equal @last_modified_time.httpdate, response['Last-Modified']
+          end
+          it 'conditional GET matches and halts' do
+            get '/', {}, { 'HTTP_IF_MODIFIED_SINCE' => (@last_modified_time + 1).httpdate }
+            assert_equal 304, status
+            assert_equal '', body
+          end
+        end
+      end
     end
   end