dor-services-client 15.30.1 → 15.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38fe63ab39d1a47f000292637f9cc4ff069fc00f14e5a0f418b10533f045d683
-  data.tar.gz: 1417b370b51776908eead2717873de190c8056179bc0e1fceabb1fe2f4b979c2
+  metadata.gz: '06370387f51516d2a08d643598cc2e885f783014aa3bcb4f353abd131372470e'
+  data.tar.gz: 218e00a0664bb35a8ce93677791f6c5d6c52ffb64e3eb23a88da2713a4e79ee6
 SHA512:
-  metadata.gz: c37c6ec851c5358ff9e2e3e932eacacf62b8a97152a8efec10e3ebc4f5028e0c7dc7fabe799f625839f39623c5a10f50b69b9c86de1ba7235b440fad4606ea0c
-  data.tar.gz: 709012201d7f5bf3dc66a3f058484ed00c3e5c72b1a1ebc5b86a988cecfb20a34e2ce79f90734ac072e24e4e135c3f3de41637c996cd26918a1cddee3f47d368
+  metadata.gz: 37fc5d5a48b56cfa1bab49622d8c63014776f6493252ca7c69d63605296c8b4a60ea4739f0cb9205989a81a6ff37e800b965ba8cf6e35fb9a9f0211719f96ac3
+  data.tar.gz: b25369fb1e80f33db2bfc03fb1135f470d882b0af2017b29a3f1342531d5d0c04c0c59f19a8c685519bd89f123b1a9803471204e42f0ad4dd28f6a5339ec9323

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    dor-services-client (15.30.1)
+    dor-services-client (15.32.0)
       activesupport (>= 7.0.0)
-      cocina-models (~> 0.112.0)
+      cocina-models (~> 0.113.0)
       deprecation
       faraday (~> 2.0)
       faraday-retry
@@ -26,7 +26,7 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
-    addressable (2.8.8)
+    addressable (2.8.9)
       public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
     attr_extras (7.1.0)
@@ -34,7 +34,7 @@ GEM
     bigdecimal (4.0.1)
     byebug (13.0.0)
       reline (>= 0.6.0)
-    cocina-models (0.112.0)
+    cocina-models (0.113.0)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -99,6 +99,9 @@ GEM
     ice_nine (0.11.2)
     io-console (0.8.2)
     json (2.18.1)
+    json-schema (6.1.0)
+      addressable (~> 2.8)
+      bigdecimal (>= 3.1, < 5)
     json_schemer (2.5.0)
       bigdecimal
       hana (~> 1.3)
@@ -109,7 +112,10 @@ GEM
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
-    minitest (6.0.1)
+    mcp (0.7.1)
+      json-schema (>= 4.1)
+    minitest (6.0.2)
+      drb (~> 2.0)
       prism (~> 1.5)
     multi_json (1.19.1)
     net-http (0.9.1)
@@ -145,14 +151,15 @@ GEM
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.7)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.7)
-    rubocop (1.84.2)
+    rubocop (1.85.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
+      mcp (~> 0.6)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
@@ -214,4 +221,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-  4.0.6
+  4.0.7

data/README.md

@@ -108,6 +108,8 @@ object_client.version.current
 # Status includes whether the object is open, assembling, accessioning, or closeable.
 # See also objects_client.statuses for getting statuses in batch.
 object_client.version.status
+# Returns object version as Cocina instance if valid; returns a Hash<cocina_object:, error_message:> if invalid
+object_client.version.find(3)
 
 # see dor-services-app openapi.yml for optional params
 object_client.version.open(description: 'Changed title')

data/dor-services-client.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 3.0', '< 5'
 
   spec.add_dependency 'activesupport', '>= 7.0.0'
-  spec.add_dependency 'cocina-models', '~> 0.112.0'
+  spec.add_dependency 'cocina-models', '~> 0.113.0'
   spec.add_dependency 'deprecation', '>= 0'
   spec.add_dependency 'faraday', '~> 2.0'
   spec.add_dependency 'faraday-retry'

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

@@ -53,15 +53,21 @@ module Dor
           @object_identifier = object_identifier
         end
 
-        # @return [Cocina::Models::DROWithMetadata] the object metadata
-        # @raise [UnexpectedResponse] on an unsuccessful response from the server
+        # @return [Cocina::Models::DROWithMetadata, Hash] the object metadata or a hash with
+        #   invalid metadata and a message about the source of the invalidity
+        # @raise [Dor::Services::Client::Error] on an unsuccessful response from the server
         def find(version)
           resp = connection.get do |req|
             req.url "#{base_path}/#{version}"
           end
-          raise_exception_based_on_response!(resp) unless resp.success?
 
-          build_cocina_from_response(JSON.parse(resp.body), headers: resp.headers, validate: false)
+          if resp.success?
+            build_cocina_from_response(JSON.parse(resp.body), headers: resp.headers, validate: false)
+          elsif resp.status == 409 # Signals the Cocina is present but invalid
+            build_invalid_cocina_from_response(resp)
+          else
+            raise_exception_based_on_response!(resp) unless resp.success?
+          end
         end
 
         # Get the current version for a DOR object. This comes from ObjectVersion table in the DSA

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

@@ -3,7 +3,7 @@
 module Dor
   module Services
     class Client
-      VERSION = '15.30.1'
+      VERSION = '15.32.0'
     end
   end
 end

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

@@ -54,6 +54,15 @@ module Dor
           Cocina::Models.without_metadata(cocina_object).to_json
         end
 
+        def build_invalid_cocina_from_response(response)
+          invalid_cocina_error = JSON.parse(response.body).dig('errors', 0)
+
+          {
+            cocina_object: invalid_cocina_error.dig('meta', 'json'),
+            error_message: invalid_cocina_error['message']
+          }.with_indifferent_access
+        end
+
         def date_from_header(headers, key)
           headers[key]&.to_datetime
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services-client
 version: !ruby/object:Gem::Version
-  version: 15.30.1
+  version: 15.32.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.112.0
+        version: 0.113.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.112.0
+        version: 0.113.0
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement