async-http-cache 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f2003b72015123e99c75069272771e6247c31abbd55163da86955dd462dc4d6
-  data.tar.gz: dd9798d6736f4e73c06e1a15a6010c192a663042081ee6d92484eddd4b924256
+  metadata.gz: 2439c0fb975f956215ef9eec1e8db38394e10608a4299253516fee12540b5e6f
+  data.tar.gz: 616e0a00b3e6fa00c85c29cede66c464b887ca8d56188e93b84cf6ec5d19f7a4
 SHA512:
-  metadata.gz: 9ba0a34a15023d0e2b3b66052aa233f3180b4706e28040b08c0d8605e288230cee7461ffc8ecc3602575ae57e8b0ca7e713181aa07a83453f201c76680e0a32a
-  data.tar.gz: 8722d2f6aa70df6e830ecd1482916b26bd42d8f18ccd070010fb6c7d5689982b503cceb3df604e14c359d4cd8cdc9b63a0612b0b8bbf7f40b52e7cb029817611
+  metadata.gz: aadf8138fab28ffedeaa0a74f4dedf6f888d84394e4668e6d42757bf8c87e6bad50c9afbd7477d2a26e84294c4ce13db964f4a5567badd7a994434440c0e7a73
+  data.tar.gz: 976634254e072fe0ea9f950da879d75954b2b5b56f3de52b9e4d42c10a19b71ed840ddd3c61660f5fa9efaa39ed06fbc5ac24585ebe21615f8ff4d542fff7d93

checksums.yaml.gz.sig

@@ -0,0 +1,2 @@
+.,-�t�Q����V	<#>A�i,��i��J@���ك�l� f�>b�"U�*�),v��%Ou���k_�\��:�����
+�=���ղ`+��7�)��l�Q��:�Zx���

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

@@ -1,17 +1,17 @@
 # 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
@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'set'
 require 'protocol/http/middleware'
 
 require_relative 'body'
@@ -31,102 +32,122 @@ module Async
 		module Cache
 			class General < ::Protocol::HTTP::Middleware
 				CACHE_CONTROL  = 'cache-control'
-				
+
 				CONTENT_TYPE = 'content-type'
 				AUTHORIZATION = 'authorization'
 				COOKIE = 'cookie'
-				
+
+				# Status codes of responses that MAY be stored by a cache or used in reply
+				# to a subsequent request.
+				#
+				# http://tools.ietf.org/html/rfc2616#section-13.4
+				CACHEABLE_RESPONSE_CODES = {
+					200 => true, # OK
+					203 => true, # Non-Authoritative Information
+					300 => true, # Multiple Choices
+					301 => true, # Moved Permanently
+					302 => true, # Found
+					404 => true, # Not Found
+					410 => true  # Gone
+				}.freeze
+
 				def initialize(app, store: Store.default)
 					super(app)
-					
+
 					@count = 0
-					
+
 					@store = store
 				end
-				
+
 				attr :count
 				attr :store
-				
+
 				def close
 					@store.close
 				ensure
 					super
 				end
-				
+
 				def key(request)
 					@store.normalize(request)
-					
+
 					[request.authority, request.method, request.path]
 				end
-				
+
 				def cacheable?(request)
-					# We don't support caching requests which have a body:
+					# We don't support caching requests which have a request 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:
 					unless request.method == 'GET' || request.method == 'HEAD'
 						return false
 					end
-					
+
 					if request.headers[AUTHORIZATION]
 						return false
 					end
-					
+
 					if request.headers[COOKIE]
 						return false
 					end
-					
+
 					# Otherwise, we can cache it:
 					return true
 				end
-				
+
 				def wrap(key, request, response)
-					if response.status != 200
+					unless CACHEABLE_RESPONSE_CODES.include?(response.status)
 						return response
 					end
-					
+
+					response_cache_control = response.headers[CACHE_CONTROL]
+
+					if response_cache_control&.no_store? || response_cache_control&.private?
+						return response
+					end
+
 					if request.head? and body = response.body
 						unless body.empty?
 							Console.logger.warn(self) {"HEAD request resulted in non-empty body!"}
-							
+
 							return response
 						end
 					end
-					
+
 					return Body.wrap(response) do |response, body|
 						Console.logger.debug(self) {"Updating cache for #{key}..."}
 						@store.insert(key, request, Response.new(response, body))
 					end
 				end
-				
+
 				def call(request)
 					key = self.key(request)
-					
+
 					cache_control = request.headers[CACHE_CONTROL]
-					
+
 					unless cache_control&.no_cache?
 						if response = @store.lookup(key, request)
 							Console.logger.debug(self) {"Cache hit for #{key}..."}
 							@count += 1
-							
+
 							# Return the cached response:
 							return response
 						end
 					end
-					
+
 					unless cache_control&.no_store?
 						if cacheable?(request)
 							return wrap(key, request, super)
 						end
 					end
-					
+
 					return super
 				end
 			end

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

@@ -56,7 +56,7 @@ module Async
 					@etag ||= @headers[ETAG]
 				end
 				
-				def cachable?
+				def cacheable?
 					if cache_control = @headers[CACHE_CONTROL]
 						if cache_control.private? || !cache_control.public?
 							return false

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

@@ -25,9 +25,10 @@ module Async
 		module Cache
 			module Store
 				class Memory
-					def initialize(limit: 1024)
+					def initialize(limit: 1024, maximum_size: 1024*64, prune_interval: 60)
 						@index = {}
 						@limit = limit
+						@maximum_size = maximum_size
 						
 						@hit = 0
 						@miss = 0
@@ -35,7 +36,7 @@ module Async
 						
 						@gardener = Async(transient: true, annotation: self.class) do |task|
 							while true
-								task.sleep(60)
+								task.sleep(prune_interval)
 								
 								pruned = self.prune
 								@pruned += pruned
@@ -96,7 +97,7 @@ module Async
 					def insert(key, request, response)
 						if @index.size < @limit
 							length = response.body&.length
-							if length.nil? or length < 1024*64
+							if length.nil? or length < @maximum_size
 								@index[key] = response
 							end
 						end

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

@@ -23,7 +23,7 @@
 module Async
 	module HTTP
 		module Cache
-			VERSION = "0.4.2"
+			VERSION = "0.4.3"
 		end
 	end
 end

metadata

@@ -1,14 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: async-http-cache
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Samuel Williams
+- Olle Jonsson
 autorequire:
 bindir: bin
-cert_chain: []
-date: 2021-05-13 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIE2DCCA0CgAwIBAgIBATANBgkqhkiG9w0BAQsFADBhMRgwFgYDVQQDDA9zYW11
+  ZWwud2lsbGlhbXMxHTAbBgoJkiaJk/IsZAEZFg1vcmlvbnRyYW5zZmVyMRIwEAYK
+  CZImiZPyLGQBGRYCY28xEjAQBgoJkiaJk/IsZAEZFgJuejAeFw0yMjA4MDYwNDUz
+  MjRaFw0zMjA4MDMwNDUzMjRaMGExGDAWBgNVBAMMD3NhbXVlbC53aWxsaWFtczEd
+  MBsGCgmSJomT8ixkARkWDW9yaW9udHJhbnNmZXIxEjAQBgoJkiaJk/IsZAEZFgJj
+  bzESMBAGCgmSJomT8ixkARkWAm56MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB
+  igKCAYEAomvSopQXQ24+9DBB6I6jxRI2auu3VVb4nOjmmHq7XWM4u3HL+pni63X2
+  9qZdoq9xt7H+RPbwL28LDpDNflYQXoOhoVhQ37Pjn9YDjl8/4/9xa9+NUpl9XDIW
+  sGkaOY0eqsQm1pEWkHJr3zn/fxoKPZPfaJOglovdxf7dgsHz67Xgd/ka+Wo1YqoE
+  e5AUKRwUuvaUaumAKgPH+4E4oiLXI4T1Ff5Q7xxv6yXvHuYtlMHhYfgNn8iiW8WN
+  XibYXPNP7NtieSQqwR/xM6IRSoyXKuS+ZNGDPUUGk8RoiV/xvVN4LrVm9upSc0ss
+  RZ6qwOQmXCo/lLcDUxJAgG95cPw//sI00tZan75VgsGzSWAOdjQpFM0l4dxvKwHn
+  tUeT3ZsAgt0JnGqNm2Bkz81kG4A2hSyFZTFA8vZGhp+hz+8Q573tAR89y9YJBdYM
+  zp0FM4zwMNEUwgfRzv1tEVVUEXmoFCyhzonUUw4nE4CFu/sE3ffhjKcXcY//qiSW
+  xm4erY3XAgMBAAGjgZowgZcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
+  BBYEFO9t7XWuFf2SKLmuijgqR4sGDlRsMC4GA1UdEQQnMCWBI3NhbXVlbC53aWxs
+  aWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MC4GA1UdEgQnMCWBI3NhbXVlbC53aWxs
+  aWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MA0GCSqGSIb3DQEBCwUAA4IBgQB5sxkE
+  cBsSYwK6fYpM+hA5B5yZY2+L0Z+27jF1pWGgbhPH8/FjjBLVn+VFok3CDpRqwXCl
+  xCO40JEkKdznNy2avOMra6PFiQyOE74kCtv7P+Fdc+FhgqI5lMon6tt9rNeXmnW/
+  c1NaMRdxy999hmRGzUSFjozcCwxpy/LwabxtdXwXgSay4mQ32EDjqR1TixS1+smp
+  8C/NCWgpIfzpHGJsjvmH2wAfKtTTqB9CVKLCWEnCHyCaRVuKkrKjqhYCdmMBqCws
+  JkxfQWC+jBVeG9ZtPhQgZpfhvh+6hMhraUYRQ6XGyvBqEUe+yo6DKIT3MtGE2+CP
+  eX9i9ZWBydWb8/rvmwmX2kkcBbX0hZS1rcR593hGc61JR6lvkGYQ2MYskBveyaxt
+  Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
+  voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
+  -----END CERTIFICATE-----
+date: 2022-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -99,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Standard-compliant cache for async-http.

metadata.gz.sig

@@ -0,0 +1,2 @@
+?���|$���Ŗ�~�;�r�k�p�񳄉���m��C@�Cѧ/�Bθ�_�ý�X��;�z��|���
�q]`��.�C���v2�yJ:���.7n�c�*���j����^/>���m����O�	F��۴�&��O�����@�aj�N0ޯG8��]EUJz�嗒1��R�j���XSt.��i�ve�Z),�ő(�3���H�V����m��/�e��=��ek�,�
+P�<�P;�|��1�*7[�n,�?�/����beq�o�x�q�ð�y4��,