faraday-http-cache 2.8.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00c9816f80d3f4a4f700bf153c6e4b20eed4f28fc0fcbc59d3e6a9135dd864fb
-  data.tar.gz: 1298dc1a38f6529db56b8d862524268908ac09a2825678450958955b2af8f096
+  metadata.gz: 8308a71aed66c20d85c6bc345b40c36f63d6362b562e2ce21ba11c002c25929a
+  data.tar.gz: 707c84e7c6b8d0f54f7f55142649db9623f0031197d0fe08f195ab96d9e2fe49
 SHA512:
-  metadata.gz: 959cd511c16d707e18369d66527bcd33dcec3de70e093f906cc688c6c68f715e2e74eefc0777e97eb00070d7edb906505b2edfd2e77e05778d66c42d33597d6b
-  data.tar.gz: 6acca89a4a35247611b553d293c627c053f7eba252ae2fa65ccc1fa07b85d5cedfb815e7924963fce288ecc113d98ca3c565426e604781aa0db2c83dd80482f6
+  metadata.gz: 7cfea8ce8b26348fd53e4295aed88e46f3ac5f628d6b2ee65e0c939a034c789009e9bd403c1037a8c86b4c6f7f39fa3555d4acafc27db4c4a7219abb2c335917
+  data.tar.gz: 037b527d2ba46be6c9f961ba417fcc585f9bda4daf21eb01fd820f4c902b597a2f32df90863dc213ed0916fa1788a142a6b106d46c2bb5afd2314fb75767b6a2

data/lib/faraday/http_cache/cache_control.rb

@@ -34,9 +34,9 @@ module Faraday
 
       # Internal: Gets the 'max-age' directive as an Integer.
       #
-      # Returns nil if the 'max-age' directive isn't present.
+      # Returns nil if the 'max-age' directive isn't present or has no value.
       def max_age
-        @directives['max-age'].to_i if @directives.key?('max-age')
+        integer_directive('max-age')
       end
 
       # Internal: Gets the 'max-age' directive as an Integer.
@@ -45,16 +45,16 @@ module Faraday
       # if present to account for having to remove static age header when caching responses
       def normalize_max_ages(age)
         if age > 0
-          @directives['max-age'] = @directives['max-age'].to_i - age if @directives.key?('max-age')
-          @directives['s-maxage'] = @directives['s-maxage'].to_i - age if @directives.key?('s-maxage')
+          @directives['max-age'] = max_age - age if max_age
+          @directives['s-maxage'] = shared_max_age - age if shared_max_age
         end
       end
 
       # Internal: Gets the 's-maxage' directive as an Integer.
       #
-      # Returns nil if the 's-maxage' directive isn't present.
+      # Returns nil if the 's-maxage' directive isn't present or has no value.
       def shared_max_age
-        @directives['s-maxage'].to_i if @directives.key?('s-maxage')
+        integer_directive('s-maxage')
       end
       alias s_maxage shared_max_age
 
@@ -70,9 +70,10 @@ module Faraday
 
       # Internal: Gets the 'stale-while-revalidate' directive as an Integer.
       #
-      # Returns nil if the 'stale-while-revalidate' directive isn't present.
+      # Returns nil if the 'stale-while-revalidate' directive isn't present or
+      # has no value.
       def stale_while_revalidate
-        @directives['stale-while-revalidate'].to_i if @directives.key?('stale-while-revalidate')
+        integer_directive('stale-while-revalidate')
       end
 
       # Internal: Gets the String representation for the cache directives.
@@ -98,6 +99,16 @@ module Faraday
 
       private
 
+      # Internal: Reads a directive whose value must be an integer.
+      # A directive given without a value (a bare 'max-age') is parsed as
+      # true; treat it as absent instead of calling to_i on it.
+      #
+      # Returns the Integer value, or nil.
+      def integer_directive(name)
+        value = @directives[name]
+        value.to_i unless value.nil? || value == true
+      end
+
       # Internal: Parses the Cache Control string to a Hash.
       # Existing whitespace will be removed and the string is split on commas.
       # For each part everything before a '=' will be treated as the key

data/lib/faraday/http_cache/version.rb

@@ -2,6 +2,6 @@
 
 module Faraday
   class HttpCache
-    VERSION = '2.8.0'
+    VERSION = '3.0.0'
   end
 end

data/lib/faraday/http_cache.rb

@@ -314,9 +314,11 @@ module Faraday
     end
 
     def delete(request, response)
-      headers = %w[Location Content-Location]
-      headers.each do |header|
-        url = response.headers[header]
+      # A response cut short by a timeout or a reset can arrive without
+      # headers; there is still an entry to invalidate for the request URL.
+      headers = response.headers || {}
+      %w[Location Content-Location].each do |header|
+        url = headers[header]
         @strategy.delete(url) if url
       end
 

data/spec/cache_control_spec.rb

@@ -52,6 +52,23 @@ describe Faraday::HttpCache::CacheControl do
     expect(cache_control.shared_max_age).to eq(600)
   end
 
+  it 'responds to #max_age with nil when the max-age directive has no value' do
+    cache_control = Faraday::HttpCache::CacheControl.new('public, max-age')
+    expect(cache_control.max_age).to be_nil
+  end
+
+  it 'responds to #shared_max_age with nil when the s-maxage directive has no value' do
+    cache_control = Faraday::HttpCache::CacheControl.new('public, s-maxage')
+    expect(cache_control.shared_max_age).to be_nil
+  end
+
+  it 'normalizes max ages without raising when a directive has no value' do
+    cache_control = Faraday::HttpCache::CacheControl.new('max-age, s-maxage=600')
+    cache_control.normalize_max_ages(100)
+    expect(cache_control.max_age).to be_nil
+    expect(cache_control.shared_max_age).to eq(500)
+  end
+
   it 'responds to #shared_max_age with nil when no s-maxage directive present' do
     cache_control = Faraday::HttpCache::CacheControl.new('public')
     expect(cache_control.shared_max_age).to be_nil
@@ -116,4 +133,14 @@ describe Faraday::HttpCache::CacheControl do
     cache_control = Faraday::HttpCache::CacheControl.new('public, max-age=60')
     expect(cache_control.stale_while_revalidate).to be_nil
   end
+
+  it 'responds to #stale_while_revalidate with 0 when directive is invalid true string value' do
+    cache_control = Faraday::HttpCache::CacheControl.new('public, max-age=60, stale-while-revalidate=true')
+    expect(cache_control.stale_while_revalidate).to eq(0)
+  end
+
+  it 'responds to #stale_while_revalidate with nil when directive has no integer assignment' do
+    cache_control = Faraday::HttpCache::CacheControl.new('public, max-age=60, stale-while-revalidate')
+    expect(cache_control.stale_while_revalidate).to be_nil
+  end
 end

data/spec/http_cache_spec.rb

@@ -96,6 +96,33 @@ describe Faraday::HttpCache do
       client.get('broken')
     end
 
+    it 'still expires the request URL when the response has no headers' do
+      store = Faraday::HttpCache::MemoryStore.new
+      cached = Faraday.new(url: ENV['FARADAY_SERVER']) do |stack|
+        stack.use Faraday::HttpCache, store: store
+        stack.adapter ENV['FARADAY_ADAPTER'].to_sym
+      end
+      # Mimics an adapter that gives up mid-response: the env is completed
+      # with no status worth the name and no response headers at all.
+      headerless_adapter = Class.new(Faraday::Adapter) do
+        def call(env)
+          super
+          env.status = 0
+          env.response_headers = nil
+          env.response.finish(env)
+        end
+      end
+      broken = Faraday.new(url: ENV['FARADAY_SERVER']) do |stack|
+        stack.use Faraday::HttpCache, store: store
+        stack.adapter headerless_adapter
+      end
+
+      cached.get('get')
+      broken.post('get')
+
+      expect(cached.get('get').body).to eq('2')
+    end
+
     it 'expires entries for the "Location" header' do
       client.get('get')
       client.post('delete-with-location')

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: faraday-http-cache
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Lucas Mazza
 - George Guimarães
 - Gustavo Araujo
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -68,7 +67,6 @@ homepage: https://github.com/sourcelevel/faraday-http-cache
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -76,15 +74,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A Faraday middleware that stores and validates cache expiration.
 test_files: