async-http 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de4dff870c7d93652b036dfc3a5bfd80c9b88d899877f566b3a10a3e52a2a9f2
-  data.tar.gz: da2eea4408999ebcef45259231095d531e89f4ae59f287ff9b3fe8b888d2fa77
+  metadata.gz: 9747cc8b9879031adf8d9e6086942e69955ff33ca04a598bac893f6a04588680
+  data.tar.gz: d4dca36355247bfdd1c5162493813ffc2eaf815b1a9d8c6297fed08069a3c15e
 SHA512:
-  metadata.gz: 41b9c69088c19277328694962dfa01431af5f33cc058ce348aa15327cda5e83d8e2ad57c38a9f67632b441f95ff463774c8f6e5048f9b23d7ddf8d0debe2106d
-  data.tar.gz: cf6842c7be2895859a8bcc17ff0710d45f519658af83bead6facb94b8f25f3ada10eba70c7e2febd0f4418a52c3ad13131e598e689eb519acbb9f27114ca67c5
+  metadata.gz: d3060ef8cf5a1dc5524c8170437cfdc1a027446737ab199daed129d9d5cb8230e3df0b228c4a8259c2b2f70d0221419c1261707097d9f0a32104a13980716aef
+  data.tar.gz: 9ef10b59d8e2b27295dccc8eef3db0b60052bcf01497d124e1eae16e4d2a9d129e29acd29de71f17ffedf0ae431b2f31b1fa1ba8ec404c88663fc2aecb92982c

data/lib/async/http/headers.rb

@@ -0,0 +1,105 @@
+# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+module Async
+	module HTTP
+		class Headers
+			def initialize(fields = [])
+				@fields = fields
+				@indexed = to_h
+			end
+			
+			attr :fields
+			
+			def freeze
+				return if frozen?
+				
+				@indexed = to_h
+				
+				super
+			end
+			
+			def each(&block)
+				@fields.each(&block)
+			end
+			
+			def include? key
+				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 []= key, value
+				@fields << [key, value]
+				
+				if @indexed
+					key = key.downcase
+					
+					if current_value = @indexed[key]
+						@indexed[key] = Array(current_value) << value
+					else
+						@indexed[key] = value
+					end
+				end
+			end
+			
+			def [] key
+				@indexed ||= to_h
+				
+				@indexed[key]
+			end
+			
+			def to_h
+				@fields.inject({}) do |hash, (key, value)|
+					key = key.downcase
+					
+					if current_value = hash[key]
+						hash[key] = Array(current_value) << value
+					else
+						hash[key] = value
+					end
+					
+					hash
+				end
+			end
+			
+			def == other
+				if other.is_a? Hash
+					to_h == other
+				else
+					@fields == other.fields
+				end
+			end
+		end
+	end
+end

data/lib/async/http/protocol/http11.rb

@@ -22,6 +22,7 @@ require 'async/io/protocol/line'
 
 require_relative '../request'
 require_relative '../response'
+require_relative '../headers'
 
 require_relative '../body/chunked'
 require_relative '../body/fixed'
@@ -155,17 +156,18 @@ module Async
 					end
 				end
 				
-				def read_headers(headers = {})
-					# Parsing headers:
+				def read_headers
+					fields = []
+					
 					each_line do |line|
 						if line =~ /^([a-zA-Z\-]+):\s*(.+?)\s*$/
-							headers[$1.downcase] = $2
+							fields << [$1, $2]
 						else
 							break
 						end
 					end
 					
-					return headers
+					return Headers.new(fields)
 				end
 				
 				def write_body(body, chunked = true)

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

@@ -20,6 +20,7 @@
 
 require_relative '../request'
 require_relative '../response'
+require_relative '../headers'
 require_relative '../body/writable'
 
 require 'async/notification'
@@ -112,12 +113,11 @@ module Async
 						
 						request = Request.new
 						request.version = self.version
-						request.headers = {}
+						request.headers = Headers.new
 						body = Body::Writable.new
 						request.body = body
 						
 						stream.on(:headers) do |headers|
-							# puts "Got request headers: #{headers.inspect}"
 							headers.each do |key, value|
 								if key == METHOD
 									request.method = value

data/lib/async/http/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.21.0"
+		VERSION = "0.22.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -136,6 +136,7 @@ files:
 - lib/async/http/body/writable.rb
 - lib/async/http/client.rb
 - lib/async/http/content_encoding.rb
+- lib/async/http/headers.rb
 - lib/async/http/middleware.rb
 - lib/async/http/middleware/builder.rb
 - lib/async/http/pool.rb