Fix minor bug in 'Age' header

Author: aw

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.17 (2015-04-30)
+
+  * Return the proper 'Age' header and ignore the 'public' control directive
+
 ## 0.1.16 (2015-04-29)
 
   * Errors caused by empty HTTP headers. Fixes issue #8

cache_rules.gemspec

@@ -6,7 +6,7 @@ require 'date'
 
 Gem::Specification.new do |s|
   s.name        = 'cache_rules'
-  s.version     = '0.1.16'
+  s.version     = '0.1.17'
 
   s.date        = Date.today.to_s
 

lib/helpers.rb

@@ -68,7 +68,7 @@ def helper_response(url, actions, column, cached, response = {})
     headers_304   = helper_headers_200_304.call(cached, normalized) if status == 200 || status == 304
     headers_url   = {'Location' => url}                             if status == 307
 
-    headers       = [age, warning, x_cache, headers_304, headers_url].compact.reduce &:merge
+    headers       = [headers_304, age, warning, x_cache, headers_url].compact.reduce &:merge
 
     {:body => body, :code => status, :headers => headers}
   end
@@ -249,7 +249,7 @@ def helper_current_age(now, cached)
     date_value            = cached['Date']['timestamp']             # Required
     request_time          = cached['X-Cache-Req-Date']['timestamp'] # Required
     response_time         = cached['X-Cache-Res-Date']['timestamp'] # Required
-    age_value             = cached['Age'].nil? ? 0 : cached['Age']['timestamp'].to_i
+    age_value             = cached['Age'].nil? ? 0 : cached['Age'].to_i
 
     apparent_age          = helper_apparent_age           response_time, date_value
     corrected_age_value   = helper_corrected_age_value    response_time, request_time, age_value
@@ -285,12 +285,12 @@ def helper_explicit(cached_headers)
     return (cached_headers['Expires']['timestamp'] - cached_headers['Date']['timestamp']) if cached_headers['Expires']
   end
 
-  # Calculate Heuristic Freshness if there's not explicit expiration time
+  # Calculate Heuristic Freshness if there's no explicit expiration time
   # source: https://tools.ietf.org/html/rfc7234#section-4.2.2
   def helper_heuristic(now, cached, current_age)
-    # Use 10% only if the response is public and there's a Last-Modified header
+    # Use 10% only if there's a Last-Modified header
     # source: https://tools.ietf.org/html/rfc7234#section-4.2.2
-    if cached['Cache-Control'] && cached['Cache-Control']['public'] && cached['Last-Modified']
+    if cached['Last-Modified']
       result = (now - cached['Last-Modified']['timestamp']) / 10
 
       # Don't cache heuristic responses more than 24 hours old, and avoid sending a 113 Warning ;)

test/test_validations.rb

@@ -65,9 +65,10 @@ def setup
     @headers_nothing = {
       :request => {"If-None-Match" => ["\"myetag\""] },
       :cached => {
-        "Date"              => next_date,
-        "X-Cache-Req-Date"  => next_date,
-        "X-Cache-Res-Date"  => next_date,
+        "Expires"           => next_date,
+        "Date"              => date,
+        "X-Cache-Req-Date"  => date,
+        "X-Cache-Res-Date"  => date,
         "Cache-Control"     => {
           "must-revalidate" => {"token"=>nil, "quoted_string"=>nil}
         }
@@ -121,9 +122,9 @@ def test_expired
     stale     = CacheRules.validate_expired? @headers
     fresh     = CacheRules.validate_expired? @headers_nothing
 
-    assert_equal guard, 0
-    assert_equal stale, 1
-    assert_equal fresh, 0
+    assert_equal 0, guard
+    assert_equal 1, stale
+    assert_equal 0, fresh
   end
 
   def test_only_if_cached