cache_rules 0.1.14 → 0.1.15

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.15 (2015-04-29)
+
+  * No max-stale = allow anything. Fixes issue #7
+
 ## 0.1.14 (2015-04-28)
 
   * Ensure Cache-Control is verified

data/cache_rules.gemspec

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

data/lib/helpers.rb

@@ -303,10 +303,12 @@ module CacheRules
 
   # source: https://tools.ietf.org/html/rfc7234#section-5.2.1.2
   def helper_max_stale
-    Proc.new {|request, freshness_lifetime, current_age|
+    ->(request, freshness_lifetime, current_age) {
       if request && request['max-stale']
         token = request['max-stale']['token']
         token ? (freshness_lifetime.to_i + token.to_i) > current_age : true
+      else
+        true
       end
     }
   end

data/test/test_cache_rules.rb

@@ -75,7 +75,7 @@ class TestCacheRules < MiniTest::Test
   end
 
   def test_validate_column4
-    request = {"Host"=>"test.url", "Cache-Control"=>"max-stale=10000000"}
+    request = {"Host"=>"test.url"}
     cached  = {"Date"=>{"httpdate"=>"Sat, 03 Jan 2015 07:03:45 GMT", "timestamp"=>1420268625}, "X-Cache-Req-Date"=>{"httpdate"=>"Sat, 03 Jan 2015 07:03:45 GMT", "timestamp"=>1420268625}, "X-Cache-Res-Date"=>{"httpdate"=>"Sat, 03 Jan 2015 07:03:45 GMT", "timestamp"=>1420268625}, "Last-Modified" => {"httpdate"=>"Sat, 03 Jan 2015 07:03:45 GMT", "timestamp"=>1420268625}, "Last-Modified" => {"httpdate"=>"Sat, 03 Jan 2015 07:03:45 GMT", "timestamp"=>1420268625}, "ETag" => "\"validEtag\"", "Cache-Control"=>{"max-age"=>{"token"=>"100", "quoted_string" => nil}}} 
 
     result = CacheRules.validate('http://test.url/test1', request, cached)
@@ -87,7 +87,7 @@ class TestCacheRules < MiniTest::Test
   end
 
   def test_validate_column5
-    request = {"Host"=>"test.url", "Cache-Control"=>"max-stale=10000000", "If-None-Match"=>"*"}
+    request = {"Host"=>"test.url", "If-None-Match"=>"*"}
     cached  = {"Date"=>{"httpdate"=>"Sat, 03 Jan 2015 07:03:45 GMT", "timestamp"=>1420268625}, "X-Cache-Req-Date"=>{"httpdate"=>"Sat, 03 Jan 2015 07:03:45 GMT", "timestamp"=>1420268625}, "X-Cache-Res-Date"=>{"httpdate"=>"Sat, 03 Jan 2015 07:03:45 GMT", "timestamp"=>1420268625}, "Last-Modified" => {"httpdate"=>"Sat, 03 Jan 2015 07:03:45 GMT", "timestamp"=>1420268625}, "Last-Modified" => {"httpdate"=>"Sat, 03 Jan 2015 07:03:45 GMT", "timestamp"=>1420268625}, "ETag" => "\"validEtag\"", "Cache-Control"=>{"max-age"=>{"token"=>"100", "quoted_string" => nil}}} 
 
     result = CacheRules.validate('http://test.url/test1', request, cached)

data/test/test_helpers.rb

@@ -376,7 +376,7 @@ class TestHelpers < MiniTest::Test
 
     assert_kind_of TrueClass, stale
     assert_kind_of FalseClass, fresh
-    assert_nil noop
+    assert_kind_of TrueClass, noop
     assert_kind_of TrueClass, notoken
   end
 

data/test/test_regressions.rb

@@ -26,4 +26,13 @@ class TestRegressions < MiniTest::Test
     assert_kind_of String,  age_string['Age']
     assert_kind_of Integer, age_integer
   end
+
+  # https://github.com/aw/CacheRules/issues/7
+  def test_bugfix_7_invalid_validation_of_max_stale
+    request = {"Host"=>"test.url"}
+
+    no_max_stale = CacheRules.helper_max_stale.call request, 0, 0
+
+    assert_kind_of TrueClass, no_max_stale
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cache_rules
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakeweb