protocol-http1 0.10.3 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6860775fdc28f8e8d173ff80296cefa5c5e1505e70ce264876959fb453beab5a
-  data.tar.gz: 9985d69a3696bc98c2e01b78d29282220c9b90b968d0030d60ed95b26a3bab14
+  metadata.gz: dd207477ff1c6e86ccc2a90b3ec7ae27c7a3f5dbfd58e42cf78fb841638d43c1
+  data.tar.gz: 797536146daeb57ce4b40cf4e71bbcea02cc49067ecdd05d1c1b9c55f768212d
 SHA512:
-  metadata.gz: 33093bb74d0b00b2a3dfded4432c66276ff27d6fe4e1137b4f0b867b51ca5aa1add02512b3f9427b2520be1617bf3e2c039ed497c192a686cc237bb4a65f690f
-  data.tar.gz: c845bf16f06d9798553a6241ffd3fae1692584bf6ff276437e1ab7828773200716b86be3b15a5808956ac74389852a2772c81b29fdbb6599a6da1bfe1a8bb9ee
+  metadata.gz: 0efd8f411bc383b88694116c674376acd8d9fd9871aa4d3a89bfa95a39b0124aa2577c1c3767a11eed91f310bb0581f07c8f80b20ab2a79033db534028b346ce
+  data.tar.gz: 4e1836661c69a4dbe0cc42ac961afd76153e07f5a41f83428a8d37673924a05cbc9795daa1cc14f530bb38815cee374b61e2dbe105e6df21fafade35a103d6e2

data/.travis.yml

@@ -2,9 +2,10 @@ language: ruby
 dist: xenial
 cache: bundler
 
+script: bundle exec rspec
+
 matrix:
   include:
-    - rvm: 2.4
     - rvm: 2.5
     - rvm: 2.6
     - rvm: 2.7

data/lib/protocol/http1/body/chunked.rb

@@ -26,11 +26,15 @@ module Protocol
 	module HTTP1
 		module Body
 			class Chunked < HTTP::Body::Readable
-				# TODO maybe this should take a stream rather than a connection?
-				def initialize(stream)
+				TRAILERS = 'trailers'
+				CRLF = "\r\n"
+				
+				def initialize(stream, headers)
 					@stream = stream
 					@finished = false
 					
+					@headers = headers
+					
 					@length = 0
 					@count = 0
 				end
@@ -49,6 +53,7 @@ module Protocol
 					super
 				end
 				
+				# Follows the procedure outlined in https://tools.ietf.org/html/rfc7230#section-4.1.3
 				def read
 					return nil if @finished
 					
@@ -56,13 +61,17 @@ module Protocol
 					
 					if length == 0
 						@finished = true
-						read_line
+						
+						read_trailers
 						
 						return nil
 					end
 					
-					chunk = @stream.read(length)
-					read_line # Consume the trailing CRLF
+					# Read trailing CRLF:
+					chunk = @stream.read(length + 2)
+					
+					# ...and chomp it off:
+					chunk.chomp!(CRLF)
 					
 					@length += length
 					@count += 1
@@ -77,7 +86,22 @@ module Protocol
 				private
 				
 				def read_line
-					@stream.gets(chomp: true)
+					@stream.gets(CRLF, chomp: true)
+				end
+				
+				def read_trailers
+					@headers.trailers!
+					
+					while line = read_line
+						# Empty line indicates end of headers:
+						break if line.empty?
+						
+						if match = line.match(HEADER)
+							@headers.add(match[1], match[2])
+						else
+							raise BadHeader, "Could not parse header: #{line.dump}"
+						end
+					end
 				end
 			end
 		end

data/lib/protocol/http1/connection.rb

@@ -307,7 +307,7 @@ module Protocol
 				end
 			end
 			
-			def write_chunked_body(body, head)
+			def write_chunked_body(body, head, trailers = nil)
 				@stream.write("transfer-encoding: chunked\r\n\r\n")
 				@stream.flush
 				
@@ -326,7 +326,14 @@ module Protocol
 					@stream.flush
 				end
 				
-				@stream.write("0\r\n\r\n")
+				if trailers
+					@stream.write("0\r\n")
+					write_headers(trailers)
+					@stream.write("\r\n")
+				else
+					@stream.write("0\r\n\r\n")
+				end
+				
 				@stream.flush
 			end
 			
@@ -349,7 +356,7 @@ module Protocol
 				@stream.close_write
 			end
 			
-			def write_body(version, body, head = false)
+			def write_body(version, body, head = false, trailers = nil)
 				if body.nil? or body.empty?
 					write_connection_header(version)
 					write_empty_body(body)
@@ -359,7 +366,7 @@ module Protocol
 				elsif @persistent and version == HTTP11
 					write_connection_header(version)
 					# We specifically ensure that non-persistent connections do not use chunked response, so that hijacking works as expected.
-					write_chunked_body(body, head)
+					write_chunked_body(body, head, trailers)
 				else
 					@persistent = false
 					write_connection_header(version)
@@ -367,8 +374,8 @@ module Protocol
 				end
 			end
 			
-			def read_chunked_body
-				Body::Chunked.new(@stream)
+			def read_chunked_body(headers)
+				Body::Chunked.new(@stream, headers)
 			end
 			
 			def read_fixed_body(length)
@@ -466,7 +473,7 @@ module Protocol
 					end
 					
 					if transfer_encoding.last == CHUNKED
-						return read_chunked_body
+						return read_chunked_body(headers)
 					else
 						# If a Transfer-Encoding header field is present in a response and
 						# the chunked transfer coding is not the final encoding, the
@@ -479,7 +486,7 @@ module Protocol
 						return read_remainder_body
 					end
 				end
-
+				
 				# 5.  If a valid Content-Length header field is present without
 				# Transfer-Encoding, its decimal value defines the expected message
 				# body length in octets.  If the sender closes the connection or

data/lib/protocol/http1/version.rb

@@ -22,6 +22,6 @@
 
 module Protocol
 	module HTTP1
-		VERSION = "0.10.3"
+		VERSION = "0.11.0"
 	end
 end

data/protocol-http1.gemspec

@@ -20,11 +20,11 @@ Gem::Specification.new do |spec|
 	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
 	spec.require_paths = ["lib"]
 	
-	spec.add_dependency "protocol-http", "~> 0.15"
+	spec.add_dependency "protocol-http", "~> 0.16.3"
 	
 	spec.add_development_dependency "covered"
 	spec.add_development_dependency "bundler"
-	spec.add_development_dependency "rake", "~> 10.0"
+	spec.add_development_dependency "bake-bundler"
 	spec.add_development_dependency "rspec", "~> 3.0"
 	spec.add_development_dependency "rspec-memory", "~> 1.0"
 	spec.add_development_dependency "rspec-files", "~> 1.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http1
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-21 00:00:00.000000000 Z
+date: 2020-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-http
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.16.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.16.3
 - !ruby/object:Gem::Dependency
   name: covered
   requirement: !ruby/object:Gem::Requirement
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bake-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +121,6 @@ files:
 - ".travis.yml"
 - Gemfile
 - README.md
-- Rakefile
 - examples/http1/request.rb
 - lib/protocol/http1.rb
 - lib/protocol/http1/body/chunked.rb

data/Rakefile

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec