protocol-rack 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33d20313d282ba893b555e32c7676f6f45c0b43c500f673d17bcab5b6ce3b437
-  data.tar.gz: 7c270c6c6ca1aa8714be1e98fb5fd51a8e4509c5090bc8a8ed256378c1e8cac1
+  metadata.gz: 8e9b2aad169f53bf60e4f21ce4e7732f44222c9540ffbe7b15350de8c5bc57c0
+  data.tar.gz: d99efa0f3ee9ffd1f9661e4f4ee0b56a4c78f35e7fe6356e403b27c60cb72463
 SHA512:
-  metadata.gz: dd26486f5e87e796d554a0a62748703afee8d92d583b6f218ae001fe53714e6b313494db57eb57ecdedbe1a131263d88f643d13f18f9d556474883f83c1f496f
-  data.tar.gz: 5171e4cc0360783c6ac043e34572f125d513569247c1e83f5ad663cd283f7fb074ed4407413d3d1698be108b8bbda9b0bf7d68cae70984dd2a60afdfa6694085
+  metadata.gz: ceadf027092c2e6745730109584cbc7bbf68f6830eae08b348fbe4e59e8339e5d27f121790c10c6f576b091c8eff1d951384af29ba381f613623a32dfdf7ed70
+  data.tar.gz: eff6dcdc9b0d2e06ce09788c15af9e55106375f5f040333194a30836a28082fa34f1a6175288f30078459aef143275c3904c0d90dcce54dd9356ced515932c6b

data/lib/protocol/rack/adapter.rb

@@ -20,6 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'rack'
+
 require_relative 'adapter/rack2'
 require_relative 'adapter/rack3'
 

data/lib/protocol/rack/constants.rb

@@ -20,13 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'rack'
-
-require_relative 'input'
-require_relative 'response'
-
-require 'console'
-
 module Protocol
 	module Rack
 		# Used for injecting the raw request in the the rack environment.

data/lib/protocol/rack/input.rb

@@ -44,34 +44,23 @@ module Protocol
 			# @attribute [Protocol::HTTP::Body::Readable]
 			attr :body
 			
+			include Protocol::HTTP::Body::Stream::Reader
+			
+			alias gets read_partial
+			
 			# Enumerate chunks of the request body.
 			# @yields {|chunk| ...}
 			# 	@parameter chunk [String]
 			def each(&block)
 				return to_enum unless block_given?
 				
-				while chunk = gets
+				return if closed? 
+				
+				while chunk = read_partial
 					yield chunk
 				end
 			end
 			
-			include Protocol::HTTP::Body::Stream::Reader
-			
-			# Read the next chunk of data from the input stream.
-			#
-			# `gets` must be called without arguments and return a `String`, or `nil` when the input stream has no more data.
-			#
-			# @returns [String | Nil] The next chunk from the body.
-			def gets
-				if @buffer.nil?
-					return read_next
-				else
-					buffer = @buffer
-					@buffer = nil
-					return buffer
-				end
-			end
-			
 			# Close the input and output bodies.
 			def close(error = nil)
 				if @body
@@ -105,9 +94,9 @@ module Protocol
 				@body.nil?
 			end
 			
-			# Whether there are any output chunks remaining?
+			# Whether there are any input chunks remaining?
 			def empty?
-				@output.empty?
+				@body.nil?
 			end
 			
 			private
@@ -116,7 +105,6 @@ module Protocol
 				if @body
 					@body.read
 				else
-					@body = nil
 					raise IOError, "Stream is not readable, input has been closed!"
 				end
 			end

data/lib/protocol/rack/version.rb

@@ -22,6 +22,6 @@
 
 module Protocol
 	module Rack
-		VERSION = "0.1.1"
+		VERSION = "0.1.4"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-rack
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,7 +37,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-08-18 00:00:00.000000000 Z
+date: 2022-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-http