protocol-rack 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10a0c5ad45e5da6659b4b3bef87ba9f2161727e4e465694421bf9d3b1ba3d37a
-  data.tar.gz: 7f87087ac4cec6a2d58c3b0a30066f00b3b43e14c513813aad780c581dec3651
+  metadata.gz: 30e960af55f8f9e0c401657bd0e245c448f46315ef97cdd3d25aeeb8f41ef99c
+  data.tar.gz: 1d4f9d858799b04e909776e120f4f376aa54ad4a956bd077e109edc704f3a2ff
 SHA512:
-  metadata.gz: aec78a45bb3c5287841286308a61063910a26384768da2f9aba370b46c9604321253491d488b05aecffa57e194955dc6910a1b2af5bf46e550bf23a03dd0fc0c
-  data.tar.gz: c83dcd78e675d363d40002a666642a1e4a0a897ebf70815ee9eab0523da6845ea65cff5f1bfef20c4e9f703e1409076a471a26d04e85273488164c0638c065aa
+  metadata.gz: c71e270584bfe6e4da54ce6b175664880180ddf5ba2cb5fec1fb4ef3b67aa93af2ef78ecc0d74869f477caed03e5caf4e072758fef7f831fcb8e249ccea60e5f
+  data.tar.gz: 9af0d3f0bbd79784f9f8464a1cffdfc76f55e9d49e386a9c770b43af85da2a2d1a0dfd0bbb624d2465d99f79ae1ef2663848d38195a2816aa57ebb9a9588a926

data/lib/protocol/rack/adapter/generic.rb

@@ -90,10 +90,8 @@ module Protocol
 					# HTTP/2 prefers `:authority` over `host`, so we do this for backwards compatibility.
 					env[CGI::HTTP_HOST] ||= request.authority
 								
-					if request.respond_to?(:remote_address)
-						if remote_address = request.remote_address
-							env[CGI::REMOTE_ADDR] = remote_address.ip_address if remote_address.ip?
-						end
+					if peer = request.peer
+						env[CGI::REMOTE_ADDR] = peer.ip_address
 					end
 				end
 				

data/lib/protocol/rack/adapter/rack31.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2022-2024, by Samuel Williams.
+
+require "console"
+
+require_relative "rack3"
+
+module Protocol
+	module Rack
+		module Adapter
+			class Rack31 < Rack3
+				def make_environment(request)
+					request_path, query_string = request.path.split("?", 2)
+					server_name, server_port = (request.authority || "").split(":", 2)
+					
+					env = {
+						PROTOCOL_HTTP_REQUEST => request,
+						
+						RACK_ERRORS => $stderr,
+						RACK_LOGGER => self.logger,
+						
+						# The request protocol, either from the upgrade header or the HTTP/2 pseudo header of the same name.
+						RACK_PROTOCOL => request.protocol,
+						
+						# The response finished callbacks:
+						RACK_RESPONSE_FINISHED => [],
+						
+						# The HTTP request method, such as “GET” or “POST”. This cannot ever be an empty string, and so is always required.
+						CGI::REQUEST_METHOD => request.method,
+						
+						# The initial portion of the request URL's “path” that corresponds to the application object, so that the application knows its virtual “location”. This may be an empty string, if the application corresponds to the “root” of the server.
+						CGI::SCRIPT_NAME => "",
+						
+						# The remainder of the request URL's “path”, designating the virtual “location” of the request's target within the application. This may be an empty string, if the request URL targets the application root and does not have a trailing slash. This value may be percent-encoded when originating from a URL.
+						CGI::PATH_INFO => request_path,
+						CGI::REQUEST_PATH => request_path,
+						CGI::REQUEST_URI => request.path,
+						
+						# The portion of the request URL that follows the ?, if any. May be empty, but is always required!
+						CGI::QUERY_STRING => query_string || "",
+						
+						# The server protocol (e.g. HTTP/1.1):
+						CGI::SERVER_PROTOCOL => request.version,
+						
+						# The request scheme:
+						RACK_URL_SCHEME => request.scheme,
+						
+						# I'm not sure what sane defaults should be here:
+						CGI::SERVER_NAME => server_name,
+						CGI::SERVER_PORT => server_port,
+					}
+					
+					if body = request.body
+						if body.empty?
+							body.close
+						else
+							env[RACK_INPUT] = Input.new(body)
+						end
+					end
+					
+					self.unwrap_request(request, env)
+					
+					return env
+				end
+			end
+		end
+	end
+end

data/lib/protocol/rack/adapter.rb

@@ -5,15 +5,19 @@
 
 require "rack"
 
-require_relative "adapter/rack2"
-require_relative "adapter/rack3"
-
 module Protocol
 	module Rack
 		module Adapter
-			if ::Rack.release >= "3"
+			VERSION = ENV.fetch("PROTOCOL_RACK_ADAPTER_VERSION", ::Rack.release)
+			
+			if VERSION >= "3.1"
+				require_relative "adapter/rack31"
+				IMPLEMENTATION = Rack31
+			elsif VERSION >= "3"
+				require_relative "adapter/rack3"
 				IMPLEMENTATION = Rack3
 			else
+				require_relative "adapter/rack2"
 				IMPLEMENTATION = Rack2
 			end
 			

data/lib/protocol/rack/version.rb

@@ -5,6 +5,6 @@
 
 module Protocol
 	module Rack
-		VERSION = "0.10.1"
+		VERSION = "0.11.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-rack
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -38,7 +38,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-10-11 00:00:00.000000000 Z
+date: 2024-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-http
@@ -46,14 +46,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: '0.43'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: '0.43'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -79,6 +79,7 @@ files:
 - lib/protocol/rack/adapter/generic.rb
 - lib/protocol/rack/adapter/rack2.rb
 - lib/protocol/rack/adapter/rack3.rb
+- lib/protocol/rack/adapter/rack31.rb
 - lib/protocol/rack/body.rb
 - lib/protocol/rack/body/enumerable.rb
 - lib/protocol/rack/body/input_wrapper.rb
@@ -112,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: An implementation of the Rack protocol/specification.