dor-services-client 13.0.0 → 13.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52d7f1922fb592d9b86bc19bb2613ea2649b294a83e6dc898795514ef75889ab
-  data.tar.gz: 3f455ceee20044d6b2dda3f9f74f25100349a7f390c9de462df2621b051e29da
+  metadata.gz: 07a7f4f3a4799676f9af98bc7a8dbb3b991a2a907a430a103d652258365feff8
+  data.tar.gz: 0601c6f446cda0eb0e8cc09286c5e082f26c9dbf54a51fb5e3958f7bec679274
 SHA512:
-  metadata.gz: 3a11dbc88113dbb5844d483c4514616ddbea9de1c5cce7afcab3e38b1f466e0f4c1f63cf6fe58953a7b6321b02eb408e2196a240ae8850d25b51d32a1785a48f
-  data.tar.gz: f322703d6d85a737bebc790701235f4765c4e2fd7fee248704c1c5dc1c027f991b082634765b415cbfb483e4d2f5c664712e500b67af82823fe00c194037639f
+  metadata.gz: 7760cdb2c74b39ded300b991c617214ac455c9d3be14a9a477e74404f222b530f9817056329b86b20cab170a13964ac3e9f2eb78bd999d3347692bc890716fe4
+  data.tar.gz: ac7d1c9102f10883157ac49c849a6d3984fd020fe314e263df8a8316b3205b1aa3fb5738dacc28671a4957f676fa41a2137906a9e310e10ee0b8ac1dddc2e21b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dor-services-client (13.0.0)
+    dor-services-client (13.1.0)
       activesupport (>= 4.2, < 8)
       cocina-models (~> 0.91.0)
       deprecation
@@ -12,16 +12,22 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.8)
+    activesupport (7.1.1)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     attr_extras (7.1.0)
     base64 (0.1.1)
+    bigdecimal (3.1.4)
     byebug (11.1.3)
     cocina-models (0.91.2)
       activesupport
@@ -40,12 +46,15 @@ GEM
       zeitwerk (~> 2.1)
     commonmarker (0.23.10)
     concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
     crack (0.4.5)
       rexml
     deprecation (1.1.0)
       activesupport
     diff-lcs (1.5.0)
     docile (1.4.0)
+    drb (2.1.1)
+      ruby2_keywords
     dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
       zeitwerk (~> 2.6)
@@ -81,11 +90,12 @@ 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)
     multi_json (1.15.0)
+    mutex_m (0.1.2)
     nokogiri (1.15.4-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.15.4-x86_64-linux)
@@ -95,7 +105,7 @@ GEM
     openapi_parser (1.0.0)
     optimist (3.1.0)
     parallel (1.23.0)
-    parser (3.2.2.3)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
     patience_diff (1.2.0)
@@ -104,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)
@@ -121,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)

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'active_support/json' # required for serializing time as iso8601
-
 module Dor
   module Services
     class Client

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'active_support/json' # required for serializing time as iso8601
-
 module Dor
   module Services
     class Client

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

@@ -3,7 +3,7 @@
 module Dor
   module Services
     class Client
-      VERSION = '13.0.0'
+      VERSION = '13.1.0'
     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

data/lib/dor/services/client.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
+require 'active_support'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/object/blank'
-require 'active_support/json'
 require 'active_support/core_ext/object/json'
 require 'active_support/core_ext/object/to_query'
+require 'active_support/json'
 require 'cocina/models'
 require 'faraday'
 require 'faraday/retry'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services-client
 version: !ruby/object:Gem::Version
-  version: 13.0.0
+  version: 13.1.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-04 00:00:00.000000000 Z
+date: 2023-10-20 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.3.7
 signing_key:
 specification_version: 4
 summary: A client for dor-services-app