faraday-http-cache 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 944d63dfce54bd8e47a79dbc623ea1ad9e8fe043
-  data.tar.gz: a56ffdfa6ce7e24529dae5c80ebd7661000a05b8
+  metadata.gz: 63e018cc1939d1fefb02b7d90f810a71afdd15b9
+  data.tar.gz: 408cdbabae9f4a6d144b0c799341bf4c7a46adea
 SHA512:
-  metadata.gz: 0da2c34ab6926b90d05c4b41977568bf6dd465a06b6c3733fe4270346c1f3f72b4a84934a02194ecbe6f1d33ac24e327a731770665415547805208ddb53acd6f
-  data.tar.gz: 789ffc45c250c7b9c2e89c6bf205cb22404551748771229ef4a1906e44ca20611df99cfdcda0fb6fd8a30b575eb1d2bf0d2f37fdf46cb5cbe5a34bf09d12a3d9
+  metadata.gz: 5247068c970b755688f710a557a4d6e6366cbb909c303f16a67e1cb1814240e6a709b4b7bba3d75048c31b0c716b36ce34b4b85152455e9d13e299e92be08ead
+  data.tar.gz: bfe06e86bdd004958ac7ca444c346f3fd5060fa8d61e54e66075464c215afb3bca14e7c5ed10714bd78ebc79a77e7aab7bdb2326b1e919e3b442d7980ff5aabe

data/README.md

@@ -48,8 +48,10 @@ client = Faraday.new do |builder|
   builder.adapter Faraday.default_adapter
 end
 ```
-The default store provided is a simple in memory cache that lives on the client
-instance, so it's important to configure a proper one for your production environment.
+The default store provided is a simple in memory cache that lives on the client instance.
+This type of store **might not be persisted across multiple processes or connection instances**
+so it is probably not suitable for most production environments.
+Make sure that you configure a store that is suitable for you.
 
 the stdlib `JSON` module is used for serialization by default.
 If you expect to be dealing with images, you can use [Marshal][marshal] instead, or

data/lib/faraday/http_cache/storage.rb

@@ -6,10 +6,11 @@ module Faraday
     # Internal: A wrapper around an ActiveSupport::CacheStore to store responses.
     #
     # Examples
+    #
     #   # Creates a new Storage using a MemCached backend from ActiveSupport.
     #   Faraday::HttpCache::Storage.new(:mem_cache_store)
     #
-    #   # Reuse some other instance of a ActiveSupport::CacheStore object.
+    #   # Reuse some other instance of an ActiveSupport::Cache::Store object.
     #   Faraday::HttpCache::Storage.new(Rails.cache)
     #
     #   # Creates a new Storage using Marshal for serialization.
@@ -76,17 +77,21 @@ module Faraday
       private
 
       # Internal: Generates a String key for a given request object.
-      # The request object is folded into a sorted Array (since we can't count
-      # on hashes order on Ruby 1.8), encoded as JSON and digested as a `SHA1`
-      # string.
       #
-      # Returns the encoded String.
+      # Returns the digested String.
       def cache_key_for(request)
-        cache_keys = request.each_with_object([]) do |(key, value), parts|
-          parts << [key.to_s, value]
+        digest = Digest::SHA1.new
+        digest.update 'method'
+        digest.update request[:method].to_s
+        digest.update 'request_headers'
+        request[:request_headers].keys.sort.each do |key|
+          digest.update key.to_s
+          digest.update request[:request_headers][key].to_s
         end
+        digest.update 'url'
+        digest.update request[:url].to_s
 
-        Digest::SHA1.hexdigest(@serializer.dump(cache_keys.sort))
+        digest.to_s
       end
 
       # Internal: Creates a cache store from 'ActiveSupport' with a set of options.

data/spec/storage_spec.rb

@@ -49,7 +49,7 @@ describe Faraday::HttpCache::Storage do
 
     context 'with default serializer' do
       let(:serialized) { JSON.dump(response.serializable_hash) }
-      let(:cache_key)  { '503ac9f7180ca1cdec49e8eb73a9cc0b47c27325' }
+      let(:cache_key)  { '084dd517af7651a9ca7823728544b9b55e0cc130' }
       it_behaves_like 'serialization'
 
       context 'with ASCII character in response that cannot be converted to UTF-8' do
@@ -73,11 +73,19 @@ describe Faraday::HttpCache::Storage do
     context 'with Marshal serializer' do
       let(:storage)    { Faraday::HttpCache::Storage.new store: cache, serializer: Marshal }
       let(:serialized) { Marshal.dump(response.serializable_hash) }
-      let(:cache_key) do
-        array = request.stringify_keys.to_a.sort
-        Digest::SHA1.hexdigest(Marshal.dump(array))
-      end
+      let(:cache_key) { '084dd517af7651a9ca7823728544b9b55e0cc130' }
+
       it_behaves_like 'serialization'
+
+      it 'should have a unique cache key' do
+        request = { method: :get, request_headers: {}, url: URI.parse('http://foo.bar/path/to/somewhere') }
+        duplicate_request = { method: :get, request_headers: {}, url: URI.parse('http://foo.bar/path/to/somewhere') }
+        storage = Faraday::HttpCache::Storage.new(serializer: Marshal)
+        response = Faraday::HttpCache::Response.new(status: 200, body: 'body')
+        storage.write(request, response)
+        read_response  = storage.read(duplicate_request).serializable_hash
+        expect(read_response).to eq(response.serializable_hash)
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-http-cache
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Lucas Mazza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday