disk_cache 0.0.7 → 0.0.8

data/lib/disk_cache.rb

@@ -1,5 +1,6 @@
 require 'disk_cache/version'
 require 'open-uri'
+require 'openssl'
 require 'digest/sha1'
 require 'fileutils'
 
@@ -21,7 +22,23 @@ module DiskCache
     return nil if File.exist?(file)
 
     FileUtils.mkdir_p path(url)
-    File.open(file, "wb") { |f| f << open(escape(url)).read }
+    trys = 0
+    begin
+      trys = trys + 1
+      data = open(escape(url)).read
+      File.open(file, "wb") { |f| f << data }
+    rescue OpenURI::HTTPError => httperror
+      raise httperror unless trys < 3
+      retry
+    rescue Timeout::Error => timeout
+      raise timeout unless trys < 3
+      retry
+    rescue OpenSSL::SSL::SSLError => ssl
+      raise ssl unless trys < 3
+      retry
+    rescue => error
+      raise error
+    end
     nil
   end
 

data/lib/disk_cache/version.rb

@@ -1,3 +1,3 @@
 module DiskCache
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/disk_cache/disk_cache_spec.rb

@@ -68,4 +68,55 @@ describe DiskCache do
       FileUtils.compare_file(path, file_from_cache).should be_true
     end
   end
+
+  context "failure responses" do
+    let(:web) { 'http://example.com/Troll%20face.svg' }
+
+    # fail once
+    fail_once = {
+      "400" => "Bad Request",
+      "401" => "Unauthorized",
+      "403" => "Forbidden",
+      "404" => "Not Found",
+      "405" => "Method Not Allowed",
+      "501" => "Not Implemented"
+    }
+    fail_once.each do |code, msg|
+      it "#{code}" do
+        stub_request(:get, web).to_return(:status => [code, msg])
+        expect { DiskCache.put(web) }.to raise_error(OpenURI::HTTPError)
+        DiskCache.get(web).should be_nil
+      end
+    end
+
+    # retry!
+    retry_on_failure = {
+      "408" => "Request Timeout",
+      "409" => "Conflict",
+      "410" => "Gone",
+      "500" => "Internal Server Error",
+      "502" => "Bad Gateway",
+      "503" => "Service Unavailable",
+      "504" => "Gateway Timeout"
+    }
+    retry_on_failure.each do |code, msg|
+      it "#{code}" do
+        stub_request(:get, web).to_return(:status => [code, msg])
+        expect { DiskCache.put(web) }.to raise_error(OpenURI::HTTPError)
+        DiskCache.get(web).should be_nil
+      end
+    end
+
+    it "should retry on timeout" do
+      stub_request(:get, web).to_timeout
+      expect { DiskCache.put(web) }.to raise_error(Timeout::Error)
+      DiskCache.get(web).should be_nil
+    end
+
+    it "should retry on SSL Error" do
+      stub_request(:get, web).to_raise(OpenSSL::SSL::SSLError)
+      expect { DiskCache.put(web) }.to raise_error(OpenSSL::SSL::SSLError)
+      DiskCache.get(web).should be_nil
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disk_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake