syntropy 0.30.0 → 0.31.0

data/test/test_app.rb

@@ -19,111 +19,111 @@ class AppTest < Minitest::Test
       watch_files: 0.05,
       machine: @machine
     )
-  end
 
-  def make_request(*, **)
-    req = mock_req(*, **)
-    @app.call(req)
-    req
+    @test_harness = Syntropy::TestHarness.new(@app)
   end
 
   def test_app_rendering
-    req = make_request(':method' => 'GET', ':path' => '/')
+    req = @test_harness.request(':method' => 'GET', ':path' => '/')
     assert_equal HTTP::NOT_FOUND, req.response_status
     assert_equal 'Not found', req.response_body
 
-    req = make_request(':method' => 'HEAD', ':path' => '/')
+    req = @test_harness.request(':method' => 'HEAD', ':path' => '/')
     assert_equal HTTP::NOT_FOUND, req.response_status
     assert_nil req.response_body
 
-    req = make_request(':method' => 'POST', ':path' => '/')
+    req = @test_harness.request(':method' => 'POST', ':path' => '/')
     assert_equal 'Not found', req.response_body
     assert_equal HTTP::NOT_FOUND, req.response_status
 
-    req = make_request(':method' => 'GET', ':path' => '/test')
+    req = @test_harness.request(':method' => 'GET', ':path' => '/test')
     assert_equal HTTP::OK, req.response_status
     assert_equal '<h1>Hello, world!</h1>', req.response_body
 
-    req = make_request(':method' => 'HEAD', ':path' => '/test')
+    req = @test_harness.request(':method' => 'HEAD', ':path' => '/test')
     assert_equal HTTP::OK, req.response_status
     assert_nil req.response_body
 
-    req = make_request(':method' => 'POST', ':path' => '/test')
+    req = @test_harness.request(':method' => 'POST', ':path' => '/test')
     assert_equal HTTP::METHOD_NOT_ALLOWED, req.response_status
     assert_equal "Method not allowed", req.response_body
 
-    req = make_request(':method' => 'GET', ':path' => '/test/assets/style.css')
+    req = @test_harness.request(':method' => 'GET', ':path' => '/test/assets/style.css')
     assert_equal '* { color: beige }', req.response_body
     assert_equal 'text/css', req.response_headers['Content-Type']
 
-    req = make_request(':method' => 'GET', ':path' => '/assets/style.css')
+    req = @test_harness.request(':method' => 'GET', ':path' => '/assets/style.css')
     assert_equal HTTP::NOT_FOUND, req.response_status
 
-    req = make_request(':method' => 'GET', ':path' => '/test/api?q=get')
-    assert_equal({ status: 'OK', response: 0 }, req.response_json)
+    req = @test_harness.request(':method' => 'GET', ':path' => '/test/api?q=get')
+    assert_equal({ 'status' => 'OK', 'response' => 0 }, req.response_json)
 
-    req = make_request(':method' => 'POST', ':path' => '/test/api?q=get')
+    req = @test_harness.request(':method' => 'POST', ':path' => '/test/api?q=get')
     assert_equal HTTP::METHOD_NOT_ALLOWED, req.response_status
-    assert_equal({ status: 'Error', message: 'Method not allowed' }, req.response_json)
+    assert_equal({ 'status' => 'Error', 'message' => 'Method not allowed' }, req.response_json)
 
-    req = make_request(':method' => 'GET', ':path' => '/test/api/foo?q=get')
-    assert_equal({ status: 'OK', response: 0 }, req.response_json)
+    req = @test_harness.request(':method' => 'GET', ':path' => '/test/api/foo?q=get')
+    assert_equal({ 'status' => 'OK', 'response' => 0 }, req.response_json)
 
-    req = make_request(':method' => 'POST', ':path' => '/test/api?q=incr')
-    assert_equal({ status: 'OK', response: 1 }, req.response_json)
+    req = @test_harness.request(':method' => 'POST', ':path' => '/test/api?q=incr')
+    assert_equal({ 'status' => 'OK', 'response' => 1 }, req.response_json)
 
-    req = make_request(':method' => 'GET', ':path' => '/test/api?q=incr')
+    req = @test_harness.request(':method' => 'GET', ':path' => '/test/api?q=incr')
     assert_equal HTTP::METHOD_NOT_ALLOWED, req.response_status
-    assert_equal({ status: 'Error', message: 'Method not allowed' }, req.response_json)
+    assert_equal({ 'status' => 'Error', 'message' => 'Method not allowed' }, req.response_json)
 
-    req = make_request(':method' => 'POST', ':path' => '/test/api/foo?q=incr')
-    assert_equal({ status: 'Error', message: 'Teapot' }, req.response_json)
+    req = @test_harness.request(':method' => 'POST', ':path' => '/test/api/foo?q=incr')
+    assert_equal({ 'status' => 'Error', 'message' => 'Teapot' }, req.response_json)
     assert_equal HTTP::TEAPOT, req.response_status
 
-    req = make_request(':method' => 'POST', ':path' => '/test/api/foo/bar?q=incr')
-    assert_equal({ status: 'Error', message: 'Teapot' }, req.response_json)
+    req = @test_harness.request(':method' => 'POST', ':path' => '/test/api/foo/bar?q=incr')
+    assert_equal({ 'status' => 'Error', 'message' => 'Teapot' }, req.response_json)
     assert_equal HTTP::TEAPOT, req.response_status
 
-    req = make_request(':method' => 'GET', ':path' => '/test/bar')
+    req = @test_harness.request(':method' => 'GET', ':path' => '/test/bar')
     assert_equal 'foobar', req.response_body
     assert_equal HTTP::OK, req.response_status
 
-    req = make_request(':method' => 'POST', ':path' => '/test/bar')
+    req = @test_harness.request(':method' => 'POST', ':path' => '/test/bar')
     assert_equal 'foobar', req.response_body
     assert_equal HTTP::OK, req.response_status
 
-    req = make_request(':method' => 'GET', ':path' => '/test/baz')
+    req = @test_harness.request(':method' => 'GET', ':path' => '/test/baz')
     assert_equal 'foobar', req.response_body
     assert_equal HTTP::OK, req.response_status
 
-    req = make_request(':method' => 'POST', ':path' => '/test/baz')
+    req = @test_harness.request(':method' => 'POST', ':path' => '/test/baz')
     assert_equal 'Method not allowed', req.response_body
     assert_equal HTTP::METHOD_NOT_ALLOWED, req.response_status
 
-    req = make_request(':method' => 'GET', ':path' => '/test/about')
+    req = @test_harness.request(':method' => 'GET', ':path' => '/test/about')
     assert_equal 'About', req.response_body.chomp
 
-    req = make_request(':method' => 'GET', ':path' => '/test/about/foo')
+    req = @test_harness.request(':method' => 'GET', ':path' => '/test/about/foo')
     assert_equal '<!DOCTYPE html><html><head><title></title></head><body><p>Hello from Markdown</p></body></html>', req.response_body.gsub(/\n/, '')
 
-    req = make_request(':method' => 'HEAD', ':path' => '/test/about/foo')
+    req = @test_harness.request(':method' => 'HEAD', ':path' => '/test/about/foo')
     assert_nil req.response_body
 
-    req = make_request(':method' => 'GET', ':path' => '/test/about/foo/bar')
+    req = @test_harness.request(':method' => 'GET', ':path' => '/test/about/foo/bar')
     assert_equal HTTP::NOT_FOUND, req.response_status
 
-    req = make_request(':method' => 'GET', ':path' => '/test/params/abc')
+    req = @test_harness.request(':method' => 'GET', ':path' => '/test/params/abc')
     assert_equal '/test/params/[foo]-abc', req.response_body.chomp
 
-    req = make_request(':method' => 'GET', ':path' => '/test/rss')
+    req = @test_harness.request(':method' => 'GET', ':path' => '/test/rss')
     assert_equal '<link>foo</link>', req.response_body
 
-    req = make_request(':method' => 'GET', ':path' => '/test/bad_mod')
+    req = @test_harness.request(':method' => 'GET', ':path' => '/test/bad_mod')
     assert_equal HTTP::INTERNAL_SERVER_ERROR, req.response_status
+
+    req = @test_harness.request(':method' => 'GET', ':path' => '/test/.well-known/foo')
+    assert_equal HTTP::OK, req.response_status
+    assert_equal 'foo', req.response_body
   end
 
   def test_automatic_redirect_on_trailing_slash
-    req = make_request(':method' => 'GET', ':path' => '/test/rss/')
+    req = @test_harness.request(':method' => 'GET', ':path' => '/test/rss/')
     assert_equal HTTP::MOVED_PERMANENTLY, req.response_status
     assert_equal '/test/rss', req.response_headers['Location']
   end
@@ -131,37 +131,37 @@ class AppTest < Minitest::Test
   def test_app_file_watching
     @machine.sleep 0.3
 
-    req = make_request(':method' => 'GET', ':path' => @tmp_path)
+    req = @test_harness.request(':method' => 'GET', ':path' => @tmp_path)
     assert_equal 'foo', req.response_body
 
     orig_body = IO.read(@tmp_fn)
     IO.write(@tmp_fn, orig_body.gsub('foo', 'bar'))
     @machine.sleep(0.3)
 
-    req = make_request(':method' => 'GET', ':path' => @tmp_path)
+    req = @test_harness.request(':method' => 'GET', ':path' => @tmp_path)
     assert_equal 'bar', req.response_body
   ensure
     IO.write(@tmp_fn, orig_body) if orig_body
   end
 
   def test_middleware
-    req = make_request(':method' => 'HEAD', ':path' => '/test?foo=42')
+    req = @test_harness.request(':method' => 'HEAD', ':path' => '/test?foo=42')
     assert_equal HTTP::OK, req.response_status
     assert_nil req.response_body
     assert_equal '42', req.ctx[:foo]
 
-    req = make_request(':method' => 'HEAD', ':path' => '/test/about/raise?foo=43')
+    req = @test_harness.request(':method' => 'HEAD', ':path' => '/test/about/raise?foo=43')
     assert_equal HTTP::INTERNAL_SERVER_ERROR, req.response_status
     assert_equal '<h1>Raised error</h1>', req.response_body
     assert_equal '43', req.ctx[:foo]
   end
 
   def test_middleware_invocation_on_404
-    req = make_request(':method' => 'HEAD', ':path' => '/azerty?foo=bar')
+    req = @test_harness.request(':method' => 'HEAD', ':path' => '/azerty?foo=bar')
     assert_equal HTTP::NOT_FOUND, req.response_status
     assert_nil req.ctx[:foo]
 
-    req = make_request(':method' => 'HEAD', ':path' => '/test/azerty?foo=bar')
+    req = @test_harness.request(':method' => 'HEAD', ':path' => '/test/azerty?foo=bar')
     assert_equal HTTP::NOT_FOUND, req.response_status
     assert_equal 'bar', req.ctx[:foo]
   end
@@ -179,16 +179,11 @@ class CustomAppTest < Minitest::Test
       root_dir: APP_ROOT,
       mount_path: '/'
     )
-  end
-
-  def make_request(*, **)
-    req = mock_req(*, **)
-    @app.call(req)
-    req
+    @test_harness = Syntropy::TestHarness.new(@app)
   end
 
   def test_app_with_site_rb_file
-    req = make_request(':method' => 'GET', ':path' => '/foo/bar')
+    req = @test_harness.request(':method' => 'GET', ':path' => '/foo/bar')
     assert_nil req.response_body
     assert_equal HTTP::TEAPOT, req.response_status
   end
@@ -206,23 +201,18 @@ class MultiSiteAppTest < Minitest::Test
       root_dir: APP_ROOT,
       mount_path: '/'
     )
-  end
-
-  def make_request(*, **)
-    req = mock_req(*, **)
-    @app.call(req)
-    req
+    @test_harness = Syntropy::TestHarness.new(@app)
   end
 
   def test_route_by_host
-    req = make_request(':method' => 'GET', ':path' => '/', 'host' => 'blah')
+    req = @test_harness.request(':method' => 'GET', ':path' => '/', 'host' => 'blah')
     assert_nil req.response_body
     assert_equal HTTP::BAD_REQUEST, req.response_status
 
-    req = make_request(':method' => 'GET', ':path' => '/', 'host' => 'foo.bar')
+    req = @test_harness.request(':method' => 'GET', ':path' => '/', 'host' => 'foo.bar')
     assert_equal '<h1>foo.bar</h1>', req.response_body.chomp
 
-    req = make_request(':method' => 'GET', ':path' => '/', 'host' => 'bar.baz')
+    req = @test_harness.request(':method' => 'GET', ':path' => '/', 'host' => 'bar.baz')
     assert_equal '<h1>bar.baz</h1>', req.response_body.chomp
   end
 end
@@ -296,12 +286,6 @@ class AppDependenciesTest < Minitest::Test
 
   APP_ROOT = File.join(__dir__, 'app')
 
-  def make_request(*, **)
-    req = mock_req(*, **)
-    @app.call(req)
-    req
-  end
-
   def test_app_dependencies
     foo = { foo: 'foo' }
     bar = { bar: 'bar' }
@@ -318,8 +302,9 @@ class AppDependenciesTest < Minitest::Test
       foo: foo,
       bar: bar
     )
+    @test_harness = Syntropy::TestHarness.new(@app)
 
-    req = make_request(':method' => 'GET', ':path' => '/test/bar')
+    req = @test_harness.request(':method' => 'GET', ':path' => '/test/bar')
     assert_equal 'foobar', req.response_body
     assert_equal HTTP::OK, req.response_status
   end

data/test/test_caching.rb

@@ -40,7 +40,7 @@ class CachingTest < Minitest::Test
     @app = Syntropy::App.new(**@env)
 
     @c_fd, @s_fd = make_socket_pair
-    @adapter = Syntropy::HTTP::Connection.new(nil, @machine, @s_fd, @env) { @app.(it) }
+    @adapter = Syntropy::HTTP::ServerConnection.new(@machine, @s_fd, @env) { @app.(it) }
   end
 
   def teardown

data/test/test_http_client.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require_relative './helper'
+require 'json'
+
+class HTTPClientTest < Minitest::Test
+  def setup
+    @machine = UM.new
+    @handler = ->(req) { req.respond_json(req.headers) }
+
+    @port = 10000 + rand(30000)
+    @env = { bind: "127.0.0.1:#{@port}" }
+    @server = Syntropy::HTTP::Server.new(@machine, @env) { @app&.call(it) }
+    @server_fiber = @machine.spin { @server.run }
+
+    # let server spin and listen to incoming connections
+    @machine.sleep(0.01)
+
+    @client = Syntropy::HTTP::Client.new(@machine)
+  end
+
+  def teardown
+    @machine.schedule(@server_fiber, UM::Terminate.new)
+    @machine.join(@server_fiber)
+  end
+
+  def test_get
+    @app = ->(req) { req.respond('foo') }
+    headers, body = @client.get("http://localhost:#{@port}")
+
+    assert_kind_of Hash, headers
+    assert_equal Syntropy::HTTP::OK, headers[':status']
+
+    assert_kind_of String, body
+    assert_equal 'foo', body
+  end
+
+  def test_get_with_block
+    @app = ->(req) { req.respond('foo') }
+    headers = body = nil
+    @client.get("http://localhost:#{@port}") { |h, c|
+      headers = h
+      body = c.get_response_body(headers)
+    }
+
+    assert_kind_of Hash, headers
+    assert_equal Syntropy::HTTP::OK, headers[':status']
+
+    assert_kind_of String, body
+    assert_equal 'foo', body
+  end
+end

data/test/test_http_client_connection.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require_relative './helper'
+require 'json'
+
+class HTTPClientConectionTest < Minitest::Test
+  def setup
+    @client_fd, @server_fd = UM.socketpair(UM::AF_UNIX, UM::SOCK_STREAM, 0)
+    @machine = UM.new
+    @handler = ->(req) { req.respond_json(req.headers) }
+    @server_connection = Syntropy::HTTP::ServerConnection.new(
+      @machine, @server_fd, {}, &->(req) { @handler.(req) }
+    )
+    @server_fiber = @machine.spin { @server_connection.run }
+    @client_connection = Syntropy::HTTP::ClientConnection.new(
+      @machine, @client_fd
+    )
+  end
+
+  def teardown
+    @machine.schedule(@server_fiber, UM::Terminate.new)
+    @machine.join(@server_fiber)
+  end
+
+  def test_req_teapot
+    @handler = ->(req) { req.respond(nil, ':status' => Syntropy::HTTP::TEAPOT) }
+    headers = @client_connection.req(':method' => 'GET', ':path' => '/')
+
+    assert_kind_of Hash, headers
+    assert_equal Syntropy::HTTP::TEAPOT, headers[':status']
+  end
+
+  def test_req_with_response_body
+    @handler = ->(req) { req.respond('foo') }
+    headers = @client_connection.req(':method' => 'GET', ':path' => '/')
+
+    assert_kind_of Hash, headers
+    assert_equal Syntropy::HTTP::OK, headers[':status']
+
+    body = @client_connection.get_response_body(headers)
+    assert_equal 'foo', body
+  end
+end

data/test/{test_connection.rb → test_http_server_connection.rb}

@@ -3,7 +3,7 @@
 require_relative './helper'
 require 'securerandom'
 
-class ConnectionTest < Minitest::Test
+class HTTPServerConnectionTest < Minitest::Test
   def make_socket_pair
     port = SecureRandom.random_number(10000..40000)
     server_fd = @machine.socket(UM::AF_INET, UM::SOCK_STREAM, 0, 0)
@@ -29,7 +29,7 @@ class ConnectionTest < Minitest::Test
     @hook = nil
     @app = ->(req) { @reqs << req; @hook&.call(req) }
     @env = {}
-    @adapter = Syntropy::HTTP::Connection.new(nil, @machine, @s_fd, @env, &@app)
+    @connection = Syntropy::HTTP::ServerConnection.new(@machine, @s_fd, @env, &@app)
   end
 
   def teardown
@@ -54,14 +54,14 @@ class ConnectionTest < Minitest::Test
 
   def test_http_unsupported_versions
     write_http_request "GET / HTTP/0.9\r\n\r\n"
-    @adapter.serve_request
+    @connection.serve_request
     response = read_client_side
     assert_equal "HTTP/1.1 505\r\nTransfer-Encoding: chunked\r\n\r\n1a\r\nHTTP version not supported\r\n0\r\n\r\n", response
 
     setup
 
     write_http_request "GET / HTTP/1.0\r\n\r\n"
-    @adapter.serve_request
+    @connection.serve_request
     response = read_client_side
     assert_equal "HTTP/1.1 505\r\nTransfer-Encoding: chunked\r\n\r\n1a\r\nHTTP version not supported\r\n0\r\n\r\n", response
 
@@ -69,7 +69,7 @@ class ConnectionTest < Minitest::Test
 
     @hook = ->(req) { req.respond('hi') }
     write_http_request "GET / HTTP/1.1\r\n\r\n"
-    @adapter.serve_request
+    @connection.serve_request
     @machine.close(@s_fd)
     response = read_client_side
     assert_equal "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\n\r\n2\r\nhi\r\n0\r\n\r\n", response
@@ -78,7 +78,7 @@ class ConnectionTest < Minitest::Test
   def test_basic_request_parsing
     write_http_request "GET / HTTP/1.1\r\n\r\n"
 
-    @adapter.serve_request
+    @connection.serve_request
     assert_equal 1, @reqs.size
     req = @reqs.shift
     headers = req.headers
@@ -101,7 +101,7 @@ class ConnectionTest < Minitest::Test
     HTTP
     write_http_request msg
 
-    @adapter.run
+    @connection.run
     assert_equal 2, @reqs.size
     req0 = @reqs.shift
     headers = req0.headers
@@ -137,7 +137,7 @@ class ConnectionTest < Minitest::Test
     @bodies = []
     @hook = ->(req) { @bodies << req.read }
 
-    @adapter.run
+    @connection.run
     assert_equal 2, @reqs.size
 
     req0 = @reqs.shift
@@ -195,7 +195,7 @@ class ConnectionTest < Minitest::Test
     @bodies = []
     @hook = ->(req) { @bodies << req.read }
 
-    @adapter.run
+    @connection.run
     assert_equal 2, @reqs.size
 
     req0 = @reqs.shift
@@ -247,7 +247,7 @@ class ConnectionTest < Minitest::Test
     chunks = []
     @hook = ->(req) { req.each_chunk { chunks << it } }
 
-    @adapter.serve_request
+    @connection.serve_request
     assert_equal 1, @reqs.size
 
     req0 = @reqs.shift
@@ -263,7 +263,7 @@ class ConnectionTest < Minitest::Test
     assert_equal ['abc', 'de'], chunks
 
     chunks.clear
-    @adapter.serve_request
+    @connection.serve_request
     assert_equal 1, @reqs.size
 
     req1 = @reqs.shift
@@ -285,7 +285,7 @@ class ConnectionTest < Minitest::Test
     }
 
     write_http_request "GET / HTTP/1.1\r\n\r\n"
-    @adapter.run
+    @connection.run
     response = read_client_side
 
     expected = <<~HTTP.crlf_lines
@@ -305,7 +305,7 @@ class ConnectionTest < Minitest::Test
 
     # using HTTP 1.0, server should close connection after responding
     write_http_request "GET / HTTP/1.1\r\n\r\n"
-    @adapter.run
+    @connection.run
 
     response = read_client_side
     expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\n\r\nd\r\nHello, world!\r\n0\r\n\r\n"
@@ -318,14 +318,14 @@ class ConnectionTest < Minitest::Test
     }
 
     write_http_request "GET / HTTP/1.1\r\nConnection: close\r\n\r\n", false
-    res = @adapter.serve_request
+    res = @connection.serve_request
     assert_equal false, res
 
     response = read_client_side
     assert_equal("HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\n\r\n2\r\nHi\r\n0\r\n\r\n", response)
 
     write_http_request "GET / HTTP/1.1\r\n\r\n", false
-    res = @adapter.serve_request
+    res = @connection.serve_request
     assert_equal true, res
 
     response = read_client_side
@@ -344,7 +344,7 @@ class ConnectionTest < Minitest::Test
     }
 
     write_http_request "GET / HTTP/1.1\r\n\r\nGET / HTTP/1.1\r\nFoo: bar\r\n\r\n"
-    @adapter.run
+    @connection.run
     response = read_client_side
 
     expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\n\r\nd\r\nHello, world!\r\n0\r\n\r\n" +
@@ -368,7 +368,7 @@ class ConnectionTest < Minitest::Test
 
     msg = "POST / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n6\r\nfoobar\r\n"
     write_http_request msg, false
-    @machine.spin { @adapter.serve_request rescue nil }
+    @machine.spin { @connection.serve_request rescue nil }
     @machine.sleep(0.01)
 
     assert request
@@ -417,7 +417,7 @@ class ConnectionTest < Minitest::Test
 
     msg = "GET / HTTP/1.1\r\nUpgrade: echo\r\nConnection: upgrade\r\n\r\n"
     write_http_request(msg, false)
-    @machine.spin { @adapter.serve_request rescue nil }
+    @machine.spin { @connection.serve_request rescue nil }
     @machine.sleep(0.01)
 
     response = read_client_side
@@ -462,7 +462,7 @@ class ConnectionTest < Minitest::Test
 
     write_client_side("GET / HTTP/1.1\r\n\r\n")
     @machine.spin do
-      @adapter.serve_request
+      @connection.serve_request
     rescue => e
       p e
       p e.backtrace
@@ -498,7 +498,7 @@ class ConnectionTest < Minitest::Test
 
     write_client_side("GET / HTTP/1.1\r\n\r\n")
     @machine.spin do
-      @adapter.serve_request
+      @connection.serve_request
     rescue => e
       p e
       p e.backtrace
@@ -531,7 +531,7 @@ class ConnectionTest < Minitest::Test
     count = 0
 
     write_client_side("GET / HTTP/1.1\r\n\r\n")
-    @machine.spin { @adapter.serve_request }
+    @machine.spin { @connection.serve_request }
 
     while (data = read_client_side(65536))
       response << data
@@ -551,7 +551,7 @@ class ConnectionTest < Minitest::Test
     end
 
     write_client_side("GET / HTTP/1.1\r\n\r\n")
-    @adapter.serve_request
+    @connection.serve_request
     response = read_client_side(65536)
     expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\nServer: Syntropy\r\n\r\n3\r\nfoo\r\n0\r\n\r\n"
     assert_equal expected, response
@@ -559,7 +559,7 @@ class ConnectionTest < Minitest::Test
     @env[:server_headers] = "Server: TP3\r\n"
 
     write_client_side("GET / HTTP/1.1\r\n\r\n")
-    @adapter.serve_request
+    @connection.serve_request
     response = read_client_side(65536)
     expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\nServer: TP3\r\n\r\n3\r\nfoo\r\n0\r\n\r\n"
     assert_equal expected, response
@@ -572,7 +572,7 @@ class ConnectionTest < Minitest::Test
     }
 
     write_client_side("GET / HTTP/1.1\r\n\r\n")
-    @adapter.serve_request
+    @connection.serve_request
     response = read_client_side(65536)
     expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\nSet-Cookie: foo=bar\r\n\r\n3\r\nfoo\r\n0\r\n\r\n"
     assert_equal expected, response
@@ -583,7 +583,7 @@ class ConnectionTest < Minitest::Test
     }
 
     write_client_side("GET / HTTP/1.1\r\n\r\n")
-    @adapter.serve_request
+    @connection.serve_request
     response = read_client_side(65536)
     expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\nSet-Cookie: foo=bar\r\nContent-Type: text/plain\r\n\r\n3\r\nfoo\r\n0\r\n\r\n"
     assert_equal expected, response
@@ -597,7 +597,7 @@ class ConnectionTest < Minitest::Test
     }
 
     write_client_side("GET / HTTP/1.1\r\n\r\n")
-    @adapter.serve_request
+    @connection.serve_request
     response = read_client_side(65536)
     expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\nSet-Cookie: foo=bar\r\nFoo: bar\r\nContent-Type: text/plain\r\n\r\n3\r\nfoo\r\n0\r\n\r\n"
     assert_equal expected, response
@@ -610,7 +610,7 @@ class ConnectionTest < Minitest::Test
     }
 
     write_client_side("GET / HTTP/1.1\r\n\r\n")
-    @adapter.serve_request
+    @connection.serve_request
     response = read_client_side(65536)
     expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\nSet-Cookie: foo=bar; HttpOnly\r\n\r\n3\r\nfoo\r\n0\r\n\r\n"
     assert_equal expected, response
@@ -624,7 +624,7 @@ class ConnectionTest < Minitest::Test
     }
 
     write_client_side("GET / HTTP/1.1\r\n\r\n")
-    @adapter.serve_request
+    @connection.serve_request
     response = read_client_side(65536)
     expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\nSet-Cookie: foo=bar; HttpOnly\r\nSet-Cookie: bar=baz\r\n\r\n3\r\nfoo\r\n0\r\n\r\n"
     assert_equal expected, response
@@ -640,7 +640,7 @@ class ConnectionTest < Minitest::Test
     }
 
     write_client_side("GET / HTTP/1.1\r\n\r\n")
-    @adapter.serve_request
+    @connection.serve_request
     response = read_client_side(65536)
     expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\nSet-Cookie: a=1\r\nSet-Cookie: b=2\r\nSet-Cookie: c=3\r\nSet-Cookie: d=4\r\nSet-Cookie: e=5\r\n\r\n3\r\nfoo\r\n0\r\n\r\n"
     assert_equal expected, response

data/test/test_json_api.rb

@@ -28,7 +28,7 @@ class JSONAPITest < Minitest::Test
     req = mock_req(':method' => 'GET', ':path' => '/?q=foo')
     @app.call(req)
     assert_equal HTTP::OK, req.response_status
-    assert_equal({ status: 'OK', response: nil }, req.response_json)
+    assert_equal({ 'status' => 'OK', 'response' => nil }, req.response_json)
 
     req = mock_req(':method' => 'POST', ':path' => '/?q=foo')
     @app.call(req)
@@ -38,7 +38,7 @@ class JSONAPITest < Minitest::Test
     req = mock_req(':method' => 'POST', ':path' => '/?q=bar&v=foo')
     @app.call(req)
     assert_equal HTTP::OK, req.response_status
-    assert_equal({ status: 'OK', response: true }, req.response_json)
+    assert_equal({ 'status' => 'OK', 'response' => true }, req.response_json)
 
     req = mock_req(':method' => 'GET', ':path' => '/?q=bar&v=foo')
     @app.call(req)
@@ -47,12 +47,12 @@ class JSONAPITest < Minitest::Test
     req = mock_req(':method' => 'GET', ':path' => '/?q=foo')
     @app.call(req)
     assert_equal HTTP::OK, req.response_status
-    assert_equal({ status: 'OK', response: 'foo' }, req.response_json)
+    assert_equal({ 'status' => 'OK', 'response' => 'foo' }, req.response_json)
 
     req = mock_req(':method' => 'GET', ':path' => '/?q=foo')
     @app.call(req)
     assert_equal HTTP::OK, req.response_status
-    assert_equal({ status: 'OK', response: 'foo' }, req.response_json)
+    assert_equal({ 'status' => 'OK', 'response' => 'foo' }, req.response_json)
 
     req = mock_req(':method' => 'GET', ':path' => '/?q=xxx')
     @app.call(req)