sinatra 1.4.3 → 1.4.4

data/lib/sinatra/version.rb

@@ -1,3 +1,3 @@
 module Sinatra
-  VERSION = '1.4.3'
+  VERSION = '1.4.4'
 end

data/test/base_test.rb

@@ -156,7 +156,6 @@ class BaseTest < Test::Unit::TestCase
 
     class TestMiddlewareContentLength < Sinatra::Base
       get '/forward' do
-        res = forward
         'From after explicit forward!'
       end
     end

data/test/compile_test.rb

@@ -45,10 +45,10 @@ class CompileTest < Test::Unit::TestCase
 
   converts "/", %r{\A/\z}
   parses "/", "/", {}
-  
+
   converts "/foo", %r{\A/foo\z}
   parses "/foo", "/foo", {}
-  
+
   converts "/:foo", %r{\A/([^/?#]+)\z}
   parses "/:foo", "/foo",       "foo" => "foo"
   parses "/:foo", "/foo.bar",   "foo" => "foo.bar"
@@ -58,68 +58,68 @@ class CompileTest < Test::Unit::TestCase
   fails  "/:foo", "/foo/bar"
   fails  "/:foo", "/"
   fails  "/:foo", "/foo/"
-  
+
   converts "/föö", %r{\A/f%[Cc]3%[Bb]6%[Cc]3%[Bb]6\z}
   parses "/föö", "/f%C3%B6%C3%B6", {}
-  
+
   converts "/:foo/:bar", %r{\A/([^/?#]+)/([^/?#]+)\z}
   parses "/:foo/:bar", "/foo/bar", "foo" => "foo", "bar" => "bar"
-  
+
   converts "/hello/:person", %r{\A/hello/([^/?#]+)\z}
   parses "/hello/:person", "/hello/Frank", "person" => "Frank"
-  
+
   converts "/?:foo?/?:bar?", %r{\A/?([^/?#]+)?/?([^/?#]+)?\z}
   parses "/?:foo?/?:bar?", "/hello/world", "foo" => "hello", "bar" => "world"
   parses "/?:foo?/?:bar?", "/hello",       "foo" => "hello", "bar" => nil
   parses "/?:foo?/?:bar?", "/",            "foo" => nil, "bar" => nil
   parses "/?:foo?/?:bar?", "",             "foo" => nil, "bar" => nil
-  
+
   converts "/*", %r{\A/(.*?)\z}
   parses "/*", "/",       "splat" => ""
   parses "/*", "/foo",    "splat" => "foo"
   parses "/*", "/foo/bar", "splat" => "foo/bar"
-  
+
   converts "/:foo/*", %r{\A/([^/?#]+)/(.*?)\z}
   parses "/:foo/*", "/foo/bar/baz", "foo" => "foo", "splat" => "bar/baz"
-  
+
   converts "/:foo/:bar", %r{\A/([^/?#]+)/([^/?#]+)\z}
   parses "/:foo/:bar", "/user@example.com/name", "foo" => "user@example.com", "bar" => "name"
-  
+
   converts "/test$/", %r{\A/test(?:\$|%24)/\z}
   parses "/test$/", "/test$/", {}
-  
+
   converts "/te+st/", %r{\A/te(?:\+|%2[Bb])st/\z}
   parses "/te+st/", "/te+st/", {}
   fails  "/te+st/", "/test/"
   fails  "/te+st/", "/teeest/"
-  
+
   converts "/test(bar)/", %r{\A/test(?:\(|%28)bar(?:\)|%29)/\z}
   parses "/test(bar)/", "/test(bar)/", {}
-  
+
   converts "/path with spaces", %r{\A/path(?:%20|(?:\+|%2[Bb]))with(?:%20|(?:\+|%2[Bb]))spaces\z}
   parses "/path with spaces", "/path%20with%20spaces", {}
   parses "/path with spaces", "/path%2Bwith%2Bspaces", {}
   parses "/path with spaces", "/path+with+spaces",     {}
-  
+
   converts "/foo&bar", %r{\A/foo(?:&|%26)bar\z}
   parses "/foo&bar", "/foo&bar", {}
-  
+
   converts "/:foo/*", %r{\A/([^/?#]+)/(.*?)\z}
   parses "/:foo/*", "/hello%20world/how%20are%20you", "foo" => "hello%20world", "splat" => "how%20are%20you"
-  
+
   converts "/*/foo/*/*", %r{\A/(.*?)/foo/(.*?)/(.*?)\z}
   parses "/*/foo/*/*", "/bar/foo/bling/baz/boom", "splat" => ["bar", "bling", "baz/boom"]
   fails  "/*/foo/*/*", "/bar/foo/baz"
-  
+
   converts "/test.bar", %r{\A/test(?:\.|%2[Ee])bar\z}
   parses "/test.bar", "/test.bar", {}
   fails  "/test.bar", "/test0bar"
-  
+
   converts "/:file.:ext", %r{\A/((?:[^\./?#%]|(?:%[^2].|%[2][^Ee]))+)(?:\.|%2[Ee])((?:[^/?#%]|(?:%[^2].|%[2][^Ee]))+)\z}
   parses "/:file.:ext", "/pony.jpg",   "file" => "pony", "ext" => "jpg"
   parses "/:file.:ext", "/pony%2Ejpg", "file" => "pony", "ext" => "jpg"
   fails  "/:file.:ext", "/.jpg"
-  
+
   converts "/:name.?:format?", %r{\A/((?:[^\./?#%]|(?:%[^2].|%[2][^Ee]))+)(?:\.|%2[Ee])?((?:[^/?#%]|(?:%[^2].|%[2][^Ee]))+)?\z}
   parses "/:name.?:format?", "/foo",       "name" => "foo", "format" => nil
   parses "/:name.?:format?", "/foo.bar",   "name" => "foo", "format" => "bar"
@@ -129,41 +129,41 @@ class CompileTest < Test::Unit::TestCase
   parses "/:name?.:format?", "/.bar", "name" => nil, "format" => "bar"
   fails  "/:name.:format", "/.bar"
   fails  "/:name.?:format?", "/.bar"
-  
+
   converts "/:user@?:host?", %r{\A/((?:[^@/?#%]|(?:%[^4].|%[4][^0]))+)(?:@|%40)?((?:[^@/?#%]|(?:%[^4].|%[4][^0]))+)?\z}
   parses "/:user@?:host?", "/foo@bar",     "user" => "foo", "host" => "bar"
   parses "/:user@?:host?", "/foo.foo@bar", "user" => "foo.foo", "host" => "bar"
   parses "/:user@?:host?", "/foo@bar.bar", "user" => "foo", "host" => "bar.bar"
-  
+
   # From https://gist.github.com/2154980#gistcomment-169469.
   #
   # converts "/:name(.:format)?", %r{\A/([^\.%2E/?#]+)(?:\(|%28)(?:\.|%2E)([^\.%2E/?#]+)(?:\)|%29)?\z}
   # parses "/:name(.:format)?", "/foo", "name" => "foo", "format" => nil
   # parses "/:name(.:format)?", "/foo.bar", "name" => "foo", "format" => "bar"
   fails "/:name(.:format)?", "/foo."
-  
+
   parses "/:id/test.bar", "/3/test.bar", {"id" => "3"}
   parses "/:id/test.bar", "/2/test.bar", {"id" => "2"}
   parses "/:id/test.bar", "/2E/test.bar", {"id" => "2E"}
   parses "/:id/test.bar", "/2e/test.bar", {"id" => "2e"}
   parses "/:id/test.bar", "/%2E/test.bar", {"id" => "%2E"}
-  
+
   parses '/10/:id', '/10/test', "id" => "test"
   parses '/10/:id', '/10/te.st', "id" => "te.st"
-  
+
   parses '/10.1/:id', '/10.1/test', "id" => "test"
   parses '/10.1/:id', '/10.1/te.st', "id" => "te.st"
   parses '/:foo/:id', '/10.1/te.st', "foo" => "10.1", "id" => "te.st"
   parses '/:foo/:id', '/10.1.2/te.st', "foo" => "10.1.2", "id" => "te.st"
   parses '/:foo.:bar/:id', '/10.1/te.st', "foo" => "10", "bar" => "1", "id" => "te.st"
   fails '/:foo.:bar/:id', '/10.1.2/te.st' # We don't do crazy.
-  
+
   parses '/:a/:b.?:c?', '/a/b',       "a" => "a",   "b" => "b", "c" => nil
   parses '/:a/:b.?:c?', '/a/b.c',     "a" => "a",   "b" => "b", "c" => "c"
   parses '/:a/:b.?:c?', '/a.b/c',     "a" => "a.b", "b" => "c", "c" => nil
   parses '/:a/:b.?:c?', '/a.b/c.d',   "a" => "a.b", "b" => "c", "c" => "d"
   fails  '/:a/:b.?:c?', '/a.b/c.d/e'
-  
+
   parses "/:file.:ext", "/pony%2ejpg", "file" => "pony", "ext" => "jpg"
   parses "/:file.:ext", "/pony%E6%AD%A3%2Ejpg", "file" => "pony%E6%AD%A3", "ext" => "jpg"
   parses "/:file.:ext", "/pony%e6%ad%a3%2ejpg", "file" => "pony%e6%ad%a3", "ext" => "jpg"
@@ -171,12 +171,12 @@ class CompileTest < Test::Unit::TestCase
   parses "/:file.:ext", "/pony正%2ejpg", "file" => "pony正", "ext" => "jpg"
   parses "/:file.:ext", "/pony正..jpg", "file" => "pony正", "ext" => ".jpg"
   fails  "/:file.:ext", "/pony正.%2ejpg"
-  
+
   converts "/:name.:format", %r{\A/((?:[^\./?#%]|(?:%[^2].|%[2][^Ee]))+)(?:\.|%2[Ee])((?:[^/?#%]|(?:%[^2].|%[2][^Ee]))+)\z}
   parses "/:name.:format", "/file.tar.gz", "name" => "file", "format" => "tar.gz"
   parses "/:name.:format1.:format2", "/file.tar.gz", "name" => "file", "format1" => "tar", "format2" => "gz"
   parses "/:name.:format1.:format2", "/file.temp.tar.gz", "name" => "file", "format1" => "temp", "format2" => "tar.gz"
-  
+
   # From issue #688.
   #
   parses "/articles/10.1103/:doi", "/articles/10.1103/PhysRevLett.110.026401", "doi" => "PhysRevLett.110.026401"

data/test/filter_test.rb

@@ -445,7 +445,7 @@ class AfterFilterTest < Test::Unit::TestCase
     assert ran
   end
 
-  it 'only triggeres provides condition if conforms with current Content-Type' do
+  it 'only triggers provides condition if conforms with current Content-Type' do
     mock_app do
       before(:provides => :txt)  { @type = 'txt' }
       before(:provides => :html) { @type = 'html' }

data/test/helpers_test.rb

@@ -905,6 +905,17 @@ class HelpersTest < Test::Unit::TestCase
       get '/'
       assert_equal 'image/gif', response['Content-Type']
     end
+
+    it 'can have :status option as a string' do
+      path = @file
+      mock_app do
+        post '/' do
+          send_file path, :status => '422'
+        end
+      end
+      post '/'
+      assert_equal response.status, 422
+    end
   end
 
   describe 'cache_control' do

data/test/integration/app.rb

@@ -44,6 +44,23 @@ get '/send' do
   "ok"
 end
 
+get '/send_file' do
+  file = File.expand_path '../../views/a/in_a.str', __FILE__
+  send_file file
+end
+
+get '/streaming' do
+  headers['Content-Length'] = '46'
+  stream do |out|
+    out << "It's gonna be legen -\n"
+    sleep 0.5
+    out << " (wait for it) \n"
+    puts headers
+    sleep 1
+    out << "- dary!\n"
+  end
+end
+
 class Subclass < Sinatra::Base
   set :out, nil
   get '/subclass/async' do

data/test/integration_helper.rb

@@ -73,6 +73,15 @@ module IntegrationHelper
       end
     end
 
+    def get_response(url)
+      Net::HTTP.start '127.0.0.1', port do |http|
+        request = Net::HTTP::Get.new url
+        http.request request do |response|
+          response
+        end
+      end
+    end
+
     def get(url)
       Timeout.timeout(1) { open("http://127.0.0.1:#{port}#{url}").read }
     end
@@ -221,7 +230,7 @@ module IntegrationHelper
 
     base_port = 5000 + Process.pid % 100
     Sinatra::Base.server.each_with_index do |server, index|
-      Server.run(server, 5000+index)
+      Server.run(server, base_port+index)
     end
   end
 end

data/test/integration_test.rb

@@ -91,4 +91,14 @@ class IntegrationTest < Test::Unit::TestCase
     server.get '/app_file'
     assert_equal [], server.warnings
   end
-end
+
+  it 'sets the Content-Length response header when sending files' do
+    response = server.get_response '/send_file'
+    assert response['Content-Length']
+  end
+
+  it "doesn't ignore Content-Length header when streaming" do
+    response = server.get_response '/streaming'
+    assert_equal '46', response['Content-Length']
+  end
+end

data/test/rdoc_test.rb

@@ -16,13 +16,13 @@ class RdocTest < Test::Unit::TestCase
   it 'renders inline rdoc strings' do
     rdoc_app { rdoc '= Hiya' }
     assert ok?
-    assert_body /<h1[^>]*>Hiya(<span><a href=\"#label-Hiya\">&para;<\/a> <a href=\"#documentation\">&uarr;<\/a><\/span>)?<\/h1>/
+    assert_body(/<h1[^>]*>Hiya(<span><a href=\"#label-Hiya\">&para;<\/a> <a href=\"#documentation\">&uarr;<\/a><\/span>)?<\/h1>/)
   end
 
   it 'renders .rdoc files in views path' do
     rdoc_app { rdoc :hello }
     assert ok?
-    assert_body /<h1[^>]*>Hello From RDoc(<span><a href=\"#label-Hello\+From\+RDoc\">&para;<\/a> <a href=\"#documentation\">&uarr;<\/a><\/span>)?<\/h1>/
+    assert_body(/<h1[^>]*>Hello From RDoc(<span><a href=\"#label-Hello\+From\+RDoc\">&para;<\/a> <a href=\"#documentation\">&uarr;<\/a><\/span>)?<\/h1>/)
   end
 
   it "raises error if template not found" do

data/test/request_test.rb

@@ -63,6 +63,11 @@ class RequestTest < Test::Unit::TestCase
     end
   end
 
+  it "accepts types when wildcards are requested" do
+    request = Sinatra::Request.new('HTTP_ACCEPT' => 'image/*')
+    assert request.accept?('image/jpeg')
+  end
+
   it "properly decodes MIME type parameters" do
     request = Sinatra::Request.new(
       'HTTP_ACCEPT' => 'image/jpeg;unquoted=0.25;quoted="0.25";chartest="\";,\x"'
@@ -70,4 +75,18 @@ class RequestTest < Test::Unit::TestCase
     expected = { 'unquoted' => '0.25', 'quoted' => '0.25', 'chartest' => '";,x' }
     assert_equal(expected, request.preferred_type.params)
   end
+
+  it 'accepts */* when HTTP_ACCEPT is not present in the request' do
+    request = Sinatra::Request.new Hash.new
+    assert_equal 1, request.accept.size
+    assert request.accept?('text/html')
+    assert_equal '*/*', request.preferred_type.to_s
+  end
+
+  it 'accepts */* when HTTP_ACCEPT is blank in the request' do
+    request = Sinatra::Request.new 'HTTP_ACCEPT' => ''
+    assert_equal 1, request.accept.size
+    assert request.accept?('text/html')
+    assert_equal '*/*', request.preferred_type.to_s
+  end
 end

data/test/response_test.rb

@@ -37,7 +37,7 @@ class ResponseTest < Test::Unit::TestCase
 
   it 'Calculates the Content-Length using the bytesize of the body' do
     @response.body = ['Hello', 'World!', '✈']
-    status, headers, body = @response.finish
+    _, headers, body = @response.finish
     assert_equal '14', headers['Content-Length']
     assert_same_body @response.body, body
   end

data/test/routing_test.rb

@@ -669,6 +669,24 @@ class RoutingTest < Test::Unit::TestCase
     assert "this", body
   end
 
+  it "uses optional block passed to pass as route block if no other route is found and superclass has non-matching routes" do
+    base = Class.new(Sinatra::Base)
+    base.get('/foo') { 'foo in baseclass' }
+
+    mock_app(base) {
+      get "/" do
+        pass do
+          "this"
+        end
+        "not this"
+      end
+    }
+
+    get "/"
+    assert_equal 200, status
+    assert "this", body
+  end
+
   it "passes when matching condition returns false" do
     mock_app {
       condition { params[:foo] == 'bar' }

data/test/slim_test.rb

@@ -48,7 +48,7 @@ class SlimTest < Test::Unit::TestCase
   HTML4_DOCTYPE = "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">"
 
   it "passes slim options to the slim engine" do
-    mock_app { get('/') { slim("x foo='bar'", :attr_wrapper => "'") }}
+    mock_app { get('/') { slim("x foo='bar'", :attr_quote => "'") }}
     get '/'
     assert ok?
     assert_body "<x foo='bar'></x>"
@@ -56,7 +56,7 @@ class SlimTest < Test::Unit::TestCase
 
   it "passes default slim options to the slim engine" do
     mock_app do
-      set :slim, :attr_wrapper => "'"
+      set :slim, :attr_quote => "'"
       get('/') { slim("x foo='bar'") }
     end
     get '/'
@@ -66,9 +66,9 @@ class SlimTest < Test::Unit::TestCase
 
   it "merges the default slim options with the overrides and passes them to the slim engine" do
     mock_app do
-      set :slim, :attr_wrapper => "'"
+      set :slim, :attr_quote => "'"
       get('/') { slim("x foo='bar'") }
-      get('/other') { slim("x foo='bar'", :attr_wrapper => '"') }
+      get('/other') { slim("x foo='bar'", :attr_quote => '"') }
     end
     get '/'
     assert ok?

data/test/templates_test.rb

@@ -79,6 +79,21 @@ class TemplatesTest < Test::Unit::TestCase
     assert_equal "Hello World!", body
   end
 
+  it 'allows overriding false default layout with explicit true' do
+    mock_app do
+      template(:layout) { 'Layout!!! <%= yield %>' }
+      set :erb, :layout => false
+
+      get('/') do
+        erb('Hello World!', { :layout => true })
+      end
+    end
+
+    get '/'
+    assert ok?
+    assert_equal "Layout!!! Hello World!", body
+  end
+
   it 'renders String templates directly' do
     render_app { render(:test, 'Hello World') }
     assert ok?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Blake Mizerany
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -105,7 +105,7 @@ files:
 - lib/sinatra/images/404.png
 - lib/sinatra/images/500.png
 - lib/sinatra/main.rb
-- lib/sinatra/showexceptions.rb
+- lib/sinatra/show_exceptions.rb
 - lib/sinatra/version.rb
 - sinatra.gemspec
 - test/base_test.rb
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Classy web-development dressed in a DSL