async-http 0.17.1 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a529cc7156fef7700b2d40a03ae88512fe7ad34efcba524a17a23c5bc4bead5
-  data.tar.gz: 06e805dcf6fb6dacf9f00317238026f1faa97c7dbe294f22111cf1e333d6c827
+  metadata.gz: 283dedfc7cd41922f947682aa3f542ccd5368497a6380602de87c6e38eadd4e0
+  data.tar.gz: cb1671a0bd33170eae0c826f081ccf5581135cc07724fd45cc9930186fc83d89
 SHA512:
-  metadata.gz: 153939bf31fb232c81681feed848f0f6cf10656609f2755006297a8ff6bb93c7646aa3cfc5f489a680d2c29370fa4069d4de472a7e0860a3b7a932cf60a47c5a
-  data.tar.gz: da73399d0615db7aaf78fc008e914819b6da85b79c8d25d521ef2d7c756895bdbca4506754344979493e14a53fd95cdb7bec34ce4d332951508ac8d9a711fa7f
+  metadata.gz: 01a9422366d59623c93e7a3e17969bfb8d66b2e6213a54f4ef14bbb81d9a23de7e90f8e16dde950630ee2053bf8f7533ea47fcd404cece57de51ee3027e872cb
+  data.tar.gz: c20d43c98c4febc062c3e94d0accb04df7a0dc8ddd08b2a83c45d1042b6229bb210f674288cca4f437d57f210255f0fd9ef720c8f2cfedd24c8886625a7193fb

data/lib/async/http/body.rb

@@ -30,10 +30,17 @@ module Async
 				@stopped = false
 			end
 			
+			# Read all chunks until the stream is closed.
+			def close
+				BufferedBody.for(self)
+			end
+			
+			# Have all chunks been read?
 			def finished?
 				@finished
 			end
 			
+			# Enumerate all chunks until finished.
 			def each
 				return to_enum unless block_given?
 				
@@ -51,6 +58,7 @@ module Async
 				@finished = true
 			end
 			
+			# Read the next available chunk.
 			def read
 				return if @finished
 				
@@ -61,6 +69,7 @@ module Async
 				return chunk
 			end
 			
+			# Read all remaining chunks into a single binary string.
 			def join
 				buffer = Async::IO::BinaryString.new
 				
@@ -71,6 +80,7 @@ module Async
 				return buffer
 			end
 			
+			# Write a single chunk to the body. Signal completion by calling `#finish`.
 			def write(chunk)
 				if @stopped
 					raise @stopped
@@ -81,19 +91,30 @@ module Async
 				@queue.enqueue(chunk)
 			end
 			
+			# Signal that output has finished.
 			def finish
 				@queue.enqueue(nil)
 			end
 		end
 		
 		class BufferedBody
-			def initialize(body)
-				@chunks = []
-				@index = 0
+			def self.for(body)
+				chunks = []
 				
 				body.each do |chunk|
-					@chunks << chunk
+					chunks << chunk
 				end
+				
+				self.new(chunks)
+			end
+			
+			def initialize(chunks)
+				@chunks = chunks
+				@index = 0
+			end
+			
+			def close
+				self
 			end
 			
 			def each(&block)
@@ -135,11 +156,9 @@ module Async
 				end
 				
 				def finish
-					return if self.body.nil? or self.body.finished?
+					return if self.body.nil?
 					
-					unless self.body.is_a? BufferedBody
-						self.body = BufferedBody.new(self.body)
-					end
+					self.body = self.body.close
 				end
 			end
 		end
@@ -150,6 +169,10 @@ module Async
 				@finished = false
 			end
 			
+			def close
+				BufferedBody.for(self)
+			end
+			
 			def finished?
 				@finished
 			end
@@ -201,6 +224,10 @@ module Async
 				@stream = stream
 			end
 			
+			def close
+				BufferedBody.for(self)
+			end
+			
 			def finished?
 				@remaining == 0
 			end

data/lib/async/http/client.rb

@@ -57,8 +57,8 @@ module Async
 			VERBS = ['GET', 'HEAD', 'POST', 'PUT', 'PATCH', 'DELETE']
 			
 			VERBS.each do |verb|
-				define_method(verb.downcase) do |*args, &block|
-					self.request(verb, *args, &block)
+				define_method(verb.downcase) do |reference, *args, &block|
+					self.request(verb, reference.to_str, *args, &block)
 				end
 			end
 			
@@ -67,7 +67,7 @@ module Async
 					response = connection.send_request(@authority, *args)
 					
 					begin
-						yield response if block_given?
+						return yield response if block_given?
 					ensure
 						# This forces the stream to complete reading.
 						response.finish

data/lib/async/http/deflate_body.rb

@@ -0,0 +1,124 @@
+# Copyright, 2018, 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.
+
+require 'zlib'
+
+module Async
+	module HTTP
+		class DeflateBody
+			DEFLATE = -Zlib::MAX_WBITS
+			GZIP =  Zlib::MAX_WBITS | 16
+			
+			ENCODINGS = {
+				'deflate' => DEFLATE,
+				'gzip' => GZIP,
+			}
+			
+			def self.for_request(headers, body, *args)
+				if content_encoding = headers['content-encoding']
+					if encoding = ENCODINGS[content_encoding]
+						return self.for(body, encoding, *args)
+					end
+				end
+				
+				return body
+			end
+			
+			def self.for(body, encoding = GZIP, level = Zlib::DEFAULT_COMPRESSION)
+				self.new(body, Zlib::Deflate.new(level, encoding))
+			end
+			
+			def initialize(body, stream)
+				@body = body
+				@stream = stream
+			end
+			
+			def each(&block)
+				return to_enum unless block_given?
+				
+				while chunk = self.read
+					yield chunk
+				end
+			end
+			
+			def read
+				return if @stream.finished?
+				
+				if chunk = @body.read
+					return @stream.deflate(chunk, Zlib::SYNC_FLUSH)
+				else
+					chunk = @stream.finish
+					
+					return chunk.empty? ? nil : chunk
+				end
+			end
+			
+			def close
+				@body = @body.close
+				
+				return self
+			end
+			
+			def join
+				buffer = Async::IO::BinaryString.new
+				
+				while chunk = self.read
+					buffer << chunk
+				end
+				
+				return buffer
+			end
+			
+			def finished?
+				@body.finished?
+			end
+		end
+		
+		class InflateBody < DeflateBody
+			def self.for_response(response)
+				if content_encoding = response.headers['content-encoding']
+					if encoding = ENCODINGS[content_encoding]
+						return self.for(response.body, encoding)
+					end
+					
+					raise ArgumentError.new("Unsupported content encoding: #{content_encoding.inspect}")
+				end
+				
+				return response.body
+			end
+			
+			def self.for(body, encoding = GZIP)
+				self.new(body, Zlib::Inflate.new(encoding))
+			end
+			
+			def read
+				return if @stream.finished?
+				
+				if chunk = @body.read
+					chunk = @stream.inflate(chunk)
+				else
+					chunk = @stream.finish
+				end
+				
+				return chunk.empty? ? nil : chunk
+			end
+		end
+	end
+end

data/lib/async/http/response.rb

@@ -35,6 +35,10 @@ module Async
 				status >= 300 && status < 400
 			end
 			
+			def preserve_method?
+				status == 307 || status == 308
+			end
+			
 			def failure?
 				status >= 400 && status < 600
 			end

data/lib/async/http/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.17.1"
+		VERSION = "0.18.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.18.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2018-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -116,7 +116,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".gitmodules"
 - ".rspec"
 - ".travis.yml"
 - Gemfile
@@ -126,6 +125,7 @@ files:
 - lib/async/http.rb
 - lib/async/http/body.rb
 - lib/async/http/client.rb
+- lib/async/http/deflate_body.rb
 - lib/async/http/pool.rb
 - lib/async/http/protocol.rb
 - lib/async/http/protocol/http1.rb

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "ext/http-parser"]
-	path = ext/http-parser
-	url = https://github.com/nodejs/http-parser