dor-services-client 3.7.0 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3579f137bb76a9db9abb8b701de338b7fd4d6190d2aa36337c51141d8611db6
-  data.tar.gz: 8096f0878f77f2c79e477ab4c34e7d8cd47ac1fffb1b17b2be887ee094447ea7
+  metadata.gz: 17d1bc1362286691b1f977cad23f8a4055fdd12009b23fb407c59813d302cbc3
+  data.tar.gz: a9279fc138723d1d9e6c9d3be6ef5de0736cbe06c5b03de72270b079e1336d29
 SHA512:
-  metadata.gz: 044544aa4d1b55cbec9eb6ff17a3f92c3ee8e1b3326c0ab892bbfe143e20d6fb5e26b280a414028f7b79d945ce46f05b265370c949e42b1cda2afa0465963cf1
-  data.tar.gz: 3d5c76a3c79318e8c5eacb24f8d82a1ecc97df50513491637d1644c1f2ed73c83d187826e7af52c4f5f72fc7f34c11f82216fd7687d8933a8956b71ccaac40e2
+  metadata.gz: 40fff715eb9581abefd027fbd29bb92b955cd6d15b77c525966313f35feccd72f7f4cf8443114938e952d74aba57811bc9ada622d5cd6f17dd90180e1ab146d2
+  data.tar.gz: '0483086f12869253fbeef14715703ed1c23ac74f8d068bd23a96c80f720a1188d0029f9f6c5d39b15d9da20a789d536da5bd468fcb35de608ae2fa779e6f4a54'

data/lib/dor/services/client/async_result.rb

@@ -14,11 +14,16 @@ module Dor
           @url = url
         end
 
-        # @param [Integer] seconds_between_requests (3) how many seconds between polling requests
+        # Polls using exponential backoff, so as not to overrwhelm the server.
+        # @param [Float] seconds_between_requests (3.0) initially, how many seconds between polling requests
         # @param [Integer] timeout_in_seconds (180) timeout after this many seconds
+        # @param [Float] backoff_factor (2.0) how quickly to backoff.  This should be > 1.0 and probably ought to be <= 2.0
         # @return true if successful false if unsuccessful.
-        def wait_until_complete(seconds_between_requests: 3, timeout_in_seconds: 180)
-          poll_until_complete(seconds_between_requests, timeout_in_seconds)
+        def wait_until_complete(seconds_between_requests: 3.0,
+                                timeout_in_seconds: 180,
+                                backoff_factor: 2.0,
+                                max_seconds_between_requests: 60)
+          poll_until_complete(seconds_between_requests, timeout_in_seconds, backoff_factor, max_seconds_between_requests)
           errors.nil?
         end
 
@@ -34,12 +39,15 @@ module Dor
 
         private
 
-        def poll_until_complete(seconds_between_requests, timeout_in_seconds)
+        def poll_until_complete(seconds_between_requests, timeout_in_seconds, backoff_factor, max_seconds_between_requests)
+          interval = seconds_between_requests
           Timeout.timeout(timeout_in_seconds) do
             loop do
               break if complete?
 
-              sleep(seconds_between_requests)
+              sleep(interval)
+              # Exponential backoff, limited to max_seconds_between_requests
+              interval = [interval * backoff_factor, max_seconds_between_requests].min
             end
           end
         rescue Timeout::Error

data/lib/dor/services/client/embargo.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: tru
+# frozen_string_literal: true
 
 module Dor
   module Services

data/lib/dor/services/client/metadata.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: tru
+# frozen_string_literal: true
 
 module Dor
   module Services

data/lib/dor/services/client/object.rb

@@ -70,12 +70,10 @@ module Dor
         # @param [String] workflow ('accessionWF') which workflow to callback to.
         # @return [boolean] true on success
         def publish(workflow: nil)
-          unless workflow
-            workflow = 'accessionWF'
-            Deprecation.warn(self, 'calling publish without passing a workflow is deprecated and will be removed in the next major version')
-          end
+          publish_path = "#{object_path}/publish"
+          publish_path = "#{publish_path}?workflow=#{workflow}" if workflow
           resp = connection.post do |req|
-            req.url "#{object_path}/publish?workflow=#{workflow}"
+            req.url publish_path
           end
           return resp.headers['Location'] if resp.success?
 

data/lib/dor/services/client/version.rb

@@ -3,7 +3,7 @@
 module Dor
   module Services
     class Client
-      VERSION = '3.7.0'
+      VERSION = '3.8.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services-client
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.8.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-04 00:00:00.000000000 Z
+date: 2019-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport