protocol-rack 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f7becb7e22562224a7b79eeaa6776b2132f5b5261a51aba1ac9e75e56dcc038
-  data.tar.gz: 333f072f05e98e6e52662294e41387cfdf1e59b9217990d42bb6694c241ed427
+  metadata.gz: 93f36e89bf961a77ffb20daa447e04e07d019e213d477c35383c8195f0dff9b4
+  data.tar.gz: cd60bb47a4d8e04b5505e339df964237efc00de093783b3179c8421c33eabcc3
 SHA512:
-  metadata.gz: 881510d4b665e3d9b6ef041eedeb27732601294a8d0e45c43900a8ef8cc11556fcff164c900aa0444272ba6e81cca1716a619b1520996ee411b842d166c5065f
-  data.tar.gz: e64f1f3c7ce42aa4a829bce8e1d9c4c270bb4fe5ecc99f6d01ae69222d3a18440f1e3ce83b2b50e842e7fd49b9c28d74383e6b9df8f9d6aa01e6afe564fe6019
+  metadata.gz: 4e25a07fa07b2e41fc19a48d331311db49ddd19f87faa26ffc523285081a64ba2fc94e9a9d480c0f86e1f78a9bc883f8e45a2239b372ada59df2e9a11682500e
+  data.tar.gz: a96d427f73445ee5e449ca0f80bf2bd396cc7737fc2b97fb5704143cbe5b2325a663403197cf51d807b77d89bcf62bbab36bc965241661be19a942dab08582c2

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

@@ -73,6 +73,30 @@ module Protocol
 					return env
 				end
 				
+				# Build a rack `env` from the incoming request and apply it to the rack middleware.
+				#
+				# @parameter request [Protocol::HTTP::Request] The incoming request.
+				def call(request)
+					env = self.make_environment(request)
+					
+					status, headers, body = @app.call(env)
+					
+					headers, meta = self.wrap_headers(headers)
+					
+					# Rack 2 spec does not allow only partial hijacking.
+					# if hijack_body = meta[RACK_HIJACK]
+					# 	body = hijack_body
+					# end
+					
+					return Response.wrap(env, status, headers, meta, body, request)
+				rescue => exception
+					Console.logger.error(self) {exception}
+					
+					body&.close if body.respond_to?(:close)
+					
+					return failure_response(exception)
+				end
+				
 				# Process the rack response headers into into a {Protocol::HTTP::Headers} instance, along with any extra `rack.` metadata.
 				# @returns [Tuple(Protocol::HTTP::Headers, Hash)]
 				def wrap_headers(fields)

data/lib/protocol/rack/body/streaming.rb

@@ -14,41 +14,47 @@ module Protocol
 				def initialize(block, input = nil)
 					@block = block
 					@input = input
+					@output = nil
 				end
 				
 				attr :block
-
-				def each(&block)
-					stream = ::Protocol::HTTP::Body::Stream.new(@input, Output.new(block))
-					
-					@block.call(stream)
-				end
-
-				def stream?
-					true
-				end
-
-				def call(stream)
-					@block.call(stream)
-				end
 				
 				class Output
-					def initialize(block)
-						@block = block
+					def initialize(input, block)
+						stream = ::Protocol::HTTP::Body::Stream.new(input, self)
+						@fiber = Fiber.new do
+							block.call(stream)
+							@fiber = nil
+						end
 					end
 					
 					def write(chunk)
-						@block.call(chunk)
+						Fiber.yield(chunk)
 					end
 					
 					def close
-						@block = nil
+						@fiber = nil
 					end
 					
-					def empty?
-						true
+					def read
+						@fiber&.resume
 					end
 				end
+				
+				# Invokes the block in a fiber which yields chunks when they are available.
+				def read
+					@output ||= Output.new(@input, @block)
+					return @output.read
+				end
+				
+				def stream?
+					true
+				end
+				
+				def call(stream)
+					raise "Streaming body has already been read!" if @output
+					@block.call(stream)
+				end
 			end
 		end
 	end

data/lib/protocol/rack/response.rb

@@ -46,6 +46,10 @@ module Protocol
 					Console.logger.warn(self, "Ignoring protocol-level headers: #{ignored.inspect}")
 				end
 
+				if hijack_body = meta['rack.hijack']
+					body = hijack_body
+				end
+
 				body = Body.wrap(env, status, headers, body, request&.body)
 
 				if request&.head?

data/lib/protocol/rack/version.rb

@@ -5,6 +5,6 @@
 
 module Protocol
 	module Rack
-		VERSION = "0.2.0"
+		VERSION = "0.2.3"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-rack
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,7 +37,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-08-27 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-http
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.4
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.4
+        version: '0.23'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -85,72 +85,72 @@ dependencies:
   name: bake-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bake-test-external
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: covered
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: sus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: sus-fixtures-async-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0.1'
 description:
 email:
 executables: []