faraday-http-cache 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6603be3bbf6a2840ba11f947f7e42f030ab52600912e9a62d16aaf27ee5e6446
-  data.tar.gz: 95b8b2f4b08525406027d47e14341f5f301409a2518332b243dc08d2bde4e693
+  metadata.gz: 9ec7c39769697b84b0fd12f97d8dd14953cef613f3621be2bea6561e40a77805
+  data.tar.gz: f47c57b3233c0e7fec8ae527f33be203918393eb8efc3443bfc3e1a421ddd3b9
 SHA512:
-  metadata.gz: 4675c865c18641322c71b77881a74d3ca4edbf4fb1d628ac0fe7a6388d6a3c973946f1d7fa7b09d654f1eff61484a8c2d8524c966e4377c1e12854bf8114e13a
-  data.tar.gz: 832d7579eb75d3631e539ca7af996b9d062dbe43582468f98c349b3dbc963dde17cecf57a0202af1916297013143becba1a0fc1f32ddf92ab98490876e3efc84
+  metadata.gz: 46ae27b09f324cea6d5d49c6f83b9ee11c00e3840dce48243534896bf9fed16cc3e2f55d9711b8355597327af7118b35aa70fa5ba6bfc97ef924ff58b249e22c
+  data.tar.gz: 6a013f290b94a09be66880fd339885fde26df832f65eff3a0352fc1689a5bd2c7dece5e80998c0ab6ea8890ebd3b6b77e8a1d8643a94b4429e9de2a7b3ed60d1

data/lib/faraday/http_cache/response.rb

@@ -142,7 +142,8 @@ module Faraday
         {
           status: @payload[:status],
           body: @payload[:body],
-          response_headers: @payload[:response_headers]
+          response_headers: @payload[:response_headers],
+          reason_phrase: @payload[:reason_phrase]
         }
       end
 

data/lib/faraday/http_cache/strategies/base_strategy.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'json'
+require 'logger'
 require 'faraday/http_cache/memory_store'
 
 module Faraday

data/lib/faraday/http_cache/strategies/by_vary.rb

@@ -77,7 +77,7 @@ module Faraday
         # @return [String]
         def response_cache_key_for(request, vary)
           method = request.method.to_s
-          headers = vary.split(/[\s,]+/).map { |header| request.headers[header] }
+          headers = vary.split(/[\s,]+/).uniq.sort.map { |header| request.headers[header] }
           Digest::SHA1.hexdigest("by_vary#{@cache_salt}#{method}#{request.url}#{headers.join}")
         end
       end

data/lib/faraday/http_cache.rb

@@ -301,7 +301,8 @@ module Faraday
       {
         status: hash[:status],
         body: hash[:body] || hash[:response_body],
-        response_headers: hash[:response_headers]
+        response_headers: hash[:response_headers],
+        reason_phrase: hash[:reason_phrase]
       }
     end
 

data/spec/response_spec.rb

@@ -200,7 +200,7 @@ describe Faraday::HttpCache::Response do
   end
 
   describe 'response unboxing' do
-    subject { described_class.new(status: 200, response_headers: {}, body: 'Hi!') }
+    subject { described_class.new(status: 200, response_headers: {}, body: 'Hi!', reason_phrase: 'Success') }
 
     let(:env) { { method: :get } }
     let(:response) { subject.to_response(env) }
@@ -224,6 +224,10 @@ describe Faraday::HttpCache::Response do
     it 'merges the body' do
       expect(response.body).to eq('Hi!')
     end
+
+    it 'merges the reason phrase' do
+      expect(response.reason_phrase).to eq('Success') if response.respond_to?(:reason_phrase)
+    end
   end
 
   describe 'remove age before caching and normalize max-age if non-zero age present' do

data/spec/strategies/by_vary_spec.rb

@@ -4,10 +4,11 @@ require 'spec_helper'
 
 describe Faraday::HttpCache::Strategies::ByVary do
   let(:vary_index_cache_key) { '64896419583e8022efeb21d0ece6e266c0e58b59' }
-  let(:cache_key) { '25230d75622fffc4f4de8a6af69e6e3764f7eb6f' }
-  let(:vary) { '' }
+  let(:cache_key) { '978047698d156fe8642a86dbfaacc675917c9a22' }
+  let(:vary) { 'Accept, Accept-Encoding, X-Requested-With' }
+  let(:headers) { {'Accept' => 'text/html', 'Accept-Encoding' => 'gzip, deflate, br' } }
   let(:request) do
-    env = {method: :get, url: 'http://test/index'}
+    env = {method: :get, url: 'http://test/index', headers: headers}
     double(env.merge(serializable_hash: env))
   end
 
@@ -54,11 +55,17 @@ describe Faraday::HttpCache::Strategies::ByVary do
           )
         end
       end
+
+      context 'with reordered and doubled values in the vary' do
+        let(:vary) { 'X-Requested-With,Accept,Accept-Encoding,Accept' }
+
+        it_behaves_like 'A strategy with serialization'
+      end
     end
 
     context 'with the Marshal serializer' do
       let(:vary_index_cache_key) { '6a7cb42440c10ef6edeb1826086a4d90b04103f0' }
-      let(:cache_key) { '45e0efd1a60d29ed69d6c6018dfcb96f58db89e0' }
+      let(:cache_key) { 'c9edbf280da95d4cac5acda8b8109c0aba2a469a' }
       let(:serializer) { Marshal }
       let(:strategy) { described_class.new(store: cache, serializer: Marshal) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faraday-http-cache
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Lucas Mazza
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-08 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: A Faraday middleware that stores and validates cache expiration.