cobot_client 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a67e3173fd83c076f30bce37d2f6a1d9a80e4426
-  data.tar.gz: 7ee2e4a0ac5ef5604f59cfa58ee96a2fdfe37177
+  metadata.gz: 6065b773f6bf01f885cbf320e358894fdb5022ec
+  data.tar.gz: 2a522841f501b3604930674f6e3d69aa95f2ceca
 SHA512:
-  metadata.gz: 94847dfac172d129492c411cac5b64c1c3da5a13f8a2219b7216f3f892d9d64ecb409e48796ae15eaec3a6819397e574748a3ab27e5e1c2b093e72388a5cc45b
-  data.tar.gz: 40c671e342f8d083df6277912583c03d811e1b3bbb9cead2fc18d3b700a0ac79fd91238a92d7f0a1144dbc349e53ec64d3edd7ca59c2a6f56b0a4f86273251e6
+  metadata.gz: c550f7fdb4895e31ad25d37e7201aaca0a1bebe9724dd0ac0783ea47ed50d436f40bd2e48c538101b94e6271f0deb5d0b902f3b0aeb39b2124c3f4757400dd37
+  data.tar.gz: ba50673265ee4f7e7f9555b06e7364b705b6aa272c406b1dd544d9899c55b3cd6f5e2f8c56054914d7bfbdb765156c84a72cbdcb943c1485a4edf3cc3e290047

data/lib/cobot_client/api_client.rb

@@ -6,8 +6,9 @@ module CobotClient
     include UrlHelper
 
     class << self
-      attr_accessor :user_agent
+      attr_accessor :user_agent, :retry_time
     end
+    self.retry_time = 1
 
     def initialize(access_token)
       @access_token = access_token
@@ -30,35 +31,13 @@ module CobotClient
     end
 
     # args: either a full URL or subdomain, path, plus a body as hash
-    def put(*args)
-      url, subdomain, path, body = parse_args(*args)
-      rewrap_errors do
-        response = RestClient.put(
-          build_url(url || subdomain, path),
-          body.to_json,
-          headers.merge(content_type_header))
-        JSON.parse response.body, symbolize_names: true unless response.code == 204
-      end
-    end
-
-    # args: either a full URL or subdomain, path
-    def delete(*args)
-      url, subdomain, path, _ = parse_args(*args)
-      rewrap_errors do
-        RestClient.delete(build_url(url || subdomain, path), headers)
-      end
+    def post(*args)
+      request :post, *args
     end
 
     # args: either a full URL or subdomain, path, plus a body as hash
-    def post(*args)
-      url, subdomain, path, body = parse_args(*args)
-      rewrap_errors do
-        response = RestClient.post(
-            build_url(url || subdomain, path),
-            body.to_json,
-            headers.merge(content_type_header))
-        JSON.parse response.body, symbolize_names: true unless response.code == 204
-      end
+    def put(*args)
+      request :put, *args
     end
 
     # args: either a full URL or subdomain, path, plus an optional params hash
@@ -72,12 +51,40 @@ module CobotClient
         end, symbolize_names: true)
     end
 
+    # args: either a full URL or subdomain, path
+    def delete(*args)
+      url, subdomain, path, _ = parse_args(*args)
+      rewrap_errors do
+        RestClient.delete(build_url(url || subdomain, path), headers)
+      end
+    end
+
     private
 
+    def request(method, *args)
+      url, subdomain, path, body = parse_args(*args)
+      rewrap_errors do
+        response = RestClient.public_send(method,
+          build_url(url || subdomain, path),
+          body.to_json,
+          headers.merge(content_type_header))
+        JSON.parse response.body, symbolize_names: true unless response.code == 204
+      end
+    end
+
     def rewrap_errors
+      retries = 0
       yield
-      rescue RestClient::Exception => e
-        raise CobotClient::Exceptions::EXCEPTIONS_MAP[e.class].new(e.response)
+    rescue RestClient::BadGateway => e
+      if retries < 3
+        sleep self.class.retry_time
+        retries += 1
+        retry
+      else
+        raise e
+      end
+    rescue RestClient::Exception => e
+      fail CobotClient::Exceptions::EXCEPTIONS_MAP[e.class].new(e.response)
     end
 
     def parse_args(*args)

data/lib/cobot_client/version.rb

@@ -1,3 +1,3 @@
 module CobotClient
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/spec/cobot_client/api_client_spec.rb

@@ -6,6 +6,7 @@ describe CobotClient::ApiClient do
 
   before(:each) do
     CobotClient::ApiClient.user_agent = 'test agent'
+    CobotClient::ApiClient.retry_time = 0
   end
 
   context 'listing resources' do
@@ -107,6 +108,20 @@ describe CobotClient::ApiClient do
 
       expect(api_client.put('co-up', '/invoices', {})).to be_nil
     end
+
+    it 'retries a 502 error' do
+      @times = 0
+      allow(RestClient).to receive(:put) do
+        if @times < 3
+          @times += 1
+          fail RestClient::BadGateway
+        else
+          double(code: 200, body: {success: true}.to_json)
+        end
+      end
+
+      expect(api_client.put('co-up', '/invoices', {})).to eql(success: true)
+    end
   end
 
   context '#post' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cobot_client
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Alexander Lang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus