qeweney 0.20 → 0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7cccd729e2db47b7cbf560dcd58615a97a97d4305c7edde20be1771d1a44571
-  data.tar.gz: d386ad5b4713412f22e4d02248717f27fa8a7ccd2ec289abc132b9931b299d9a
+  metadata.gz: 83fd3aeea3a2ab2fff17ca871189e60098168523583b801423a6d2ecd21d5a9f
+  data.tar.gz: 53dcc37653949d20a6324d5e24df1f5b827a56ce134dd69c168369242917f825
 SHA512:
-  metadata.gz: 1d12923a83b5d33a2e5503e1c164cfcec5b6de862d2e049b784cf8a6b8055e442b5c67f2892013ca3eaad90cf03f62176b076680b05f6a510535ca85a087746c
-  data.tar.gz: 7fd3a28276cbf48044c32d5f11e3a0b2b665df4ba2405c7ead715f5641fa727a4c3c6bfb2b45856c1034613fa97c9e2e0c768e67ecd43a71d6e6a35923cad4a8
+  metadata.gz: 3cee5ee51f356cddcff578d2cd2e582ea0f293ce2d898e43022fe9ab83d0e812423473f047701306796f70ac53833818b125f7308a438c6a05d18a00465e9e93
+  data.tar.gz: 6de0f052bc1077e665d5c5bd3f6fc8de59442e5944ddc68c3b9ceca873cfdd2e6ed47880bb5e0a89dbb36cbfc802936f3f15c121e82e59922515f000bd5d7b31

data/.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        ruby: ['3.0', 3.1, 3.2]
+        ruby: [3.2, 3.3, 3.4]
 
     name: >-
       ${{matrix.os}}, ${{matrix.ruby}}

data/.gitignore

@@ -45,7 +45,7 @@ build-iPhoneSimulator/
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
+Gemfile.lock
 # .ruby-version
 # .ruby-gemset
 

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.22 2025-08-28
+
+- Improve form data parsing.
+- Add `Qeweney::BadRequestError` exception class.
+
+## 0.20 2025-01-09
+
+- Improve `Qeweney::MockAdapter`.
+
 ## 0.18 2022-02-16
 
 - Implement `Request#rewrite!` (#2)

data/TODO.md

@@ -1,3 +1,7 @@
+## Immediate
+
+- [ ] Tests for `#parse_form_data`!
+
 ## Serve files / arbitrary content
 
 - `#serve_file(path, opts)`

data/lib/qeweney/errors.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Qeweney
+  class BadRequestError < StandardError
+  end
+end

data/lib/qeweney/mime_types.rb

@@ -35,4 +35,4 @@ module Qeweney
       end
     end
   end
-end
+end

data/lib/qeweney/mock_adapter.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'qeweney'
+
+module Qeweney
+  class MockAdapter
+    attr_reader :body, :headers, :calls
+
+    def get_body_chunk(_req, _buffered_only)
+      @request_body_chunks.shift
+    end
+
+    def get_body(_req)
+      body = @request_body_chunks.join('')
+      @request_body_chunks.clear
+      body
+    end
+
+    def complete?(_req)
+      @request_body_chunks.empty?
+    end
+
+    def initialize(request_body)
+      case request_body
+      when Array
+        @request_body_chunks = request_body
+      when nil
+        @request_body_chunks = []
+      else
+        @request_body_chunks = [request_body]
+      end
+      @calls = []
+    end
+
+    def respond(req, body, headers)
+      @calls << [:respond, req, body, headers]
+      @body = body
+      @headers = headers
+    end
+
+    def status
+      headers[':status'] || Qeweney::Status::OK
+    end
+
+    def method_missing(sym, *args)
+      calls << [sym, *args]
+    end
+
+    def self.mock(headers = {}, request_body = nil)
+      headers[':method'] ||= ''
+      headers[':path'] ||= ''
+      Request.new(headers, new(request_body))
+    end
+  end
+end

data/lib/qeweney/request.rb

@@ -45,7 +45,7 @@ module Qeweney
         end
         @buffered_body_chunks = nil
       end
-      while (chunk = @adapter.get_body_chunk(self))
+      while (chunk = @adapter.get_body_chunk(self, false))
         yield chunk
       end
     end
@@ -115,4 +115,4 @@ module Qeweney
       (headers[':rx'] || 0) + (headers[':tx'] || 0)
     end
   end
-end
+end

data/lib/qeweney/request_info.rb

@@ -3,6 +3,8 @@
 require 'uri'
 require 'escape_utils'
 
+require_relative './errors'
+
 module Qeweney
   module RequestInfoMethods
     def host
@@ -126,12 +128,13 @@ module Qeweney
       when /^application\/x-www-form-urlencoded/
         parse_urlencoded_form_data(body)
       else
-        raise "Unsupported form data content type: #{content_type}"
+        raise BadRequestError, "Unsupported form data content type: #{content_type}"
       end
     end
 
     def parse_multipart_form_data(body, boundary)
       parts = body.split(boundary)
+      raise BadRequestError, 'Invalid form data' if parts.size < 2
       parts.each_with_object({}) do |p, h|
         next if p.empty? || p == "--\r\n"
 
@@ -174,7 +177,7 @@ module Qeweney
       [part, headers]
     end
 
-    PARAMETER_RE = /^(.+)=(.*)$/.freeze
+    PARAMETER_RE = /^([^=]+)(?:=(.*))?$/.freeze
     MAX_PARAMETER_NAME_SIZE = 256
     MAX_PARAMETER_VALUE_SIZE = 2**20 # 1MB
 
@@ -183,15 +186,15 @@ module Qeweney
 
       body.force_encoding(Encoding::UTF_8) unless body.encoding == Encoding::UTF_8
       body.split('&').each_with_object({}) do |i, m|
-        raise 'Invalid parameter format' unless i =~ PARAMETER_RE
+        raise BadRequestError, 'Invalid parameter format' unless i =~ PARAMETER_RE
 
         k = Regexp.last_match(1)
-        raise 'Invalid parameter size' if k.size > MAX_PARAMETER_NAME_SIZE
+        raise BadRequestError, 'Invalid parameter size' if k.size > MAX_PARAMETER_NAME_SIZE
 
         v = Regexp.last_match(2)
-        raise 'Invalid parameter size' if v.size > MAX_PARAMETER_VALUE_SIZE
+        raise BadRequestError, 'Invalid parameter size' if v && v.size > MAX_PARAMETER_VALUE_SIZE
 
-        m[EscapeUtils.unescape_uri(k)] = EscapeUtils.unescape_uri(v)
+        m[EscapeUtils.unescape_uri(k)] = v ? EscapeUtils.unescape_uri(v) : true
       end
     end
   end

data/lib/qeweney/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Qeweney
-  VERSION = '0.20'
+  VERSION = '0.22'
 end

data/lib/qeweney.rb

@@ -3,5 +3,6 @@
 module Qeweney
 end
 
-require_relative 'qeweney/request.rb'
-require_relative 'qeweney/status.rb'
+require_relative 'qeweney/errors'
+require_relative 'qeweney/request'
+require_relative 'qeweney/status'

data/qeweney.gemspec

@@ -10,17 +10,17 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split
   s.homepage    = 'https://github.com/digital-fabric/qeweney'
   s.metadata    = {
-    "source_code_uri" => "https://github.com/digital-fabric/qeweney"
+    'source_code_uri' => 'https://github.com/digital-fabric/qeweney'
   }
-  s.rdoc_options = ["--title", "Qeweney", "--main", "README.md"]
-  s.extra_rdoc_files = ["README.md"]
-  s.require_paths = ["lib"]
+  s.rdoc_options = ['--title', 'Qeweney', '--main', 'README.md']
+  s.extra_rdoc_files = ['README.md']
+  s.require_paths = ['lib']
   s.required_ruby_version = '>= 2.6'
 
-  s.add_runtime_dependency      'escape_utils',       '~>1.3.0'
+  s.add_runtime_dependency      'escape_utils',   '1.3.0'
 
-  s.add_development_dependency  'rake',               '~>12.3.3'
-  s.add_development_dependency  'minitest',           '~>5.11.3'
-  s.add_development_dependency  'minitest-reporters', '~>1.4.2'
-  s.add_development_dependency  'benchmark-ips',      '~>2.8.3'
+  s.add_development_dependency  'benchmark-ips',  '2.14.0'
+  s.add_development_dependency  'minitest',       '5.25.4'
+  s.add_development_dependency  'rake',           '13.2.1'
+  s.add_development_dependency  'listen',         '3.9.0'
 end

data/test/helper.rb

@@ -2,35 +2,8 @@
 
 require 'bundler/setup'
 require 'qeweney'
-
+require 'qeweney/mock_adapter'
 require 'fileutils'
-
-require_relative './coverage' if ENV['COVERAGE']
-
 require 'minitest/autorun'
 
-module Qeweney
-  class MockAdapter
-    attr_reader :calls
-
-    def initialize
-      @calls = []
-    end
-
-    def method_missing(sym, *args)
-      calls << [sym, *args]
-    end
-  end
-
-  def self.mock(headers = {})
-    headers[':method'] ||= ''
-    headers[':path'] ||= ''
-    Request.new(headers, MockAdapter.new)
-  end
-
-  class Request
-    def response_calls
-      adapter.calls
-    end
-  end
-end
+require_relative './coverage' if ENV['COVERAGE']

data/test/run_loop.rb

@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+
+require 'listen'
+
+def run_all_tests
+  puts
+  system('bundle exec ruby test/run.rb')
+end
+
+def run_test(fn)
+  system("bundle exec ruby #{fn}")
+end
+
+listener = Listen.to('lib', 'test') do |modified, added, removed|
+  puts '*' * 40
+
+  fns = []
+
+  modified.each { fns << it }
+  added.each    { fns << it }
+  removed.each  { fns << it }
+
+  fns = fns.uniq
+  puts "modified: #{fns.inspect}"
+  puts '*' * 40
+
+  if fns.size == 1 && fns.first =~ /test_/
+    run_test(fns.first)
+  else
+    run_all_tests
+  end
+end
+
+run_all_tests
+listener.start
+sleep

data/test/test_mock_adapter.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class MockAdapterTest < Minitest::Test
+  def test_mock_adapter
+    adapter = Qeweney::MockAdapter.new(nil)
+    req = Qeweney::Request.new({ ':path' => '/foo' }, adapter)
+    req.respond('bar', 'Content-Type' => 'baz')
+
+    assert_equal 'bar', adapter.body
+    assert_equal({'Content-Type' => 'baz'}, adapter.headers)
+  end
+
+  def test_mock_adapter_with_body
+    adapter = Qeweney::MockAdapter.new('barbaz')
+    req = Qeweney::Request.new({ ':path' => '/foo' }, adapter)
+    assert_equal false, req.complete?
+
+    body = req.read
+    assert_equal 'barbaz', body
+    assert_equal true, req.complete?
+  end
+
+  def test_mock_adapter_with_chunked_body
+    adapter = Qeweney::MockAdapter.new(['bar', 'baz'])
+    req = Qeweney::Request.new({ ':path' => '/foo' }, adapter)
+    assert_equal false, req.complete?
+
+    chunk = req.next_chunk
+    assert_equal 'bar', chunk
+    assert_equal false, req.complete?
+
+    chunk = req.next_chunk
+    assert_equal 'baz', chunk
+    assert_equal true, req.complete?
+  end
+
+  def test_mock_adapter_each_chunk
+    chunks = []
+    adapter = Qeweney::MockAdapter.new(['bar', 'baz'])
+    req = Qeweney::Request.new({ ':path' => '/foo' }, adapter)
+    assert_equal false, req.complete?
+
+    req.each_chunk { chunks << _1 }
+    assert_equal ['bar', 'baz'], chunks
+    assert_equal true, req.complete?
+  end
+end

data/test/test_request_info.rb

@@ -2,46 +2,46 @@
 
 require_relative 'helper'
 
-class RequestInfoTest < MiniTest::Test
+class RequestInfoTest < Minitest::Test
   def test_uri
-    r = Qeweney.mock(':path' => '/test/path')
+    r = Qeweney::MockAdapter.mock(':path' => '/test/path')
     assert_equal '/test/path', r.path
     assert_equal({}, r.query)
 
-    r = Qeweney.mock(':path' => '/test/path?a=1&b=2&c=3%2f4')
+    r = Qeweney::MockAdapter.mock(':path' => '/test/path?a=1&b=2&c=3%2f4')
     assert_equal '/test/path', r.path
     assert_equal({ a: '1', b: '2', c: '3/4' }, r.query)
   end
 
   def test_query
-    r = Qeweney.mock(':path' => '/GponForm/diag_Form?images/')
+    r = Qeweney::MockAdapter.mock(':path' => '/GponForm/diag_Form?images/')
     assert_equal '/GponForm/diag_Form', r.path
     assert_equal({:'images/' => true}, r.query)
 
-    r = Qeweney.mock(':path' => '/?a=1&b=2')
+    r = Qeweney::MockAdapter.mock(':path' => '/?a=1&b=2')
     assert_equal '/', r.path
     assert_equal({a: '1', b: '2'}, r.query)
 
-    r = Qeweney.mock(':path' => '/?l=a&t=&x=42')
+    r = Qeweney::MockAdapter.mock(':path' => '/?l=a&t=&x=42')
     assert_equal({l: 'a', t: '', x: '42'}, r.query)
   end
 
   def test_host
-    r = Qeweney.mock(':path' => '/')
+    r = Qeweney::MockAdapter.mock(':path' => '/')
     assert_nil r.host
     assert_nil r.authority
 
-    r = Qeweney.mock('host' => 'my.example.com')
+    r = Qeweney::MockAdapter.mock('host' => 'my.example.com')
     assert_equal 'my.example.com', r.host
     assert_equal 'my.example.com', r.authority
 
-    r = Qeweney.mock(':authority' => 'my.foo.com')
+    r = Qeweney::MockAdapter.mock(':authority' => 'my.foo.com')
     assert_equal 'my.foo.com', r.host
     assert_equal 'my.foo.com', r.authority
   end
 
   def test_full_uri
-    r = Qeweney.mock(
+    r = Qeweney::MockAdapter.mock(
       ':scheme' => 'https',
       'host' => 'foo.bar',
       ':path' => '/hey?a=b&c=d'
@@ -51,11 +51,11 @@ class RequestInfoTest < MiniTest::Test
   end
 
   def test_cookies
-    r = Qeweney.mock
+    r = Qeweney::MockAdapter.mock
 
     assert_equal({}, r.cookies)
 
-    r = Qeweney.mock(
+    r = Qeweney::MockAdapter.mock(
       'cookie' => 'uaid=a%2Fb; lastLocus=settings; signin_ref=/'
     )
 
@@ -67,7 +67,7 @@ class RequestInfoTest < MiniTest::Test
   end
 
   def test_rewrite!
-    r = Qeweney.mock(
+    r = Qeweney::MockAdapter.mock(
       ':scheme' => 'https',
       'host' => 'foo.bar',
       ':path' => '/hey/ho?a=b&c=d'

data/test/test_response.rb

@@ -2,27 +2,27 @@
 
 require_relative 'helper'
 
-class RedirectTest < MiniTest::Test
+class RedirectTest < Minitest::Test
   def test_redirect
-    r = Qeweney.mock
+    r = Qeweney::MockAdapter.mock
     r.redirect('/foo')
 
     assert_equal [
       [:respond, r, nil, {":status"=>302, "Location"=>"/foo"}]
-    ], r.response_calls
+    ], r.adapter.calls
   end
 
   def test_redirect_wirth_status
-    r = Qeweney.mock
+    r = Qeweney::MockAdapter.mock
     r.redirect('/bar', Qeweney::Status::MOVED_PERMANENTLY)
 
     assert_equal [
       [:respond, r, nil, {":status"=>301, "Location"=>"/bar"}]
-    ], r.response_calls
+    ], r.adapter.calls
   end
 end
 
-class StaticFileResponeTest < MiniTest::Test
+class StaticFileResponeTest < Minitest::Test
   def setup
     @path = File.join(__dir__, 'helper.rb')
     @stat = File.stat(@path)
@@ -33,42 +33,42 @@ class StaticFileResponeTest < MiniTest::Test
   end
 
   def test_serve_file
-    r = Qeweney.mock
+    r = Qeweney::MockAdapter.mock
     r.serve_file('helper.rb', base_path: __dir__)
 
     assert_equal [
       [:respond, r, @content, { 'etag' => @etag, 'last-modified' => @last_modified }]
-    ], r.response_calls
+    ], r.adapter.calls
   end
 
   def test_serve_file_with_cache_headers
-    r = Qeweney.mock('if-none-match' => @etag)
+    r = Qeweney::MockAdapter.mock('if-none-match' => @etag)
     r.serve_file('helper.rb', base_path: __dir__)
     assert_equal [
       [:respond, r, nil, { 'etag' => @etag, ':status' => Qeweney::Status::NOT_MODIFIED }]
-    ], r.response_calls
+    ], r.adapter.calls
 
-    r = Qeweney.mock('if-modified-since' => @last_modified)
+    r = Qeweney::MockAdapter.mock('if-modified-since' => @last_modified)
     r.serve_file('helper.rb', base_path: __dir__)
     assert_equal [
       [:respond, r, nil, { 'etag' => @etag, ':status' => Qeweney::Status::NOT_MODIFIED }]
-    ], r.response_calls
+    ], r.adapter.calls
 
-    r = Qeweney.mock('if-none-match' => 'foobar')
+    r = Qeweney::MockAdapter.mock('if-none-match' => 'foobar')
     r.serve_file('helper.rb', base_path: __dir__)
     assert_equal [
       [:respond, r, @content, { 'etag' => @etag, 'last-modified' => @last_modified }]
-    ], r.response_calls
+    ], r.adapter.calls
 
-    r = Qeweney.mock('if-modified-since' => Time.now.httpdate)
+    r = Qeweney::MockAdapter.mock('if-modified-since' => Time.now.httpdate)
     r.serve_file('helper.rb', base_path: __dir__)
     assert_equal [
       [:respond, r, @content, { 'etag' => @etag, 'last-modified' => @last_modified }]
-    ], r.response_calls
+    ], r.adapter.calls
   end
 
   def test_serve_file_deflate
-    r = Qeweney.mock('accept-encoding' => 'deflate')
+    r = Qeweney::MockAdapter.mock('accept-encoding' => 'deflate')
     r.serve_file('helper.rb', base_path: __dir__)
 
     deflate = Zlib::Deflate.new
@@ -81,11 +81,11 @@ class StaticFileResponeTest < MiniTest::Test
         'vary' => 'Accept-Encoding',
         'content-encoding' => 'deflate'
       }]
-    ], r.response_calls
+    ], r.adapter.calls
   end
 
   def test_serve_file_gzip
-    r = Qeweney.mock('accept-encoding' => 'gzip')
+    r = Qeweney::MockAdapter.mock('accept-encoding' => 'gzip')
     r.serve_file('helper.rb', base_path: __dir__)
 
     buf = StringIO.new
@@ -102,21 +102,21 @@ class StaticFileResponeTest < MiniTest::Test
         'vary' => 'Accept-Encoding',
         'content-encoding' => 'gzip'
       }]
-    ], r.response_calls
+    ], r.adapter.calls
   end
 
   def test_serve_file_non_existent
-    r = Qeweney.mock
+    r = Qeweney::MockAdapter.mock
     r.serve_file('foo.rb', base_path: __dir__)
     assert_equal [
       [:respond, r, nil, { ':status' => Qeweney::Status::NOT_FOUND }]
-    ], r.response_calls
+    ], r.adapter.calls
   end
 end
 
-class UpgradeTest < MiniTest::Test
+class UpgradeTest < Minitest::Test
   def test_upgrade
-    r = Qeweney.mock
+    r = Qeweney::MockAdapter.mock
     r.upgrade('df')
 
     assert_equal [
@@ -125,10 +125,10 @@ class UpgradeTest < MiniTest::Test
         'Upgrade' => 'df',
         'Connection' => 'upgrade'
       }]
-    ], r.response_calls
+    ], r.adapter.calls
 
 
-    r = Qeweney.mock
+    r = Qeweney::MockAdapter.mock
     r.upgrade('df', { 'foo' => 'bar' })
 
     assert_equal [
@@ -138,11 +138,11 @@ class UpgradeTest < MiniTest::Test
         'Connection' => 'upgrade',
         'foo' => 'bar'
       }]
-    ], r.response_calls
+    ], r.adapter.calls
   end
 
   def test_websocket_upgrade
-    r = Qeweney.mock(
+    r = Qeweney::MockAdapter.mock(
       'connection' => 'upgrade',
       'upgrade' => 'websocket',
       'sec-websocket-version' => '23',
@@ -163,13 +163,13 @@ class UpgradeTest < MiniTest::Test
         'Sec-WebSocket-Accept' => accept
       }],
       [:websocket_connection, r]
-    ], r.response_calls
+    ], r.adapter.calls
   end
 end
 
-class ServeRackTest < MiniTest::Test
+class ServeRackTest < Minitest::Test
   def test_serve_rack
-    r = Qeweney.mock(
+    r = Qeweney::MockAdapter.mock(
       ':method' => 'get',
       ':path' => '/foo/bar?a=1&b=2%2F3',
       'accept' => 'blah'
@@ -180,6 +180,6 @@ class ServeRackTest < MiniTest::Test
 
     assert_equal [
       [:respond, r, 'GET /foo/bar', {':status' => 404, 'Foo' => 'Bar' }]
-    ], r.response_calls
+    ], r.adapter.calls
   end
 end

data/test/test_routing.rb

@@ -2,7 +2,7 @@
 
 require_relative 'helper'
 
-class RoutingTest < MiniTest::Test
+class RoutingTest < Minitest::Test
   App1 = ->(r) do
     r.route do
       r.on_root { r.redirect '/hello' }
@@ -18,29 +18,29 @@ class RoutingTest < MiniTest::Test
   end
 
   def test_app1
-    r = Qeweney.mock(':path' => '/foo')
+    r = Qeweney::MockAdapter.mock(':path' => '/foo')
     App1.(r)
-    assert_equal [[:respond, r, nil, { ':status' => 404 }]], r.response_calls
+    assert_equal [[:respond, r, nil, { ':status' => 404 }]], r.adapter.calls
 
-    r = Qeweney.mock(':path' => '/')
+    r = Qeweney::MockAdapter.mock(':path' => '/')
     App1.(r)
-    assert_equal [[:respond, r, nil, { ':status' => 302, 'Location' => '/hello' }]], r.response_calls
+    assert_equal [[:respond, r, nil, { ':status' => 302, 'Location' => '/hello' }]], r.adapter.calls
 
-    r = Qeweney.mock(':path' => '/hello', ':method' => 'foo')
+    r = Qeweney::MockAdapter.mock(':path' => '/hello', ':method' => 'foo')
     App1.(r)
-    assert_equal [[:respond, r, nil, { ':status' => 404 }]], r.response_calls
+    assert_equal [[:respond, r, nil, { ':status' => 404 }]], r.adapter.calls
 
-    r = Qeweney.mock(':path' => '/hello', ':method' => 'get')
+    r = Qeweney::MockAdapter.mock(':path' => '/hello', ':method' => 'get')
     App1.(r)
-    assert_equal [[:respond, r, 'Hello', {}]], r.response_calls
+    assert_equal [[:respond, r, 'Hello', {}]], r.adapter.calls
 
-    r = Qeweney.mock(':path' => '/hello', ':method' => 'post')
+    r = Qeweney::MockAdapter.mock(':path' => '/hello', ':method' => 'post')
     App1.(r)
-    assert_equal [[:respond, r, nil, { ':status' => 302, 'Location' => '/' }]], r.response_calls
+    assert_equal [[:respond, r, nil, { ':status' => 302, 'Location' => '/' }]], r.adapter.calls
 
-    r = Qeweney.mock(':path' => '/hello/world', ':method' => 'get')
+    r = Qeweney::MockAdapter.mock(':path' => '/hello/world', ':method' => 'get')
     App1.(r)
-    assert_equal [[:respond, r, 'Hello world', {}]], r.response_calls
+    assert_equal [[:respond, r, 'Hello world', {}]], r.adapter.calls
   end
 
   def test_on_root
@@ -57,21 +57,21 @@ class RoutingTest < MiniTest::Test
       }
     end
 
-    r = Qeweney.mock(':path' => '/')
+    r = Qeweney::MockAdapter.mock(':path' => '/')
     app.(r)
-    assert_equal [[:respond, r, 'root', {}]], r.response_calls
+    assert_equal [[:respond, r, 'root', {}]], r.adapter.calls
 
-    r = Qeweney.mock(':path' => '/foo')
+    r = Qeweney::MockAdapter.mock(':path' => '/foo')
     app.(r)
-    assert_equal [[:respond, r, 'foo root', {}]], r.response_calls
+    assert_equal [[:respond, r, 'foo root', {}]], r.adapter.calls
 
-    r = Qeweney.mock(':path' => '/foo/bar')
+    r = Qeweney::MockAdapter.mock(':path' => '/foo/bar')
     app.(r)
-    assert_equal [[:respond, r, 'bar root', {}]], r.response_calls
+    assert_equal [[:respond, r, 'bar root', {}]], r.adapter.calls
 
-    r = Qeweney.mock(':path' => '/foo/bar/baz')
+    r = Qeweney::MockAdapter.mock(':path' => '/foo/bar/baz')
     app.(r)
-    assert_equal [[:respond, r, 'baz root', {}]], r.response_calls
+    assert_equal [[:respond, r, 'baz root', {}]], r.adapter.calls
   end
 
   def test_relative_path
@@ -88,31 +88,31 @@ class RoutingTest < MiniTest::Test
       r.on('baz') { r.respond(r.route_relative_path) }
     end
 
-    r = Qeweney.mock(':path' => '/')
+    r = Qeweney::MockAdapter.mock(':path' => '/')
     app.(r)
     assert_equal '/', default_relative_path
-    assert_equal [[:respond, r, 'ROOT/', {}]], r.response_calls
+    assert_equal [[:respond, r, 'ROOT/', {}]], r.adapter.calls
 
 
-    r = Qeweney.mock(':path' => '/foo/bar/baz')
+    r = Qeweney::MockAdapter.mock(':path' => '/foo/bar/baz')
     app.(r)
     assert_equal '/foo/bar/baz', default_relative_path
-    assert_equal [[:respond, r, 'FOO/bar/baz', {}]], r.response_calls
+    assert_equal [[:respond, r, 'FOO/bar/baz', {}]], r.adapter.calls
 
-    r = Qeweney.mock(':path' => '/bar/a/b/c')
+    r = Qeweney::MockAdapter.mock(':path' => '/bar/a/b/c')
     app.(r)
     assert_equal '/bar/a/b/c', default_relative_path
-    assert_equal [[:respond, r, 'BAR/a/b/c', {}]], r.response_calls
+    assert_equal [[:respond, r, 'BAR/a/b/c', {}]], r.adapter.calls
 
-    r = Qeweney.mock(':path' => '/bar/baz/b/c')
+    r = Qeweney::MockAdapter.mock(':path' => '/bar/baz/b/c')
     app.(r)
     assert_equal '/bar/baz/b/c', default_relative_path
-    assert_equal [[:respond, r, 'BAR/BAZ/b/c', {}]], r.response_calls
+    assert_equal [[:respond, r, 'BAR/BAZ/b/c', {}]], r.adapter.calls
 
-    r = Qeweney.mock(':path' => '/baz/d/e/f')
+    r = Qeweney::MockAdapter.mock(':path' => '/baz/d/e/f')
     app.(r)
     assert_equal '/baz/d/e/f', default_relative_path
-    assert_equal [[:respond, r, '/d/e/f', {}]], r.response_calls
+    assert_equal [[:respond, r, '/d/e/f', {}]], r.adapter.calls
   end
 
   def test_well_known
@@ -121,9 +121,9 @@ class RoutingTest < MiniTest::Test
       r.default { r.respond('not found') }
     end
 
-    r = Qeweney.mock(':path' => '/.well-known/acme-challenge/foo')
+    r = Qeweney::MockAdapter.mock(':path' => '/.well-known/acme-challenge/foo')
     app.(r)
-    assert_equal [[:respond, r, '/foo', {}]], r.response_calls
+    assert_equal [[:respond, r, '/foo', {}]], r.adapter.calls
   end
 end
 

metadata

@@ -1,86 +1,84 @@
 --- !ruby/object:Gem::Specification
 name: qeweney
 version: !ruby/object:Gem::Version
-  version: '0.20'
+  version: '0.22'
 platform: ruby
 authors:
 - Sharon Rosner
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-16 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 5.11.3
+        version: 5.25.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 5.11.3
+        version: 5.25.4
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 13.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 13.2.1
 - !ruby/object:Gem::Dependency
-  name: benchmark-ips
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.3
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.3
-description:
+        version: 3.9.0
 email: sharon@noteflakes.com
 executables: []
 extensions: []
@@ -92,35 +90,35 @@ files:
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - TODO.md
 - examples/routing_benchmark.rb
 - lib/qeweney.rb
+- lib/qeweney/errors.rb
 - lib/qeweney/mime_types.rb
+- lib/qeweney/mock_adapter.rb
 - lib/qeweney/rack.rb
 - lib/qeweney/request.rb
 - lib/qeweney/request_info.rb
 - lib/qeweney/response.rb
 - lib/qeweney/routing.rb
 - lib/qeweney/status.rb
-- lib/qeweney/test_adapter.rb
 - lib/qeweney/version.rb
 - qeweney.gemspec
 - test/helper.rb
 - test/run.rb
+- test/run_loop.rb
+- test/test_mock_adapter.rb
 - test/test_request_info.rb
 - test/test_response.rb
 - test/test_routing.rb
-- test/test_test_adapter.rb
 homepage: https://github.com/digital-fabric/qeweney
 licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/digital-fabric/qeweney
-post_install_message:
 rdoc_options:
 - "--title"
 - Qeweney
@@ -139,8 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Qeweney - cross library HTTP request / response API
 test_files: []

data/Gemfile.lock

@@ -1,35 +0,0 @@
-PATH
-  remote: .
-  specs:
-    qeweney (0.19)
-      escape_utils (~> 1.3.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ansi (1.5.0)
-    benchmark-ips (2.8.4)
-    builder (3.3.0)
-    escape_utils (1.3.0)
-    minitest (5.11.3)
-    minitest-reporters (1.4.3)
-      ansi
-      builder
-      minitest (>= 5.0)
-      ruby-progressbar
-    rake (12.3.3)
-    ruby-progressbar (1.13.0)
-
-PLATFORMS
-  ruby
-  x86_64-linux
-
-DEPENDENCIES
-  benchmark-ips (~> 2.8.3)
-  minitest (~> 5.11.3)
-  minitest-reporters (~> 1.4.2)
-  qeweney!
-  rake (~> 12.3.3)
-
-BUNDLED WITH
-   2.5.22

data/lib/qeweney/test_adapter.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module Qeweney
-  class TestAdapter
-    attr_reader :body, :headers
-
-    def get_body_chunk
-      nil
-    end
-
-    def respond(req, body, headers)
-      @body = body
-      @headers = headers
-    end
-
-    def status
-      headers[':status'] || Qeweney::Status::OK
-    end
-
-    def self.mock(headers = {})
-      headers[':method'] ||= ''
-      headers[':path'] ||= ''
-      Request.new(headers, new)
-    end
-  end
-end

data/test/test_test_adapter.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'helper'
-require 'qeweney/test_adapter'
-
-class TestAdapterTest < MiniTest::Test
-  def test_test_adapter
-    adapter = Qeweney::TestAdapter.new
-    req = Qeweney::Request.new({ ':path' => '/foo' }, adapter)
-    req.respond('bar', 'Content-Type' => 'baz')
-
-    assert_equal 'bar', adapter.body
-    assert_equal({'Content-Type' => 'baz'}, adapter.headers)
-  end
-end