cache_rules 0.1.6 → 0.1.7

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.7 (2014-02-02)
+
+  * Refactor and simplify `revalidate_response()` method
+
 ## 0.1.6 (2014-02-02)
 
   * Don't rescue ArgumentError on httpdate parse errors

data/Gemfile.lock

@@ -36,7 +36,6 @@ GEM
     tins (1.3.3)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES

data/README.md

@@ -1,6 +1,6 @@
 ## What is CacheRules
 
-_CacheRules_ is a well-behaved HTTP caching library aimed at being [RFC 7234](https://tools.ietf.org/html/rfc7234) complaint.
+_CacheRules_ is a well-behaved HTTP caching library aimed at being [RFC 7234](https://tools.ietf.org/html/rfc7234) compliant.
 
 This library does **not actually _cache_ anything**, and it is **not a _proxy_**.
 It validates HTTP headers and returns the appropriate response to determine

data/Rakefile

@@ -8,7 +8,7 @@ def run_test
 
   Rake::TestTask.new do |t|
     t.libs << "test"
-    t.test_files = FileList['test/helper.rb', 'test/test_formatting.rb']
+    t.test_files = FileList['test/helper.rb', 'test/test_*.rb']
   end
 
 end

data/cache_rules.gemspec

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

data/lib/cache_rules.rb

@@ -120,22 +120,15 @@ module CacheRules
   end
 
   # Revalidates a response by fetching headers from the origin server
-  def revalidate_response(url, request_headers, cached_headers)
-    request_date      = Time.now.gmtime.httpdate
-    response          = make_request.call(url, request_headers, cached_headers).call
-    response_date     = Time.now.gmtime.httpdate
-    response_headers  = normalize.(response.to_hash.map &:flatten)
-
-    response_headers['Date'] = response_date if response_headers['Date']
-    response_headers['X-Cache-Req-Date'] = request_date
-    response_headers['X-Cache-Res-Date'] = response_date
-    response_headers['Status'] = response.code
+  def revalidate_response(*args)
+    url, request, cached = *args
+    res_headers = helper_response_headers.(helper_make_request_timer.(args))
 
     # 1. get the column
-    column = RESPONSE_MAP[helper_run_validate.call(RESPONSE_TABLE[:conditions], request_headers, cached_headers, response_headers).join]
+    column = RESPONSE_MAP[helper_run_validate.call(RESPONSE_TABLE[:conditions], request, cached, res_headers).join]
 
     # 2. return the response
-    helper_response url, RESPONSE_TABLE[:actions], column, cached_headers, response_headers
+    helper_response url, RESPONSE_TABLE[:actions], column, cached, res_headers
   rescue => error
     {:code => 504, :body => 'Gateway Timeout', :headers => [], :error => error.message, :debug => error}
   end

data/lib/helpers.rb

@@ -335,4 +335,27 @@ module CacheRules
     Proc.new { http.request request }
   end
 
+  def helper_make_request_timer
+    Proc.new {|url, request, cached|
+      {
+        :req_date  => Time.now.gmtime.httpdate,
+        :res       => make_request.call(url, request, cached).call,
+        :res_date  => Time.now.gmtime.httpdate
+      }
+    }
+  end
+
+  def helper_response_headers
+    Proc.new {|result|
+      res_headers = normalize.(result[:res].to_hash.map &:flatten)
+
+      res_headers['Date']             = result[:res_date] if res_headers['Date']
+      res_headers['X-Cache-Req-Date'] = result[:req_date]
+      res_headers['X-Cache-Res-Date'] = result[:res_date]
+      res_headers['Status']           = result[:res].code
+
+      res_headers
+    }
+  end
+
 end

data/test/helper.rb

@@ -2,7 +2,7 @@ require 'coveralls'
 require 'fakeweb'
 require 'simplecov'
 
-# Coveralls.wear!
+Coveralls.wear!
 
 SimpleCov.start do
   add_filter '/test/'

data/test/test_helpers.rb

@@ -407,4 +407,26 @@ class TestHelpers < MiniTest::Test
     assert_equal result.arity, 0
   end
 
+  def test_make_request_timer
+    result = CacheRules.helper_make_request_timer
+
+    assert_kind_of Proc, result
+    assert_equal result.arity, 3
+  end
+
+  def test_response_headers
+    http     = Net::HTTPResponse.new(1.1, 200, "OK")
+    http.add_field "Warning", "299 - \"Hello World\""
+
+    response_no_date  = {:req_date=>"Mon, 02 Feb 2015 04:21:37 GMT", :res=>http, :res_date=>"Mon, 02 Feb 2015 04:21:40 GMT"}
+    result_no_date    = CacheRules.helper_response_headers.call response_no_date
+
+    http.add_field "Date", "Fri, 02 Jan 2015 11:03:45 GMT"
+    response_with_date = {:req_date=>"Mon, 02 Feb 2015 04:21:37 GMT", :res=>http, :res_date=>"Mon, 02 Feb 2015 04:21:40 GMT"}
+    result_with_date   = CacheRules.helper_response_headers.call response_with_date
+
+    assert_equal result_no_date,   {"Warning"=>["299 - \"Hello World\""], "X-Cache-Req-Date"=>"Mon, 02 Feb 2015 04:21:37 GMT", "X-Cache-Res-Date"=>"Mon, 02 Feb 2015 04:21:40 GMT", "Status"=>200}
+    assert_equal result_with_date, {"Warning"=>["299 - \"Hello World\""], "Date"=>"Mon, 02 Feb 2015 04:21:40 GMT", "X-Cache-Req-Date"=>"Mon, 02 Feb 2015 04:21:37 GMT", "X-Cache-Res-Date"=>"Mon, 02 Feb 2015 04:21:40 GMT", "Status"=>200}
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cache_rules
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakeweb