cobot_client 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dfd4c62d32c8f73b4f3a6516efe07c1b4653f50
-  data.tar.gz: 7db698ffaa50919b76cc593a79f3809bc6f671f1
+  metadata.gz: 8bfefdd5912cd681463438148356aa9f1d0d8363
+  data.tar.gz: 09f09c0510a514770a0ea1045ad8a454976b235f
 SHA512:
-  metadata.gz: 521f570cc57fa3bcfa94eab4af094b64d63444c96ddcba4a136695254f3e5c44341964e10e42a7387567871c62c01b0ece00b56cbcd32e54aa3300d77bda98e9
-  data.tar.gz: 25f3235571faf4917c2db72e1ea3f79a8acc0512ee1384f230907a441aca2ae8185cb004fd6e23358160abe5b3552c4202abe357178d6932cc4b2f3d6d678a79
+  metadata.gz: 2a29822652a7ba6fec690d041d06483b50c86d9793da1474b6ce61194586aff1aed70e6bec42f1d7aeda0ae0364f74c300835d445be542d1ca51c0b0e38b893b
+  data.tar.gz: a6a38ab577636192fc1a57d88561824a4a35f46e674d27c7b778290ccb6a1845020c3a676df78a0be0dd023467ee6b2b0b10d6d27e0688ff45aa79db00c60f4d

data/.travis.yml

@@ -1,4 +1,4 @@
 rvm:
-  - 2.0.0
   - 2.1.0
-  - 1.9.3
+  - 2.2.4
+  - 2.3.0

data/lib/cobot_client/api_client.rb

@@ -72,21 +72,27 @@ module CobotClient
       end
     end
 
-    def rewrap_errors
-      retries = 0
-      yield
-    rescue RestClient::BadGateway, SocketError => e
-      if retries < 3
-        sleep self.class.retry_time
-        retries += 1
-        retry
-      else
-        raise e
-      end
+    def rewrap_errors(&block)
+      retry_errors(&block)
     rescue RestClient::Exception => e
       fail CobotClient::Exceptions::EXCEPTIONS_MAP[e.class].new(e.response)
     end
 
+    def retry_errors
+      retries = 0
+      begin
+        yield
+      rescue RestClient::BadGateway, SocketError, RestClient::RequestTimeout => e
+        if retries < 3
+          sleep self.class.retry_time
+          retries += 1
+          retry
+        else
+          raise e
+        end
+      end
+    end
+
     def parse_args(*args)
       if args.last.is_a?(Hash)
         params = args.pop

data/lib/cobot_client/version.rb

@@ -1,3 +1,3 @@
 module CobotClient
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

data/spec/cobot_client/api_client_spec.rb

@@ -191,6 +191,30 @@ describe CobotClient::ApiClient do
       end.to raise_error(CobotClient::ResourceNotFound)
     end
 
+    it 'retries a RestClient::RequestTimeout' do
+      count = 0
+      allow(RestClient).to receive(:get) do
+        if count == 0
+          count += 1
+          fail RestClient::RequestTimeout
+        else
+          double(:response, body: '{}')
+        end
+      end
+
+      expect(RestClient).to receive(:get).exactly(2).times
+
+      api_client.get('co-up', '/invoices')
+    end
+
+    it 'converts a RestClient::RequestTimeout into a CobotClient::RequestTimeout' do
+      allow(RestClient).to receive(:get).and_raise(RestClient::RequestTimeout)
+
+      expect do
+        api_client.get('co-up', '/invoices')
+      end.to raise_error(CobotClient::RequestTimeout)
+    end
+
     it 'includes the response, http code and http body in the exception' do
       response = double(:response, code: 404, body: 'boom')
       error = RestClient::ResourceNotFound.new(response)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cobot_client
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Alexander Lang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus