protocol-http 0.58.0 → 0.59.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 971bece5e113d3f945faf8b8ce44858e97f0e6282e3a264b6e6fca1e57c8e71c
-  data.tar.gz: 8d1139a2022dbe96710d7e0286a5c30c2384e14fcba3e0907428361b25c3a703
+  metadata.gz: e36f456a67fc57a222502502affe651c8f27d5b92b3a08918acfc8e5a8d54a1f
+  data.tar.gz: 465441e3c8c02f95c46a22147c4f7716d2db2927dd901ccb0b4f8aa00196741a
 SHA512:
-  metadata.gz: 69d17f997389daf2332cacc0d5ac407897e2dc2a45c3e329f23dfc9b18f7075b425e10c43fff27ff1728f64e92a6843e3291be5103e9ee8c72d1f810c2603c01
-  data.tar.gz: '09676f19f6b3bd4d6290b5dccd8f93d2c6409e82926fa74a9b21f39f4fa92df0d289ef8fac6b0460a9de2784d78d7114d262f9a5088f66518ef60b9d60a877f4'
+  metadata.gz: 887eff91a9b9ce7bbd7f7174029b34cb6b8039aa1dc4344d7eedc86dd398aec3bb81c16fd5d55d4e65b8175bba33baab785f2b8f4761a32d0c42be4c9d1eadf2
+  data.tar.gz: b276d08be05079a3f00a87fc2fccbf1a7e517c9621424fa8de0678707a5c7eda6049db03f28a2ce335202d95282fe5748148bd9b9b6e36051d133997301fb92b

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

@@ -113,15 +113,19 @@ module Protocol
 					return if @stream.finished?
 					
 					# The stream might have been closed while waiting for the chunk to come in.
-					if chunk = super
-						@input_length += chunk.bytesize
-						
-						chunk = @stream.deflate(chunk, Zlib::SYNC_FLUSH)
-						
-						@output_length += chunk.bytesize
-						
-						return chunk
-					elsif !@stream.closed?
+					while chunk = super
+						unless chunk.empty?
+							@input_length += chunk.bytesize
+							
+							chunk = @stream.deflate(chunk, Zlib::SYNC_FLUSH)
+							
+							@output_length += chunk.bytesize
+							
+							return chunk
+						end
+					end
+					
+					if !@stream.closed?
 						chunk = @stream.finish
 						
 						@output_length += chunk.bytesize

data/lib/protocol/http/error.rb

@@ -19,12 +19,33 @@ module Protocol
 			include BadRequest
 			
 			# @parameter key [String] The header key that was duplicated.
-			def initialize(key)
+			def initialize(key, existing_value, new_value)
 				super("Duplicate singleton header key: #{key.inspect}")
+				
+				@key = key
+				@existing_value = existing_value
+				@new_value = new_value
 			end
 			
 			# @attribute [String] key The header key that was duplicated.
 			attr :key
+			
+			# @attribute [String] existing_value The existing value for the duplicated header.
+			attr :existing_value
+			
+			# @attribute [String] new_value The new value for the duplicated header.
+			attr :new_value
+			
+			# Provides a detailed error message including the existing and new values.
+			# @parameter highlight [Boolean] Whether to highlight the message (not currently used).
+			# @return [String] The detailed error message.
+			def detailed_message(highlight: false)
+				<<~MESSAGE
+					#{self.message}
+						Existing value: #{@existing_value.inspect}
+						New value: #{@new_value.inspect}
+				MESSAGE
+			end
 		end
 		
 		# Raised when an invalid trailer header is encountered in headers.

data/lib/protocol/http/headers.rb

@@ -453,7 +453,7 @@ module Protocol
 					end
 				else
 					if hash.key?(key)
-						raise DuplicateHeaderError, key
+						raise DuplicateHeaderError.new(key, hash[key], value)
 					end
 					
 					hash[key] = value

data/lib/protocol/http/middleware/builder.rb

@@ -18,6 +18,22 @@ module Protocol
 					@app = default_app
 				end
 				
+				# Build the middleware application using the given block.
+				#
+				# @parameter block [Proc] The block to pass to the middleware constructor.
+				# @returns [Builder] The builder.
+				def build(&block)
+					if block_given?
+						if block.arity == 0
+							instance_exec(&block)
+						else
+							yield self
+						end
+					end
+					
+					return self
+				end
+				
 				# Use the given middleware with the given arguments and options.
 				#
 				# @parameter middleware [Class | Object] The middleware class to use.
@@ -44,15 +60,28 @@ module Protocol
 			end
 			
 			# Build a middleware application using the given block.
-			def self.build(&block)
-				builder = Builder.new
+			def self.build(*arguments, &block)
+				builder = Builder.new(*arguments)
+				
+				builder.build(&block)
+				
+				return builder.to_app
+			end
+			
+			# Load a middleware application from the given path.
+			#
+			# @parameter path [String] The path to the middleware application.
+			# @parameter arguments [Array] The arguments to pass to the middleware constructor.
+			# @parameter options [Hash] The options to pass to the middleware constructor.
+			# @parameter block [Proc] The block to pass to the middleware constructor.
+			def self.load(path, *arguments, &block)
+				builder = Builder.new(*arguments)
+				
+				binding = Builder::TOPLEVEL_BINDING.call(builder)
+				eval(File.read(path), binding, path)
 				
 				if block_given?
-					if block.arity == 0
-						builder.instance_exec(&block)
-					else
-						yield builder
-					end
+					builder.build(&block)
 				end
 				
 				return builder.to_app
@@ -60,3 +89,5 @@ module Protocol
 		end
 	end
 end
+
+Protocol::HTTP::Middleware::Builder::TOPLEVEL_BINDING = ->(builder){builder.instance_eval{binding}}

data/lib/protocol/http/version.rb

@@ -5,6 +5,6 @@
 
 module Protocol
 	module HTTP
-		VERSION = "0.58.0"
+		VERSION = "0.59.0"
 	end
 end

data/readme.md

@@ -30,6 +30,15 @@ Please see the [project documentation](https://socketry.github.io/protocol-http/
 
 Please see the [project releases](https://socketry.github.io/protocol-http/releases/index) for all releases.
 
+### v0.59.0
+
+  - Introduce `Protocol::HTTP::Middleware.load` method for loading middleware applications from files.
+  - Prevent `ZLib::BufError` when deflating empty chunks by skipping deflation for empty chunks.
+
+### v0.58.1
+
+  - `Protocol::HTTP::DuplicateHeaderError` now includes the existing and new values for better debugging.
+
 ### v0.58.0
 
   - Move trailer validation to `Headers#add` method to ensure all additions are checked at the time of addition as this is a hard requirement.
@@ -81,14 +90,6 @@ Please see the [project releases](https://socketry.github.io/protocol-http/relea
   - `Protocol::HTTP::Headers#add` now coerces the value to a string when adding a header, ensuring consistent behaviour.
   - `Protocol::HTTP::Body::Head.for` now accepts an optional `length` parameter, allowing it to create a head body even when the body is not provided, based on the known content length.
 
-### v0.50.0
-
-    - Drop support for Ruby v3.1.
-
-### v0.48.0
-
-  - Add support for parsing `accept`, `accept-charset`, `accept-encoding` and `accept-language` headers into structured values.
-
 ## See Also
 
   - [protocol-http1](https://github.com/socketry/protocol-http1) — HTTP/1 client/server implementation using this

data/releases.md

@@ -1,5 +1,14 @@
 # Releases
 
+## v0.59.0
+
+  - Introduce `Protocol::HTTP::Middleware.load` method for loading middleware applications from files.
+  - Prevent `ZLib::BufError` when deflating empty chunks by skipping deflation for empty chunks.
+
+## v0.58.1
+
+  - `Protocol::HTTP::DuplicateHeaderError` now includes the existing and new values for better debugging.
+
 ## v0.58.0
 
   - Move trailer validation to `Headers#add` method to ensure all additions are checked at the time of addition as this is a hard requirement.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http
 version: !ruby/object:Gem::Version
-  version: 0.58.0
+  version: 0.59.0
 platform: ruby
 authors:
 - Samuel Williams