sdr-client 0.61.0 → 0.64.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 101554d535c7a2e1fd71fb0d2f9abbd956e871c688b09461c8330e4e3526864b
-  data.tar.gz: d65b128417c52e9df5aac2b399fc036cc77f3d93b62dac27b2aba24a2b8de24d
+  metadata.gz: b3c30726b9a149f69e8dc920594be85f01bdd574119012ddc42ce3a83c168ca8
+  data.tar.gz: 729fed0fdde2452ea5efd1fa5e9dd56ecec4d83afffdea42c64c53cbce1c3602
 SHA512:
-  metadata.gz: f732927aab94e1c2bf36f52976b5ec815788513111b8cbebf8cb3cf339c44976f70c574fa18267a81192f9f267ef1402e6c77baf3a23a23094bcad02f72313a7
-  data.tar.gz: d0ab06ae6318729d62adfab59483f4363e8b5d3fdcb1a97397fb0690d60d30e1fdbdd3976b8d7057e129d816eab40e4bad17a6c82321c1935b9ab9faaba55bf7
+  metadata.gz: a5720ec320e602a76d9a2aa3a5a5e3a61ebf3927943d8af4d7480bc0026e9f6b5092923174f2c9ed0d187be07b66691e8853682d44b5117f4af3eb1cd29fb9e1
+  data.tar.gz: 490fdd129716005a4216e319f9920ad2431e660224db51821d7409914807b3672f261d8bde33e18f25f4f68a7dea99cda661da69f43ab11392de5178b68cfc94

data/.circleci/config.yml

@@ -1,35 +1,10 @@
 version: 2.1
-
-jobs:
+orbs:
+  ruby-rails: sul-dlss/ruby-rails@2.0.0
+workflows:
   build:
-    docker:
-      - image: circleci/ruby:2.7.1
-        environment:
-          CC_TEST_REPORTER_ID: 859fcfe88b00c026d15dce30e838e2299face8088b49fe62bc3a02d1507ce3d5
-          RAILS_ENV: test
-    steps:
-      - checkout
-      - run:
-          name: Install Bundler
-          command: gem install bundler
-      - run:
-          name: Which bundler?
-          command: bundle -v
-      - run:
-          name: Bundle Install
-          command: bundle check || bundle install
-      - run:
-          name: Lint using rubocop
-          command: bundle exec rubocop
-      - run:
-          name: Setup Code Climate test-reporter
-          command: |
-            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-            chmod +x ./cc-test-reporter
-            ./cc-test-reporter before-build
-      - run:
-          name: rspec
-          command: bundle exec rspec
-      - run:
-          name: upload test coverage report to Code Climate
-          command: ./cc-test-reporter after-build --coverage-input-type simplecov --exit-code $?
+    jobs:
+      - ruby-rails/lint:
+          name: lint
+      - ruby-rails/test-gem:
+          name: test

data/.rubocop.yml

@@ -1,7 +1,11 @@
 inherit_from: .rubocop_todo.yml
 
+require:
+  - rubocop-rake
+  - rubocop-rspec
+
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.0
   Exclude:
     - 'bin/console'
     - 'vendor/**/*'
@@ -9,8 +13,8 @@ AllCops:
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/*'
-    -  'sdr-client.gemspec'
-  ExcludedMethods:
+    - 'sdr-client.gemspec'
+  IgnoredMethods:
     - 'OptionParser.new'
 
 Metrics/ClassLength:
@@ -20,3 +24,116 @@ Metrics/ClassLength:
 Naming/FileName:
   Exclude:
     - 'lib/sdr-client.rb'
+
+Gemspec/DateAssignment: # new in 1.10
+  Enabled: true
+Gemspec/RequireMFA: # new in 1.23
+  Enabled: true
+Layout/LineEndStringConcatenationIndentation: # new in 1.18
+  Enabled: true
+Layout/SpaceBeforeBrackets: # new in 1.7
+  Enabled: true
+Lint/AmbiguousAssignment: # new in 1.7
+  Enabled: true
+Lint/AmbiguousOperatorPrecedence: # new in 1.21
+  Enabled: true
+Lint/AmbiguousRange: # new in 1.19
+  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/IncompatibleIoSelectWithFiberScheduler: # new in 1.21
+  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/RequireRelativeSelfPath: # new in 1.22
+  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
+Lint/UselessRuby2Keywords: # new in 1.23
+  Enabled: true
+Naming/BlockForwarding: # new in 1.24
+  Enabled: true
+Security/IoMethods: # new in 1.22
+  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/FileRead: # new in 1.24
+  Enabled: true
+Style/FileWrite: # new in 1.24
+  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/MapToHash: # new in 1.24
+  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/NumberedParameters: # new in 1.22
+  Enabled: true
+Style/NumberedParametersLimit: # new in 1.22
+  Enabled: true
+Style/OpenStructUse: # new in 1.23
+  Enabled: true
+Style/QuotedSymbols: # new in 1.16
+  Enabled: true
+Style/RedundantArgument: # new in 1.4
+  Enabled: true
+Style/RedundantSelfAssignmentBranch: # new in 1.19
+  Enabled: true
+Style/SelectByRegexp: # new in 1.22
+  Enabled: true
+Style/StringChars: # new in 1.12
+  Enabled: true
+Style/SwapValues: # new in 1.1
+  Enabled: true
+RSpec/ExcessiveDocstringSpacing: # new in 2.5
+  Enabled: true
+RSpec/IdenticalEqualityAssertion: # new in 2.4
+  Enabled: true
+RSpec/SubjectDeclaration: # new in 2.5
+  Enabled: true
+RSpec/FactoryBot/SyntaxMethods: # new in 2.7
+  Enabled: true
+RSpec/Rails/AvoidSetupHook: # new in 2.4
+  Enabled: true

data/.rubocop_todo.yml

@@ -1,25 +1,25 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude`
-# on 2021-04-15 12:18:21 -0700 using RuboCop version 0.79.0.
+# on 2022-01-14 01:45:54 UTC using RuboCop version 1.24.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 1
-# Configuration parameters: Max.
-Metrics/AbcSize:
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
   Exclude:
-    - 'lib/sdr_client/deposit/model_process.rb'
+    - 'sdr-client.gemspec'
 
 # Offense count: 1
-# Configuration parameters: Max.
-Metrics/CyclomaticComplexity:
+Lint/NoReturnInBeginEndBlocks:
   Exclude:
-    - 'lib/sdr_client/cli.rb'
+    - 'lib/sdr_client/deposit/model_process.rb'
 
-# Offense count: 9
-# Configuration parameters: CountComments, Max, ExcludedMethods.
+# Offense count: 10
+# Configuration parameters: CountComments, Max, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
   Exclude:
     - 'lib/sdr_client/cli.rb'
@@ -29,9 +29,87 @@ Metrics/MethodLength:
     - 'lib/sdr_client/deposit/request.rb'
     - 'lib/sdr_client/login.rb'
 
-# Offense count: 231
+# Offense count: 6
+# Configuration parameters: Max, CountAsOne.
+RSpec/ExampleLength:
+  Exclude:
+    - 'spec/sdr_client/deposit_spec.rb'
+    - 'spec/sdr_client/model_deposit_spec.rb'
+
+# Offense count: 3
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
+# Include: **/*_spec*rb*, **/spec/**/*
+RSpec/FilePath:
+  Exclude:
+    - 'spec/sdr_client/client_spec.rb'
+    - 'spec/sdr_client/deposit/find_spec.rb'
+    - 'spec/sdr_client/model_deposit_spec.rb'
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: have_received, receive
+RSpec/MessageSpies:
+  Exclude:
+    - 'spec/sdr_client/deposit_spec.rb'
+
+# Offense count: 9
+# Configuration parameters: Max.
+RSpec/MultipleExpectations:
+  Exclude:
+    - 'spec/sdr_client/connection_spec.rb'
+    - 'spec/sdr_client/deposit_spec.rb'
+    - 'spec/sdr_client/login_spec.rb'
+    - 'spec/sdr_client/model_deposit_spec.rb'
+
+# Offense count: 21
+# Configuration parameters: AllowSubject, Max.
+RSpec/MultipleMemoizedHelpers:
+  Exclude:
+    - 'spec/sdr_client/deposit/metadata_builder_spec.rb'
+    - 'spec/sdr_client/deposit/model_process_spec.rb'
+    - 'spec/sdr_client/deposit/process_spec.rb'
+    - 'spec/sdr_client/deposit/request_spec.rb'
+
+# Offense count: 24
+# Configuration parameters: IgnoreSharedExamples.
+RSpec/NamedSubject:
+  Exclude:
+    - 'spec/sdr_client/background_job_results_spec.rb'
+    - 'spec/sdr_client/connection_spec.rb'
+    - 'spec/sdr_client/credentials_spec.rb'
+    - 'spec/sdr_client/deposit/model_process_spec.rb'
+    - 'spec/sdr_client/deposit/process_spec.rb'
+    - 'spec/sdr_client/login_spec.rb'
+
+# Offense count: 11
+# Configuration parameters: Max.
+RSpec/NestedGroups:
+  Exclude:
+    - 'spec/sdr_client/deposit/model_process_spec.rb'
+    - 'spec/sdr_client/deposit/process_spec.rb'
+    - 'spec/sdr_client/login_spec.rb'
+
+# Offense count: 19
+# Cop supports --auto-correct.
+Style/KeywordParametersOrder:
+  Exclude:
+    - 'lib/sdr_client/deposit.rb'
+    - 'lib/sdr_client/deposit/request.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: Mode.
+Style/StringConcatenation:
+  Exclude:
+    - 'lib/sdr_client/deposit/create_resource.rb'
+    - 'spec/sdr_client/deposit_spec.rb'
+
+# Offense count: 19
 # Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Max: 132
+  Exclude:
+    - 'lib/sdr_client/deposit/model_process.rb'
+    - 'spec/sdr_client/deposit/model_process_spec.rb'
+    - 'spec/sdr_client/deposit/process_spec.rb'

data/Gemfile

@@ -6,3 +6,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'byebug'
+gem 'rspec_junit_formatter' # For circleCI

data/exe/sdr

@@ -30,8 +30,8 @@ deposit_options = OptionParser.new do |opts|
   end
 
   opts.on('--type TYPE', 'The object type to create. ' \
-          'One of: "image", "book", "document", "map", "manuscript", "media", ' \
-          '"three_dimensional", "object", "collection", or "admin_policy"') do |type|
+                         'One of: "image", "book", "document", "map", "manuscript", "media", ' \
+                         '"three_dimensional", "object", "collection", or "admin_policy"') do |type|
     if %w[image book document map manuscript media three_dimensional object collection admin_policy].include?(type)
       options[:type] = "http://cocina.sul.stanford.edu/models/#{type}.jsonld"
     end
@@ -58,12 +58,12 @@ deposit_options = OptionParser.new do |opts|
   end
 
   opts.on('--viewing-direction DIRECTION', 'The viewing direction (if a book). ' \
-          'Either "left-to-right" or "right-to-left"') do |viewing_direction|
+                                           'Either "left-to-right" or "right-to-left"') do |viewing_direction|
     options[:viewing_direction] = viewing_direction if %w[left-to-right right-to-left].include?(viewing_direction)
   end
 
   opts.on('--access LEVEL', 'The access level for this object. ' \
-          'Either "world", "stanford", "location-based", "citation-only" or "dark"') do |level|
+                            'Either "world", "stanford", "location-based", "citation-only" or "dark"') do |level|
     options[:access] = level if %w[world stanford location-based citation-only dark].include?(level)
   end
 

data/lib/sdr_client/connection.rb

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

data/lib/sdr_client/credentials.rb

@@ -18,7 +18,7 @@ module SdrClient
     def self.read
       raise NoCredentialsError unless ::File.exist?(credentials_file)
 
-      creds = IO.readlines(credentials_file, chomp: true).first if ::File.exist?(credentials_file)
+      creds = File.readlines(credentials_file, chomp: true).first if ::File.exist?(credentials_file)
       raise NoCredentialsError if creds.nil?
 
       creds

data/lib/sdr_client/deposit/create_resource.rb

@@ -6,7 +6,7 @@ module SdrClient
     class CreateResource
       DRO_PATH = '/v1/resources'
 
-      def self.run(accession:, assign_doi: false, metadata:, logger:, connection:)
+      def self.run(accession:, metadata:, logger:, connection:, assign_doi: false)
         new(accession: accession,
             assign_doi: assign_doi,
             metadata: metadata,

data/lib/sdr_client/deposit/file.rb

@@ -26,7 +26,7 @@ module SdrClient
 
       def as_json
         {
-          "type": 'http://cocina.sul.stanford.edu/models/file.jsonld',
+          type: 'http://cocina.sul.stanford.edu/models/file.jsonld',
           label: @label,
           filename: @filename,
           externalIdentifier: @external_identifier,
@@ -58,7 +58,7 @@ module SdrClient
 
       def create_message_digest(algorithm, digest)
         {
-          "type": algorithm,
+          type: algorithm,
           digest: digest
         }
       end

data/lib/sdr_client/deposit/file_set.rb

@@ -4,25 +4,25 @@ module SdrClient
   module Deposit
     # This represents the FileSet metadata that we send to the server for doing a deposit
     class FileSet
+      # @param [String] label
       # @param [Array] uploads
       # @param [Hash<String,Hash<String,String>>] uploads_metadata the file level metadata
       # @param [Array] files
-      # @param [String] label
-      def initialize(uploads: [], uploads_metadata: {}, files: [], label:)
+      def initialize(label:, uploads: [], uploads_metadata: {}, files: [])
         @label = label
-        @files = if !uploads.empty?
+        @files = if uploads.empty?
+                   files
+                 else
                    uploads.map do |upload|
                      File.new(**file_args(upload, uploads_metadata.fetch(upload.filename, {})))
                    end
-                 else
-                   files
                  end
       end
 
       def as_json
         {
-          "type": 'http://cocina.sul.stanford.edu/models/resources/file.jsonld',
-          "label": label,
+          type: 'http://cocina.sul.stanford.edu/models/resources/file.jsonld',
+          label: label,
           structural: {
             contains: files.map(&:as_json)
           },
@@ -44,7 +44,7 @@ module SdrClient
         }
         args.merge!(upload_metadata)
         # Symbolize
-        Hash[args.map { |k, v| [k.to_sym, v] }]
+        args.transform_keys(&:to_sym)
       end
     end
   end

data/lib/sdr_client/deposit/model_process.rb

@@ -8,15 +8,16 @@ module SdrClient
     class ModelProcess
       # @param [Cocina::Model::RequestDRO] request_dro for depositing
       # @param [Connection] connection the connection to use
-      # @param [Array<String>] files a list of file names to upload
       # @param [Boolean] accession should the accessionWF be started
+      # @param [Array<String>] files a list of file names to upload
       # @param [Boolean] assign_doi should a DOI be assigned to this item
       # @param [Logger] logger the logger to use
       def initialize(request_dro:, # rubocop:disable Metrics/ParameterLists
                      connection:,
-                     files: [], accession:,
+                     accession:,
+                     files: [],
                      assign_doi: false,
-                     logger: Logger.new(STDOUT))
+                     logger: Logger.new($stdout))
         @files = files
         @connection = connection
         @request_dro = request_dro
@@ -62,7 +63,7 @@ module SdrClient
 
         # Request files without files
         filenames = files.map { |filepath| ::File.basename(filepath) }
-        request_files.keys.each do |request_filename|
+        request_files.each_key do |request_filename|
           raise "File not provided for request file #{request_filename}" unless filenames.include?(request_filename)
         end
       end
@@ -70,11 +71,9 @@ module SdrClient
       # Map of filenames to mimetypes
       def mime_types
         @mime_types ||=
-          Hash[
-            request_files.map do |filename, file|
-              [filename, file.hasMimeType || 'application/octet-stream']
-            end
-          ]
+          request_files.transform_values do |file|
+            file.hasMimeType || 'application/octet-stream'
+          end
       end
 
       # Map of filenames to request files
@@ -82,13 +81,11 @@ module SdrClient
         @request_files ||= begin
           return {} unless request_dro.structural
 
-          Hash[
-              request_dro.structural.contains.map do |file_set|
-                file_set.structural.contains.map do |file|
-                  [file.filename, file]
-                end
-              end.flatten(1)
-          ]
+          request_dro.structural.contains.map do |file_set|
+            file_set.structural.contains.map do |file|
+              [file.filename, file]
+            end
+          end.flatten(1).to_h
         end
       end
     end

data/lib/sdr_client/deposit/process.rb

@@ -7,17 +7,21 @@ module SdrClient
     # The process for doing a deposit
     class Process
       # @param [Request] metadata information about the object
-      # @param [Class] grouping_strategy class whose run method groups an array of uploads
       # @param [String] connection the server connection to use
+      # @param [Boolean] accession should the accessionWF be started
+      # @param [Class] grouping_strategy class whose run method groups an array of uploads
       # @param [Array<String>] files a list of file names to upload
       # @param [Boolean] assign_doi should a DOI be assigned to this item
-      # @param [Boolean] accession should the accessionWF be started
       # @param [Logger] logger the logger to use
       #
       # rubocop:disable Metrics/ParameterLists
-      def initialize(metadata:, grouping_strategy: SingleFileGroupingStrategy,
-                     connection:, files: [], accession:, assign_doi: false,
-                     logger: Logger.new(STDOUT))
+      def initialize(metadata:,
+                     connection:,
+                     accession:,
+                     grouping_strategy: SingleFileGroupingStrategy,
+                     files: [],
+                     assign_doi: false,
+                     logger: Logger.new($stdout))
         @files = files
         @connection = connection
         @metadata = metadata
@@ -63,12 +67,10 @@ module SdrClient
 
       def mime_types
         @mime_types ||=
-          Hash[
-            files.map do |filepath|
-              filename = ::File.basename(filepath)
-              [filename, metadata.for(filename)['mime_type']]
-            end
-          ]
+          files.to_h do |filepath|
+            filename = ::File.basename(filepath)
+            [filename, metadata.for(filename)['mime_type']]
+          end
       end
     end
   end

data/lib/sdr_client/deposit/request.rb

@@ -12,7 +12,6 @@ module SdrClient
       # @param [Hash<String, Hash<String, String>>] files_metadata file name, hash of additional file metadata
       # Additional metadata includes access, preserve, shelve, publish, md5, sha1
       # rubocop:disable Metrics/ParameterLists
-      # rubocop:disable Metrics/AbcSize
       def initialize(label: nil,
                      access: 'dark',
                      download: 'none',
@@ -46,9 +45,8 @@ module SdrClient
         @files_metadata = files_metadata
         @viewing_direction = viewing_direction
       end
-      # rubocop:enable Metrics/ParameterLists
-      # rubocop:enable Metrics/AbcSize
 
+      # rubocop:enable Metrics/ParameterLists
       def as_json
         {
           access: access_struct,
@@ -62,7 +60,6 @@ module SdrClient
       end
 
       # @return [Request] a clone of this request with the file_sets added
-      # rubocop:disable Metrics/AbcSize
       def with_file_sets(file_sets)
         Request.new(label: label,
                     access: access,
@@ -81,7 +78,6 @@ module SdrClient
                     file_sets: file_sets,
                     files_metadata: files_metadata)
       end
-      # rubocop:enable Metrics/AbcSize
 
       # @param [String] filename
       # @return [Hash] the metadata for the file

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/update_dro_with_file_identifiers.rb

@@ -17,7 +17,7 @@ module SdrClient
       end
 
       def self.signed_id_map(upload_responses)
-        Hash[upload_responses.map { |response| [response.filename, response.signed_id] }]
+        upload_responses.to_h { |response| [response.filename, response.signed_id] }
       end
       private_class_method :signed_id_map
 

data/lib/sdr_client/deposit/upload_files.rb

@@ -35,9 +35,11 @@ module SdrClient
       attr_reader :logger, :connection, :file_metadata
 
       def upload_file_metadata
-        Hash[file_metadata.map { |filename, metadata| [filename, direct_upload(metadata.to_json)] }]
+        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')

data/lib/sdr_client/deposit.rb

@@ -28,7 +28,7 @@ module SdrClient
                  files_metadata: {},
                  accession: false,
                  grouping_strategy: SingleFileGroupingStrategy,
-                 logger: Logger.new(STDOUT))
+                 logger: Logger.new($stdout))
       augmented_metadata = FileMetadataBuilder.build(files: files, files_metadata: files_metadata)
       metadata = Request.new(label: label,
                              type: type,
@@ -59,7 +59,7 @@ module SdrClient
                        files: [],
                        url:,
                        accession:,
-                       logger: Logger.new(STDOUT))
+                       logger: Logger.new($stdout))
       connection = Connection.new(url: url)
       ModelProcess.new(request_dro: request_dro,
                        connection: connection,

data/lib/sdr_client/find.rb

@@ -7,7 +7,7 @@ module SdrClient
   module Find
     DRO_PATH = '/v1/resources/%<id>s'
     # @return [String] job id for the background job result
-    def self.run(druid, url:, logger: Logger.new(STDOUT))
+    def self.run(druid, url:, logger: Logger.new($stdout))
       connection = Connection.new(url: url)
       path = format(DRO_PATH, id: druid)
       logger.info("Retrieving metadata from: #{path}")

data/lib/sdr_client/version.rb

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

data/sdr-client.gemspec

@@ -28,15 +28,17 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'cocina-models', '~> 0.62.0'
+  spec.add_dependency 'cocina-models', '~> 0.63.0'
   spec.add_dependency 'dry-monads'
   spec.add_dependency 'faraday', '>= 0.16'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.79.0'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.37.1'
-  spec.add_development_dependency 'simplecov', '~> 0.17.0' # CodeClimate cannot use SimpleCov >= 0.18.0 for generating test coverage
+  spec.add_development_dependency 'rubocop', '~> 1.24'
+  spec.add_development_dependency 'rubocop-rake'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.1'
+  spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'webmock', '~> 3.7'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 0.61.0
+  version: 0.64.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.62.0
+        version: 0.63.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.62.0
+        version: 0.63.0
 - !ruby/object:Gem::Dependency
   name: dry-monads
   requirement: !ruby/object:Gem::Requirement
@@ -114,42 +114,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: '1.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: '1.24'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.37.1
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.37.1
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -224,6 +238,7 @@ metadata:
   homepage_uri: https://github.com/sul-dlss/sdr-client
   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:
 rdoc_options: []
 require_paths:
@@ -239,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.4
 signing_key:
 specification_version: 4
 summary: The CLI for https://github.com/sul-dlss/sdr-api