protocol-http 0.16.3 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f3dfaca48112b9b8d52096c8cab996403736391102e44a2f9ed6f5e71c2ce7d
-  data.tar.gz: 611c1ba35c482cba1e4fbeb98daadaf7872b8d2198717c795dfa94a4343e7b38
+  metadata.gz: c02d05f1a36b888ef0420bcc999a1c84d81361f85ca1cf6a08d1f17a25dd9050
+  data.tar.gz: e65e3f34864adbea7577c8bcd06df99834af884db393a4d625c567266398a1a2
 SHA512:
-  metadata.gz: 8d6988b4b2f2c1218c441d05788b88db0aa8890ac70877acc6f87c8ce2f18e32bae5d20505532ece25576c792c1935d42f69bb11ea3e34a8908211ed3fadc88f
-  data.tar.gz: 111ec27937755f580826ff37e2cdfcce11b8fcc571434e31c12822e355694b5d4431fc378c3e91476368006bf657bcb0be164392302274221586074e0193b03a
+  metadata.gz: d5fb517f1f766d093cc54cb8503d215b74606e501f6f0f873b129ad8299900ea8cdae619f2b94a1d9f1c936e37235384f0d505d8773716e7ce6b4af74c53423e
+  data.tar.gz: 0e032fc0d601764a39404ddc5e28a98956295e049ca7c0a455977f2226f418db6beea4c65584ee549e8f5b798a4c284dfca71f17e82ccc37a704cf2f04f4c786

data/lib/protocol/http/body/buffered.rb

@@ -22,8 +22,6 @@
 
 require_relative 'readable'
 
-require 'digest/sha2'
-
 module Protocol
 	module HTTP
 		module Body
@@ -58,17 +56,9 @@ module Protocol
 					@length = length
 					
 					@index = 0
-					@digest = nil
 				end
 				
-				def digest
-					if @digest.nil?
-						@digest = Digest::SHA256.new
-						@chunks.each{|chunk| @digest.update(chunk)}
-					end
-					
-					@digest.hexdigest
-				end
+				attr :chunks
 				
 				def finish
 					self

data/lib/protocol/http/body/digestable.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require_relative 'wrapper'
+
+require 'digest/sha2'
+
+module Protocol
+	module HTTP
+		module Body
+			# Invokes a callback once the body has finished reading.
+			class Digestable < Wrapper
+				def self.wrap(message, digest = Digest::SHA256.new, &block)
+					if body = message&.body and !body.empty?
+						message.body = self.new(message.body, digest, block)
+					end
+				end
+				
+				def initialize(body, digest = Digest::SHA256.new, callback = nil)
+					super(body)
+					
+					@digest = digest
+					@callback = callback
+				end
+				
+				def digest
+					@digest
+				end
+				
+				def etag
+					@digest.hexdigest.dump
+				end
+				
+				def read
+					if chunk = super
+						@digest.update(chunk)
+						
+						return chunk
+					else
+						@callback&.call(self)
+						
+						return nil
+					end
+				end
+			end
+		end
+	end
+end

data/lib/protocol/http/body/rewindable.rb

@@ -33,16 +33,6 @@ module Protocol
 					
 					@chunks = []
 					@index = 0
-					@digest = nil
-				end
-				
-				def digest
-					if @digest.nil?
-						@digest = Digest::SHA256.new
-						@chunks.each{|chunk| @digest.update(chunk)}
-					end
-					
-					@digest.hexdigest
 				end
 				
 				def empty?
@@ -61,7 +51,6 @@ module Protocol
 					else
 						if chunk = super
 							@chunks << chunk
-							@digest&.update(chunk)
 							@index += 1
 						end
 					end

data/lib/protocol/http/body/wrapper.rb

@@ -27,6 +27,12 @@ module Protocol
 		module Body
 			# Wrapping body instance. Typically you'd override `#read`.
 			class Wrapper < Readable
+				def self.wrap(message)
+					if body = message.body
+						message.body = self.new(body)
+					end
+				end
+				
 				def initialize(body)
 					@body = body
 				end

data/lib/protocol/http/headers.rb

@@ -53,7 +53,6 @@ module Protocol
 				
 				# Marks where trailers start in the @fields array.
 				@tail = nil
-				@deferred = []
 			end
 			
 			def initialize_dup(other)
@@ -61,14 +60,13 @@ module Protocol
 				
 				@fields = @fields.dup
 				@indexed = @indexed.dup
-				@deferred = @deferred.dup
+				@tail = nil
 			end
 			
 			def clear
 				@fields.clear
 				@indexed = nil
 				@tail = nil
-				@deferred.clear
 			end
 			
 			# An array of `[key, value]` pairs.
@@ -84,23 +82,13 @@ module Protocol
 				@tail != nil
 			end
 			
-			def flatten!
-				unless @deferred.empty?
-					@tail ||= @fields.size
-					
-					@deferred.each do |key, value|
-						self.add(key, value.call)
-					end
-				end
-			end
-			
 			# Enumerate all trailers, including evaluating all deferred headers.
 			def trailers(&block)
 				return nil unless self.include?(TRAILERS)
 				
-				return to_enum(:trailers) unless block_given?
+				trailers!
 				
-				flatten!
+				return to_enum(:trailers) unless block_given?
 				
 				if @tail
 					@fields.drop(@tail).each(&block)
@@ -110,18 +98,9 @@ module Protocol
 			def freeze
 				return if frozen?
 				
-				# Ensure all deferred headers are evaluated:
-				self.flatten!
-				
 				# Ensure @indexed is generated:
 				self.to_h
 				
-				# Remove all trailers:
-				self.delete(TRAILERS)
-				
-				# No longer has stateful trailers:
-				@tail = nil
-				
 				@fields.freeze
 				@indexed.freeze
 				
@@ -161,14 +140,8 @@ module Protocol
 			# Add the specified header key value pair.
 			# @param key [String] the header key.
 			# @param value [String] the header value to assign.
-			# @yield dynamically generate the value when used as a trailer.
-			def add(key, value = nil, &block)
-				if block_given?
-					@deferred << [key, block]
-					self[TRAILERS] = key
-				else
-					self[key] = value
-				end
+			def add(key, value)
+				self[key] = value
 			end
 			
 			# Set the specified header key to the specified value, replacing any existing header keys with the same name.

data/lib/protocol/http/middleware.rb

@@ -28,6 +28,14 @@ require_relative 'response'
 module Protocol
 	module HTTP
 		class Middleware < Methods
+			# Convert a block to a middleware delegate.
+			def self.for(&block)
+				def block.close
+				end
+				
+				return self.new(block)
+			end
+			
 			def initialize(delegate)
 				@delegate = delegate
 			end

data/lib/protocol/http/request.rb

@@ -69,6 +69,7 @@ module Protocol
 			
 			def self.[](method, path, headers, body)
 				body = Body::Buffered.wrap(body)
+				headers = ::Protocol::HTTP::Headers[headers]
 				
 				self.new(nil, nil, method, path, nil, headers, body)
 			end

data/lib/protocol/http/response.rb

@@ -90,6 +90,7 @@ module Protocol
 			
 			def self.[](status, headers = [], body = nil, protocol = nil)
 				body = Body::Buffered.wrap(body)
+				headers = ::Protocol::HTTP::Headers[headers]
 				
 				self.new(nil, status, headers, body, protocol)
 			end

data/lib/protocol/http/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.17.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-06 00:00:00.000000000 Z
+date: 2020-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: covered
@@ -83,6 +83,7 @@ files:
 - lib/protocol/http/accept_encoding.rb
 - lib/protocol/http/body/buffered.rb
 - lib/protocol/http/body/deflate.rb
+- lib/protocol/http/body/digestable.rb
 - lib/protocol/http/body/file.rb
 - lib/protocol/http/body/head.rb
 - lib/protocol/http/body/inflate.rb