faraday-http-cache 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f18d30f7f544974ede44d28d9bba250e746a9b2e
-  data.tar.gz: 29cfe8e36786c6a0a47d3d9f1b3cbdb2388f1a19
+  metadata.gz: 944d63dfce54bd8e47a79dbc623ea1ad9e8fe043
+  data.tar.gz: a56ffdfa6ce7e24529dae5c80ebd7661000a05b8
 SHA512:
-  metadata.gz: 14809735e62b3f547d9a8a9b8e35ce1be0f44a962650a2c196d4dece1c372829184766cc979ec1bf8cad3cfd4011dd086aebefd74e1f11847b684e277853bf8e
-  data.tar.gz: a1cdb3e8286c86b03f61dfb6516affbe2b743707b4b7c7d68a8c45e34df55bfd9dcd9e3c7e8290d8f965f3ee36af762a8be2fd751730a6842244a00534c05eac
+  metadata.gz: 0da2c34ab6926b90d05c4b41977568bf6dd465a06b6c3733fe4270346c1f3f72b4a84934a02194ecbe6f1d33ac24e327a731770665415547805208ddb53acd6f
+  data.tar.gz: 789ffc45c250c7b9c2e89c6bf205cb22404551748771229ef4a1906e44ca20611df99cfdcda0fb6fd8a30b575eb1d2bf0d2f37fdf46cb5cbe5a34bf09d12a3d9

data/lib/faraday/http_cache/cache_control.rb

@@ -1,6 +1,6 @@
 module Faraday
   class HttpCache < Faraday::Middleware
-    # Internal: a class to represent the 'Cache-Control' header options.
+    # Internal: A class to represent the 'Cache-Control' header options.
     # This implementation is based on 'rack-cache' internals by Ryan Tomayko.
     # It breaks the several directives into keys/values and stores them into
     # a Hash.

data/lib/faraday/http_cache/response.rb

@@ -3,7 +3,7 @@ require 'faraday/http_cache/cache_control'
 
 module Faraday
   class HttpCache < Faraday::Middleware
-    # Internal: a class to represent a response from a Faraday request.
+    # Internal: A class to represent a response from a Faraday request.
     # It decorates the response hash into a smarter object that queries
     # the response headers and status informations about how the caching
     # middleware should handle this specific response.

data/lib/faraday/http_cache/storage.rb

@@ -3,7 +3,7 @@ require 'digest/sha1'
 
 module Faraday
   class HttpCache < Faraday::Middleware
-    # Internal: A Wrapper around an ActiveSupport::CacheStore to store responses.
+    # Internal: A wrapper around an ActiveSupport::CacheStore to store responses.
     #
     # Examples
     #   # Creates a new Storage using a MemCached backend from ActiveSupport.
@@ -33,7 +33,6 @@ module Faraday
           @cache = lookup_store(@cache, options[:store_options])
         end
         assert_valid_store!
-        notify_memory_store_usage
       end
 
       # Internal: Writes a response with a key based on the given request.
@@ -47,6 +46,11 @@ module Faraday
         key = cache_key_for(request)
         value = @serializer.dump(response.serializable_hash)
         @cache.write(key, value)
+      rescue Encoding::UndefinedConversionError => e
+        if @logger
+          @logger.warn("Response could not be serialized: #{e.message}. Try using Marshal to serialize.")
+        end
+        raise
       end
 
       # Internal: Reads a key based on the given request from the underlying cache.
@@ -85,19 +89,6 @@ module Faraday
         Digest::SHA1.hexdigest(@serializer.dump(cache_keys.sort))
       end
 
-      # Internal: Logs a warning when the 'cache' implementation
-      # isn't suitable for production use.
-      #
-      # Returns nothing.
-      def notify_memory_store_usage
-        return if @logger.nil?
-
-        kind = @cache.class.name.split('::').last.sub('Store', '').downcase
-        if kind == 'memory'
-          @logger.warn 'HTTP Cache: using a MemoryStore is not advised as the cache might not be persisted across multiple processes or connection instances.'
-        end
-      end
-
       # Internal: Creates a cache store from 'ActiveSupport' with a set of options.
       #
       # store   - A 'Symbol' with the store name.

data/spec/json_spec.rb

@@ -12,9 +12,6 @@ describe Faraday::HttpCache do
   end
 
   it 'works fine with other middlewares' do
-    if Faraday::VERSION == '0.9.0'
-      pending 'faraday_middleware is not compatible with faraday 0.9'
-    end
     client.get('clear')
     expect(client.get('json').body['count']).to eq(1)
     expect(client.get('json').body['count']).to eq(1)

data/spec/spec_helper.rb

@@ -3,6 +3,9 @@ require 'socket'
 
 require 'faraday-http-cache'
 require 'faraday_middleware'
+
+# https://github.com/rails/rails/pull/14667
+require 'active_support/per_thread_registry'
 require 'active_support/cache'
 
 require 'support/test_app'

data/spec/storage_spec.rb

@@ -18,12 +18,6 @@ describe Faraday::HttpCache::Storage do
       Faraday::HttpCache::Storage.new
     end
 
-    it 'emits a warning when using a MemoryStore' do
-      logger = double
-      expect(logger).to receive(:warn).with(/using a MemoryStore is not advised/)
-      Faraday::HttpCache::Storage.new(logger: logger)
-    end
-
     it 'lookups an ActiveSupport cache store if a Symbol is given' do
       expect(ActiveSupport::Cache).to receive(:lookup_store).with(:file_store, ['/tmp']).and_call_original
       Faraday::HttpCache::Storage.new(store: :file_store, store_options: ['/tmp'])
@@ -57,6 +51,23 @@ describe Faraday::HttpCache::Storage do
       let(:serialized) { JSON.dump(response.serializable_hash) }
       let(:cache_key)  { '503ac9f7180ca1cdec49e8eb73a9cc0b47c27325' }
       it_behaves_like 'serialization'
+
+      context 'with ASCII character in response that cannot be converted to UTF-8' do
+        let(:response) do
+          body = "\u2665".force_encoding('ASCII-8BIT')
+          double(:response, serializable_hash: { 'body' => body })
+        end
+
+        it 'raises and logs a warning' do
+          logger = double(:logger, warn: nil)
+          storage = Faraday::HttpCache::Storage.new(logger: logger)
+
+          expect { storage.write(request, response) }.to raise_error
+          expect(logger).to have_received(:warn).with(
+            'Response could not be serialized: "\xE2" from ASCII-8BIT to UTF-8. Try using Marshal to serialize.'
+          )
+        end
+      end
     end
 
     context 'with Marshal serializer' do
@@ -68,7 +79,6 @@ describe Faraday::HttpCache::Storage do
       end
       it_behaves_like 'serialization'
     end
-
   end
 
   describe 'reading responses' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-http-cache
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Lucas Mazza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Faraday middleware that stores and validates cache expiration.