faraday-http-cache 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03db6f441525313b0456fb22845a0273138a1c50
-  data.tar.gz: 7ede80de69498baf306b98be866b37f3b04e4683
+  metadata.gz: 75eed5459ea58ad83130acdab34d7acf40967eaa
+  data.tar.gz: f5847df239db40584db36489818143e31d821222
 SHA512:
-  metadata.gz: f3136959afbad718ce611169c3cf86f3721360c4b9bb44fca9db13fcca5e9013dc144a5a40f180ed904757c9e286c009bccd80672bb145fcde1769c84713acac
-  data.tar.gz: 4c66329f3810782ac4a586cc69d94e14ad4e1353b4cba5da928b8230a9821593a4be2ba538c20c4bb37baff75849a9ce2f30be5c7299f0bb7b562fcaeeadc6f5
+  metadata.gz: f95af2c373abe3e7b3055c10fcd92b2208b01c3725da597e9b07d9e56c0ee477e7028852f883b6a7870f02ba8a65bcbd8c338e05a0b2535cd9093a63cfdc7682
+  data.tar.gz: 8abb220a303052b25b83c4e16f40c77c4dbc6e4bd87ee33e18be28d108fde5ef2600e2baf5f5802a37e30650a89f1e8f35c7d63ffc67799ce49b5b0dc961b89f

data/lib/faraday/http_cache/cache_control.rb

@@ -38,6 +38,17 @@ module Faraday
         @directives['max-age'].to_i if @directives.key?('max-age')
       end
 
+      # Internal: Gets the 'max-age' directive as an Integer.
+      #
+      # takes the age header integer value and reduces the max-age and s-maxage
+      # if present to account for having to remove static age header when caching responses
+      def normalize_max_ages(age)
+        if age > 0
+          @directives['max-age'] = @directives['max-age'].to_i - age if @directives.key?('max-age')
+          @directives['s-maxage'] = @directives['s-maxage'].to_i - age if @directives.key?('s-maxage')
+        end
+      end
+
       # Internal: Gets the 's-maxage' directive as an Integer.
       #
       # Returns nil if the 's-maxage' directive isn't present.

data/lib/faraday/http_cache/response.rb

@@ -106,7 +106,7 @@ module Faraday
       def max_age
         cache_control.shared_max_age ||
           cache_control.max_age ||
-          (expires && (expires - date))
+          (expires && (expires - @now))
       end
 
       # Internal: Creates a new 'Faraday::Response', merging the stored
@@ -123,6 +123,7 @@ module Faraday
       #
       # Returns a 'Hash'.
       def serializable_hash
+        prepare_to_cache
         @payload.slice(:status, :body, :response_headers)
       end
 
@@ -175,6 +176,19 @@ module Faraday
       def headers
         @payload[:response_headers]
       end
+
+      # Internal: prepares the response headers ready to be cached
+      #
+      # removes the age header if present to allow cached responses to continue aging while cached
+      # also normalizes the max age headers if age header provided to ensure accuracy once age header removed
+      def prepare_to_cache
+        if headers.key? 'Age'
+          cache_control.normalize_max_ages(headers['Age'].to_i)
+          headers.delete 'Age'
+          headers['Cache-Control'] = cache_control.to_s
+        end
+      end
+
     end
   end
 end

data/spec/response_spec.rb

@@ -90,7 +90,8 @@ describe Faraday::HttpCache::Response do
     it "fallsback to the expiration date leftovers" do
       headers = { "Expires" => (Time.now + 100).httpdate, 'Date' => Time.now.httpdate }
       response = Faraday::HttpCache::Response.new(:response_headers => headers)
-      response.max_age.should == 100
+      response.max_age.should < 100
+      response.max_age.should > 98
     end
 
     it "returns nil when there's no information to calculate the max age" do
@@ -152,4 +153,23 @@ describe Faraday::HttpCache::Response do
       response.body.should == "Hi!"
     end
   end
+
+  describe 'remove age before caching and normalize max-age if non-zero age present' do
+    it 'is fresh if the response still has some time to live' do
+      headers = {
+          'Age' => 6,
+          'Cache-Control' => 'public, max-age=40',
+          'Date' => 38.seconds.ago.httpdate,
+          'Expires' => 37.seconds.from_now.httpdate,
+          'Last-Modified' => 300.seconds.ago.httpdate
+      }
+      response = Faraday::HttpCache::Response.new(:response_headers => headers)
+      response.should be_fresh
+
+      response.serializable_hash
+      response.max_age.should == 34
+      response.should_not be_fresh
+    end
+  end
+
 end

data/spec/storage_spec.rb

@@ -38,4 +38,38 @@ describe Faraday::HttpCache::Storage do
       subject.read(request).should be_a(Faraday::HttpCache::Response)
     end
   end
+
+  describe 'remove age before caching and normalize max-age if non-zero age present' do
+    it 'is fresh if the response still has some time to live' do
+      headers = {
+          'Age' => 6,
+          'Cache-Control' => 'public, max-age=40',
+          'Date' => 38.seconds.ago.httpdate,
+          'Expires' => 37.seconds.from_now.httpdate,
+          'Last-Modified' => 300.seconds.ago.httpdate
+      }
+      response = Faraday::HttpCache::Response.new(:response_headers => headers)
+      response.should be_fresh
+      subject.write(request, response)
+
+      cached_response = subject.read(request)
+      cached_response.max_age.should == 34
+      cached_response.should_not be_fresh
+    end
+
+    it 'is fresh until cached and that 1 second elapses then the response is no longer fresh' do
+      headers = {
+          'Date' => 39.seconds.ago.httpdate,
+          'Expires' => 40.seconds.from_now.httpdate,
+      }
+      response = Faraday::HttpCache::Response.new(:response_headers => headers)
+      response.should be_fresh
+      subject.write(request, response)
+
+      sleep(1)
+      cached_response = subject.read(request)
+      cached_response.should_not be_fresh
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-http-cache
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Lucas Mazza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: A Faraday middleware that stores and validates cache expiration.