dor-services-client 9.0.0 → 9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6420f39cd3b4f4d1e125929725e7a749fdef2b4a3b41008fd6d6d440708aaba8
-  data.tar.gz: 3690b2a21d44ad9cc830a04f58117731bc4ab53f5d495edc5c4a0846150cd737
+  metadata.gz: a4b8ec2c059acbd588a6d64e931035f5552b16bacf9d0e6a1f0b8194fb371bb2
+  data.tar.gz: 750be3e2a2a234299c63ee1aeb6b40c4a0a87116785cf085bc359d80676465da
 SHA512:
-  metadata.gz: 1130a9e3510b4db1a1d383647de3e9c3c87f8b426c40586326ff88c300bb7508749c29eab8fcc35c5cb91db1cc0458fbc3b1949f12004bc3a4fa2cad9109db68
-  data.tar.gz: 63459db88fccc089c36c02b8a6496988edfa628844b04eb8991563c3fce014c88def669b5f452f48144a1e4c0bd87b2172bb1c674567295b31b280924f86124f
+  metadata.gz: d0ffa417486e6136c276b2aa289d4f17e01a798ea288e727ce5b2955b722934ce7b992318ff3c88e3060a57a7cfd2a203b29d0302c6862d79cce80e6f4bab1d9
+  data.tar.gz: f707910e959af48ab45e29a4328217517b42c50f49314ff14e142afed33688d842b2ecfc9df8ea740e59914c31cbbd4d5b5dbff67cbb7b6e1b64e197a7aa1618

data/.rubocop.yml

@@ -15,6 +15,9 @@ Metrics/BlockLength:
 RSpec/MultipleMemoizedHelpers:
   Max: 10
 
+RSpec/ExampleLength:
+  Max: 10
+
 Gemspec/DateAssignment: # (new in 1.10)
   Enabled: true
 Layout/SpaceBeforeBrackets: # (new in 1.7)

data/.rubocop_todo.yml

@@ -25,12 +25,6 @@ RSpec/AnyInstance:
     - 'spec/dor/services/client/metadata_spec.rb'
     - 'spec/dor/services/client/object_version_spec.rb'
 
-# Offense count: 1
-# Configuration parameters: Max, CountAsOne.
-RSpec/ExampleLength:
-  Exclude:
-    - 'spec/dor/services/client/metadata_spec.rb'
-
 # Offense count: 6
 RSpec/IdenticalEqualityAssertion:
   Exclude:

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

@@ -20,9 +20,9 @@ module Dor
 
           # This method needs its own exception handling logic due to how the endpoint service (SearchWorks) operates
           # raise a NotFoundResponse because the resource being requested was not found in the ILS (via dor-services-app)
-          raise NotFoundResponse, ResponseErrorFormatter.format(response: resp) if resp.success? && resp.body.blank?
+          raise NotFoundResponse.new(response: resp) if resp.success? && resp.body.blank?
 
-          raise UnexpectedResponse, ResponseErrorFormatter.format(response: resp)
+          raise UnexpectedResponse.new(response: resp)
         end
 
         # Gets MARCXML corresponding to a barcode or catkey
@@ -45,9 +45,9 @@ module Dor
           # DOR Services App does not respond with a 404 when no match in Symphony.
           # Rather, it responds with a 500 containing "Record not found in Symphony" in the body.
           # raise a NotFoundResponse because the resource being requested was not found in the ILS (via dor-services-app)
-          raise NotFoundResponse, ResponseErrorFormatter.format(response: resp) if !resp.success? && resp.body.match?(/Record not found in Symphony/)
+          raise NotFoundResponse.new(response: resp) if !resp.success? && resp.body.match?(/Record not found in Symphony/)
 
-          raise UnexpectedResponse, ResponseErrorFormatter.format(response: resp) unless resp.success?
+          raise UnexpectedResponse.new(response: resp) unless resp.success?
 
           resp.body
         end

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

@@ -35,7 +35,7 @@ module Dor
         # rubocop:disable Metrics/AbcSize
         def update(params:, skip_lock: false)
           # Raised if Cocina::Models::*WithMetadata not provided.
-          raise BadRequestError, 'ETag not provided.' unless skip_lock || params.respond_to?(:lock)
+          raise ArgumentError, 'ETag not provided.' unless skip_lock || params.respond_to?(:lock)
 
           resp = connection.patch do |req|
             req.url object_path

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

@@ -3,7 +3,7 @@
 module Dor
   module Services
     class Client
-      VERSION = '9.0.0'
+      VERSION = '9.1.0'
     end
   end
 end

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

@@ -5,6 +5,14 @@ module Dor
     class Client
       # @abstract API calls to a versioned endpoint
       class VersionedService
+        EXCEPTION_CLASS = {
+          400 => BadRequestError,
+          401 => UnauthorizedResponse,
+          404 => NotFoundResponse,
+          409 => ConflictResponse,
+          412 => PreconditionFailedResponse
+        }.freeze
+
         def initialize(connection:, version:)
           @connection = connection
           @api_version = version
@@ -19,26 +27,17 @@ module Dor
 
         attr_reader :connection, :api_version
 
-        # rubocop:disable Metrics/MethodLength
         def raise_exception_based_on_response!(response, object_identifier = nil)
-          exception_class = case response.status
-                            when 400
-                              BadRequestError
-                            when 401
-                              UnauthorizedResponse
-                            when 404
-                              NotFoundResponse
-                            when 409
-                              ConflictResponse
-                            when 412
-                              PreconditionFailedResponse
-                            else
-                              UnexpectedResponse
-                            end
-          raise exception_class,
-                ResponseErrorFormatter.format(response: response, object_identifier: object_identifier)
+          data = if response.headers['content-type'] == 'application/json'
+                   JSON.parse(response.body)
+                 else
+                   {}
+                 end
+          exception_class = EXCEPTION_CLASS.fetch(response.status, UnexpectedResponse)
+          raise exception_class.new(response: response,
+                                    object_identifier: object_identifier,
+                                    errors: data.fetch('errors', []))
         end
-        # rubocop:enable Metrics/MethodLength
 
         def build_cocina_from_response(response)
           cocina_object = Cocina::Models.build(JSON.parse(response.body))

data/lib/dor/services/client.rb

@@ -38,7 +38,26 @@ module Dor
 
       # Error that is raised when the remote server returns some unexpected response
       # this could be any 4xx or 5xx status (except the ones that are direct children of the Error class above)
-      class UnexpectedResponse < Error; end
+      class UnexpectedResponse < Error
+        # @param [Faraday::Response] response
+        # @param [String] object_identifier (nil)
+        # @param [Hash<String,Object>] errors (nil) the JSON-API errors object
+        # rubocop:disable Lint/MissingSuper
+        def initialize(response:, object_identifier: nil, errors: nil)
+          @response = response
+          @object_identifier = object_identifier
+          @errors = errors
+        end
+        # rubocop:enable Lint/MissingSuper
+
+        attr_accessor :errors
+
+        def to_s
+          return errors.map { |e| "#{e['title']} (#{e['detail']})" }.join(', ') if errors.present?
+
+          ResponseErrorFormatter.format(response: @response, object_identifier: @object_identifier)
+        end
+      end
 
       # Error that is raised when the remote server returns a 401 Unauthorized
       class UnauthorizedResponse < UnexpectedResponse; end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: dor-services-client
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 9.1.0
 platform: ruby
 authors:
 - Justin Coyne
 - Michael Giarlo
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
 date: 2022-04-20 00:00:00.000000000 Z
@@ -213,7 +213,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - jcoyne@justincoyne.com
 - leftwing@alumni.rutgers.edu
@@ -262,7 +262,7 @@ homepage: https://github.com/sul-dlss/dor-services-client
 licenses: []
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -280,8 +280,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: A client for dor-services-app
 test_files: []