sinatra 1.4.8 → 2.0.0.beta1

data/test/base_test.rb

@@ -1,167 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-class BaseTest < Minitest::Test
-  describe 'Sinatra::Base subclasses' do
-    class TestApp < Sinatra::Base
-      get('/') { 'Hello World' }
-    end
-
-    it 'include Rack::Utils' do
-      assert TestApp.included_modules.include?(Rack::Utils)
-    end
-
-    it 'processes requests with #call' do
-      assert TestApp.respond_to?(:call)
-
-      request = Rack::MockRequest.new(TestApp)
-      response = request.get('/')
-      assert response.ok?
-      assert_equal 'Hello World', response.body
-    end
-
-    class TestApp < Sinatra::Base
-      get '/state' do
-        @foo ||= "new"
-        body = "Foo: #{@foo}"
-        @foo = 'discard'
-        body
-      end
-    end
-
-    it 'does not maintain state between requests' do
-      request = Rack::MockRequest.new(TestApp)
-      2.times do
-        response = request.get('/state')
-        assert response.ok?
-        assert_equal 'Foo: new', response.body
-      end
-    end
-
-    it "passes the subclass to configure blocks" do
-      ref = nil
-      TestApp.configure { |app| ref = app }
-      assert_equal TestApp, ref
-    end
-
-    it "allows the configure block arg to be omitted and does not change context" do
-      context = nil
-      TestApp.configure { context = self }
-      assert_equal self, context
-    end
-  end
-
-  describe "Sinatra::Base#new" do
-    it 'returns a wrapper' do
-      assert_equal Sinatra::Wrapper, Sinatra::Base.new.class
-    end
-
-    it 'implements a nice inspect' do
-      assert_equal '#<Sinatra::Base app_file=nil>', Sinatra::Base.new.inspect
-    end
-
-    it 'exposes settings' do
-      assert_equal Sinatra::Base.settings, Sinatra::Base.new.settings
-    end
-
-    it 'exposes helpers' do
-      assert_equal 'image/jpeg', Sinatra::Base.new.helpers.mime_type(:jpg)
-    end
-  end
-
-  describe "Sinatra::Base as Rack middleware" do
-    app = lambda { |env|
-      headers = {'X-Downstream' => 'true'}
-      headers['X-Route-Missing'] = env['sinatra.route-missing'] || ''
-      [210, headers, ['Hello from downstream']] }
-
-    class TestMiddleware < Sinatra::Base
-    end
-
-    it 'creates a middleware that responds to #call with .new' do
-      middleware = TestMiddleware.new(app)
-      assert middleware.respond_to?(:call)
-    end
-
-    it 'exposes the downstream app' do
-      middleware = TestMiddleware.new!(app)
-      assert_same app, middleware.app
-    end
-
-    class TestMiddleware < Sinatra::Base
-      def route_missing
-        env['sinatra.route-missing'] = '1'
-        super
-      end
-
-      get('/') { 'Hello from middleware' }
-    end
-
-    middleware = TestMiddleware.new(app)
-    request = Rack::MockRequest.new(middleware)
-
-    it 'intercepts requests' do
-      response = request.get('/')
-      assert response.ok?
-      assert_equal 'Hello from middleware', response.body
-    end
-
-    it 'automatically forwards requests downstream when no matching route found' do
-      response = request.get('/missing')
-      assert_equal 210, response.status
-      assert_equal 'Hello from downstream', response.body
-    end
-
-    it 'calls #route_missing before forwarding downstream' do
-      response = request.get('/missing')
-      assert_equal '1', response['X-Route-Missing']
-    end
-
-    class TestMiddleware < Sinatra::Base
-      get('/low-level-forward') { app.call(env) }
-    end
-
-    it 'can call the downstream app directly and return result' do
-      response = request.get('/low-level-forward')
-      assert_equal 210, response.status
-      assert_equal 'true', response['X-Downstream']
-      assert_equal 'Hello from downstream', response.body
-    end
-
-    class TestMiddleware < Sinatra::Base
-      get '/explicit-forward' do
-        response['X-Middleware'] = 'true'
-        res = forward
-        assert_nil res
-        assert_equal 210, response.status
-        assert_equal 'true', response['X-Downstream']
-        assert_equal ['Hello from downstream'], response.body
-        'Hello after explicit forward'
-      end
-    end
-
-    it 'forwards the request downstream and integrates the response into the current context' do
-      response = request.get('/explicit-forward')
-      assert_equal 210, response.status
-      assert_equal 'true', response['X-Downstream']
-      assert_equal 'Hello after explicit forward', response.body
-      assert_equal '28', response['Content-Length']
-    end
-
-    app_content_length = lambda {|env|
-      [200, {'Content-Length' => '16'}, 'From downstream!']}
-
-    class TestMiddlewareContentLength < Sinatra::Base
-      get '/forward' do
-        'From after explicit forward!'
-      end
-    end
-
-    middleware_content_length = TestMiddlewareContentLength.new(app_content_length)
-    request_content_length = Rack::MockRequest.new(middleware_content_length)
-
-    it "sets content length for last response" do
-      response = request_content_length.get('/forward')
-      assert_equal '28', response['Content-Length']
-    end
-  end
-end

data/test/builder_test.rb

@@ -1,91 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-begin
-require 'builder'
-
-class BuilderTest < Minitest::Test
-  def builder_app(options = {}, &block)
-    mock_app do
-      set :views, File.dirname(__FILE__) + '/views'
-      set options
-      get('/', &block)
-    end
-    get '/'
-  end
-
-  it 'renders inline Builder strings' do
-    builder_app { builder 'xml.instruct!' }
-    assert ok?
-    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 do
-      @name = "Frank & Mary"
-      builder { |xml| xml.couple @name }
-    end
-    assert ok?
-    assert_equal "<couple>Frank &amp; Mary</couple>\n", body
-  end
-
-  it 'renders .builder files in views path' do
-    builder_app do
-      @name = "Blue"
-      builder :hello
-    end
-    assert ok?
-    assert_equal %(<exclaim>You're my boy, Blue!</exclaim>\n), body
-  end
-
-  it "renders with inline layouts" do
-    mock_app do
-      layout { %(xml.layout { xml << yield }) }
-      get('/') { builder %(xml.em 'Hello World') }
-    end
-    get '/'
-    assert ok?
-    assert_equal "<layout>\n<em>Hello World</em>\n</layout>\n", body
-  end
-
-  it "renders with file layouts" do
-    builder_app do
-      builder %(xml.em 'Hello World'), :layout => :layout2
-    end
-    assert ok?
-    assert_equal "<layout>\n<em>Hello World</em>\n</layout>\n", body
-  end
-
-  it "raises error if template not found" do
-    mock_app do
-      get('/') { builder :no_such_template }
-    end
-    assert_raises(Errno::ENOENT) { get('/') }
-  end
-end
-
-rescue LoadError
-  warn "#{$!.to_s}: skipping builder tests"
-end

data/test/coffee_test.rb

@@ -1,96 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-begin
-require 'coffee-script'
-require 'execjs'
-
-begin
-  ExecJS.compile '1'
-rescue Exception
-  raise LoadError, 'unable to execute JavaScript'
-end
-
-class CoffeeTest < Minitest::Test
-  def coffee_app(options = {}, &block)
-    mock_app do
-      set :views, File.dirname(__FILE__) + '/views'
-      set(options)
-      get('/', &block)
-    end
-    get '/'
-  end
-
-  it 'renders inline Coffee strings' do
-    coffee_app { coffee "alert 'Aye!'\n" }
-    assert ok?
-    assert body.include?("alert('Aye!');")
-  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_include body, "alert(\"Aye!\");"
-  end
-
-  it 'ignores the layout option' do
-    coffee_app { coffee :hello, :layout => :layout2 }
-    assert ok?
-    assert_include body, "alert(\"Aye!\");"
-  end
-
-  it "raises error if template not found" do
-    mock_app {
-      get('/') { coffee :no_such_template }
-    }
-    assert_raises(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_body "alert('Aye!');"
-  end
-
-  it "passes default coffee options to the coffee engine" do
-    mock_app do
-      set :coffee, :no_wrap => true # default coffee style is :nested
-      get('/') { coffee "alert 'Aye!'\n" }
-    end
-    get '/'
-    assert ok?
-    assert_body "alert('Aye!');"
-  end
-end
-
-rescue LoadError
-  warn "#{$!.to_s}: skipping coffee tests"
-rescue
-  if $!.class.name == 'ExecJS::RuntimeUnavailable'
-    warn "#{$!.to_s}: skipping coffee tests"
-  else
-    raise
-  end
-end

data/test/compile_test.rb

@@ -1,183 +0,0 @@
-# I like coding: UTF-8
-require File.expand_path('../helper', __FILE__)
-
-class CompileTest < Minitest::Test
-
-  def self.converts pattern, expected_regexp
-    it "generates #{expected_regexp.source} from #{pattern}" do
-      compiled, _ = compiled pattern
-      assert_equal expected_regexp, compiled, "Pattern #{pattern} is not compiled into #{expected_regexp.source}. Was #{compiled.source}."
-    end
-  end
-  def self.parses pattern, example, expected_params
-    it "parses #{example} with #{pattern} into params #{expected_params}" do
-      compiled, keys = compiled pattern
-      match = compiled.match(example)
-      fail %Q{"#{example}" does not parse on pattern "#{pattern}" (compiled pattern is #{compiled.source}).} unless match
-
-      # Aggregate e.g. multiple splat values into one array.
-      #
-      params = keys.zip(match.captures).reduce({}) do |hash, mapping|
-        key, value = mapping
-        hash[key] = if existing = hash[key]
-          existing.respond_to?(:to_ary) ? existing << value : [existing, value]
-        else
-          value
-        end
-        hash
-      end
-
-      assert_equal expected_params, params, "Pattern #{pattern} does not match path #{example}."
-    end
-  end
-  def self.fails pattern, example
-    it "does not parse #{example} with #{pattern}" do
-      compiled, _ = compiled pattern
-      match = compiled.match(example)
-      fail %Q{"#{pattern}" does parse "#{example}" but it should fail} if match
-    end
-  end
-  def compiled pattern
-    app ||= mock_app {}
-    compiled, keys = app.send(:compile, pattern)
-    [compiled, keys]
-  end
-
-  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"
-  parses "/:foo", "/foo%2Fbar", "foo" => "foo%2Fbar"
-  parses "/:foo", "/%0Afoo",    "foo" => "%0Afoo"
-  fails  "/:foo", "/foo?"
-  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"
-  parses "/:name.?:format?", "/foo%2Ebar", "name" => "foo", "format" => "bar"
-  parses "/:name?.?:format", "/.bar", "name" => nil, "format" => "bar"
-  parses "/:name?.?:format?", "/.bar", "name" => nil, "format" => "bar"
-  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"
-  parses "/:file.:ext", "/pony正%2Ejpg", "file" => "pony正", "ext" => "jpg"
-  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"
-end