etre-client 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 873e9221d77b3b966b45e5c007cb61e8aaf9dee2
-  data.tar.gz: cbfa5da072e0aa1c1fcc3c18b7fe32c53527a5b9
+  metadata.gz: 3c0c27ca99e636fe368d12b0adcc385bb695b74e
+  data.tar.gz: d147ec9aebe97c2190abdf6f13c4adabb32fe2fc
 SHA512:
-  metadata.gz: 9e12da6df7e27771778ce3b1de0390841a4c82c5beff987620cc33c7e547567fdfc5a3122126cad4120568695f14f3843dd8e12668d4c7ea1af7fae0a9fca207
-  data.tar.gz: f807aab0ca6bbd7688b44be9e12adcb9c7d36ca664f2b9ed2a0ffe94f1fa1732e163304dd8af434a0ed3cde5c656b9276aacef62c1402e29e93ca39cf3e7d4d1
+  metadata.gz: 85745cb3cc557539c3140e4e58d5247706074e253f0f9458b5e1d78e616bc73dfc9854927c21f6abd695e274892303bfe50fad543d1ca85bd69f8d290c1b9487
+  data.tar.gz: b34d5b094f7aafd896dfb382572815d69794099080af88f9aeff6ab5d9900c1a7c105f5d54a61baf5471042bc09def2e81b1a8c87219124574035f68969f8250

data/README.md

@@ -102,6 +102,11 @@ Run the tests
 bundle exec rake spec
 ```
 
+Publish a new version of the gem:
+1. Bump the version in lib/etre-client/version.rb
+2. Build the gem with `gem build etre-client.gemspec`
+3. Publish the new gem with `gem push etre-client-#{GEM_VERSION}.gem`
+
 ## License
 
 Copyright (c) 2017 Square Inc. Distributed under the Apache 2.0 License.

data/lib/etre-client/client.rb

@@ -1,4 +1,5 @@
 require 'etre-client/errors'
+require 'logger'
 require 'rest-client'
 require 'json'
 
@@ -10,10 +11,14 @@ module Etre
     META_LABEL_ID = "_id"
     META_LABEL_TYPE = "_type"
 
-    def initialize(entity_type:, url:, options: {})
+    def initialize(entity_type:, url:, retry_count: 0, retry_wait: 1, options: {})
       @entity_type = entity_type
       @url = url
+      @retry_count = retry_count # retry count on network or API error
+      @retry_wait = retry_wait # wait time between retries
       @options = options
+
+      @logger = Logger.new(STDOUT)
     end
 
     # query returns an array of entities that satisfy a query.
@@ -236,29 +241,37 @@ module Etre
     private
 
     def etre_get(route)
-      resource_for_route(route).get(
-        get_headers,
-      )
+      rest_retry {
+        resource_for_route(route).get(
+          get_headers,
+        )
+      }
     end
 
     def etre_post(route, params = nil)
-      resource_for_route(route).post(
-        params.to_json,
-        post_headers,
-      )
+      rest_retry {
+        resource_for_route(route).post(
+          params.to_json,
+          post_headers,
+        )
+      }
     end
 
     def etre_put(route, params = nil)
-      resource_for_route(route).put(
-        params.to_json,
-        put_headers,
-      )
+      rest_retry {
+        resource_for_route(route).put(
+          params.to_json,
+          put_headers,
+        )
+      }
     end
 
     def etre_delete(route)
-      resource_for_route(route).delete(
-        delete_headers,
-      )
+      rest_retry {
+        resource_for_route(route).delete(
+          delete_headers,
+        )
+      }
     end
 
     def get_headers
@@ -287,5 +300,21 @@ module Etre
     def parse_response(response)
       JSON.parse(response)
     end
+
+    def rest_retry(&block)
+      retries = 0
+
+      begin
+        yield
+      rescue => e
+        if (retries += 1) <= @retry_count
+          @logger.warn("Error querying etre (#{e}). Sleeping for #{@retry_wait} seconds before trying again (attmept #{retries}/#{@retry_count}).")
+          sleep(@retry_wait)
+          retry
+        else
+          raise
+        end
+      end
+    end
   end
 end

data/lib/etre-client/version.rb

@@ -1,5 +1,5 @@
 module Etre
   class Client
-    VERSION = "0.8.3"
+    VERSION = "0.8.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: etre-client
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Michael Finch