faraday-http-cache 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbe28eb1ed1ea0c338b45aad4f4c85002031a3d7
-  data.tar.gz: a98f5ecdd009cabb2a535ebc9b505c168fdac1f7
+  metadata.gz: 31653854fcef7bc7fb46c6ba9f92e83d5450a681
+  data.tar.gz: 90b06cc78065d338fa1216292eb124ae3f70b18f
 SHA512:
-  metadata.gz: d92bdd0d0ccc0e30da2aa4288c7b33be98c82ef2c8e200f8bdd65bb79433dfc64ba1314c0174dd4e5add8992499816b3e0385b38c7e8d50b3ac665612f25d77d
-  data.tar.gz: d9f5c220e6179f176640c7d97c5c6ff7235e5d774882dbbff9352dcbecf73ce788b6d303655a6cafba2ae53332fddd499fdc06caf41432611aaf4af6a3b4d3c2
+  metadata.gz: b10e5f35769cff0522aeef88f465dffe522cc4da8e4a8d7719d024c963f05dd09d3ab6ad2404da8586198acff5da94da8287308f015e373f4d081c2d619fc456
+  data.tar.gz: 7429b49fc0db0619cb4c1d87914c2bbb464547c3fd5d581ce2da93e3b0d380a21d0586c38973c2cd39f2fee86b185f0cbd40c9f97d3d06e0d7a6a375884b6218

data/README.md

@@ -123,7 +123,7 @@ end
 You can clone this repository, install it's dependencies with Bundler (run `bundle install`) and
 execute the files under the `examples` directory to see a sample of the middleware usage.
 
-## What get's cached?
+## What gets cached?
 
 The middleware will use the following headers to make caching decisions:
 - Cache-Control

data/lib/faraday/http_cache.rb

@@ -74,11 +74,12 @@ module Faraday
     #
     # app  - the next endpoint on the 'Faraday' stack.
     # args - aditional options to setup the logger and the storage.
-    #             :logger        - A logger object.
-    #             :serializer    - A serializer that should respond to 'dump' and 'load'.
-    #             :shared_cache  - A flag to mark the middleware as a shared cache or not.
-    #             :store         - A cache store that should respond to 'read' and 'write'.
-    #             :instrumenter  - An instrumentation object that should respond to 'instrument'.
+    #             :logger          - A logger object.
+    #             :serializer      - A serializer that should respond to 'dump' and 'load'.
+    #             :shared_cache    - A flag to mark the middleware as a shared cache or not.
+    #             :store           - A cache store that should respond to 'read', 'write', and 'delete'.
+    #             :instrumenter    - An instrumentation object that should respond to 'instrument'.
+    #             :instrument_name - The String name of the instrument being reported on (optional).
     #
     # Examples:
     #
@@ -102,6 +103,7 @@ module Faraday
       @logger = options[:logger]
       @shared_cache = options.fetch(:shared_cache, true)
       @instrumenter = options[:instrumenter]
+      @instrument_name = options.fetch(:instrument_name, EVENT_NAME)
       @storage = create_storage(options)
     end
 
@@ -341,7 +343,7 @@ module Faraday
         cache_status: extract_status(env[:http_cache_trace])
       }
 
-      @instrumenter.instrument(EVENT_NAME, payload)
+      @instrumenter.instrument(@instrument_name, payload)
     end
 
     # Internal: Extracts the cache status from a trace.

data/lib/faraday/http_cache/response.rb

@@ -16,7 +16,7 @@ module Faraday
       # * 302 - 'Found'
       # * 404 - 'Not Found'
       # * 410 - 'Gone'
-      CACHEABLE_STATUS_CODES = [200, 203, 300, 301, 302, 404, 410]
+      CACHEABLE_STATUS_CODES = [200, 203, 300, 301, 302, 307, 404, 410]
 
       # Internal: Gets the actual response Hash (status, headers and body).
       attr_reader :payload
@@ -173,9 +173,9 @@ module Faraday
 
       # Internal: Gets the 'Expires' in a Time object.
       #
-      # Returns the Time object, or nil if the header isn't present.
+      # Returns the Time object, or nil if the header isn't present or isn't RFC 2616 compliant.
       def expires
-        headers['Expires'] && Time.httpdate(headers['Expires'])
+        @expires ||= headers['Expires'] && Time.httpdate(headers['Expires']) rescue nil
       end
 
       # Internal: Gets the 'CacheControl' object.

data/lib/faraday/http_cache/storage.rb

@@ -24,7 +24,7 @@ module Faraday
       # options - Storage options (default: {}).
       #           :logger        - A Logger object to be used to emit warnings.
       #           :store         - An cache store object that should
-      #                            respond to 'dump' and 'load'.
+      #                            respond to 'read', 'write', and 'delete'.
       #           :serializer    - A serializer object that should
       #                            respond to 'dump' and 'load'.
       def initialize(options = {})
@@ -46,6 +46,7 @@ module Faraday
         entry = serialize_entry(request.serializable_hash, response.serializable_hash)
 
         entries = cache.read(key) || []
+        entries = entries.dup if entries.frozen?
 
         entries.reject! do |(cached_request, cached_response)|
           response_matches?(request, deserialize_object(cached_request), deserialize_object(cached_response))

data/spec/response_spec.rb

@@ -22,7 +22,7 @@ describe Faraday::HttpCache::Response do
       expect(response).not_to be_cacheable_in_shared_cache
     end
 
-    [200, 203, 300, 301, 302, 404, 410].each do |status|
+    [200, 203, 300, 301, 302, 307, 404, 410].each do |status|
       it "the response is cacheable if the status code is #{status} and the response is fresh" do
         headers  = { 'Cache-Control' => 'max-age=400' }
         response = Faraday::HttpCache::Response.new(status: status, response_headers: headers)
@@ -53,7 +53,7 @@ describe Faraday::HttpCache::Response do
       expect(response).not_to be_cacheable_in_private_cache
     end
 
-    [200, 203, 300, 301, 302, 404, 410].each do |status|
+    [200, 203, 300, 301, 302, 307, 404, 410].each do |status|
       it "the response is cacheable if the status code is #{status} and the response is fresh" do
         headers  = { 'Cache-Control' => 'max-age=400' }
         response = Faraday::HttpCache::Response.new(status: status, response_headers: headers)
@@ -130,6 +130,12 @@ describe Faraday::HttpCache::Response do
       response = Faraday::HttpCache::Response.new
       expect(response.max_age).to be_nil
     end
+
+    it 'returns nil when falling back to expiration date but it is not RFC 2616 compliant' do
+      headers = { 'Expires' => 'Mon, 1 Jan 2001 00:00:00 GMT' }
+      response = Faraday::HttpCache::Response.new(response_headers: headers)
+      expect(response.max_age).to be_nil
+    end
   end
 
   describe 'age calculation' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-http-cache
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Lucas Mazza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday