sinatra 1.4.8 → 2.1.0

data/test/static_test.rb

@@ -1,266 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-class StaticTest < Minitest::Test
-  setup do
-    mock_app do
-      set :static, true
-      set :public_folder, File.dirname(__FILE__)
-    end
-  end
-
-  it 'serves GET requests for files in the public directory' do
-    get "/#{File.basename(__FILE__)}"
-    assert ok?
-    assert_equal File.read(__FILE__), body
-    assert_equal File.size(__FILE__).to_s, response['Content-Length']
-    assert response.headers.include?('Last-Modified')
-  end
-
-  it 'produces a body that can be iterated over multiple times' do
-    env = Rack::MockRequest.env_for("/#{File.basename(__FILE__)}")
-    _, _, body = @app.call(env)
-    buf1, buf2 = [], []
-    body.each { |part| buf1 << part }
-    body.each { |part| buf2 << part }
-    assert_equal buf1.join, buf2.join
-    assert_equal File.read(__FILE__), buf1.join
-  end
-
-  it 'sets the sinatra.static_file env variable if served' do
-    env = Rack::MockRequest.env_for("/#{File.basename(__FILE__)}")
-    @app.call(env)
-    assert_equal File.expand_path(__FILE__), env['sinatra.static_file']
-  end
-
-  it 'serves HEAD requests for files in the public directory' do
-    head "/#{File.basename(__FILE__)}"
-    assert ok?
-    assert_equal '', body
-    assert response.headers.include?('Last-Modified')
-    assert_equal File.size(__FILE__).to_s, response['Content-Length']
-  end
-
-  %w[POST PUT DELETE].each do |verb|
-    it "does not serve #{verb} requests" do
-      send verb.downcase, "/#{File.basename(__FILE__)}"
-      assert_equal 404, status
-    end
-  end
-
-  it 'serves files in preference to custom routes' do
-    @app.get("/#{File.basename(__FILE__)}") { 'Hello World' }
-    get "/#{File.basename(__FILE__)}"
-    assert ok?
-    assert body != 'Hello World'
-  end
-
-  it 'does not serve directories' do
-    get "/"
-    assert not_found?
-  end
-
-  it 'passes to the next handler when the static option is disabled' do
-    @app.set :static, false
-    get "/#{File.basename(__FILE__)}"
-    assert not_found?
-  end
-
-  it 'passes to the next handler when the public option is nil' do
-    @app.set :public_folder, nil
-    get "/#{File.basename(__FILE__)}"
-    assert not_found?
-  end
-
-  it '404s when a file is not found' do
-    get "/foobarbaz.txt"
-    assert not_found?
-  end
-
-  it 'serves files when .. path traverses within public directory' do
-    get "/data/../#{File.basename(__FILE__)}"
-    assert ok?
-    assert_equal File.read(__FILE__), body
-  end
-
-  it '404s when .. path traverses outside of public directory' do
-    mock_app do
-      set :static, true
-      set :public_folder, File.dirname(__FILE__) + '/data'
-    end
-    get "/../#{File.basename(__FILE__)}"
-    assert not_found?
-  end
-
-  def assert_valid_range(http_range, range, path, file)
-    request = Rack::MockRequest.new(@app)
-    response = request.get("/#{File.basename(path)}", 'HTTP_RANGE' => http_range)
-
-    should_be = file[range]
-    expected_range = "bytes #{range.begin}-#{range.end}/#{file.length}"
-
-    assert_equal(
-      206,response.status,
-      "Should be HTTP/1.1 206 Partial content"
-    )
-    assert_equal(
-      should_be.length,
-      response.body.length,
-      "Unexpected response length for #{http_range}"
-    )
-    assert_equal(
-      should_be,
-      response.body,
-      "Unexpected response data for #{http_range}"
-    )
-    assert_equal(
-      should_be.length.to_s,
-      response['Content-Length'],
-      "Incorrect Content-Length for #{http_range}"
-    )
-    assert_equal(
-      expected_range,
-      response['Content-Range'],
-      "Incorrect Content-Range for #{http_range}"
-    )
-  end
-
-  it 'handles valid byte ranges correctly' do
-    # Use the biggest file in this dir so we can test ranges > 8k bytes. (StaticFile sends in 8k chunks.)
-    path = File.dirname(__FILE__) + '/helpers_test.rb'  # currently 16k bytes
-    file = File.read(path)
-    length = file.length
-    assert length > 9000, "The test file #{path} is too short (#{length} bytes) to run these tests"
-
-    [0..0, 42..88, 1234..1234, 100..9000, 0..(length-1), (length-1)..(length-1)].each do |range|
-      assert_valid_range("bytes=#{range.begin}-#{range.end}", range, path, file)
-    end
-
-    [0, 100, length-100, length-1].each do |start|
-      assert_valid_range("bytes=#{start}-", (start..length-1), path, file)
-    end
-
-    [1, 100, length-100, length-1, length].each do |range_length|
-      assert_valid_range("bytes=-#{range_length}", (length-range_length..length-1), path, file)
-    end
-
-    # Some valid ranges that exceed the length of the file:
-    assert_valid_range("bytes=100-999999", (100..length-1), path, file)
-    assert_valid_range("bytes=100-#{length}", (100..length-1), path, file)
-    assert_valid_range("bytes=-#{length}", (0..length-1), path, file)
-    assert_valid_range("bytes=-#{length+1}", (0..length-1), path, file)
-    assert_valid_range("bytes=-999999", (0..length-1), path, file)
-  end
-
-  it 'correctly ignores syntactically invalid range requests' do
-    # ...and also ignores multi-range requests, which aren't supported yet
-    ["bytes=45-40", "bytes=IV-LXVI", "octets=10-20", "bytes=-", "bytes=1-2,3-4"].each do |http_range|
-      request = Rack::MockRequest.new(@app)
-      response = request.get("/#{File.basename(__FILE__)}", 'HTTP_RANGE' => http_range)
-
-      assert_equal(
-        200,
-        response.status,
-        "Invalid range '#{http_range}' should be ignored"
-      )
-      assert_equal(
-        nil,
-        response['Content-Range'],
-        "Invalid range '#{http_range}' should be ignored"
-      )
-    end
-  end
-
-  it 'returns error 416 for unsatisfiable range requests' do
-    # An unsatisfiable request is one that specifies a start that's at or past the end of the file.
-    length = File.read(__FILE__).length
-    ["bytes=888888-", "bytes=888888-999999", "bytes=#{length}-#{length}"].each do |http_range|
-      request = Rack::MockRequest.new(@app)
-      response = request.get("/#{File.basename(__FILE__)}", 'HTTP_RANGE' => http_range)
-
-      assert_equal(
-        416,
-        response.status,
-        "Unsatisfiable range '#{http_range}' should return 416"
-      )
-      assert_equal(
-        "bytes */#{length}",
-        response['Content-Range'],
-        "416 response should include actual length"
-      )
-    end
-  end
-
-  it 'does not include static cache control headers by default' do
-    env = Rack::MockRequest.env_for("/#{File.basename(__FILE__)}")
-    _, headers, _ = @app.call(env)
-    assert !headers.has_key?('Cache-Control')
-  end
-
-  it 'sets cache control headers on static files if set' do
-    @app.set :static_cache_control, :public
-    env = Rack::MockRequest.env_for("/#{File.basename(__FILE__)}")
-    status, headers, body = @app.call(env)
-    assert headers.has_key?('Cache-Control')
-    assert_equal headers['Cache-Control'], 'public'
-
-    @app.set(
-      :static_cache_control,
-      [:public, :must_revalidate, {:max_age => 300}]
-    )
-    env = Rack::MockRequest.env_for("/#{File.basename(__FILE__)}")
-    status, headers, body = @app.call(env)
-    assert headers.has_key?('Cache-Control')
-    assert_equal(
-      headers['Cache-Control'],
-      'public, must-revalidate, max-age=300'
-    )
-  end
-
-  it 'renders static assets with custom status via options' do
-    mock_app do
-      set :static, true
-      set :public_folder, File.dirname(__FILE__)
-
-      post '/*' do
-        static!(:status => params[:status])
-      end
-    end
-
-    post "/#{File.basename(__FILE__)}?status=422"
-    assert_equal response.status, 422
-    assert_equal File.read(__FILE__), body
-    assert_equal File.size(__FILE__).to_s, response['Content-Length']
-    assert response.headers.include?('Last-Modified')
-  end
-
-  it 'serves files with a + sign in the path' do
-    mock_app do
-      set :static, true
-      set :public_folder, File.join(File.dirname(__FILE__), 'public')
-    end
-    
-    get "/hello+world.txt"
-    
-    real_path = File.join(File.dirname(__FILE__), 'public', 'hello+world.txt')
-    assert ok?
-    assert_equal File.read(real_path), body
-    assert_equal File.size(real_path).to_s, response['Content-Length']
-    assert response.headers.include?('Last-Modified')
-  end
-
-  it 'serves files with a URL encoded + sign (%2B) in the path' do
-    mock_app do
-      set :static, true
-      set :public_folder, File.join(File.dirname(__FILE__), 'public')
-    end
-    
-    get "/hello%2bworld.txt"
-    
-    real_path = File.join(File.dirname(__FILE__), 'public', 'hello+world.txt')
-    assert ok?
-    assert_equal File.read(real_path), body
-    assert_equal File.size(real_path).to_s, response['Content-Length']
-    assert response.headers.include?('Last-Modified')
-  end
-
-end

data/test/streaming_test.rb

@@ -1,149 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-class StreamingTest < Minitest::Test
-  Stream = Sinatra::Helpers::Stream
-
-  it 'returns the concatenated body' do
-    mock_app do
-      get('/') do
-        stream do |out|
-          out << "Hello" << " "
-          out << "World!"
-        end
-      end
-    end
-
-    get('/')
-    assert_body "Hello World!"
-  end
-
-  it 'always yields strings' do
-    stream = Stream.new { |out| out << :foo }
-    stream.each { |str| assert_equal 'foo', str }
-  end
-
-  it 'postpones body generation' do
-    step = 0
-
-    stream = Stream.new do |out|
-      10.times do
-        out << step
-        step += 1
-      end
-    end
-
-    stream.each do |s|
-      assert_equal s, step.to_s
-      step += 1
-    end
-  end
-
-  it 'calls the callback after it is done' do
-    step   = 0
-    final  = 0
-    stream = Stream.new { |_| 10.times { step += 1 }}
-    stream.callback { final = step }
-    stream.each {|_|}
-    assert_equal 10, final
-  end
-
-  it 'does not trigger the callback if close is set to :keep_open' do
-    step   = 0
-    final  = 0
-    stream = Stream.new(Stream, :keep_open) { |_| 10.times { step += 1 } }
-    stream.callback { final = step }
-    stream.each {|_|}
-    assert_equal 0, final
-  end
-
-  it 'allows adding more than one callback' do
-    a = b = false
-    stream = Stream.new { }
-    stream.callback { a = true }
-    stream.callback { b = true }
-    stream.each {|_| }
-    assert a, 'should trigger first callback'
-    assert b, 'should trigger second callback'
-  end
-
-  class MockScheduler
-    def initialize(*)     @schedule, @defer = [], []                end
-    def schedule(&block)  @schedule << block                        end
-    def defer(&block)     @defer    << block                        end
-    def schedule!(*)      @schedule.pop.call until @schedule.empty? end
-    def defer!(*)         @defer.pop.call    until @defer.empty?    end
-  end
-
-  it 'allows dropping in another scheduler' do
-    scheduler  = MockScheduler.new
-    processing = sending = done = false
-
-    stream = Stream.new(scheduler) do |out|
-      processing = true
-      out << :foo
-    end
-
-    stream.each { sending = true}
-    stream.callback { done = true }
-
-    scheduler.schedule!
-    assert !processing
-    assert !sending
-    assert !done
-
-    scheduler.defer!
-    assert processing
-    assert !sending
-    assert !done
-
-    scheduler.schedule!
-    assert sending
-    assert done
-  end
-
-  it 'schedules exceptions to be raised on the main thread/event loop/...' do
-    scheduler = MockScheduler.new
-    Stream.new(scheduler) { fail 'should be caught' }.each { }
-    scheduler.defer!
-    assert_raises(RuntimeError) { scheduler.schedule! }
-  end
-
-  it 'does not trigger an infinite loop if you call close in a callback' do
-    stream = Stream.new { |out| out.callback { out.close }}
-    stream.each { |_| }
-  end
-
-  it 'gives access to route specific params' do
-    mock_app do
-      get('/:name') do
-        stream { |o| o << params[:name] }
-      end
-    end
-    get '/foo'
-    assert_body 'foo'
-  end
-
-  it 'sets up async.close if available' do
-    ran = false
-    mock_app do
-      get('/') do
-        close = Object.new
-        def close.callback; yield end
-        def close.errback; end
-        env['async.close'] = close
-        stream(:keep_open) do |out|
-          out.callback { ran = true }
-        end
-      end
-    end
-    get '/'
-    assert ran
-  end
-
-  it 'has a public interface to inspect its open/closed state' do
-    stream = Stream.new(Stream) { |out| out << :foo }
-    assert !stream.closed?
-    stream.close
-    assert stream.closed?
-  end
-end

data/test/stylus_test.rb

@@ -1,90 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-begin
-  require 'stylus'
-  require 'stylus/tilt'
-
-  begin
-    Stylus.compile '1'
-  rescue RuntimeError
-    raise LoadError, 'unable to find Stylus compiler'
-  end
-
-  class StylusTest < Minitest::Test
-    def stylus_app(options = {}, &block)
-      mock_app do
-        set :views, File.dirname(__FILE__) + '/views'
-        set(options)
-        get('/', &block)
-      end
-      get '/'
-    end
-
-    it 'renders inline Stylus strings' do
-      stylus_app { stylus "a\n margin auto\n" }
-      assert ok?
-      assert body.include?("a {\n  margin: auto;\n}\n")
-    end
-
-    it 'defaults content type to css' do
-      stylus_app { stylus :hello }
-      assert ok?
-      assert_equal "text/css;charset=utf-8", response['Content-Type']
-    end
-
-    it 'defaults allows setting content type per route' do
-      stylus_app do
-        content_type :html
-        stylus :hello
-      end
-      assert ok?
-      assert_equal "text/html;charset=utf-8", response['Content-Type']
-    end
-
-    it 'defaults allows setting content type globally' do
-      stylus_app(:styl => { :content_type => 'html' }) do
-        stylus :hello
-      end
-      assert ok?
-      assert_equal "text/html;charset=utf-8", response['Content-Type']
-    end
-
-    it 'renders .styl files in views path' do
-      stylus_app { stylus :hello }
-      assert ok?
-      assert_include body, "a {\n  margin: auto;\n}\n"
-    end
-
-    it 'ignores the layout option' do
-      stylus_app { stylus :hello, :layout => :layout2 }
-      assert ok?
-      assert_include body, "a {\n  margin: auto;\n}\n"
-    end
-
-    it "raises error if template not found" do
-      mock_app {
-        get('/') { stylus :no_such_template }
-      }
-      assert_raises(Errno::ENOENT) { get('/') }
-    end
-
-    it "passes stylus options to the stylus engine" do
-      stylus_app { stylus :hello, :no_wrap => true }
-      assert ok?
-      assert_body "a {\n  margin: auto;\n}\n"
-    end
-
-    it "passes default stylus options to the stylus engine" do
-      mock_app do
-        set :stylus, :no_wrap => true # default stylus style is :nested
-        get('/') { stylus :hello }
-      end
-      get '/'
-      assert ok?
-      assert_body "a {\n  margin: auto;\n}\n"
-    end
-  end
-
-rescue LoadError
-  warn "#{$!.to_s}: skipping stylus tests"
-end