protocol-rack 0.1.3 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49a30005b471894675e712aa002435c47a19744e184bd61dcbfbd552cb87e3a3
-  data.tar.gz: 0fe2c629bc8cc0484e460ad9cd707bda6eaf94dbcf3498b2e6f8304c536e3dd2
+  metadata.gz: 2826bd60593f65a9f2f5350e714c2436b266b9d393d8afb594e59d18ab9168f9
+  data.tar.gz: 4c5051edaf485a0413d5090641c6347ead593a3b5210fcb9b2538808218d7a63
 SHA512:
-  metadata.gz: ed9396014d93e549539bdad9e1d24e65f947fc900222edabc6ff326f10a9993ebdd4a44cc19dda4e2d32944e6570e1b74147188aecfd4705cbade8f2f625e550
-  data.tar.gz: bcbd5528e66527c9c2afabbcb23583e7cd87437c3fe49f03d89fd8556d7f550df7d5e9d187fd9343967697ed12b607973b3eab715d20da9d4c437db3b69fc379
+  metadata.gz: df9fa485dd38739b5ff6a400cf047f7dd24237211b9e092252f927ea6bda819f383b08b8dc44be434cf4d44a1828661542aaa60058cac56d8d49c376355bb0ef
+  data.tar.gz: f2a4c166cf5466f230a4cbdf0b1e221d328d06462dee18a7c2d6951ced7530e58528519f5627ee3905449bb4e53cd7dfd563f5f6606a7e93511df1daac5867ba

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

@@ -103,7 +103,9 @@ module Protocol
 					
 					status, headers, body = @app.call(env)
 					
-					return Response.wrap(status, headers, body, request)
+					headers, meta = self.wrap_headers(headers)
+					
+					return Response.wrap(status, headers, meta, body, request)
 				rescue => exception
 					Console.logger.error(self) {exception}
 					

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

@@ -90,11 +90,34 @@ module Protocol
 					return env
 				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)
+					headers = ::Protocol::HTTP::Headers.new
+					meta = {}
+					
+					fields.each do |key, value|
+						key = key.downcase
+						
+						if key.start_with?('rack.')
+							meta[key] = value
+						else
+							value.split("\n").each do |value|
+								headers[key] = value
+							end
+						end
+					end
+					
+					return headers, meta
+				end
+				
 				def self.make_response(env, response)
 					# These interfaces should be largely compatible:
 					headers = response.headers.to_h
+					
 					if protocol = response.protocol
 						headers['rack.protocol'] = protocol
+						# headers['upgrade'] = protocol
 					end
 					
 					if body = response.body and body.stream?
@@ -103,7 +126,11 @@ module Protocol
 							body = []
 						end
 					end
-					  
+					
+					headers.transform_values! do |value|
+						value.is_a?(Array) ? value.join("\n") : value
+					end
+					
 					[response.status, headers, body]
 				end
 			end

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

@@ -76,6 +76,29 @@ module Protocol
 					return env
 				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)
+					headers = ::Protocol::HTTP::Headers.new
+					meta = {}
+					
+					fields.each do |key, value|
+						key = key.downcase
+						
+						if key.start_with?('rack.')
+							meta[key] = value
+						elsif value.is_a?(Array)
+							value.each do |value|
+								headers[key] = value
+							end
+						else
+							headers[key] = value
+						end
+					end
+					
+					return headers, meta
+				end
+				
 				def self.make_response(env, response)
 					# These interfaces should be largely compatible:
 					headers = response.headers.to_h

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
@@ -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/request.rb

@@ -21,6 +21,7 @@
 # THE SOFTWARE.
 
 require 'protocol/http/request'
+require 'protocol/http/headers'
 
 require_relative 'body/input_wrapper'
 

data/lib/protocol/rack/response.rb

@@ -51,38 +51,14 @@ module Protocol
 				'upgrade',
 			]
 			
-			# 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 self.wrap_headers(fields)
-				headers = ::Protocol::HTTP::Headers.new
-				meta = {}
-				
-				fields.each do |key, value|
-					key = key.downcase
-					
-					if key.start_with?('rack.')
-						meta[key] = value
-					elsif value.is_a?(Array)
-						value.each do |value|
-							headers[key] = value
-						end
-					else
-						headers[key] = value
-					end
-				end
-				
-				return headers, meta
-			end
-			
 			# Wrap a rack response.
 			# @parameter status [Integer] The rack response status.
 			# @parameter headers [Duck(:each)] The rack response headers.
 			# @parameter body [Duck(:each, :close) | Nil] The rack response body.
 			# @parameter request [Protocol::HTTP::Request] The original request.
-			def self.wrap(status, headers, body, request = nil)
-				headers, meta = wrap_headers(headers)
-
+			def self.wrap(status, headers, meta, body, request = nil)
 				ignored = headers.extract(HOP_HEADERS)
+				
 				unless ignored.empty?
 					Console.logger.warn(self, "Ignoring protocol-level headers: #{ignored.inspect}")
 				end

data/lib/protocol/rack/version.rb

@@ -22,6 +22,6 @@
 
 module Protocol
 	module Rack
-		VERSION = "0.1.3"
+		VERSION = "0.1.6"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-rack
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.6
 platform: ruby
 authors:
 - Samuel Williams