async-http 0.28.0 → 0.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0902e29085dc6e9908afb45613d5a8d923f60767fb111b2a1ef5d8a549b75dd
-  data.tar.gz: ff5f7aaf1141e192d95b53a197ef12b5ad4404fad761d09201367d0f029decf5
+  metadata.gz: 16e5b6f4cbf9aa5955ae132734d5055076ee5dce533f0aafd4a71ec3812d422a
+  data.tar.gz: 4e0aade981100c1bf1e1b7a1ec71fb72894a60f729262e7090010ca2b7d7f05a
 SHA512:
-  metadata.gz: a70f1bb712b485d3aeae3cc374f4c430f628ac3e8db194757f4b83233e1fc91937d8b13ad04d7d22e0ee3ff8cb95d9515063211e98ff0d796beced993c52a282
-  data.tar.gz: '04821bd0c538d1df175152e3591cef5603a4ab593f57313378bb87a088a98784f40e0f5fc05ebeb988f3fd710329b0859fdec560c7b0048ab17b8efd3115f649'
+  metadata.gz: ee421022248aa197ef31e1a3b4d7b26c04bbeaea88585ddf628305e2b0736df86035e8f0f980434ec7202af235a00bdce7cb4a6dbcb3469286c41a256acb6aac
+  data.tar.gz: 6385e47d16633c5f183b582951e3f5c4dc454473155c8fb407e7e475f142422a4f0164d60dd8d5090a023bebad9e039ee26e3bc95eff7a1e422167260a817fed

data/async-http.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |spec|
 	spec.require_paths = ["lib"]
 	
 	spec.add_dependency("async", "~> 1.6")
-	spec.add_dependency("async-io", "~> 1.14")
+	spec.add_dependency("async-io", "~> 1.15")
 	
-	spec.add_dependency("http-protocol", "~> 0.1.0")
+	spec.add_dependency("http-protocol", "~> 0.2.0")
 	
 	# spec.add_dependency("openssl")
 	

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

@@ -29,7 +29,7 @@ module Async
 				METHOD = ':method'.freeze
 				PATH = ':path'.freeze
 				AUTHORITY = ':authority'.freeze
-				REASON = ':reason'.freeze
+				REASON = 'reason'.freeze
 				STATUS = ':status'.freeze
 				VERSION = 'HTTP/2.0'.freeze
 				

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

@@ -77,18 +77,21 @@ module Async
 					def receive_reset_stream(stream, error_code)
 					end
 					
-					NO_RESPONSE = [[STATUS, '500'], [REASON, "No response generated"]]
+					NO_RESPONSE = [
+						[STATUS, '500'],
+						[REASON, "No response generated"]
+					]
 					
 					def send_response(response)
 						if response.nil?
 							@stream.send_headers(nil, NO_RESPONSE, ::HTTP::Protocol::HTTP2::END_STREAM)
 						else
-							headers = Headers::Merged.new({
-								STATUS => response.status,
-								REASON => response.reason,
-							}, response.headers)
+							headers = Headers::Merged.new([
+								[STATUS, response.status],
+								[REASON, response.reason],
+							], response.headers)
 							
-							if response.body.nil?
+							if response.body.nil? or response.body.empty?
 								@stream.send_headers(nil, headers, ::HTTP::Protocol::HTTP2::END_STREAM)
 							else
 								@stream.send_headers(nil, headers)

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

@@ -54,35 +54,37 @@ module Async
 							chunk = @remainder
 							@remainder = nil
 						elsif chunk = @body.read
+							# There was a new chunk of data to send
 						else
 							@body = nil
 							
 							# @body.read above might take a while and a stream reset might be received in the mean time.
-							unless @state == :closed
+							unless closed?
 								send_data(nil, ::HTTP::Protocol::HTTP2::END_STREAM)
 							end
 							
 							return false
 						end
 						
-						return false if @state == :closed
+						return false if closed?
 						
 						if chunk.bytesize <= maximum_size
 							send_data(chunk, maximum_size: maximum_size)
-							
-							return true
 						else
-							send_data(chunk.byteslice(0, maximum_size), padding_size: 0)
-							@remainder = chunk.byteslice(maximum_size, chunk.bytesize - maximum_size)
+							send_data(chunk.byteslice(0, maximum_size), maximum_size: maximum_size)
 							
-							return false
+							@remainder = chunk.byteslice(maximum_size, chunk.bytesize - maximum_size)
 						end
+						
+						return true
 					end
 					
 					def window_updated
 						return unless @body
 						
-						while send_chunk; end
+						while send_chunk
+							# There could be more data to send...
+						end
 					end
 					
 					def receive_headers(frame)
@@ -108,6 +110,7 @@ module Async
 						
 						if @body
 							@body.stop(EOFError.new(error_code))
+							@body = nil
 						end
 						
 						delegate.receive_reset_stream(self, error_code)

data/lib/async/http/url_endpoint.rb

@@ -71,17 +71,17 @@ module Async
 			end
 			
 			def port
-				@url.port || default_port
+				@options[:port] || @url.port || default_port
 			end
 			
 			def hostname
-				@options.fetch(:hostname, @url.hostname)
+				@options[:hostname] || @url.hostname
 			end
 			
 			DEFAULT_ALPN_PROTOCOLS = ['h2', 'http/1.1'].freeze
 			
 			def alpn_protocols
-				@options.fetch(:alpn_protocols, DEFAULT_ALPN_PROTOCOLS)
+				@options[:alpn_protocols] || DEFAULT_ALPN_PROTOCOLS
 			end
 			
 			def ssl_context
@@ -98,20 +98,22 @@ module Async
 				{reuse_port: @options[:reuse_port] ? true : false}
 			end
 			
-			def endpoint
-				unless @endpoint
-					@endpoint = Async::IO::Endpoint.tcp(hostname, port, tcp_options)
-					
-					if secure?
-						# Wrap it in SSL:
-						@endpoint = Async::IO::SSLEndpoint.new(@endpoint,
-							ssl_context: ssl_context,
-							hostname: self.hostname
-						)
-					end
+			def build_endpoint(endpoint = nil)
+				endpoint ||= Async::IO::Endpoint.tcp(hostname, port, tcp_options)
+				
+				if secure?
+					# Wrap it in SSL:
+					return Async::IO::SSLEndpoint.new(endpoint,
+						ssl_context: self.ssl_context,
+						hostname: self.hostname
+					)
 				end
 				
-				return @endpoint
+				return endpoint
+			end
+			
+			def endpoint
+				@endpoint ||= build_endpoint
 			end
 			
 			def bind(*args, &block)

data/lib/async/http/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.28.0"
+		VERSION = "0.28.1"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.28.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-31 00:00:00.000000000 Z
+date: 2018-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: http-protocol
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement