async-http-cache 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 923d97088cda9896dcec9c48c21b6142fc9002acfc15ae70a5cb6fac4eacf086
-  data.tar.gz: 9819dd06fa5f44a42c7b9f866477fa163df6e857ce0c5618306f5962f2bbfcc1
+  metadata.gz: c0819bedaf18e394d19ae5ac3e53fa5eb418f2166252b4a578c6087a3a5b4704
+  data.tar.gz: b9d593ee6e8ecef570603c486b04fd52aaaec9c227abe73118cfa0463a54c58d
 SHA512:
-  metadata.gz: c1ffbd84fe0928014e500f0290a25720581e50ef688e30ad8161fd3b62ea7a6acc21fe2b40a12cf47ef0f3ec2e007e2613f63cb4fdf1518bf324ae88c63b58ad
-  data.tar.gz: e4ece204ed54c4d23c1e831d887ae2b7cb169e702b80e890f4bac5438f393fb31c15a873f494ac1ffcc1d3a88663b4eb12e0abb2c95c9fee4e4f030771158b8c
+  metadata.gz: fd1bf4dc1595e38f251094969895398b4b335380bb654cd7449197932f657f0aaa3d0f849d8f58846b1ee23ff317f5a6c14359c458e5c25c34630f521af4a620
+  data.tar.gz: dbdc2267bb3a61ce7e376bb4f76c37c81913b41a48b98eb220856b1b2352aac3e00a63191125404318c0880a8e83d7ef10a49eb8bdfc85ae87f2c2e047f864ed

data/.github/workflows/development.yml

@@ -11,7 +11,6 @@ jobs:
           - macos
         
         ruby:
-          - 2.4
           - 2.5
           - 2.6
           - 2.7

data/Gemfile

@@ -2,3 +2,7 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in async-http-cache.gemspec
 gemspec
+
+# gem "async-http", path: "../async-http"
+# gem "protocol-http", path: "../protocol-http"
+# gem "protocol-http1", path: "../protocol-http1"

data/async-http-cache.gemspec

@@ -21,13 +21,12 @@ Gem::Specification.new do |spec|
 	
 	spec.require_paths = ["lib"]
 	
-	spec.add_dependency "async-http"
-	spec.add_dependency "protocol-http", "~> 0.14.4"
+	spec.add_dependency "async-http", "~> 0.51"
 	
 	spec.add_development_dependency "async-rspec", "~> 1.10"
 	
 	spec.add_development_dependency "covered"
 	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "rspec"
-	spec.add_development_dependency "rake"
+	spec.add_development_dependency "bake-bundler"
 end

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

@@ -22,32 +22,48 @@
 
 require 'protocol/http/body/rewindable'
 require 'protocol/http/body/streamable'
+require 'protocol/http/body/digestable'
 
 module Async
 	module HTTP
 		module Cache
 			module Body
-				def self.wrap(message, &block)
-					if body = message.body
-						# Create a rewindable body wrapping the message body:
-						rewindable = ::Protocol::HTTP::Body::Rewindable.new(body)
-						
-						# Set the message body to the rewindable body:
-						message.body = rewindable
-						
-						# Wrap the message with the callback:
-						::Protocol::HTTP::Body::Streamable.wrap(message) do |error|
-							if error
-								Async.logger.error(self) {error}
-							else
-								yield message, rewindable.buffered
+				TRAILERS = 'trailers'
+				ETAG = 'etag'
+				
+				def self.wrap(response, &block)
+					if body = response.body
+						if body.empty?
+							# A body that is empty? at the outset, is immutable. This generally only applies to HEAD requests.
+							yield response, body
+						else
+							# Insert a rewindable body so that we can cache the response body:
+							rewindable = ::Protocol::HTTP::Body::Rewindable.wrap(response)
+							
+							unless response.headers.include?(ETAG)
+								# Compute a digest and add it to the response headers:
+								::Protocol::HTTP::Body::Digestable.wrap(response) do |wrapper|
+									response.headers.add(ETAG, wrapper.etag)
+								end
+								
+								# Ensure the etag is listed as a trailer:
+								response.headers.add(TRAILERS, ETAG)
+							end
+							
+							# Wrap the response with the callback:
+							::Protocol::HTTP::Body::Streamable.wrap(response) do |error|
+								if error
+									Async.logger.error(self) {error}
+								else
+									yield response, rewindable.buffered
+								end
 							end
 						end
 					else
-						yield message, nil
+						yield response, nil
 					end
 					
-					return message
+					return response
 				end
 			end
 		end

data/lib/async/http/cache/general.rb

@@ -31,6 +31,7 @@ module Async
 		module Cache
 			class General < ::Protocol::HTTP::Middleware
 				CACHE_CONTROL  = 'cache-control'
+				
 				CONTENT_TYPE = 'content-type'
 				AUTHORIZATION = 'authorization'
 				COOKIE = 'cookie'
@@ -91,9 +92,17 @@ module Async
 						return response
 					end
 					
-					return Body.wrap(response) do |message, body|
+					if request.head? and body = response.body
+						unless body.empty?
+							Async.logger.warn(self) {"HEAD request resulted in non-empty body!"}
+							
+							return response
+						end
+					end
+					
+					return Body.wrap(response) do |response, body|
 						Async.logger.debug(self) {"Updating cache for #{key}..."}
-						@store.insert(key, request, Response.new(message, body))
+						@store.insert(key, request, Response.new(response, body))
 					end
 				end
 				
@@ -107,7 +116,7 @@ module Async
 							Async.logger.debug(self) {"Cache hit for #{key}..."}
 							@count += 1
 							
-							# Create a dup of the response:
+							# Return the cached response:
 							return response
 						end
 					end

data/lib/async/http/cache/response.rb

@@ -29,6 +29,9 @@ module Async
 			class Response < ::Protocol::HTTP::Response
 				CACHE_CONTROL = 'cache-control'
 				SET_COOKIE = 'set-cookie'
+				ETAG = 'etag'
+				
+				X_CACHE = 'x-cache'
 				
 				def initialize(response, body)
 					@generated_at = Async::Clock.now
@@ -36,21 +39,31 @@ module Async
 					super(
 						response.version,
 						response.status,
-						response.headers.dup,
+						response.headers.flatten,
 						body,
 						response.protocol
 					)
 					
 					@max_age = @headers[CACHE_CONTROL]&.max_age
+					@etag = nil
+					
+					@headers.set(X_CACHE, 'hit')
 				end
 				
 				attr :generated_at
 				
+				def etag
+					@etag ||= @headers[ETAG]
+				end
+				
 				def cachable?
 					if cache_control = @headers[CACHE_CONTROL]
 						if cache_control.private? || !cache_control.public?
 							return false
 						end
+					else
+						# No cache control header...
+						return false
 					end
 					
 					if set_cookie = @headers[SET_COOKIE]
@@ -66,7 +79,9 @@ module Async
 				end
 				
 				def expired?
-					self.age > @max_age
+					if @max_age
+						self.age > @max_age
+					end
 				end
 				
 				def dup

data/lib/async/http/cache/store/memory.rb

@@ -64,6 +64,9 @@ module Async
 					
 					attr :index
 					
+					IF_NONE_MATCH = 'if-none-match'
+					NOT_MODIFIED = ::Protocol::HTTP::Response[304]
+					
 					def lookup(key, request)
 						if response = @index[key]
 							if response.expired?
@@ -74,6 +77,12 @@ module Async
 								return nil
 							end
 							
+							if etags = request.headers[IF_NONE_MATCH]
+								if etags.include?(response.etag)
+									return NOT_MODIFIED
+								end
+							end
+							
 							@hit += 1
 							
 							return response.dup
@@ -86,7 +95,8 @@ module Async
 					
 					def insert(key, request, response)
 						if @index.size < @limit
-							if response.body.length < 1024*64
+							length = response.body&.length
+							if length.nil? or length < 1024*64
 								@index[key] = response
 							end
 						end

data/lib/async/http/cache/version.rb

@@ -23,7 +23,7 @@
 module Async
 	module HTTP
 		module Cache
-			VERSION = "0.1.1"
+			VERSION = "0.2.0"
 		end
 	end
 end

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: async-http-cache
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: protocol-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: '0.51'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: '0.51'
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bake-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -120,7 +106,6 @@ files:
 - ".rspec"
 - Gemfile
 - README.md
-- Rakefile
 - async-http-cache.gemspec
 - lib/async/http/cache.rb
 - lib/async/http/cache/body.rb

data/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec