http-protocol 0.6.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1b76ea55a51799658ab7d9838a5f0c59fd6928e62907093fe5082962db45633
-  data.tar.gz: d4af58357d2c2acf313ce20aba89c3ba4133214a630bcbca237850718d4ed030
+  metadata.gz: e259d3cffa653715457b5ecae02b116b4ab063bb837828370ac87d5ae5ec6c70
+  data.tar.gz: 3e4044515e54d35934d1fa90be3c518c5baee318fe7c01f8237dfb0411076f39
 SHA512:
-  metadata.gz: 3f356e2d520ec0b4403b900699895b4af175e94860cb6e7d9dd402298d9e299c3f71f68e2cafb2af282011f4d9d15f933832b4643394999b8979cf96b2dc9c33
-  data.tar.gz: 948892bbb053c697a59bd5efa9c8aafa99425a1b401d88b044e7d2a274e4c373f8e13af478b99785dbd41700ae9cb62d459480f4b771ebfb020a4262935787c0
+  metadata.gz: 8eeddbf50275851a6aa5958cf9efc0f07a004c438b0ef6eb8780819ac1ff5816736d7c0214adbec05d2e387c89f8e3e6077e93913369cac5858139e9168c52b0
+  data.tar.gz: c05014726647a9fe13f716d119e578f7793e22d496ab29670a3523d5b65cdaed8e5c67114e6614e9c04a41274c2e58cadb2752b89c5e3d73ab33c74e1684f473

data/lib/http/protocol/headers.rb

@@ -91,30 +91,13 @@ module HTTP
 				self[key] != nil
 			end
 			
-			# Delete all headers with the given key, and return the value of the last one, if any.
-			def delete(key)
-				values, @fields = @fields.partition do |field|
-					field.first.downcase == key
-				end
-				
-				if @indexed
-					@indexed.delete(key)
-				end
-				
-				if field = values.last
-					return field.last
-				end
-			end
-			
 			def slice!(keys)
 				values, @fields = @fields.partition do |field|
 					keys.include?(field.first.downcase)
 				end
 				
-				if @indexed
-					keys.each do |key|
-						@indexed.delete(key)
-					end
+				keys.each do |key|
+					@indexed.delete(key)
 				end
 			end
 			
@@ -125,10 +108,8 @@ module HTTP
 			def []= key, value
 				@fields << [key, value]
 				
-				if @indexed
-					# It would be good to do some kind of validation here.
-					merge(@indexed, key.downcase, value)
-				end
+				# It would be good to do some kind of validation here.
+				merge(@indexed, key.downcase, value)
 			end
 			
 			MERGE_POLICY = {
@@ -159,6 +140,15 @@ module HTTP
 				'proxy-authenticate' => Multiple
 			}.tap{|hash| hash.default = Split}
 			
+			# Delete all headers with the given key, and return the merged value.
+			def delete(key)
+				values, @fields = @fields.partition do |field|
+					field.first.downcase == key
+				end
+				
+				return @indexed.delete(key)
+			end
+			
 			def merge(hash, key, value)
 				if policy = MERGE_POLICY[key]
 					if current_value = hash[key]
@@ -175,8 +165,6 @@ module HTTP
 			end
 			
 			def [] key
-				@indexed ||= to_h
-				
 				@indexed[key]
 			end
 			

data/lib/http/protocol/http1/connection.rb

@@ -28,10 +28,9 @@ module HTTP
 				HTTP10 = "HTTP/1.0".freeze
 				HTTP11 = "HTTP/1.1".freeze
 				
-				def initialize(stream, version = HTTP11, persistent = true)
+				def initialize(stream, persistent = true)
 					@stream = stream
 					
-					@version = version
 					@persistent = persistent
 					
 					@count = 0
@@ -39,9 +38,6 @@ module HTTP
 				
 				attr :stream
 				
-				# The default HTTP version to use (if none specified).
-				attr :version
-				
 				# Whether the connection is persistent.
 				attr :persistent
 				
@@ -145,12 +141,11 @@ module HTTP
 					
 					@count += 1
 					
-					return headers[HOST], method, path, version, headers, body
+					return headers.delete(HOST), method, path, version, headers, body
 				end
 				
 				def read_response(method)
 					version, status, reason = read_line.split(/\s+/, 3)
-					Async.logger.debug(self) {"#{version} #{status} #{reason}"}
 					
 					headers = read_headers
 					
@@ -357,7 +352,7 @@ module HTTP
 					# transfer coding (Section 4.1) is the final encoding, the message
 					# body length is determined by reading and decoding the chunked
 					# data until the transfer coding indicates the data is complete.
-					if transfer_encoding = headers[TRANSFER_ENCODING]
+					if transfer_encoding = headers.delete(TRANSFER_ENCODING)
 						# If a message is received with both a Transfer-Encoding and a
 						# Content-Length header field, the Transfer-Encoding overrides the
 						# Content-Length.  Such a message might indicate an attempt to
@@ -390,7 +385,7 @@ module HTTP
 					# the recipient times out before the indicated number of octets are
 					# received, the recipient MUST consider the message to be
 					# incomplete and close the connection.
-					if content_length = headers[CONTENT_LENGTH]
+					if content_length = headers.delete(CONTENT_LENGTH)
 						length = Integer(content_length)
 						if length >= 0
 							return read_fixed_body(length)

data/lib/http/protocol/http2/client.rb

@@ -24,8 +24,8 @@ module HTTP
 	module Protocol
 		module HTTP2
 			class Client < Connection
-				def initialize(framer, *args)
-					super(framer, 1, *args)
+				def initialize(framer)
+					super(framer, 1)
 				end
 				
 				def send_connection_preface(settings = nil)

data/lib/http/protocol/http2/server.rb

@@ -24,8 +24,8 @@ module HTTP
 	module Protocol
 		module HTTP2
 			class Server < Connection
-				def initialize(framer, *args)
-					super(framer, 2, *args)
+				def initialize(framer)
+					super(framer, 2)
 				end
 				
 				def read_connection_preface(settings)

data/lib/http/protocol/version.rb

@@ -20,6 +20,6 @@
 
 module HTTP
 	module Protocol
-		VERSION = "0.6.2"
+		VERSION = "0.8.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http-protocol
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2018-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-hpack