async-http 0.50.2 → 0.50.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41ac80694fcbf70c6db39bf8eb7c623b488f7e532fee830cbfee9e7be0886fed
-  data.tar.gz: 649b951f1a870b651ff0f792c392644683ea00f99ccac95fc3fb6d90f992bdef
+  metadata.gz: c153c0c4ab78ac5723d7e92c0210913fd89009503149a33142df4d262dc7e647
+  data.tar.gz: 8922a6fe85a00d84735b7d8bb68a876d6465a57a5c76cfc3b943c82fa8f69c64
 SHA512:
-  metadata.gz: 037607a4e52539fa49d7c4977151c0287af88054b3fbfc743b76ef464a8318d63013b3d24065fdf481281fd8387b528038e2a2b1e832bca945fd4bf0d6a006f5
-  data.tar.gz: 22dd139aa493c0212a12a130878c6b90873398abc92fa9729b01418105e0e17978b338959ba6c0fbe75e3222567352eb07415ad89d64c246524887b6ea28944c
+  metadata.gz: b022b86258ed5322e6e5f5ad14f78d0eeabde46a4afa11bd2307b6b00c20995aee9795fa72d58743bbdb29b36009d73c75e782b42962f87d59b5dc4eef9c71d3
+  data.tar.gz: a652c97a5e238bf77effee3d8206807a03139674e328863d614dec53bf4ebd7be72946b9854a9ac84dafb9691e88ac3394d97fe3ce4d28bbc8852c6e917fcd6a

data/async-http.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 	spec.add_dependency("async-io", "~> 1.27.0")
 	spec.add_dependency("async-pool", "~> 0.2")
 	
-	spec.add_dependency("protocol-http", "~> 0.13.0")
+	spec.add_dependency("protocol-http", "~> 0.14.0")
 	spec.add_dependency("protocol-http1", "~> 0.10.0")
 	spec.add_dependency("protocol-http2", "~> 0.10.0")
 	
@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
 	
 	spec.add_development_dependency "rack-test"
 	
+	spec.add_development_dependency "bake"
 	spec.add_development_dependency "covered"
 	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "rspec", "~> 3.6"

data/bake/async/http.rb

@@ -0,0 +1,83 @@
+
+# Fetch the specified URL and print the response.
+# @param url [String] the URL to parse and fetch.
+# @param method [String] the HTTP method to use.
+def fetch(url, method:)
+	require 'async/http/internet'
+	require 'kernel/sync'
+	
+	terminal = Console::Terminal.for($stdout)
+	terminal[:request] = terminal.style(:blue, nil, :bold)
+	terminal[:response] = terminal.style(:green, nil, :bold)
+	terminal[:length] = terminal.style(nil, nil, :bold)
+	
+	terminal[:key] = terminal.style(nil, nil, :bold)
+	
+	terminal[:chunk_0] = terminal.style(:blue)
+	terminal[:chunk_1] = terminal.style(:cyan)
+	
+	align = 20
+	
+	format_body = proc do |body, terminal|
+		if body
+			if length = body.length
+				terminal.print(:body, "body with length", :length, length, "B")
+			else
+				terminal.print(:body, "body without length")
+			end
+		else
+			terminal.print(:body, "no body")
+		end
+	end.curry
+	
+	Sync do
+		internet = Async::HTTP::Internet.new
+		
+		response = internet.send(method.downcase.to_sym, url)
+		
+		terminal.print_line(
+			:request, method.rjust(align), :reset, ": ", url
+		)
+		
+		terminal.print_line(
+			:response, "version".rjust(align), :reset, ": ", response.version
+		)
+		
+		terminal.print_line(
+			:response, "status".rjust(align), :reset, ": ", response.status,
+		)
+		
+		terminal.print_line(
+			:response, "body".rjust(align), :reset, ": ", format_body[response.body],
+		)
+		
+		response.headers.each do |key, value|
+			terminal.print_line(
+				:key, key.rjust(align), :reset, ": ", :value, value.inspect
+			)
+		end
+		
+		if body = response.body
+			index = 0
+			style = [:chunk_0, :chunk_1]
+			response.body.each do |chunk|
+				terminal.print(style[index % 2], chunk)
+				index += 1
+			end
+		end
+		
+		response.finish
+		internet.close
+	end
+end
+
+# GET the specified URL and print the response.
+def get(url)
+	self.fetch(url, method: "GET")
+end
+
+# HEAD the specified URL and print the response.
+def head(url)
+	self.fetch(url, method: "HEAD")
+end
+

data/lib/async/http/cache.rb

@@ -0,0 +1,153 @@
+# frozen_string_literal: true
+
+# Copyright, 2020, 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 'async/http/client'
+require 'protocol/http/headers'
+require 'protocol/http/middleware'
+require 'async/clock'
+
+require 'protocol/http/body/cacheable'
+
+module Async
+	module HTTP
+		class Cache < ::Protocol::HTTP::Middleware
+			CACHE_CONTROL  = 'cache-control'
+			
+			class Response < ::Protocol::HTTP::Response
+				def initialize(response, body)
+					@generated_at = Async::Clock.now
+					
+					super(
+						response.version,
+						response.status,
+						response.headers.dup,
+						body,
+						response.protocol
+					)
+					
+					@max_age = @headers[CACHE_CONTROL]&.max_age
+				end
+				
+				def cachable?
+					if cache_control = @headers[CACHE_CONTROL]
+						if cache_control.private?
+							return false
+						end
+						
+						if cache_control.public?
+							return true
+						end
+					end
+				end
+				
+				attr :generated_at
+				
+				def age
+					Async::Clock.now - @generated_at
+				end
+				
+				def expired?
+					self.age > @max_age
+				end
+				
+				def dup
+					dup = super
+					
+					dup.body = @body.dup
+					dup.headers = @headers.dup
+					
+					return dup
+				end
+			end
+			
+			def initialize(app, responses = {})
+				super(app)
+				
+				@count = 0
+				
+				@responses = {}
+			end
+			
+			attr :count
+			
+			def key(request)
+				[request.authority, request.method, request.path]
+			end
+			
+			def cachable?(request)
+				# We don't support caching requests which have a body:
+				if request.body
+					return false
+				end
+				
+				# We can't cache upgraded requests:
+				if request.protocol
+					return false
+				end
+				
+				# We only support caching GET and HEAD requests:
+				if request.method == 'GET' || request.method == 'HEAD'
+					return true
+				end
+				
+				# Otherwise, we can't cache it:
+				return false
+			end
+			
+			def wrap(request, key, response)
+				Body::Cacheable.wrap(response) do |response, body|
+					response = Response.new(response, body)
+					
+					if response.cachable?
+						@responses[key] = response
+					end
+				end
+				
+				return response
+			end
+			
+			def call(request)
+				key = self.key(request)
+				
+				if response = @responses[key]
+					Async.logger.debug(self) {"Cache hit for #{key}..."}
+					@count += 1
+					
+					if response.expired?
+						@responses.delete(key)
+						Async.logger.debug(self) {"Cache expired for #{key}..."}
+					else
+						# Create a dup of the response:
+						return response.dup
+					end
+				end
+				
+				if cachable?(request)
+					Async.logger.debug(self) {"Updating cache for #{key}..."}
+					return wrap(request, key, super)
+				else
+					return super
+				end
+			end
+		end
+	end
+end

data/lib/async/http/relative_location.rb

@@ -32,8 +32,9 @@ module Async
 		# A client wrapper which transparently handles both relative and absolute redirects to a given maximum number of hops.
 		class RelativeLocation < ::Protocol::HTTP::Middleware
 			DEFAULT_METHOD = GET
-			
-			def initialize(app, maximum_hops = 4)
+
+			# maximum_hops is the max number of redirects. Set to 0 to allow 1 request with no redirects.
+			def initialize(app, maximum_hops = 3)
 				super(app)
 				
 				@maximum_hops = maximum_hops
@@ -48,11 +49,11 @@ module Async
 				# We need to cache the body as it might be submitted multiple times.
 				request.finish
 				
-				while hops < @maximum_hops
+				while hops <= @maximum_hops
 					response = super(request)
-					hops += 1
-						
+
 					if response.redirection?
+						hops += 1
 						response.finish
 						
 						location = response.headers['location']

data/lib/async/http/version.rb

@@ -22,6 +22,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.50.2"
+		VERSION = "0.50.3"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.50.2
+  version: 0.50.3
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2020-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: protocol-http1
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: covered
   requirement: !ruby/object:Gem::Requirement
@@ -207,6 +221,7 @@ files:
 - README.md
 - Rakefile
 - async-http.gemspec
+- bake/async/http.rb
 - examples/fetch/Gemfile
 - examples/fetch/Gemfile.lock
 - examples/fetch/README.md
@@ -229,6 +244,7 @@ files:
 - lib/async/http/body/slowloris.rb
 - lib/async/http/body/stream.rb
 - lib/async/http/body/writable.rb
+- lib/async/http/cache.rb
 - lib/async/http/client.rb
 - lib/async/http/endpoint.rb
 - lib/async/http/internet.rb