preservation-client 5.2.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 264c8e3e6d57fc3e422ec89120ee8e65d3c949328b91e45d7ac619d0ee3acc6a
-  data.tar.gz: c98d4b2d5fb782808c53812b2858d65bc90b26a606a423227ff83849b5f6dca6
+  metadata.gz: 1f564cb04f2c454690324230f40e8876d752f7eb405e1dcde3671d9cd573556e
+  data.tar.gz: f86ce941a43ca660099a67424b21450b1b83e34be79033e4dac3d99eef41c5b3
 SHA512:
-  metadata.gz: 3ea57d957febb7da750c62784e3af22213e3ae40200edb75acfc98f5eb5a9be8b03261a333cbd775a14eeb53580b8380d0d7c94828b99dd5f7b3644e3e918d67
-  data.tar.gz: 935c2ac4854dc91813242402fc51d6b88e00e31b70ca94a11feaf51c5acea90655bf434730afa7cca11e651f0c7fb180a6eb155fbb33adf2846859f90a5d6bc1
+  metadata.gz: b30b8db76ff51c9c1bda3c574da09e4acf294b1151b234addb1c3da66c0bbf7ba034bc11160d02b50766ededd6927bcb4945d6de759fd2e10d274fd7bdffedc3
+  data.tar.gz: 54ef26cec8442266b9f2b0ffb7dabd0f7df0c10b1eb18f7c05819e9b52cbda741990db9271a650b2fb6f505b66a43de736d20175289714e1cefec669822f3458

data/.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  ruby-rails: sul-dlss/ruby-rails@3.1.2
+  ruby-rails: sul-dlss/ruby-rails@3.2.0
 workflows:
   build:
     jobs:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    preservation-client (5.2.0)
+    preservation-client (6.0.0)
       activesupport (>= 4.2, < 8)
       faraday (~> 2.0)
       moab-versioning (>= 5.0.0, < 7)
@@ -36,14 +36,14 @@ GEM
     json (2.6.3)
     method_source (1.0.0)
     minitest (5.17.0)
-    moab-versioning (6.0.0)
+    moab-versioning (6.1.0)
       druid-tools (>= 1.0.0)
       json
       nokogiri
       nokogiri-happymapper
-    nokogiri (1.14.0-x86_64-darwin)
+    nokogiri (1.14.1-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.0-x86_64-linux)
+    nokogiri (1.14.1-x86_64-linux)
       racc (~> 1.4)
     nokogiri-happymapper (0.9.0)
       nokogiri (~> 1.5)
@@ -66,7 +66,7 @@ GEM
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.1)
       rspec-support (~> 3.12.0)
     rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -113,6 +113,7 @@ GEM
 
 PLATFORMS
   x86_64-darwin-19
+  x86_64-darwin-20
   x86_64-linux
 
 DEPENDENCIES

data/lib/preservation/client/catalog.rb

@@ -23,18 +23,9 @@ module Preservation
       private
 
       def request(druid:, version:, http_args:)
-        result = if version == 1
-                   connection.post "/#{api_version}/catalog", http_args
-                 else
-                   connection.patch "/#{api_version}/catalog/#{druid}", http_args
-                 end
-        unless result.success?
-          raise UnexpectedResponseError, "response was not successful. Received status #{result.status}"
-        end
+        return post('catalog', http_args) if version == 1
 
-        true
-      rescue Faraday::Error => e
-        raise UnexpectedResponseError, e
+        patch("catalog/#{druid}", http_args)
       end
     end
   end

data/lib/preservation/client/version.rb

@@ -2,6 +2,6 @@
 
 module Preservation
   class Client
-    VERSION = '5.2.0'
+    VERSION = '6.0.0'
   end
 end

data/lib/preservation/client/versioned_api_service.rb

@@ -95,8 +95,19 @@ module Preservation
       rescue Faraday::Error => e
         errmsg = "Preservation::Client.#{caller_locations.first.label} " \
                  "got #{e.response[:status]} from Preservation at #{req_url}: #{e.response[:body]}"
-        exception_class = e.response[:status] == 423 ? LockedError : UnexpectedResponseError
-        raise exception_class, errmsg
+        raise http_exception_class(e.response[:status]), errmsg
+      end
+
+      # @param status_code [Integer] the HTTP status code to translate to an exception class
+      def http_exception_class(status_code)
+        case status_code
+        when 423
+          LockedError
+        when 409
+          ConflictError
+        else
+          UnexpectedResponseError
+        end
       end
     end
   end

data/lib/preservation/client.rb

@@ -23,6 +23,9 @@ module Preservation
     # Error raised when server returns 423 Locked
     class LockedError < Error; end
 
+    # Error raised when server returns 409 Conflict
+    class ConflictError < Error; end
+
     # Error raised when server returns an unexpected response
     # e.g., 4xx or 5xx status not otherwise handled
     class UnexpectedResponseError < Error; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: preservation-client
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Naomi Dushay
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-01 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -240,7 +240,7 @@ metadata:
   homepage_uri: https://github.com/sul-dlss/preservation-client
   source_code_uri: https://github.com/sul-dlss/preservation-client.
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -256,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.32
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A thin client for getting info from SDR preservation.
 test_files: []