sdr-client 0.59.0 → 0.62.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc628ea7480d2ef9102b3fa37f37fe23b0fa9ee11d7a883251b465b3f7518112
-  data.tar.gz: 8d0e09c1a92f0ee87be08efbbd359fd4499f671a0a3de9c7edde4afeaca70942
+  metadata.gz: f26953315bf59c1c2485836f1b5485877bb58faa0375eca118016a3e1e3f5932
+  data.tar.gz: 9a00c929a3aa2da9a1698c97694dcd72d789289a83e4d6d9f330d404ad679d24
 SHA512:
-  metadata.gz: 560557769b5867a0dbcb5c5f7ba9f5bb4ccb3b6e93637fc35df4e5a8f389dc9d4ab06bdacbb220d06d5a4f0af30761836740febe7be516a72355854fd834f581
-  data.tar.gz: 38a5f18f6f4bb293731058f08407dc42790ab2932c0d8ff0d9bcdaeedfb79cb880ae065756953411a2f9a7839539310fdb40982ac212a643fc0c08d789b38f46
+  metadata.gz: f7a6daaa1c032403ba01e9ce45660fc8e71107d37fac3995af8ed73a9a1ff53e6e75a513326fc20c14e94129ec7cf4d7f711e1961ddfb82044da293fe508d46e
+  data.tar.gz: 9943f57b33e782840746d6208479aa4732d15d8dedafcd2a44bc58c153a31485bcf4663670e41d011592e727d7ba9b53732f1e4879e74a5895cdc002f41a0ab8

data/lib/sdr_client/connection.rb

@@ -5,14 +5,16 @@ module SdrClient
   class Connection
     include Dry::Monads[:result]
 
-    def initialize(url:, token: Credentials.read)
+    # @param [Integer] read_timeout the value in seconds to set the read timeout
+    def initialize(url:, token: Credentials.read, read_timeout: 180)
       @url = url
       @token = token
+      @request_options = { read_timeout: read_timeout }
     end
 
     def connection
-      @connection ||= Faraday.new(url: url) do |conn|
-        conn.authorization :Bearer, token
+      @connection ||= Faraday.new(url: url, request: request_options) do |conn|
+        conn.request :authorization, :Bearer, token
         conn.adapter :net_http
       end
     end
@@ -36,6 +38,6 @@ module SdrClient
 
     private
 
-    attr_reader :url, :token
+    attr_reader :url, :token, :request_options
   end
 end

data/lib/sdr_client/deposit/unexpected_response.rb

@@ -4,12 +4,21 @@ module SdrClient
   module Deposit
     # Handles unexpected responses when manipulating resources
     class UnexpectedResponse
+      # Raised when there is a request error (e.g.: a cocina-models version mismatch)
+      class BadRequest < StandardError; end
+      # Raised when there is a problem with the credentials
+      class Unauthorized < StandardError; end
+
       # @param [Faraday::Response] response
       def self.call(response)
-        raise "There was an error with your request: #{response.body}" if response.status == 400
-        raise 'There was an error with your credentials. Perhaps they have expired?' if response.status == 401
-
-        raise "unexpected response: #{response.status} #{response.body}"
+        case response.status
+        when 400
+          raise BadRequest, "There was an error with your request: #{response.body}"
+        when 401
+          raise Unauthorized, 'There was an error with your credentials. Perhaps they have expired?'
+        else
+          raise "unexpected response: #{response.status} #{response.body}"
+        end
       end
     end
   end

data/lib/sdr_client/deposit/upload_files.rb

@@ -38,6 +38,8 @@ module SdrClient
         Hash[file_metadata.map { |filename, metadata| [filename, direct_upload(metadata.to_json)] }]
       end
 
+      # This creates a signed token that we can use to upload the file. This token has an expiration set in sdr-api,
+      # so we have to use it before it expires.
       def direct_upload(metadata_json)
         logger.info("Starting an upload request: #{metadata_json}")
         response = connection.post(BLOB_PATH, metadata_json, 'Content-Type' => 'application/json')

data/lib/sdr_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SdrClient
-  VERSION = '0.59.0'
+  VERSION = '0.62.0'
 end

data/sdr-client.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'cocina-models', '~> 0.61.0'
+  spec.add_dependency 'cocina-models', '~> 0.62.0'
   spec.add_dependency 'dry-monads'
   spec.add_dependency 'faraday', '>= 0.16'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 0.59.0
+  version: 0.62.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-14 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.61.0
+        version: 0.62.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.61.0
+        version: 0.62.0
 - !ruby/object:Gem::Dependency
   name: dry-monads
   requirement: !ruby/object:Gem::Requirement