http-protocol 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 844a6b761eb8218e0b856cccefc1767cbac8db29ed703d1b8419a532b75bc7bf
-  data.tar.gz: 85dbf29d8cc3aefdbb79af289c0d8a9e91622f8bf13be6ca552cc7ec49acefb9
+  metadata.gz: 81d011054c5b26d9adf2351384897c7eefe52ce45ed056f9593ef6d5beeff716
+  data.tar.gz: 1dc681ebfccc93481badc3dc09006f8fb29928ea3f63ee5ef3dc0f90fa0978c6
 SHA512:
-  metadata.gz: 8771480a7207e74671a33f05fe21143039b04458c11489c5f6ffa6d8f36e44c7c5193c938bb7ffdb47c024e70a3f7abce5f212225e97131f60ebb665d7127887
-  data.tar.gz: 16582bbbe013e74ce15db5e2aa61f0f6750bae5e28d43483998d0a9d0b54088ae5ae6771048ca02ff466daab42bc72af96ea7d3d400675d3a09fe6b77699c641
+  metadata.gz: 1f2d3ed31be6772e17d9e8f116b41f9682c62e4665a11bf8bd49e180a39f8d8f4a8f267552dc6c0aa0dbac86dd5d06f5bb10e7b4081384d59f57af8b109ea2f3
+  data.tar.gz: f98c68034cd663a5f773f32b5cbc058738c9fde4399f4afa4adb92fbfcef8dd8da033522755020567d6fd4774ddf0e2dd9188c4adf39da08f88d658072a3120b

data/lib/http/protocol/error.rb

@@ -23,7 +23,11 @@ module HTTP
 	module Protocol
 		class Error < StandardError
 		end
-
+		
+		# The request was invalid/malformed in some way.
+		class BadRequest < Error
+		end
+		
 		# Raised if connection header is missing or invalid indicating that
 		# this is an invalid HTTP 2.0 request - no frames are emitted and the
 		# connection must be aborted.

data/lib/http/protocol/headers.rb

@@ -99,17 +99,37 @@ module HTTP
 				keys.each do |key|
 					@indexed.delete(key)
 				end
+				
+				return self
+			end
+			
+			def slice(keys)
+				self.dup.slice!(keys)
 			end
 			
 			def add(key, value)
 				self[key] = value
 			end
 			
+			def merge!(headers)
+				headers.each do |key, value|
+					self[key] = value
+				end
+				
+				return self
+			end
+			
+			def merge(headers)
+				self.dup.merge!(headers)
+			end
+			
+			# Append the value to the given key. Some values can be appended multiple times, others can only be set once.
+			# @param key [String] The header key.
+			# @param value The header value.
 			def []= key, value
-				@fields << [key, value]
+				merge_into(@indexed, key.downcase, value)
 				
-				# It would be good to do some kind of validation here.
-				merge(@indexed, key.downcase, value)
+				@fields << [key, value]
 			end
 			
 			MERGE_POLICY = {
@@ -149,7 +169,7 @@ module HTTP
 				return @indexed.delete(key)
 			end
 			
-			def merge(hash, key, value)
+			protected def merge_into(hash, key, value)
 				if policy = MERGE_POLICY[key]
 					if current_value = hash[key]
 						current_value << value
@@ -157,8 +177,6 @@ module HTTP
 						hash[key] = policy.new(value)
 					end
 				else
-					raise ArgumentError, "Header #{key} can only be set once!" if hash.include?(key)
-					
 					# We can't merge these, we only expose the last one set.
 					hash[key] = value
 				end
@@ -170,7 +188,7 @@ module HTTP
 			
 			def to_h
 				@fields.inject({}) do |hash, (key, value)|
-					merge(hash, key.downcase, value)
+					merge_into(hash, key.downcase, value)
 					
 					hash
 				end

data/lib/http/protocol/version.rb

@@ -20,6 +20,6 @@
 
 module HTTP
 	module Protocol
-		VERSION = "0.8.1"
+		VERSION = "0.9.0"
 	end
 end

metadata

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