protocol-http 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f51612225b6b4d55c2468ad41603450e620bb2a01d675a330c51ea412d91ecf
-  data.tar.gz: d3b907303a51a1a12961342dc9feb5f19f76c75092c26dd4b6224d494d0d9e91
+  metadata.gz: 15b85751f04e7fa40248ed85dc937f2c33cd787602ab98f2794538a0cec1c344
+  data.tar.gz: 9a9b91043c2116ed6ef940b5900104a89ea4392ec00f625d59f85d8173302afe
 SHA512:
-  metadata.gz: c0a8210b3174cdd5ff2a1da7ce76aea33754521fdc34ddc87b82f83feb7d57bf189b7cad76c201155c6f681722b97757596db737f7b399436b8a4fa565e6fed7
-  data.tar.gz: 3a3a098e8c021fb38bdca588cb62d9b4122d47eeffa022809b39dbef8013ffff4506a3b0985da0320501869313bc8e29ac9097c66998ab38d45a376da8b7019f
+  metadata.gz: 644d4523b67479376df035a027ef38e4f52d2010336ca5890b7a34ace8444500f96c7e74895989ba959d8ca8f66185353b6793b107372589958497e19bc236e5
+  data.tar.gz: 4cc9eadf0db696beee04516b7a03f1363c93c962220dd1307af8d54fd4b2766063ade1cb9a472a6abf9b57a8192ad1b75bf0dff32aeb2343c4637068e6b1609f

data/lib/protocol/http/headers.rb

@@ -20,7 +20,9 @@
 
 module Protocol
 	module HTTP
+		# Headers are an array of key-value pairs. Some header keys represent multiple values.
 		class Headers
+			# Split by commas.
 			class Split < Array
 				COMMA = /\s*,\s*/
 				
@@ -37,6 +39,7 @@ module Protocol
 				end
 			end
 			
+			# Split by newline charaters.
 			class Multiple < Array
 				def initialize(value)
 					super()
@@ -63,7 +66,7 @@ module Protocol
 				if indexed
 					@indexed = indexed.dup
 				else
-					@indexed = self.to_h
+					@indexed = nil
 				end
 			end
 			
@@ -71,12 +74,14 @@ module Protocol
 				self.class.new(@fields, @indexed)
 			end
 			
+			# An array of `[key, value]` pairs.
 			attr :fields
 			
 			def freeze
 				return if frozen?
 				
-				@indexed = to_h
+				# Generate @indexed
+				self.to_h
 				
 				super
 			end
@@ -93,21 +98,22 @@ module Protocol
 				self[key] != nil
 			end
 			
-			def slice!(keys)
-				_, @fields = @fields.partition do |field|
+			def extract(keys)
+				deleted, @fields = @fields.partition do |field|
 					keys.include?(field.first.downcase)
 				end
 				
-				keys.each do |key|
-					@indexed.delete(key)
+				if @indexed
+					keys.each do |key|
+						@indexed.delete(key)
+					end
 				end
 				
-				return self
+				return deleted
 			end
 			
-			def slice(keys)
-				self.dup.slice!(keys)
-			end
+			# This is deprecated.
+			alias slice! extract
 			
 			def add(key, value)
 				self[key] = value
@@ -129,7 +135,9 @@ module Protocol
 			# @param key [String] The header key.
 			# @param value The header value.
 			def []= key, value
-				merge_into(@indexed, key.downcase, value)
+				if @indexed
+					merge_into(@indexed, key.downcase, value)
+				end
 				
 				@fields << [key, value]
 			end
@@ -164,11 +172,23 @@ module Protocol
 			
 			# Delete all headers with the given key, and return the merged value.
 			def delete(key)
-				_, @fields = @fields.partition do |field|
+				deleted, @fields = @fields.partition do |field|
 					field.first.downcase == key
 				end
 				
-				return @indexed.delete(key)
+				if @indexed
+					return @indexed.delete(key)
+				elsif policy = MERGE_POLICY[key]
+					(key, value), *tail = deleted
+					merged = policy.new(value)
+					
+					tail.each{|k,v| merged << v}
+					
+					return merged
+				else
+					key, value = deleted.last
+					return value
+				end
 			end
 			
 			protected def merge_into(hash, key, value)
@@ -179,25 +199,28 @@ module Protocol
 						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
 			end
 			
 			def [] key
-				@indexed[key]
+				to_h[key]
 			end
 			
+			# A hash table of `{key, policy[key].map(values)}`
 			def to_h
-				@fields.inject({}) do |hash, (key, value)|
+				@indexed ||= @fields.inject({}) do |hash, (key, value)|
 					merge_into(hash, key.downcase, value)
 					
 					hash
 				end
 			end
 			
+			def inspect
+				"#<#{self.class} #{@fields.inspect}>"
+			end
+			
 			def == other
 				if other.is_a? Hash
 					to_h == other

data/lib/protocol/http/version.rb

@@ -20,6 +20,6 @@
 
 module Protocol
 	module HTTP
-		VERSION = "0.2.0"
+		VERSION = "0.3.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-08 00:00:00.000000000 Z
+date: 2019-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: covered
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Provides abstractions to handle HTTP protocols.