rack 3 initial attempt

Gemfile

@@ -15,7 +15,7 @@ gem 'net-http-persistent', '~> 4.0',    :require => false
 gem 'http',                             :require => false
 
 # adapter extensions
-gem 'rack', '< 3'
+gem 'rack', '~> 3.0'
 gem 'socksify'
 
 # coverage

httpi.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
 
   s.license = 'MIT'
 
-  s.add_dependency 'rack', '< 3'
+  s.add_dependency 'rack', '~> 3.0', '< 3.1'
   s.add_dependency 'nkf'
   s.add_dependency 'base64'
   s.add_dependency 'mutex_m'
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake',     '~> 13.0'
   s.add_development_dependency 'rspec',    '~> 3.5'
   s.add_development_dependency 'mocha',    '~> 0.13'
-  s.add_development_dependency 'puma',     '~> 5.0'
+  s.add_development_dependency 'puma',     '~> 6.0'
   s.add_development_dependency 'webmock'
 
   s.metadata["rubygems_mfa_required"] = "true"

lib/httpi/request.rb

@@ -64,12 +64,12 @@ def ssl?
 
     # Returns a Hash of HTTP headers. Defaults to return an empty Hash.
     def headers
-      @headers ||= Rack::Utils::HeaderHash.new
+      @headers ||= Rack::Headers.new
     end
 
     # Sets the Hash of HTTP headers.
     def headers=(headers)
-      @headers = Rack::Utils::HeaderHash.new(headers)
+      @headers = Rack::Headers.new.merge(headers)
     end
 
     # Adds a header information to accept gzipped content.

lib/httpi/response.rb

@@ -20,7 +20,7 @@ class Response
     # Initializer expects an HTTP response +code+, +headers+ and +body+.
     def initialize(code, headers, body)
       self.code = code.to_i
-      self.headers = Rack::Utils::HeaderHash.new(headers)
+      self.headers = Rack::Headers.new.merge(headers)
       self.raw_body = body
     end
 

spec/integration/support/server.rb

@@ -57,7 +57,7 @@ def stop
   private
 
   def events
-    Puma::Events.new($stdout, $stderr)
+    Puma::Events.new
   end
 
   def add_tcp_listener