protocol-http 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c02d05f1a36b888ef0420bcc999a1c84d81361f85ca1cf6a08d1f17a25dd9050
-  data.tar.gz: e65e3f34864adbea7577c8bcd06df99834af884db393a4d625c567266398a1a2
+  metadata.gz: d8d2f576f6e7e6ce261d80fbdc0e38e2775b2f22ac156958b1e1b91472fdfec3
+  data.tar.gz: b450d401f5791db371761fd52a6c1adb32807a13659570a1ad0ef0d5ef3dd8d5
 SHA512:
-  metadata.gz: d5fb517f1f766d093cc54cb8503d215b74606e501f6f0f873b129ad8299900ea8cdae619f2b94a1d9f1c936e37235384f0d505d8773716e7ce6b4af74c53423e
-  data.tar.gz: 0e032fc0d601764a39404ddc5e28a98956295e049ca7c0a455977f2226f418db6beea4c65584ee549e8f5b798a4c284dfca71f17e82ccc37a704cf2f04f4c786
+  metadata.gz: 0be25839110052bd336f729800768eb8d8ef51bf15c2852b9bc526e20a6998177dadfc4e71b889681b16ba263f25dc14ea42e0835ce4f87de7d343936ff91ea8
+  data.tar.gz: bf48aa19e331906fcf518eed7c6c94243656856f034d6c44a90ecf41c0bd1807c1a540d836fc61d63d6cd3acc2a769b37f1898b608296578edc45866747659a6

data/lib/protocol/http/headers.rb

@@ -35,16 +35,31 @@ module Protocol
 		class Headers
 			Split = Header::Split
 			Multiple = Header::Multiple
+			
 			TRAILERS = 'trailers'
 			
-			# Construct an instance from a headers Array or Hash. No-op if already an instance of `Headers`.
+			# Construct an instance from a headers Array or Hash. No-op if already an instance of `Headers`. If the underlying array is frozen, it will be duped.
 			# @return [Headers] an instance of headers.
 			def self.[] headers
+				if headers.nil?
+					return self.new
+				end
+				
 				if headers.is_a?(self)
-					headers
-				else
-					self.new(headers.to_a)
+					if headers.frozen?
+						return headers.dup
+					else
+						return headers
+					end
+				end
+				
+				fields = headers.to_a
+				
+				if fields.frozen?
+					fields = fields.dup
 				end
+				
+				return self.new(fields)
 			end
 			
 			def initialize(fields = [], indexed = nil)
@@ -60,7 +75,6 @@ module Protocol
 				
 				@fields = @fields.dup
 				@indexed = @indexed.dup
-				@tail = nil
 			end
 			
 			def clear
@@ -69,25 +83,43 @@ module Protocol
 				@tail = nil
 			end
 			
-			# An array of `[key, value]` pairs.
-			attr :fields
+			# Flatten trailers into the headers.
+			def flatten!
+				if @tail
+					self.delete(TRAILERS)
+					@tail = nil
+				end
+				
+				return self
+			end
 			
-			# Mark the subsequent headers as trailers.
-			def trailers!
-				@tail ||= @fields.size
+			def flatten
+				self.dup.flatten!
 			end
 			
+			# An array of `[key, value]` pairs.
+			attr :fields
+			
 			# @return the trailers if there are any.
 			def trailers?
 				@tail != nil
 			end
 			
-			# Enumerate all trailers, including evaluating all deferred headers.
-			def trailers(&block)
+			# Record the current headers, and prepare to receive trailers.
+			def trailers!(&block)
 				return nil unless self.include?(TRAILERS)
 				
-				trailers!
+				@tail ||= @fields.size
 				
+				return to_enum(:trailers!) unless block_given?
+				
+				if @tail
+					@fields.drop(@tail).each(&block)
+				end
+			end
+			
+			# Enumerate all trailers, if there are any.
+			def trailers(&block)
 				return to_enum(:trailers) unless block_given?
 				
 				if @tail

data/lib/protocol/http/methods.rb

@@ -51,7 +51,7 @@ module Protocol
 			
 			# Use Methods.constants to get all constants.
 			self.each do |name, value|
-				define_method(name.downcase) do |location, headers = [], body = nil|
+				define_method(name.downcase) do |location, headers = nil, body = nil|
 					self.call(
 						Request[value, location.to_str, Headers[headers], body]
 					)

data/lib/protocol/http/request.rb

@@ -28,7 +28,7 @@ module Protocol
 		class Request
 			prepend Body::Reader
 			
-			def initialize(scheme = nil, authority = nil, method = nil, path = nil, version = nil, headers = [], body = nil, protocol = nil)
+			def initialize(scheme = nil, authority = nil, method = nil, path = nil, version = nil, headers = Headers.new, body = nil, protocol = nil)
 				@scheme = scheme
 				@authority = authority
 				@method = method
@@ -48,12 +48,6 @@ module Protocol
 			attr_accessor :body
 			attr_accessor :protocol
 			
-			def trailers
-				if @headers.respond_to?(:trailers)
-					@headers.trailers
-				end
-			end
-			
 			# Send the request to the given connection.
 			def call(connection)
 				connection.call(self)

data/lib/protocol/http/response.rb

@@ -28,7 +28,7 @@ module Protocol
 		class Response
 			prepend Body::Reader
 			
-			def initialize(version = nil, status = 200, headers = [], body = nil, protocol = nil)
+			def initialize(version = nil, status = 200, headers = Headers.new, body = nil, protocol = nil)
 				@version = version
 				@status = status
 				@headers = headers
@@ -42,12 +42,6 @@ module Protocol
 			attr_accessor :body
 			attr_accessor :protocol
 			
-			def trailers
-				if @headers.respond_to?(:trailers)
-					@headers.trailers
-				end
-			end
-			
 			def hijack?
 				false
 			end
@@ -88,7 +82,7 @@ module Protocol
 				@status == 500
 			end
 			
-			def self.[](status, headers = [], body = nil, protocol = nil)
+			def self.[](status, headers = nil, body = nil, protocol = nil)
 				body = Body::Buffered.wrap(body)
 				headers = ::Protocol::HTTP::Headers[headers]
 				

data/lib/protocol/http/version.rb

@@ -22,6 +22,6 @@
 
 module Protocol
 	module HTTP
-		VERSION = "0.17.0"
+		VERSION = "0.18.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-07 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: covered