dor-services-client 12.9.0 → 12.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27e36e3ba14458bbf6ae12a813c0941e8e95813b6f5e2ec87d758995ea0a6a5b
-  data.tar.gz: 77369fc440a7de8ba6e884337f2b007a1f7725f2bfb45a194adf46adbc498280
+  metadata.gz: a6a8b96cc8e3c10974deb25a74cfcb78d0ef7a7abdfd9b587da2e1f1cb6773a5
+  data.tar.gz: 5800821a52f4b09fcbd34dd997c87327103d8e8ca6081ef17ccd70318e70a8b5
 SHA512:
-  metadata.gz: 5321db7775bb1b37c100b3db070e65f50664be309963bc7e908689eb338f0673bfb789877e32095d306144a2c30f515b4982671c67ae95742ccff830d34c284f
-  data.tar.gz: 93150dfc23f0d335e491ddaa03837c19c5d30f89a269470bf9802ab0e4b51d5f2ae243f46c332673aa6653c5335fa4e3be710427b3f9bf73322aaaccc5354382
+  metadata.gz: f9b6cc1c3486776c79e0df52b0ef47580c7288af6c66a69ac049590469cabdebe25a2df12f3f98831531b8771525ceb324a42e7673c4dbe8c69e29a7445ae126
+  data.tar.gz: d6cb1eec07c4f9806c5f9a976cd38bc161a8396aaee014a06d6e2b8001bb46d101234398267e04901b96742994b9faf27129a0397a3a7c7539bb3043ac4f6f69

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dor-services-client (12.9.0)
+    dor-services-client (12.10.0)
       activesupport (>= 4.2, < 8)
       cocina-models (~> 0.86.0)
       deprecation
@@ -47,30 +47,34 @@ GEM
     docile (1.4.0)
     dry-container (0.11.0)
       concurrent-ruby (~> 1.0)
-    dry-core (0.8.1)
+    dry-core (0.9.1)
       concurrent-ruby (~> 1.0)
+      zeitwerk (~> 2.6)
     dry-inflector (0.3.0)
-    dry-logic (1.2.0)
+    dry-logic (1.3.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
-    dry-struct (1.4.0)
-      dry-core (~> 0.5, >= 0.5)
-      dry-types (~> 1.5)
+      dry-core (~> 0.9, >= 0.9)
+      zeitwerk (~> 2.6)
+    dry-struct (1.5.2)
+      dry-core (~> 0.9, >= 0.9)
+      dry-types (~> 1.6)
       ice_nine (~> 0.11)
-    dry-types (1.5.1)
+      zeitwerk (~> 2.6)
+    dry-types (1.6.1)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
-      dry-core (~> 0.5, >= 0.5)
+      dry-core (~> 0.9, >= 0.9)
       dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
+      dry-logic (~> 1.3, >= 1.3)
+      zeitwerk (~> 2.6)
     edtf (3.1.0)
       activesupport (>= 3.0, < 8.0)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    faraday (2.5.2)
+    faraday (2.6.0)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.0)
+    faraday-net_http (3.0.1)
     faraday-retry (2.0.0)
       faraday (~> 2.0)
     hashdiff (1.0.1)
@@ -82,9 +86,9 @@ GEM
       multi_json
     minitest (5.16.3)
     multi_json (1.15.0)
-    nokogiri (1.13.8-x86_64-darwin)
+    nokogiri (1.13.9-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.8-x86_64-linux)
+    nokogiri (1.13.9-x86_64-linux)
       racc (~> 1.4)
     openapi3_parser (0.9.2)
       commonmarker (~> 0.17)
@@ -99,36 +103,36 @@ GEM
     racc (1.6.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.5.0)
+    regexp_parser (2.6.0)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     rss (0.2.9)
       rexml
-    rubocop (1.36.0)
+    rubocop (1.37.1)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
+    rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
-    rubocop-rspec (2.13.2)
+    rubocop-rspec (2.14.2)
       rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
@@ -150,7 +154,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.4)
 
 PLATFORMS
   x86_64-darwin-19

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

@@ -3,7 +3,7 @@
 module Dor
   module Services
     class Client
-      VERSION = '12.9.0'
+      VERSION = '12.10.0'
     end
   end
 end

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

@@ -24,13 +24,21 @@ module Dor
         end
 
         # Cleans up a workspace
-        # @raise [UnexpectedResponse] if the request is unsuccessful.
-        # @return nil
-        def cleanup
+        # @raise [NotFoundResponse] when the response is a 404 (object not found)
+        # @raise [UnexpectedResponse] when the response is not successful.
+        # @param [String] workflow (nil) which workflow to callback to.
+        # @param [String] lane_id for prioritization (default or low)
+        # @return [String] the URL of the background job on dor-service-app
+        def cleanup(workflow: nil, lane_id: nil)
+          query_params = query_params_for(workflow, lane_id)
+          query_string = query_params.any? ? "?#{query_params.join('&')}" : ''
+          cleanup_path = "#{workspace_path}#{query_string}"
           resp = connection.delete do |req|
-            req.url workspace_path
+            req.url cleanup_path
           end
-          raise_exception_based_on_response!(resp, object_identifier) unless resp.success?
+          return resp.headers['Location'] if resp.success?
+
+          raise_exception_based_on_response!(resp, object_identifier)
         end
 
         # After an object has been copied to preservation the workspace can be
@@ -50,6 +58,13 @@ module Dor
           "#{api_version}/objects/#{object_identifier}/workspace"
         end
 
+        def query_params_for(workflow, lane_id)
+          [].tap do |params|
+            params << "workflow=#{workflow}" if workflow
+            params << "lane-id=#{lane_id}" if lane_id
+          end
+        end
+
         attr_reader :object_identifier
       end
     end

data/lib/dor/services/client.rb

@@ -153,6 +153,8 @@ module Dor
           #   the Faraday instance will be passed an empty block, which
           #   causes the adapter not to be set. Thus, everything breaks.
           builder.adapter Faraday.default_adapter
+          # 5 minutes read timeout for very large cocina (eg. many files) object create/update (default if none set is 60 seconds)
+          builder.options[:timeout] = 300
           builder.headers[:user_agent] = user_agent
           builder.headers[TOKEN_HEADER] = "Bearer #{token}"
           builder.request :retry, max: 4, interval: 1, backoff_factor: 2 if with_retries

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services-client
 version: !ruby/object:Gem::Version
-  version: 12.9.0
+  version: 12.10.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-27 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -280,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A client for dor-services-app