dor-services-client 13.0.1 → 13.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74d7e3fd877e278b201d95659d3003b2a80823060553d3b6922914dac87b7c20
-  data.tar.gz: dceb16866228a3fcd1230d1d3e81be9083fdc1a92d41f6d937a964bd913dd9ff
+  metadata.gz: da7e3b9d816ebc43f5f1846e29ead0dd6db4c2796db964da7675cb9a93cb65ce
+  data.tar.gz: 77419c5558add7401662095bcdc80fe0c4f5b25ede954c2365983e4ec5c4628e
 SHA512:
-  metadata.gz: 49c37f1ab1f9cfabedf44f1f3d94c677c86c91207ed383e33d16679e5f326767f1b36ddd764bfdf928984ee2007abb8cba9d4a41ac557a4bee6e8aba174f00c6
-  data.tar.gz: 9b4fabacd6a69c13101da1d59378d359e11a297a0ee7e120ae5a1cf38ab54302774706dbc7756100507964641eb5ed34c5cc3f515ee53f44ba577b0c2f6ab994
+  metadata.gz: 6c02541dfb4939848673982e7f575eceb9d7d73c9e13d98830cc0b41a1730644c3d69ca58da80e02a769a79f7002080c2fab79ea2acfac2b020dee2cf4660bbd
+  data.tar.gz: 7ec0f190b6d1fd94c2995f5801d1833594d509a2d93fb12a2560daef719fdd309f0d77fe9e794805a9278a2551e53681f8db691d66f0e7c2c92447404bbcd2af

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dor-services-client (13.0.1)
+    dor-services-client (13.1.1)
       activesupport (>= 4.2, < 8)
       cocina-models (~> 0.91.0)
       deprecation
@@ -12,7 +12,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.0)
+    activesupport (7.1.1)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -29,7 +29,7 @@ GEM
     base64 (0.1.1)
     bigdecimal (3.1.4)
     byebug (11.1.3)
-    cocina-models (0.91.2)
+    cocina-models (0.91.4)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -90,7 +90,7 @@ GEM
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     json (2.6.3)
-    jsonpath (1.1.4)
+    jsonpath (1.1.5)
       multi_json
     language_server-protocol (3.17.0.3)
     minitest (5.20.0)
@@ -114,7 +114,7 @@ GEM
     racc (1.7.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.8.1)
+    regexp_parser (2.8.2)
     rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -131,12 +131,12 @@ GEM
     rspec-support (3.12.1)
     rss (0.3.0)
       rexml
-    rubocop (1.56.4)
+    rubocop (1.57.1)
       base64 (~> 0.1.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
@@ -165,7 +165,7 @@ GEM
       attr_extras (>= 6.2.4)
       diff-lcs
       patience_diff
-    thor (1.2.2)
+    thor (1.3.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)

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

@@ -7,8 +7,8 @@ module Dor
       class ErrorFaradayMiddleware < Faraday::Middleware
         def call(env)
           @app.call(env)
-        rescue Faraday::ConnectionFailed
-          raise ConnectionFailed, 'unable to reach dor-services-app'
+        rescue Faraday::ConnectionFailed => e
+          raise ConnectionFailed, "unable to reach dor-services-app: #{e}", e.backtrace
         end
       end
     end

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

@@ -3,7 +3,7 @@
 module Dor
   module Services
     class Client
-      VERSION = '13.0.1'
+      VERSION = '13.1.1'
     end
   end
 end

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

@@ -30,11 +30,8 @@ module Dor
         # @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 cleanup_path
+            req.url with_query_params(workspace_path, workflow, lane_id)
           end
           return resp.headers['Location'] if resp.success?
 
@@ -43,11 +40,13 @@ module Dor
 
         # After an object has been copied to preservation the workspace can be
         # reset. This is called by the reset-workspace step of the accessionWF
+        # @param [String] workflow (nil) which workflow to callback to.
+        # @param [String] lane_id for prioritization (default or low)
         # @raise [UnexpectedResponse] if the request is unsuccessful.
         # @return nil
-        def reset
+        def reset(workflow: nil, lane_id: nil)
           resp = connection.post do |req|
-            req.url "#{workspace_path}/reset"
+            req.url with_query_params("#{workspace_path}/reset", workflow, lane_id)
           end
           raise_exception_based_on_response!(resp, object_identifier) unless resp.success?
         end
@@ -65,6 +64,13 @@ module Dor
           end
         end
 
+        def with_query_params(url, workflow, lane_id)
+          query_params = query_params_for(workflow, lane_id)
+          return url unless query_params.any?
+
+          "#{url}?#{query_params.join('&')}"
+        end
+
         attr_reader :object_identifier
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services-client
 version: !ruby/object:Gem::Version
-  version: 13.0.1
+  version: 13.1.1
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-09 00:00:00.000000000 Z
+date: 2023-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -278,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: A client for dor-services-app