async-http 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 283dedfc7cd41922f947682aa3f542ccd5368497a6380602de87c6e38eadd4e0
-  data.tar.gz: cb1671a0bd33170eae0c826f081ccf5581135cc07724fd45cc9930186fc83d89
+  metadata.gz: dd03fb46876ed4121fa2232b18de6ec00e7176a6c224adf8d5001ec53cf89f1c
+  data.tar.gz: c42bf8f085ad74ee4fbc6b15c47bcb06915a41f42d3a48d58d39a43f695b267d
 SHA512:
-  metadata.gz: 01a9422366d59623c93e7a3e17969bfb8d66b2e6213a54f4ef14bbb81d9a23de7e90f8e16dde950630ee2053bf8f7533ea47fcd404cece57de51ee3027e872cb
-  data.tar.gz: c20d43c98c4febc062c3e94d0accb04df7a0dc8ddd08b2a83c45d1042b6229bb210f674288cca4f437d57f210255f0fd9ef720c8f2cfedd24c8886625a7193fb
+  metadata.gz: 7be71154d37d575a6c7b19c7d2c5b81b98e513d260a5d15c9d4c8e0a7fbaf3285d99ca7dc4030e9567af159ff73f4dc25c6144dd55e1745ae307898d0f6c8c9f
+  data.tar.gz: bb5748a2d385ce8528b218246a5a701d1c8fb1b45d1b40c2d9ce8e559b023c9c032c1ef396cc930c101278e56ddd2a57280e9e16d77df4eca1bfbc09c99e4caf

data/async-http.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
 	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
 	spec.require_paths = ["lib"]
 	
-	spec.add_dependency("async", "~> 1.5")
+	spec.add_dependency("async", "~> 1.6")
 	spec.add_dependency("async-io", "~> 1.7")
 	
 	spec.add_dependency("http-2", "~> 0.8")

data/lib/async/http/accept_encoding.rb

@@ -0,0 +1,65 @@
+# 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.
+
+require_relative 'middleware'
+
+require_relative 'body/buffered'
+require_relative 'body/inflate'
+
+module Async
+	module HTTP
+		# Set a valid accept-encoding header and decode the response.
+		class AcceptEncoding < Middleware
+			DEFAULT_WRAPPERS = {
+				'gzip' => Body::Inflate.method(:for)
+			}
+			
+			def initialize(app, wrappers = DEFAULT_WRAPPERS)
+				super(app)
+				
+				@accept_encoding = wrappers.keys.join(', ')
+				@wrappers = wrappers
+			end
+			
+			def call(request, *)
+				request.headers['accept-encoding'] = @accept_encoding
+				
+				response = super
+				
+				if !response.body.empty? and content_encoding = response.headers['content-encoding']
+					encodings = content_encoding.split(/\s*,\s*/)
+					
+					body = response.body
+					
+					# We want to unwrap all encodings
+					encodings.reverse_each do |name|
+						if wrapper = @wrappers[name]
+							body = wrapper.call(body)
+						end
+					end
+					
+					response.body = body
+				end
+				
+				return response
+			end
+		end
+	end
+end

data/lib/async/http/body.rb

@@ -18,247 +18,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'async/queue'
-
-module Async
-	module HTTP
-		class Body
-			def initialize
-				@queue = Async::Queue.new
-				
-				@finished = false
-				@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?
-				
-				return if @finished
-				
-				while chunk = @queue.dequeue
-					yield chunk
-				end
-			rescue
-				# Stop the stream because the remote end is no longer reading from it. Any attempt to write to the stream will fail.
-				@stopped = $!
-				
-				raise
-			ensure
-				@finished = true
-			end
-			
-			# Read the next available chunk.
-			def read
-				return if @finished
-				
-				unless chunk = @queue.dequeue
-					@finished = true
-				end
-				
-				return chunk
-			end
-			
-			# Read all remaining chunks into a single binary string.
-			def join
-				buffer = Async::IO::BinaryString.new
-				
-				self.each do |chunk|
-					buffer << chunk
-				end
-				
-				return buffer
-			end
-			
-			# Write a single chunk to the body. Signal completion by calling `#finish`.
-			def write(chunk)
-				if @stopped
-					raise @stopped
-				end
-				
-				# TODO should this yield if the queue is full?
-				
-				@queue.enqueue(chunk)
-			end
-			
-			# Signal that output has finished.
-			def finish
-				@queue.enqueue(nil)
-			end
-		end
-		
-		class BufferedBody
-			def self.for(body)
-				chunks = []
-				
-				body.each do |chunk|
-					chunks << chunk
-				end
-				
-				self.new(chunks)
-			end
-			
-			def initialize(chunks)
-				@chunks = chunks
-				@index = 0
-			end
-			
-			def close
-				self
-			end
-			
-			def each(&block)
-				while @index < @chunks.count
-					yield @chunks[@index]
-					@index += 1
-				end
-			end
-			
-			def read
-				if chunk = @chunks[@index]
-					@index += 1
-				end
-				
-				return chunk
-			end
-			
-			def join
-				buffer = Async::IO::BinaryString.new
-				
-				self.each do |chunk|
-					buffer << chunk
-				end
-				
-				return buffer
-			end
-			
-			def rewind
-				@index = 0
-			end
-			
-			def finished?
-				true
-			end
-			
-			module Reader
-				def read
-					self.body ? self.body.join : nil
-				end
-				
-				def finish
-					return if self.body.nil?
-					
-					self.body = self.body.close
-				end
-			end
-		end
-		
-		class ChunkedBody
-			def initialize(protocol)
-				@protocol = protocol
-				@finished = false
-			end
-			
-			def close
-				BufferedBody.for(self)
-			end
-			
-			def finished?
-				@finished
-			end
-			
-			def read
-				return nil if @finished
-				
-				size = @protocol.read_line.to_i(16)
-				
-				if size == 0
-					@protocol.read_line
-					
-					@finished = true
-					
-					return nil
-				end
-				
-				chunk = @protocol.stream.read(size)
-				@protocol.read_line # Consume the trailing CRLF
-				
-				return chunk
-			end
-			
-			def each
-				while chunk = self.read
-					yield chunk
-				end
-			end
-			
-			def join
-				buffer = Async::IO::BinaryString.new
-				
-				self.each do |chunk|
-					buffer << chunk
-				end
-				
-				return buffer
-			end
-			
-			def finish
-				self.each {}
-			end
-		end
-		
-		class FixedBody
-			def initialize(length, stream)
-				@length = length
-				@remaining = length
-				@stream = stream
-			end
-			
-			def close
-				BufferedBody.for(self)
-			end
-			
-			def finished?
-				@remaining == 0
-			end
-			
-			def each
-				while chunk = self.read
-					yield chunk
-				end
-			end
-			
-			def read
-				if @remaining > 0
-					if chunk = @stream.read(@remaining)
-						@remaining -= chunk.bytesize
-						
-						return chunk
-					end
-				end
-			end
-			
-			def join
-				buffer = @stream.read(@remaining)
-				
-				@remaining = 0
-				
-				return buffer
-			end
-			
-			def finish
-				read
-			end
-		end
-	end
-end
+require_relative 'body/writable'
+require_relative 'body/buffered'

data/lib/async/http/body/buffered.rb

@@ -0,0 +1,107 @@
+# 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_relative 'readable'
+
+module Async
+	module HTTP
+		module Body
+			# A body which buffers all it's contents.
+			class Buffered < Readable
+				# Wraps an array into a buffered body.
+				def self.wrap(body)
+					if body.is_a? Async::HTTP::Body::Readable
+						return body
+					elsif body.is_a? Array
+						return self.new(body)
+					else
+						return self.for(body)
+					end
+				end
+				
+				def self.for(body)
+					chunks = []
+					
+					body.each do |chunk|
+						chunks << chunk
+					end
+					
+					self.new(chunks)
+				end
+				
+				def initialize(chunks)
+					@chunks = chunks
+					@bytesize = nil
+					
+					@index = 0
+				end
+				
+				def bytesize
+					@bytesize ||= @chunks.inject(0) {|sum, chunk| sum + chunk.bytesize}
+				end
+				
+				def empty?
+					@chunks.empty?
+				end
+				
+				def close
+					self
+				end
+				
+				def each
+					return to_enum unless block_given?
+					
+					while @index < @chunks.count
+						yield @chunks[@index]
+						@index += 1
+					end
+				end
+				
+				def read
+					if chunk = @chunks[@index]
+						@index += 1
+					end
+					
+					return chunk
+				end
+				
+				def rewind
+					@index = 0
+				end
+				
+				def inspect
+					"\#<#{self.class} #{@chunks.count} chunks, #{self.bytesize} bytes>"
+				end
+				
+				module Reader
+					def read
+						self.body ? self.body.join : nil
+					end
+					
+					def finish
+						return if self.body.nil?
+						
+						self.body = self.body.close
+					end
+				end
+			end
+		end
+	end
+end

data/lib/async/http/body/chunked.rb

@@ -0,0 +1,67 @@
+# 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_relative 'readable'
+
+module Async
+	module HTTP
+		module Body
+			class Chunked < Readable
+				def initialize(protocol)
+					@protocol = protocol
+					@finished = false
+					
+					@bytesize = 0
+					@count = 0
+				end
+				
+				def empty?
+					@finished
+				end
+				
+				def read
+					return nil if @finished
+					
+					size = @protocol.read_line.to_i(16)
+					
+					if size == 0
+						@protocol.read_line
+						
+						@finished = true
+						
+						return nil
+					end
+					
+					chunk = @protocol.stream.read(size)
+					@protocol.read_line # Consume the trailing CRLF
+					
+					@bytesize += size
+					@count += 1
+					
+					return chunk
+				end
+				
+				def inspect
+					"\#<#{self.class} #{@bytesize} bytes read in #{@count} chunks>"
+				end
+			end
+		end
+	end
+end