dor-services-client 14.21.0 → 15.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ff6813b9be520819736afe92755b1d8cc43588fad5f6f1af004cad685c57292
-  data.tar.gz: 6d2c7eb5cb09746fb7d523a3dfedf6a98f3735d35da9c91b619c3893ddf04cf2
+  metadata.gz: 5d7ec32221ccf11fa986b36536aa4a298ac724a0686411ee7246e897e92c2bed
+  data.tar.gz: 9aadc355af7981afee4a2c82ba27c924d3693e905c07663237dbab2800f130b7
 SHA512:
-  metadata.gz: 6ad3758cdc34002e137d7d6e7702f9b639e9b56177d0ca94dc55893a7607a5ca4a20cb524018148de76a1b249a608a3a1482d5e24d7c0d30a58e0ede2df5a398
-  data.tar.gz: 16342d7ae5dbaa1138a9127cd497e43e45f6f6c78d79e1bb76d5db2b1ab18160ca5d7e608ad0d1c7ba312cc37c2f897cb3bf4b5bd8755e7c540b1fd53a7c8b8b
+  metadata.gz: a9575501c47cae7331a1761873c2f380ed6c50a4c9d64e13adf530188a6abc20b5b5be55216d9d0e4950544c8092ee47046b4097e11749f5fa8498c573c5665c
+  data.tar.gz: b7da6ff18817b7fd1b84757d2c701b73d6b989e6de0afa24ff1f57ccdb73331d6f7b79900b3d283dd2f17cc6230368cf1440973ceb0c483e79bb781823265340

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dor-services-client (14.21.0)
+    dor-services-client (15.1.0)
       activesupport (>= 4.2, < 8)
       cocina-models (~> 0.99.0)
       deprecation
@@ -12,16 +12,17 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3.4)
+    activesupport (7.2.1)
       base64
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
@@ -44,10 +45,10 @@ GEM
       super_diff
       thor
       zeitwerk (~> 2.1)
-    commonmarker (1.1.4-arm64-darwin)
-    commonmarker (1.1.4-x86_64-darwin)
-    commonmarker (1.1.4-x86_64-linux)
-    concurrent-ruby (1.3.3)
+    commonmarker (1.1.5-arm64-darwin)
+    commonmarker (1.1.5-x86_64-darwin)
+    commonmarker (1.1.5-x86_64-linux)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     crack (1.0.0)
       bigdecimal
@@ -81,25 +82,25 @@ GEM
       activesupport (>= 3.0, < 8.0)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    faraday (2.10.0)
-      faraday-net_http (>= 2.0, < 3.2)
+    faraday (2.12.0)
+      faraday-net_http (>= 2.0, < 3.4)
+      json
       logger
-    faraday-net_http (3.1.1)
+    faraday-net_http (3.3.0)
       net-http
     faraday-retry (2.2.1)
       faraday (~> 2.0)
-    hashdiff (1.1.0)
-    i18n (1.14.5)
+    hashdiff (1.1.1)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     json (2.7.2)
     jsonpath (1.1.5)
       multi_json
     language_server-protocol (3.17.0.3)
-    logger (1.6.0)
-    minitest (5.24.1)
+    logger (1.6.1)
+    minitest (5.25.1)
     multi_json (1.15.0)
-    mutex_m (0.2.0)
     net-http (0.4.1)
       uri
     nokogiri (1.16.7-arm64-darwin)
@@ -112,44 +113,42 @@ GEM
       commonmarker (>= 1.0)
     openapi_parser (1.0.0)
     optimist (3.1.0)
-    parallel (1.25.1)
-    parser (3.3.4.0)
+    parallel (1.26.3)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
     patience_diff (1.2.0)
       optimist (~> 3.0)
     public_suffix (6.0.1)
-    racc (1.8.0)
+    racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
     regexp_parser (2.9.2)
-    rexml (3.3.2)
-      strscan
+    rexml (3.3.8)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.1)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.65.0)
+    rubocop (1.66.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.32.3)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
@@ -163,27 +162,27 @@ GEM
     rubocop-rspec_rails (2.29.1)
       rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
+    securerandom (0.3.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    strscan (3.1.0)
-    super_diff (0.12.1)
+    super_diff (0.13.0)
       attr_extras (>= 6.2.4)
       diff-lcs
       patience_diff
-    thor (1.3.1)
+    thor (1.3.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
-    uri (0.13.0)
-    webmock (3.23.1)
+    unicode-display_width (2.6.0)
+    uri (0.13.1)
+    webmock (3.24.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.6.16)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   arm64-darwin-23

data/README.md

@@ -164,10 +164,9 @@ object_client.release_tags.list(public: true) # only public release tags (i.e. l
 object_client.events.create(type: type, data: data)
 object_client.events.list
 
-# Create, remove, and reset workspaces
+# Create and reset workspaces
 object_client.workspace.create(source: object_path_string)
 object_client.workspace.cleanup
-object_client.workspace.reset
 
 # Reindex
 object_client.reindex

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

@@ -3,7 +3,7 @@
 module Dor
   module Services
     class Client
-      VERSION = '14.21.0'
+      VERSION = '15.1.0'
     end
   end
 end

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

@@ -31,54 +31,30 @@ module Dor
         end
         # rubocop:enable Metrics/AbcSize
 
-        # Cleans up a workspace
+        # Cleans up and resets the workspace
+        # After an object has been copied to preservation the workspace can be
+        # reset. This is called by the reset-workspace step of the accessionWF
         # @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)
+        def cleanup(lane_id: nil)
+          cleanup_workspace_path = workspace_path
+          cleanup_workspace_path += "?lane-id=#{lane_id}" if lane_id
           resp = connection.delete do |req|
-            req.url with_query_params(workspace_path, workflow, lane_id)
+            req.url cleanup_workspace_path
           end
           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
-        # 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(workflow: nil, lane_id: nil)
-          resp = connection.post do |req|
-            req.url with_query_params("#{workspace_path}/reset", workflow, lane_id)
-          end
-          raise_exception_based_on_response!(resp, object_identifier) unless resp.success?
-        end
-
         private
 
         def workspace_path
           "#{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
-
-        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: 14.21.0
+  version: 15.1.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-06 00:00:00.000000000 Z
+date: 2024-10-10 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.4.19
+rubygems_version: 3.5.15
 signing_key:
 specification_version: 4
 summary: A client for dor-services-app