dor-services-client 15.32.0 → 15.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '06370387f51516d2a08d643598cc2e885f783014aa3bcb4f353abd131372470e'
-  data.tar.gz: 218e00a0664bb35a8ce93677791f6c5d6c52ffb64e3eb23a88da2713a4e79ee6
+  metadata.gz: 6006578d9c1200071a5c5f649d9a91bb1fe0d02199c009575796772db94a6b40
+  data.tar.gz: 8950118cf5d28e602d82b783ae1eee710d58e32677281cb6129ab4ab852b99f5
 SHA512:
-  metadata.gz: 37fc5d5a48b56cfa1bab49622d8c63014776f6493252ca7c69d63605296c8b4a60ea4739f0cb9205989a81a6ff37e800b965ba8cf6e35fb9a9f0211719f96ac3
-  data.tar.gz: b25369fb1e80f33db2bfc03fb1135f470d882b0af2017b29a3f1342531d5d0c04c0c59f19a8c685519bd89f123b1a9803471204e42f0ad4dd28f6a5339ec9323
+  metadata.gz: 52beafa824323b21cabcbca06650561969a002992fd2d37679f46ccee07cbb6ff6914fd8f765997f72a1020126f69d0e682b3e4b000610e1995102abb02ebd5a
+  data.tar.gz: b9b17d5d79e7e7b2781d42ca8141a2b4ff33be34d13c61bd32b6d814c9ccfcfccffd2d6f1467f910dbee30e6dd40283b84640c48ad024867641ff62a672d19c9

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    dor-services-client (15.32.0)
+    dor-services-client (15.34.0)
       activesupport (>= 7.0.0)
-      cocina-models (~> 0.113.0)
+      cocina-models (~> 0.114.0)
       deprecation
       faraday (~> 2.0)
       faraday-retry
+      hashie
       nokogiri
       zeitwerk (~> 2.1)
 
@@ -34,7 +35,7 @@ GEM
     bigdecimal (4.0.1)
     byebug (13.0.0)
       reline (>= 0.6.0)
-    cocina-models (0.113.0)
+    cocina-models (0.114.0)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -68,7 +69,7 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.1)
       zeitwerk (~> 2.6)
-    dry-struct (1.8.0)
+    dry-struct (1.8.1)
       dry-core (~> 1.1)
       dry-types (~> 1.8, >= 1.8.2)
       ice_nine (~> 0.11)
@@ -94,12 +95,14 @@ GEM
       faraday (~> 2.0)
     hana (1.3.7)
     hashdiff (1.2.1)
+    hashie (5.1.0)
+      logger
     i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     io-console (0.8.2)
-    json (2.18.1)
-    json-schema (6.1.0)
+    json (2.19.1)
+    json-schema (6.2.0)
       addressable (~> 2.8)
       bigdecimal (>= 3.1, < 5)
     json_schemer (2.5.0)
@@ -112,7 +115,7 @@ GEM
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
-    mcp (0.7.1)
+    mcp (0.8.0)
       json-schema (>= 4.1)
     minitest (6.0.2)
       drb (~> 2.0)
@@ -134,7 +137,7 @@ GEM
     patience_diff (1.2.0)
       optimist (~> 3.0)
     prism (1.9.0)
-    public_suffix (7.0.2)
+    public_suffix (7.0.5)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.3.1)
@@ -155,7 +158,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.7)
-    rubocop (1.85.0)
+    rubocop (1.85.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -167,7 +170,7 @@ GEM
       rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.0)
+    rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
     rubocop-rspec (3.9.0)
@@ -221,4 +224,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-  4.0.7
+  4.0.8

data/README.md

@@ -110,6 +110,8 @@ object_client.version.current
 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)
+# Include `validate: false` as a param to return the Solr representation of a version w/ invalid Cocina
+object_client.version.solr(2)
 
 # see dor-services-app openapi.yml for optional params
 object_client.version.open(description: 'Changed title')

data/dor-services-client.gemspec

@@ -25,10 +25,11 @@ 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.113.0'
+  spec.add_dependency 'cocina-models', '~> 0.114.0'
   spec.add_dependency 'deprecation', '>= 0'
   spec.add_dependency 'faraday', '~> 2.0'
   spec.add_dependency 'faraday-retry'
+  spec.add_dependency 'hashie'
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'zeitwerk', '~> 2.1'
 

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Dor
+  module Services
+    class Client
+      # A Cocina-like object that wraps an invalid Cocina object
+      class InvalidCocina < Hashie::Mash
+        include Hashie::Extensions::Mash::SymbolizeKeys
+
+        disable_warnings :size
+      end
+    end
+  end
+end

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

@@ -53,8 +53,8 @@ module Dor
           @object_identifier = object_identifier
         end
 
-        # @return [Cocina::Models::DROWithMetadata, Hash] the object metadata or a hash with
-        #   invalid metadata and a message about the source of the invalidity
+        # @return [Cocina::Models::DROWithMetadata, Dor::Services::Client::InvalidCocina] the object version or an
+        #   InvalidCocina instance that behaves similarly to a Cocina object
         # @raise [Dor::Services::Client::Error] on an unsuccessful response from the server
         def find(version)
           resp = connection.get do |req|
@@ -145,9 +145,9 @@ module Dor
 
         # @return [Hash] the solr document for the user version
         # @raise [UnexpectedResponse] on an unsuccessful response from the server
-        def solr(version)
+        def solr(version, validate: true)
           resp = connection.get do |req|
-            req.url "#{base_path}/#{version}/solr"
+            req.url "#{base_path}/#{version}/solr?validate=#{validate}"
           end
           raise_exception_based_on_response!(resp) unless resp.success?
 

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

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

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

@@ -57,10 +57,7 @@ module Dor
         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
+          InvalidCocina.new(invalid_cocina_error.dig('meta', 'json').merge(error_message: invalid_cocina_error['detail']))
         end
 
         def date_from_header(headers, key)

data/lib/dor/services/client.rb

@@ -10,6 +10,7 @@ require 'active_support/json'
 require 'cocina/models'
 require 'faraday'
 require 'faraday/retry'
+require 'hashie'
 require 'nokogiri'
 require 'singleton'
 require 'zeitwerk'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services-client
 version: !ruby/object:Gem::Version
-  version: 15.32.0
+  version: 15.34.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.113.0
+        version: 0.114.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.113.0
+        version: 0.114.0
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -250,6 +264,7 @@ files:
 - lib/dor/services/client/collections.rb
 - lib/dor/services/client/error_faraday_middleware.rb
 - lib/dor/services/client/events.rb
+- lib/dor/services/client/invalid_cocina.rb
 - lib/dor/services/client/members.rb
 - lib/dor/services/client/milestones.rb
 - lib/dor/services/client/mutate.rb