protocol-rack 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b6a6be852ed5686a4a29416d5e7f308a0b8fecdac08945f7a94c654fe961295
-  data.tar.gz: e0afd920038faa59a9739eb0780acc7d517d34fdd9bc336c80069c39b06892e4
+  metadata.gz: 33a02fca6186127b6390f9189b87c312dd05ec7b3351ad31ca75698a30c82097
+  data.tar.gz: d58cafc1f71296ed6d68bf09ceeaf945d8ba1785f701623b0139d8f81adb553d
 SHA512:
-  metadata.gz: 6d289be5ff94b209e23de3cb3569cfe76df31356daf072e2caf22ec34e22f3dce6e2e46cc027548b515c83ecd6186c1318f74a1bebaed388618ed7c221b704f4
-  data.tar.gz: 36c188b1011e436f29fdbf2c317d0c81ed46ae1831a1439cad18248492a005f735d14f2babc5855fd455940018c5f26719978878a697794c17d2d35d1846216d
+  metadata.gz: 6460132af99298b1cfb02635af9874050cf6c95c11083a1c6dd5ea884fbe1940d0f3efcea0bfcdbe2040023795bb6ca40046fea8149e55f8c03ca73a76227371
+  data.tar.gz: 05ee66f991ad3cd77b4e0937100523c346f2af359ad310591c15286ebccdbad3c01effdb7d79a049aa5f548e595f2c941e69c802e7ed550c75602acf0f48e910

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

@@ -78,6 +78,12 @@ module Protocol
 					end
 				end
 				
+				def make_environment(request)
+					{
+						request: request
+					}
+				end
+				
 				# Build a rack `env` from the incoming request and apply it to the rack middleware.
 				#
 				# @parameter request [Protocol::HTTP::Request] The incoming request.
@@ -86,6 +92,16 @@ module Protocol
 					
 					status, headers, body = @app.call(env)
 					
+					# The status must always be an integer.
+					unless status.is_a?(Integer)
+						raise ArgumentError, "Status must be an integer!"
+					end
+					
+					# Headers must always be a hash or equivalent.
+					unless headers
+						raise ArgumentError, "Headers must not be nil!"
+					end
+					
 					headers, meta = self.wrap_headers(headers)
 					
 					return Response.wrap(env, status, headers, meta, body, request)

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022, by Samuel Williams.
+# Copyright, 2022-2023, by Samuel Williams.
 
 require 'console'
 
@@ -108,10 +108,12 @@ module Protocol
 						
 						if key.start_with?('rack.')
 							meta[key] = value
-						else
+						elsif value.is_a?(String)
 							value.split("\n").each do |value|
 								headers[key] = value
 							end
+						else
+							headers[key] = value
 						end
 					end
 					

data/lib/protocol/rack/adapter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022, by Samuel Williams.
+# Copyright, 2022-2023, by Samuel Williams.
 
 require 'rack'
 
@@ -11,7 +11,7 @@ require_relative 'adapter/rack3'
 module Protocol
 	module Rack
 		module Adapter
-			if ::Rack::RELEASE >= "3"
+			if ::Rack.release >= "3"
 				IMPLEMENTATION = Rack3
 			else
 				IMPLEMENTATION = Rack2

data/lib/protocol/rack/input.rb

@@ -2,6 +2,7 @@
 
 # Released under the MIT License.
 # Copyright, 2022, by Samuel Williams.
+# Copyright, 2023, by Genki Takiuchi.
 
 require 'async/io/buffer'
 require 'protocol/http/body/stream'
@@ -18,6 +19,7 @@ module Protocol
 			# @parameter body [Protocol::HTTP::Body::Readable]
 			def initialize(body)
 				@body = body
+				@closed = false
 				
 				# Will hold remaining data in `#read`.
 				@buffer = nil
@@ -46,6 +48,8 @@ module Protocol
 			
 			# Close the input and output bodies.
 			def close(error = nil)
+				@closed = true
+				
 				if @body
 					@body.close(error)
 					@body = nil
@@ -74,7 +78,7 @@ module Protocol
 			
 			# Whether the stream has been closed.
 			def closed?
-				@body.nil?
+				@closed or @body.nil?
 			end
 			
 			# Whether there are any input chunks remaining?
@@ -87,7 +91,7 @@ module Protocol
 			def read_next
 				if @body
 					@body.read
-				else
+				elsif @closed
 					raise IOError, "Stream is not readable, input has been closed!"
 				end
 			end

data/lib/protocol/rack/request.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022, by Samuel Williams.
+# Copyright, 2022-2023, by Samuel Williams.
 
 require 'protocol/http/request'
 require 'protocol/http/headers'
@@ -42,7 +42,7 @@ module Protocol
 
 			def self.headers(env)
 				headers = ::Protocol::HTTP::Headers.new
-				env.each do |key, value|			
+				env.each do |key, value|
 					if key.start_with?('HTTP_')
 						next if key == 'HTTP_HOST'
 						headers[key[5..-1].gsub('_', '-').downcase] = value

data/lib/protocol/rack/version.rb

@@ -5,6 +5,6 @@
 
 module Protocol
 	module Rack
-		VERSION = "0.2.4"
+		VERSION = "0.2.6"
 	end
 end

data/license.md

@@ -1,6 +1,7 @@
 # MIT License
 
-Copyright, 2022, by Samuel Williams.  
+Copyright, 2022-2023, by Samuel Williams.  
+Copyright, 2023, by Genki Takiuchi.  
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: protocol-rack
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Samuel Williams
+- Genki Takiuchi
 autorequire:
 bindir: bin
 cert_chain:
@@ -37,7 +38,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2023-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-http
@@ -193,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.7
 signing_key:
 specification_version: 4
 summary: An implementation of the Rack protocol/specification.