sdr-client 0.60.0 → 0.63.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 827537801986b42218654f8edb47fe460c1bb9cf802ed11b1f9bd22fe6c419f0
-  data.tar.gz: c60c836e2822365cead36f7dfec7984bbe903b331b7eccf1483810a1598e8188
+  metadata.gz: 78ea65d3c9a57d94b5c1e0ec9570d8d46de57b6b96a241075bad23fe2d5f6951
+  data.tar.gz: 19f5e7b0f327b74654f6affd1aa2d1af63c3638574aa8b7c2aecd66d9596e5db
 SHA512:
-  metadata.gz: 818ea7f4c057215f2160375043cf58569256448159eda5d71863558cd9d55fdbe3cab21ac729769940251a582e31878ce1d5f3a2f3d2a130902f57718178c453
-  data.tar.gz: 17aafa6c32f3f95792f0cfa08c31ffb5acddd0158b1fa36c7c1bfbefd97b097e144d8faab4e899ee0cd6bdeaf07d03a85d84442c48f6a4ca4e6a6d65b29caf80
+  metadata.gz: 57d3cfa7e333339a774fdba3085cbf7323d6d9fca9804f74382198cbaac9d2210de654345baddfccdfc6b412a9ab619c8c800217da30e849b551912cacd25269
+  data.tar.gz: d04753f61d433a8c5f80317e1a8e7ebda1c70f1b361096d07fdc934950819316918165e5f466b53724a29a062cdb48882f4263d0d42b066cca20a0aa47b8949f

data/.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 jobs:
   build:
     docker:
-      - image: circleci/ruby:2.7.1
+      - image: cimg/ruby:3.0
         environment:
           CC_TEST_REPORTER_ID: 859fcfe88b00c026d15dce30e838e2299face8088b49fe62bc3a02d1507ce3d5
           RAILS_ENV: test

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: 360)
       @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.60.0'
+  VERSION = '0.63.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 0.60.0
+  version: 0.63.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: The CLI for https://github.com/sul-dlss/sdr-api