dor-services-client 15.0.0 → 15.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c9b0b8817f35c2ad2ea2d03a6ab1d70bf5290f525c4aa9b377af70764ae1926
-  data.tar.gz: 2075c060e362ff9e4464501ef72618b737036d23b0e73a9e0474f9f122c867a0
+  metadata.gz: aaec16bd6ab8deb272496997f7e8b3289652e81b01a8fd9b5cf3bbb7e19b04f8
+  data.tar.gz: 0fb8f67b2da1991cc2ae8439d49e1bb3ec526db4d762a17efdaa7612bdbe858f
 SHA512:
-  metadata.gz: d7131523aae0d2efe4011a3bbd4a62e2786ef276434edb61212137f2f0ef1337fe4c67c9ee6b2dd7b6b92fcb7e938f54ec3078087c029266fecfb298b2372197
-  data.tar.gz: fc19e0baf6f1d199bbbf8c0c8fb863f90e8b9eb22118508ea34386817c1077c95d771cb3cce881e302f195ee6f1d17a1caa4d4daa75ec3cd92a8bc341e98c417
+  metadata.gz: 7035e7003d3ac05987dd5ecdb902040ab3f5a5ac57c74fe245e7745e502b7a60ec4319fe0f9ac2f68713e062f46094493de01d3c748fdf93b6acb708a80240b2
+  data.tar.gz: 87950288c58bef7e0795d05908a2a5fb700c3651ff0b780c54289e8f3ec66b9ac6c1c25415e54a3d5f16837b46a3835f21406223db9d277979abf82f15e3cfdd

data/.rubocop.yml

@@ -12,15 +12,15 @@ Metrics/BlockLength:
     - 'dor-services-client.gemspec'
     - 'spec/**/*'
 
+RSpec/ExampleLength:
+  Enabled: false
+
 RSpec/MultipleExpectations:
   Enabled: false
 
 RSpec/MultipleMemoizedHelpers:
   Enabled: false
 
-RSpec/ExampleLength:
-  Max: 10
-
 Gemspec/DeprecatedAttributeAssignment: # (new in 1.10)
   Enabled: true
 Layout/SpaceBeforeBrackets: # (new in 1.7)
@@ -135,7 +135,7 @@ RSpec/SubjectDeclaration: # new in 2.5
   Enabled: true
 FactoryBot/SyntaxMethods: # new in 2.7
   Enabled: true
-RSpec/Rails/AvoidSetupHook: # new in 2.4
+RSpecRails/AvoidSetupHook: # new in 2.4
   Enabled: true
 
 Lint/RefinementImportMethods: # new in 1.27
@@ -179,7 +179,7 @@ RSpec/ChangeByZero: # new in 2.11.0
   Enabled: true
 Capybara/SpecificMatcher: # new in 2.12
   Enabled: false
-RSpec/Rails/HaveHttpStatus: # new in 2.12
+RSpecRails/HaveHttpStatus: # new in 2.12
   Enabled: false
 
 RSpec/ClassCheck: # new in 2.13
@@ -271,11 +271,11 @@ RSpec/SkipBlockInsideExample: # new in 2.19
   Enabled: true
 RSpec/SortMetadata: # new in 2.14
   Enabled: true
-RSpec/Rails/InferredSpecType: # new in 2.14
+RSpecRails/InferredSpecType: # new in 2.14
   Enabled: true
-RSpec/Rails/MinitestAssertions: # new in 2.17
+RSpecRails/MinitestAssertions: # new in 2.17
   Enabled: true
-RSpec/Rails/TravelAround: # new in 2.19
+RSpecRails/TravelAround: # new in 2.19
   Enabled: true
 
 Lint/MixedCaseRange: # new in 1.53
@@ -292,5 +292,64 @@ Style/YAMLFileRead: # new in 1.53
   Enabled: true
 RSpec/ReceiveMessages: # new in 2.23
   Enabled: true
-RSpec/Rails/NegationBeValid: # new in 2.23
+RSpecRails/NegationBeValid: # new in 2.23
+  Enabled: true
+
+Gemspec/AddRuntimeDependency: # new in 1.65
+  Enabled: true
+Lint/DuplicateSetElement: # new in 1.67
+  Enabled: true
+Lint/ItWithoutArgumentsInBlock: # new in 1.59
+  Enabled: true
+Lint/LiteralAssignmentInCondition: # new in 1.58
+  Enabled: true
+Lint/UselessNumericOperation: # new in 1.66
+  Enabled: true
+Style/MapIntoArray: # new in 1.63
+  Enabled: true
+Style/RedundantInterpolationUnfreeze: # new in 1.66
+  Enabled: true
+Style/SendWithLiteralMethodName: # new in 1.64
+  Enabled: true
+Style/SingleLineDoEndBlock: # new in 1.57
+  Enabled: true
+Style/SuperArguments: # new in 1.64
+  Enabled: true
+Style/SuperWithArgsParentheses: # new in 1.58
+  Enabled: true
+Capybara/ClickLinkOrButtonStyle: # new in 2.19
+  Enabled: true
+Capybara/RedundantWithinFind: # new in 2.20
+  Enabled: true
+Capybara/RSpec/HaveSelector: # new in 2.19
+  Enabled: true
+Capybara/RSpec/PredicateMatcher: # new in 2.19
+  Enabled: true
+FactoryBot/ExcessiveCreateList: # new in 2.25
+  Enabled: true
+FactoryBot/IdSequence: # new in 2.24
+  Enabled: true
+RSpec/EmptyMetadata: # new in 2.24
+  Enabled: true
+RSpec/EmptyOutput: # new in 2.29
+  Enabled: true
+RSpec/Eq: # new in 2.24
+  Enabled: true
+RSpec/ExpectInLet: # new in 2.30
+  Enabled: true
+RSpec/IsExpectedSpecify: # new in 2.27
+  Enabled: true
+RSpec/MetadataStyle: # new in 2.24
+  Enabled: true
+RSpec/RedundantPredicateMatcher: # new in 2.26
+  Enabled: true
+RSpec/RemoveConst: # new in 2.26
+  Enabled: true
+RSpec/RepeatedSubjectCall: # new in 2.27
+  Enabled: true
+RSpec/SpecFilePathFormat: # new in 2.24
+  Enabled: true
+RSpec/SpecFilePathSuffix: # new in 2.24
+  Enabled: true
+RSpec/UndescriptiveLiteralsDescription: # new in 2.29
   Enabled: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dor-services-client (15.0.0)
+    dor-services-client (15.2.0)
       activesupport (>= 4.2, < 8)
       cocina-models (~> 0.99.0)
       deprecation
@@ -12,7 +12,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.2.1)
+    activesupport (7.2.1.1)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -129,7 +129,7 @@ GEM
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.1)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -138,7 +138,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.66.1)
+    rubocop (1.67.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -182,7 +182,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.6.18)
+    zeitwerk (2.7.1)
 
 PLATFORMS
   arm64-darwin-23

data/README.md

@@ -87,9 +87,6 @@ object_client.update(params: dro)
 # Publish an object (push to PURL)
 object_client.publish(workflow: 'releaseWF', lane_id: 'low')
 
-# Unpublish an object (yank from PURL)
-object_client.unpublish()
-
 # Shelve an object (push to Stacks)
 object_client.shelve(lane_id: 'low')
 
@@ -123,7 +120,6 @@ object_client.version.current
 # Returns a struct containing the status.
 # Status includes whether the object is open, assembling, accessioning, or closeable.
 object_client.version.status
-object_client.version.openable?
 # see dor-services-app openapi.yml for optional params
 object_client.version.open(description: 'Changed title')
 # see dor-services-app openapi.yml for optional params

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

@@ -107,7 +107,7 @@ module Dor
           Transfer.new(**parent_params)
         end
 
-        delegate :publish, :unpublish, :preserve, :shelve, to: :transfer
+        delegate :publish, :preserve, :shelve, to: :transfer
 
         def mutate
           Mutate.new(**parent_params)

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

@@ -13,7 +13,7 @@ module Dor
           end
         end
 
-        VersionStatus = Struct.new(:versionId, :open, :openable, :assembling, :accessioning, :closeable, keyword_init: true) do
+        VersionStatus = Struct.new(:versionId, :open, :openable, :assembling, :accessioning, :closeable, :discardable, keyword_init: true) do
           alias_method :version, :versionId
 
           def open?
@@ -39,6 +39,10 @@ module Dor
           def closeable?
             closeable
           end
+
+          def discardable?
+            discardable
+          end
         end
 
         # @param object_identifier [String] the pid for the object
@@ -71,29 +75,6 @@ module Dor
           raise_exception_based_on_response!(resp)
         end
 
-        # Determines if a new version can be opened for a DOR object.
-        # @raise [NotFoundResponse] when the response is a 404 (object not found)
-        # @raise [UnexpectedResponse] when the response is not successful.
-        # @return [Boolean] true if a new version can be opened
-        # rubocop:disable Metrics/MethodLength
-        def openable?
-          resp = connection.get do |req|
-            req.url "#{base_path}/openable"
-          end
-
-          raise_exception_based_on_response!(resp) unless resp.success?
-
-          case resp.body
-          when 'true'
-            true
-          when 'false'
-            false
-          else
-            raise MalformedResponse, "Expected true or false, not #{resp.body}"
-          end
-        end
-        # rubocop:enable Metrics/MethodLength
-
         # Open new version for an object
         # @param description [String] a description of the object version being opened - required
         # @param opening_user_name [String] sunetid - defaults to nil
@@ -163,6 +144,18 @@ module Dor
           JSON.parse(resp.body)
         end
 
+        # Discard current version for an object
+        # @raise [NotFoundResponse] when the response is a 404 (object not found)
+        # @raise [UnexpectedResponse] when the response is not successful.
+        def discard
+          resp = connection.delete do |req|
+            req.url "#{base_path}/current"
+          end
+          return if resp.success?
+
+          raise_exception_based_on_response!(resp)
+        end
+
         private
 
         attr_reader :object_identifier

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

@@ -32,19 +32,6 @@ module Dor
           raise_exception_based_on_response!(resp)
         end
 
-        # Unpublish an object (yank from to PURL)
-        # @raise [NotFoundResponse] when the response is a 404 (object not found)
-        # @raise [UnexpectedResponse] when the response is not successful.
-        # @return [String] the URL of the background job on dor-service-app
-        def unpublish
-          resp = connection.post do |req|
-            req.url "#{object_path}/unpublish"
-          end
-          return resp.headers['Location'] if resp.success?
-
-          raise_exception_based_on_response!(resp)
-        end
-
         # Preserve an object (send to SDR)
         # @raise [NotFoundResponse] when the response is a 404 (object not found)
         # @raise [UnexpectedResponse] when the response is not successful.

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

@@ -3,7 +3,7 @@
 module Dor
   module Services
     class Client
-      VERSION = '15.0.0'
+      VERSION = '15.2.0'
     end
   end
 end

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

@@ -36,12 +36,13 @@ module Dor
         # 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?
 
@@ -54,20 +55,6 @@ 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
-
-        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: 15.0.0
+  version: 15.2.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-07 00:00:00.000000000 Z
+date: 2024-10-28 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.5.15
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: A client for dor-services-app