tinify 1.4.0 → 1.5.0

data/lib/tinify/client.rb

@@ -4,7 +4,12 @@ require "json"
 module Tinify
   class Client
     API_ENDPOINT = "https://api.tinify.com".freeze
+
+    RETRY_COUNT = 1
+    RETRY_DELAY = 500
+
     USER_AGENT = "Tinify/#{VERSION} Ruby/#{RUBY_VERSION}p#{RUBY_PATCHLEVEL} (#{defined?(RUBY_ENGINE) ? RUBY_ENGINE : "unknown"})".freeze
+
     CA_BUNDLE = File.expand_path("../../data/cacert.pem", __FILE__).freeze
 
     def initialize(key, app_identifier = nil, proxy = nil)
@@ -24,7 +29,8 @@ module Tinify
       @client.ssl_config.add_trust_ca(CA_BUNDLE)
     end
 
-    def request(method, url, body = nil, header = {})
+    def request(method, url, body = nil)
+      header = {}
       if Hash === body
         if body.empty?
           body = nil
@@ -34,26 +40,31 @@ module Tinify
         end
       end
 
-      begin
-        response = @client.request(method, url, body: body, header: header)
-      rescue HTTPClient::TimeoutError => err
-        raise ConnectionError.new("Timeout while connecting")
-      rescue StandardError => err
-        raise ConnectionError.new("Error while connecting: #{err.message}")
-      end
+      RETRY_COUNT.downto(0) do |retries|
+        sleep RETRY_DELAY / 1000.0 if retries < RETRY_COUNT
 
-      if count = response.headers["Compression-Count"]
-        Tinify.compression_count = count.to_i
-      end
+        begin
+          response = @client.request(method, url, body: body, header: header)
+        rescue HTTPClient::TimeoutError => err
+          next if retries > 0
+          raise ConnectionError.new("Timeout while connecting")
+        rescue StandardError => err
+          next if retries > 0
+          raise ConnectionError.new("Error while connecting: #{err.message}")
+        end
+
+        if count = response.headers["Compression-Count"]
+          Tinify.compression_count = count.to_i
+        end
+
+        return response if response.ok?
 
-      if response.ok?
-        response
-      else
         details = begin
           JSON.parse(response.body)
         rescue StandardError => err
-          { "message" => "Error while parsing response: #{err.message}", "error" => "ParseError" }
+          {"message" => "Error while parsing response: #{err.message}", "error" => "ParseError"}
         end
+        next if retries > 0 and response.status >= 500
         raise Error.create(details["message"], details["error"], response.status)
       end
     end

data/lib/tinify/version.rb

@@ -1,3 +1,3 @@
 module Tinify
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/test/tinify_client_test.rb

@@ -1,6 +1,9 @@
 require File.expand_path("../helper", __FILE__)
 
 describe Tinify::Client do
+  Tinify::Client.send(:remove_const, :RETRY_DELAY)
+  Tinify::Client.const_set(:RETRY_DELAY, 10)
+
   subject do
     Tinify::Client.new("key")
   end
@@ -96,7 +99,19 @@ describe Tinify::Client do
       end
     end
 
-    describe "with timeout" do
+    describe "with timeout once" do
+      before do
+        stub_request(:get, "https://api:key@api.tinify.com").to_timeout
+          .then.to_return(status: 201)
+      end
+
+      it "should return response" do
+        response = subject.request(:get, "/")
+        assert_equal "", response.body
+      end
+    end
+
+    describe "with timeout repeatedly" do
       before do
         stub_request(:get, "https://api:key@api.tinify.com").to_timeout
       end
@@ -114,7 +129,20 @@ describe Tinify::Client do
       end
     end
 
-    describe "with socket error" do
+    describe "with socket error once" do
+      before do
+        stub_request(:get, "https://api:key@api.tinify.com")
+          .to_raise(SocketError.new("nodename nor servname provided"))
+          .then.to_return(status: 201)
+      end
+
+      it "should return response" do
+        response = subject.request(:get, "/")
+        assert_equal "", response.body
+      end
+    end
+
+    describe "with socket error repeatedly" do
       before do
         stub_request(:get, "https://api:key@api.tinify.com").to_raise(SocketError.new("nodename nor servname provided"))
       end
@@ -132,7 +160,20 @@ describe Tinify::Client do
       end
     end
 
-    describe "with unexpected error" do
+    describe "with unexpected error once" do
+      before do
+        stub_request(:get, "https://api:key@api.tinify.com")
+          .to_raise("some error")
+          .then.to_return(status: 201)
+      end
+
+      it "should return response" do
+        response = subject.request(:get, "/")
+        assert_equal "", response.body
+      end
+    end
+
+    describe "with unexpected error repeatedly" do
       before do
         stub_request(:get, "https://api:key@api.tinify.com").to_raise("some error")
       end
@@ -150,7 +191,21 @@ describe Tinify::Client do
       end
     end
 
-    describe "with server error" do
+    describe "with server error once" do
+      before do
+        stub_request(:get, "https://api:key@api.tinify.com").to_return(
+          status: 584,
+          body: '{"error":"InternalServerError","message":"Oops!"}'
+        ).then.to_return(status: 201)
+      end
+
+      it "should return response" do
+        response = subject.request(:get, "/")
+        assert_equal "", response.body
+      end
+    end
+
+    describe "with server error repeatedly" do
       before do
         stub_request(:get, "https://api:key@api.tinify.com").to_return(
           status: 584,
@@ -171,7 +226,21 @@ describe Tinify::Client do
       end
     end
 
-    describe "with bad server response" do
+    describe "with bad server response once" do
+      before do
+        stub_request(:get, "https://api:key@api.tinify.com").to_return(
+          status: 543,
+          body: '<!-- this is not json -->'
+        ).then.to_return(status: 201)
+      end
+
+      it "should return response" do
+        response = subject.request(:get, "/")
+        assert_equal "", response.body
+      end
+    end
+
+    describe "with bad server response repeatedly" do
       before do
         stub_request(:get, "https://api:key@api.tinify.com").to_return(
           status: 543,
@@ -197,7 +266,7 @@ describe Tinify::Client do
         stub_request(:get, "https://api:key@api.tinify.com").to_return(
           status: 492,
           body: '{"error":"BadRequest","message":"Oops!"}'
-        )
+        ).then.to_return(status: 201)
       end
 
       it "should raise client error" do
@@ -213,12 +282,13 @@ describe Tinify::Client do
       end
     end
 
+
     describe "with bad credentials" do
       before do
         stub_request(:get, "https://api:key@api.tinify.com").to_return(
           status: 401,
           body: '{"error":"Unauthorized","message":"Oops!"}'
-        )
+        ).then.to_return(status: 201)
       end
 
       it "should raise account error" do

data/update-cacert.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+dir=lib/data
+
+cert=0
+curl https://curl.haxx.se/ca/cacert.pem | while read line; do
+  if [ "-----BEGIN CERTIFICATE-----" == "$line" ]; then
+      cert=1
+      echo $line
+  elif [ "-----END CERTIFICATE-----" == "$line" ]; then
+      cert=0
+      echo $line
+  else
+      if [ $cert == 1 ]; then
+          echo $line
+      fi
+  fi
+done > $dir/cacert.pem

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinify
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Rolf Timmermans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -89,6 +89,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".travis.yml"
+- CHANGES.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -112,6 +113,7 @@ files:
 - test/tinify_source_test.rb
 - test/tinify_test.rb
 - tinify.gemspec
+- update-cacert.sh
 homepage: https://tinify.com/developers
 licenses:
 - MIT