dor-services-client 6.35.0 → 6.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f284625ef5de76b844cbfa7569c83e1dc7deae5d19c94b4bb845f1cf69bab2e
-  data.tar.gz: 37cce8c5f6f95008bec16638f4ed2d30dd19ad01e7eb6da5e4b58ac2b330f7b4
+  metadata.gz: 9a432159ad7c4d7f287ec97a252c2783e3e3a7c2d67cea054577727b97acfa52
+  data.tar.gz: 710bca4a6fd453a73842b534616f5a8eae79040544ab563f1141e5151f903fde
 SHA512:
-  metadata.gz: 5b3f568bce673ef4d722d8140a7db715d35234e1312718205d9b352850899b10b59daaac34771ad27efe9a8715b6be5b4ba1c396d6fdc068c17b83e32abb4fcf
-  data.tar.gz: 5307d1ff1cd2a067168e452996761bb8bfde4b4c62ddf63cc070cb35478fe1dbe6b13fa1f6a3accf9dfc7bc6758dc496acea4cfe111bea4737f47231c4c1835b
+  metadata.gz: '0486fff69b07ebd63f409b9b8f587622fa6595d279a8cfc657dfbd230016d433fe2b01fd9b6ecef9742067bb9467e79d91d4fea28aecb38dd2601f5d7b114431'
+  data.tar.gz: 99a486c70acb3b5926977555be3515d16dc8ff062661427037b585014024ba929515b8a71d3e2911a7118d9309222a89e10cfbd39a41d0c6c10f5d58c62436a9

data/.rubocop.yml

@@ -8,3 +8,72 @@ Metrics/BlockLength:
   Exclude:
     - 'dor-services-client.gemspec'
     - 'spec/**/*'
+
+Gemspec/DateAssignment: # (new in 1.10)
+  Enabled: true
+Layout/SpaceBeforeBrackets: # (new in 1.7)
+  Enabled: true
+Lint/AmbiguousAssignment: # (new in 1.7)
+  Enabled: true
+Lint/DeprecatedConstants: # (new in 1.8)
+  Enabled: true
+Lint/DuplicateBranch: # (new in 1.3)
+  Enabled: true
+Lint/DuplicateRegexpCharacterClassElement: # (new in 1.1)
+  Enabled: true
+Lint/EmptyBlock: # (new in 1.1)
+  Enabled: true
+Lint/EmptyClass: # (new in 1.3)
+  Enabled: true
+Lint/EmptyInPattern: # (new in 1.16)
+  Enabled: true
+Lint/LambdaWithoutLiteralBlock: # (new in 1.8)
+  Enabled: true
+Lint/NoReturnInBeginEndBlocks: # (new in 1.2)
+  Enabled: true
+Lint/NumberedParameterAssignment: # (new in 1.9)
+  Enabled: true
+Lint/OrAssignmentToConstant: # (new in 1.9)
+  Enabled: true
+Lint/RedundantDirGlobSort: # (new in 1.8)
+  Enabled: true
+Lint/SymbolConversion: # (new in 1.9)
+  Enabled: true
+Lint/ToEnumArguments: # (new in 1.1)
+  Enabled: true
+Lint/TripleQuotes: # (new in 1.9)
+  Enabled: true
+Lint/UnexpectedBlockArity: # (new in 1.5)
+  Enabled: true
+Lint/UnmodifiedReduceAccumulator: # (new in 1.1)
+  Enabled: true
+Style/ArgumentsForwarding: # (new in 1.1)
+  Enabled: true
+Style/CollectionCompact: # (new in 1.2)
+  Enabled: true
+Style/DocumentDynamicEvalDefinition: # (new in 1.1)
+  Enabled: true
+Style/EndlessMethod: # (new in 1.8)
+  Enabled: true
+Style/HashConversion: # (new in 1.10)
+  Enabled: true
+Style/HashExcept: # (new in 1.7)
+  Enabled: true
+Style/IfWithBooleanLiteralBranches: # (new in 1.9)
+  Enabled: true
+Style/InPatternThen: # (new in 1.16)
+  Enabled: true
+Style/MultilineInPatternThen: # (new in 1.16)
+  Enabled: true
+Style/NegatedIfElseCondition: # (new in 1.2)
+  Enabled: true
+Style/NilLambda: # (new in 1.3)
+  Enabled: true
+Style/QuotedSymbols: # (new in 1.16)
+  Enabled: true
+Style/RedundantArgument: # (new in 1.4)
+  Enabled: true
+Style/StringChars: # (new in 1.12)
+  Enabled: true
+Style/SwapValues: # (new in 1.1)
+  Enabled: true

data/lib/dor/services/client.rb

@@ -26,11 +26,17 @@ module Dor
       # Base class for Dor::Services::Client exceptions
       class Error < StandardError; end
 
-      # Error that is raised when the remote server returns a 404 Not Found
+      # Error that is raised when the ultimate remote server returns a 404 Not Found for the id in our request (e.g. for druid, barcode, catkey)
       class NotFoundResponse < Error; end
 
+      # Error that is raised when the remote server returns some unparsable response
+      class MalformedResponse < Error; end
+
+      # Error that wraps Faraday connection exceptions
+      class ConnectionFailed < Error; end
+
       # Error that is raised when the remote server returns some unexpected response
-      # this could be any 4xx or 5xx status
+      # this could be any 4xx or 5xx status (except the ones that are direct children of the Error class above)
       class UnexpectedResponse < Error; end
 
       # Error that is raised when the remote server returns a 401 Unauthorized
@@ -39,11 +45,8 @@ module Dor
       # Error that is raised when the remote server returns a 409 Conflict
       class ConflictResponse < UnexpectedResponse; end
 
-      # Error that is raised when the remote server returns some unparsable response
-      class MalformedResponse < Error; end
-
-      # Error that wraps Faraday connection exceptions
-      class ConnectionFailed < Error; end
+      # Error that is raised when the remote server returns a 400 Bad Request; apps should not retry the request
+      class BadRequestError < UnexpectedResponse; end
 
       # @param object_identifier [String] the pid for the object
       # @raise [ArgumentError] when `object_identifier` is `nil`

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

@@ -21,6 +21,7 @@ module Dor
           return resp.body if resp.success? && resp.body.present?
 
           # 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 UnexpectedResponse, ResponseErrorFormatter.format(response: resp)
@@ -42,10 +43,12 @@ module Dor
           end
 
           # This method needs its own exception handling logic due to how the endpoint service (Symphony) operates
-          #
+
           # 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 UnexpectedResponse, ResponseErrorFormatter.format(response: resp) unless resp.success?
 
           resp.body

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

@@ -3,7 +3,7 @@
 module Dor
   module Services
     class Client
-      VERSION = '6.35.0'
+      VERSION = '6.36.0'
     end
   end
 end

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

@@ -22,10 +22,12 @@ module Dor
         # rubocop:disable Metrics/MethodLength
         def raise_exception_based_on_response!(response, object_identifier = nil)
           exception_class = case response.status
-                            when 404
-                              NotFoundResponse
+                            when 400
+                              BadRequestError
                             when 401
                               UnauthorizedResponse
+                            when 404
+                              NotFoundResponse
                             when 409
                               ConflictResponse
                             else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services-client
 version: !ruby/object:Gem::Version
-  version: 6.35.0
+  version: 6.36.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2021-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport