sdr-client 0.73.0 → 0.74.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d9177bcaeb8c59171ec038933046207b1527c091471ff6257c26883a69f3155
-  data.tar.gz: a5766c28e499c5d66ac874f32bc78e8bdc2e293a2aed0a1e936f4538c9fc89b6
+  metadata.gz: e961a5a661471be38fc957cb5ee14985b94d64c47d75300ebee2bec6b5d86f01
+  data.tar.gz: 39bdac093eb599e91c402778605eb5164a9a72a289d56d31727e5edfee9569f2
 SHA512:
-  metadata.gz: 6c77293e170642a901a6f1c4279a16e6bb32966e58e0e6cc3fcde3d2d7dc8525d84b5f65dfadd4136f32003629e8d4cd73a2ed47bc7896853169e36256ea606c
-  data.tar.gz: 8769b04c6aca0443cc812de990fa6daa798073b765291a5c75bee08f38a1ed95c1ada4815525f412dcac8a12dd5f810308701e8df943041d2857d86cc9ad9f6f
+  metadata.gz: 42a8987a6836d1fbffe02517bf08114ba44595524505ba318a3a3109be2b12bc4cbb67e482a2b67d5045763d24f3192b69726632989d22bab1a140c351d67b44
+  data.tar.gz: 873fb15afd29b719f2f4cefe842e7109fb47f950578364a23f3772323015ed73040d1d79ab174e8ea25f7e59272a86eb3d264c26a36649c25727cee6a62f7eff

data/lib/sdr_client/deposit/upload_files.rb

@@ -7,6 +7,7 @@ module SdrClient
     # The file uploading part of a deposit
     class UploadFiles
       BLOB_PATH = '/v1/direct_uploads'
+
       # @param [Hash<String,Files::DirectUploadRequest>] the metadata for uploading the files
       # @param [Logger] logger the logger to use
       # @param [Connection] connection
@@ -23,23 +24,23 @@ module SdrClient
         @connection = connection
       end
 
-      # @return [Array<SdrClient::Deposit::Files::DirectUploadResponse>] the responses from the server for the uploads
+      # @return [Array<Files::DirectUploadResponse>] the responses from the server for the uploads
       def run
-        upload_responses = upload_file_metadata
-        upload_files(upload_responses)
-        upload_responses.values
+        file_metadata.map do |filename, metadata|
+          direct_upload(metadata.to_json).tap do |response|
+            upload_file(filename: filename,
+                        url: response.direct_upload.fetch('url'),
+                        content_type: response.content_type,
+                        content_length: response.byte_size)
+            logger.info("Upload of #{filename} complete")
+          end
+        end
       end
 
       private
 
       attr_reader :logger, :connection, :file_metadata
 
-      def upload_file_metadata
-        file_metadata.transform_values { |metadata| 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')
@@ -56,18 +57,6 @@ module SdrClient
         raise "unexpected response: #{response.inspect}"
       end
 
-      # @param [Hash<String,Files::DirectUploadResponse>] upload_responses the filenames and their upload response
-      def upload_files(upload_responses)
-        upload_responses.each do |filename, response|
-          upload_file(filename: filename,
-                      url: response.direct_upload.fetch('url'),
-                      content_type: response.content_type,
-                      content_length: response.byte_size)
-
-          logger.info('Upload complete')
-        end
-      end
-
       def upload_file(filename:, url:, content_type:, content_length:)
         logger.info("Uploading `#{filename}' to #{url}")
 

data/lib/sdr_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 0.73.0
+  version: 0.74.0
 platform: ruby
 authors:
 - Justin Coyne
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-22 00:00:00.000000000 Z
+date: 2022-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -256,7 +256,7 @@ metadata:
   source_code_uri: https://github.com/sul-dlss/sdr-client
   changelog_uri: https://github.com/sul-dlss/sdr-client/releases
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -271,8 +271,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
-signing_key:
+rubygems_version: 3.2.32
+signing_key: 
 specification_version: 4
 summary: The CLI for https://github.com/sul-dlss/sdr-api
 test_files: []