response_bank 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d25739f9bd846e1cd3364a422cc90590b32fcb5f7e56cd307af0e83f0d5ddac
-  data.tar.gz: 14c1a7f96abcc45025cee9f998342fb6185779774dc72986ebb1a5bbcb96c413
+  metadata.gz: a2fbaca21dd928ad2b387d10300acbbb61dedca00a8cdab23247484af8c749bf
+  data.tar.gz: a4f81948c53b5e574e5bd3cb3a3c9d621c387a3040706aa0ee873ffc5dab5362
 SHA512:
-  metadata.gz: b6120bc7a707fa5ddd1cd3a143e40681e375864b075fe0e74b1128cc4ee460690400a70c47599772addba8d2bee56b02ce14a820c5e4af376f0eaa154f1fe88c
-  data.tar.gz: 5ae1545f2c40d7abbf06b8ba43c8d353cb171fc97ce667fa280c5f991c37f7e514c7673898a99242e446f9975ef22f4cb91eaa053165664a9c309fa4d6b39197
+  metadata.gz: b3a0956f4ab5b627d4e80f4349c16cc830b49eecb602357b52aedc3e60703ddd2547bca663656d28b4525dfd9f47a4b67d226f9eaca4322ff9da1acfa1351c00
+  data.tar.gz: 602e5ed4aca5b96d30b61fed0d90c814689424b986374f9f6030ee4f03c6c41db6138cd7542be475bd86c3cb94fcd77453d52a6e7b58c5d954f50ca2a25ead3b

data/lib/response_bank/middleware.rb

@@ -22,8 +22,7 @@ module ResponseBank
 
       if env['cacheable.cache']
         if [200, 404, 301, 304].include?(status)
-          headers['ETag'] = env['cacheable.key']
-
+          headers['ETag'] = %{"#{env['cacheable.key']}"}
         end
 
         if [200, 404, 301].include?(status) && env['cacheable.miss']

data/lib/response_bank/response_cache_handler.rb

@@ -145,11 +145,14 @@ module ResponseBank
         # regen
         @headers.merge!(headers)
 
-        # if a cache key hit and client doesn't match encoding, return the raw body
-        if !@env['HTTP_ACCEPT_ENCODING'].to_s.include?(@headers['Content-Encoding'])
-          ResponseBank.log("uncompressing payload for client as client doesn't require encoding")
-          body = ResponseBank.decompress(body, @headers['Content-Encoding'])
-          @headers.delete('Content-Encoding')
+        if @headers['Content-Encoding']
+          if !@env['HTTP_ACCEPT_ENCODING'].to_s.include?(@headers['Content-Encoding'])
+            ResponseBank.log("uncompressing payload for client as client doesn't require encoding")
+            body = ResponseBank.decompress(body, @headers['Content-Encoding'])
+            @headers.delete('Content-Encoding')
+          end
+        else
+          ResponseBank.log("Cache hit, but missing content-encoding in the cache value headers, maybe because of 301 or 404 response or empty body string")
         end
 
         [status, @headers, [body]]
@@ -163,13 +166,19 @@ module ResponseBank
       # If-None-Match: "abc"
       # If-None-Match: W/"abc"
       # If-None-Match: "abc", "def"
-      # If-None-Match: "*"
+      # If-None-Match: *
       return false unless entity_tag
       return false unless if_none_match
 
+      return true if if_none_match == "*"
+
       # strictly speaking an unquoted etag is not valid, yet common
       # to avoid unintended greedy matches in we check for naked entity then includes with quoted entity values
-      if_none_match == "*" || if_none_match == entity_tag || if_none_match.include?(%{"#{entity_tag}"})
+      entity_tag = %{"#{entity_tag}"} unless entity_tag.starts_with?('"')
+
+      if_none_match = %{"#{if_none_match}"} unless if_none_match.starts_with?('"') || if_none_match.starts_with?('W/"')
+
+      if_none_match == entity_tag || if_none_match.include?(entity_tag)
     end
 
     def stale_while_revalidate?(timestamp, cache_age_tolerance)

data/lib/response_bank/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ResponseBank
-  VERSION = "1.3.0"
+  VERSION = "1.3.2"
 end

data/lib/response_bank.rb

@@ -64,7 +64,7 @@ module ResponseBank
         key = %{#{key}:#{hash_value_str(data[:version])}} if data[:version]
 
         # add the encoding to only the cache key but don't expose this detail in the entity_tag
-        key = %{#{key}:#{hash_value_str(data[:encoding])}} if data[:encoding] && data[:encoding] != "gzip"
+        key = %{#{key}:#{hash_value_str(data[:encoding])}} if data[:encoding]
 
         key
       when Array

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: response_bank
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Tobias Lütke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-04 00:00:00.000000000 Z
+date: 2023-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack