faraday-manual-cache 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9908ab5ca8956f133b3371bb8313fc70eefa01e9
-  data.tar.gz: 71e6b04c0c4bd4f512acab094c09cc4c68f60c41
+  metadata.gz: a68b0911c029cdb80405cae43fee9559e976d7bb
+  data.tar.gz: 64f2279973047eb744398526cf3ce5a62f541c0f
 SHA512:
-  metadata.gz: c46b3edf75261d00b1c039fa77f03c247b4cbec6acc21421b6a574f308c034937072347d52d9cbbc5f7f234b96d6a5f73d41f89364dbaedef825ff4e50891b4e
-  data.tar.gz: 254fa5f85405e188bcc66f97275fd0dcd086f418275a79c61c95133c4757b4318342f9b073a9cc211180968c5f90d1f145f3d553def7fa4bc5a1648afe28f6c7
+  metadata.gz: 2b54c26beca7332c2bcd52bd5f2c0d504e43187ce3c6f52f8e48f508063155ca4f349f0a2dda20090789afdd6a4ec52ab106afa3076ab466bfd309c21d8776db
+  data.tar.gz: 0a9c7c49bddc69c01d6243f9e1c102bc221ad771a74f288bdf917023481e9daf64491fa154aa5c53dcb3af7655d34e90f6e742330d184b906ff9227ada5e782b

data/faraday-manual-cache.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = 'faraday-manual-cache'
-  spec.version       = '0.1.0'
+  spec.version       = '0.1.1'
   spec.authors       = ['Daniel O\'Brien']
   spec.email         = ['dan@dobs.org']
   spec.summary       = %q(A super simple Faraday cache implementation.)

data/lib/faraday/manual_cache.rb

@@ -39,20 +39,20 @@ module Faraday
     def call!(env)
       response_env = cached_response(env)
 
-      if response_env && !env.request_headers['x-faraday-manual-cache']
-        info "Cache HIT: #{key(env)}"
+      if response_env
         response_env.response_headers['x-faraday-manual-cache'] = 'HIT'
         to_response(cached_response(env)) 
       else
-        info "Cache MISS: #{key(env)}"
         @app.call(env).on_complete do |response_env|
           response_env.response_headers['x-faraday-manual-cache'] = 'MISS'
-          cache_response(response_env) if cacheable?(env)
+          cache_response(response_env)
         end
       end
     end
 
     def cache_response(env)
+      return unless cacheable?(env) && !env.request_headers['x-faraday-manual-cache']
+
       info "Cache WRITE: #{key(env)}"
       @store.write(key(env), env, expires_in: @expires_in)
     end
@@ -62,7 +62,13 @@ module Faraday
     end
 
     def cached_response(env)
-      @store.fetch(key(env)) if cacheable?(env)
+      response_env = @store.fetch(key(env)) if cacheable?(env) && !env.request_headers['x-faraday-manual-cache']
+      if response_env
+        info "Cache HIT: #{key(env)}"
+      else
+        info "Cache MISS: #{key(env)}"
+      end
+      response_env
     end
 
     def info(message)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-manual-cache
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Daniel O'Brien
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport