sdr-client 2.13.1 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 073d9149d7aade5f78842251778f8731ca9ef8e767ab0abe59f5ff360f3d8c2a
-  data.tar.gz: 1085b1b409a72c1a7d0377198199f44244ea7f4db17e78449a1931ac0e1502af
+  metadata.gz: 92a856bedc983187ec0a1721ca4ec66ee7eaa1986fa1ed795fc079bf1140c956
+  data.tar.gz: c53dd7fbff6953c2a333245b631dcc8c24d84e9d10833e2c91b92f6cb534feaa
 SHA512:
-  metadata.gz: 84aff6cb5c387c48fded7fa363f486e7123f3c2e2d55396e0fe7c9e785fd1a268158d5cc65eb77cd34dfaea8d66654f1a2e727ee0d366f66ce53f50087054840
-  data.tar.gz: aafac64bc2a0bd62c06085288858d19e1d9ea17c88fd5d8b58edc6172c5ebd907c091d577a7b778bf00c2cfff0ac155810bad7387eab3f8665c393cd75eb366e
+  metadata.gz: b1000308c12ebab774556315768ccc2100b19fa95d9df91fa63356cb9e2b85b4965d32c59de6b6a2f9ba7217477dad3d59102a7185db17a3da5314a9daaafc0c
+  data.tar.gz: f6cc0eb1b8d0beff8e46c54f56743ab576d6318148c4fe0bc1360eca7e995171a49fd448a7c246533ac23c816df8a60f3dfb50da51c12d73f332c62438dd41f4

data/.rubocop.yml

@@ -30,6 +30,9 @@ Naming/FileName:
   Exclude:
     - 'lib/sdr-client.rb'
 
+RSpec/MultipleExpectations:
+  Enabled: false
+
 RSpec/MultipleMemoizedHelpers:
   Enabled: false
 

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude`
-# on 2024-03-26 19:28:56 UTC using RuboCop version 1.62.0.
+# on 2024-05-01 23:27:58 UTC using RuboCop version 1.63.4.
 # 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
@@ -13,6 +13,19 @@ Gemspec/RequiredRubyVersion:
   Exclude:
     - 'sdr-client.gemspec'
 
+# Offense count: 35
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Exclude:
+    - 'lib/sdr_client/cli.rb'
+    - 'lib/sdr_client/deposit/model_process.rb'
+    - 'lib/sdr_client/update.rb'
+    - 'spec/sdr_client/deposit/model_process_spec.rb'
+    - 'spec/sdr_client/deposit/process_spec.rb'
+    - 'spec/sdr_client/update_spec.rb'
+
 # Offense count: 1
 Lint/NoReturnInBeginEndBlocks:
   Exclude:
@@ -26,11 +39,12 @@ Lint/UnusedMethodArgument:
     - 'lib/sdr_client/deposit/file_type_file_set_strategy.rb'
     - 'lib/sdr_client/deposit/image_file_set_strategy.rb'
 
-# Offense count: 11
+# Offense count: 15
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Exclude:
     - 'lib/sdr_client/cli.rb'
+    - 'lib/sdr_client/deposit/request.rb'
     - 'lib/sdr_client/redesigned_client.rb'
     - 'lib/sdr_client/redesigned_client/cli.rb'
     - 'lib/sdr_client/redesigned_client/cli/update.rb'
@@ -74,20 +88,6 @@ RSpec/MessageSpies:
   Exclude:
     - 'spec/sdr_client/deposit_spec.rb'
 
-# Offense count: 19
-# Configuration parameters: Max.
-RSpec/MultipleExpectations:
-  Exclude:
-    - 'spec/sdr_client/connection_spec.rb'
-    - 'spec/sdr_client/deposit/metadata_builder_spec.rb'
-    - 'spec/sdr_client/deposit_model_spec.rb'
-    - 'spec/sdr_client/deposit_spec.rb'
-    - 'spec/sdr_client/find_spec.rb'
-    - 'spec/sdr_client/login_spec.rb'
-    - 'spec/sdr_client/redesigned_client/deposit_spec.rb'
-    - 'spec/sdr_client/redesigned_client/job_status_spec.rb'
-    - 'spec/sdr_client/redesigned_client/upload_files_spec.rb'
-
 # Offense count: 24
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
@@ -117,7 +117,7 @@ RSpec/ReceiveMessages:
   Exclude:
     - 'spec/sdr_client/update_spec.rb'
 
-# Offense count: 21
+# Offense count: 23
 # This cop supports safe autocorrection (--autocorrect).
 Style/KeywordParametersOrder:
   Exclude:
@@ -138,16 +138,3 @@ Style/StringConcatenation:
   Exclude:
     - 'lib/sdr_client/deposit/create_resource.rb'
     - 'spec/sdr_client/deposit_spec.rb'
-
-# Offense count: 35
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Exclude:
-    - 'lib/sdr_client/cli.rb'
-    - 'lib/sdr_client/deposit/model_process.rb'
-    - 'lib/sdr_client/update.rb'
-    - 'spec/sdr_client/deposit/model_process_spec.rb'
-    - 'spec/sdr_client/deposit/process_spec.rb'
-    - 'spec/sdr_client/update_spec.rb'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sdr-client (2.13.1)
+    sdr-client (2.14.0)
       activesupport
       cocina-models (~> 0.96.0)
       config
@@ -28,7 +28,7 @@ GEM
     ast (2.4.2)
     attr_extras (7.1.0)
     base64 (0.2.0)
-    bigdecimal (3.1.7)
+    bigdecimal (3.1.8)
     byebug (11.1.3)
     childprocess (5.0.0)
     cocina-models (0.96.0)
@@ -94,14 +94,14 @@ GEM
     faraday-net_http (3.1.0)
       net-http
     hashdiff (1.1.0)
-    i18n (1.14.4)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     json (2.7.2)
     jsonpath (1.1.5)
       multi_json
     language_server-protocol (3.17.0.3)
-    launchy (3.0.0)
+    launchy (3.0.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
     minitest (5.22.3)
@@ -109,16 +109,18 @@ GEM
     mutex_m (0.2.0)
     net-http (0.4.1)
       uri
-    nokogiri (1.16.4-x86_64-darwin)
+    nokogiri (1.16.5-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.4-x86_64-linux)
+    nokogiri (1.16.5-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.5-x86_64-linux)
       racc (~> 1.4)
     openapi3_parser (0.9.2)
       commonmarker (~> 0.17)
     openapi_parser (1.0.0)
     optimist (3.1.0)
     parallel (1.24.0)
-    parser (3.3.0.5)
+    parser (3.3.1.0)
       ast (~> 2.4.1)
       racc
     patience_diff (1.2.0)
@@ -127,7 +129,7 @@ GEM
     racc (1.7.3)
     rainbow (3.1.1)
     rake (13.2.1)
-    regexp_parser (2.9.0)
+    regexp_parser (2.9.1)
     rexml (3.2.6)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
@@ -138,7 +140,7 @@ GEM
     rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
@@ -146,7 +148,7 @@ GEM
       rspec-core (>= 2, < 4, != 2.12.0)
     rss (0.3.0)
       rexml
-    rubocop (1.63.2)
+    rubocop (1.63.5)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -157,15 +159,15 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.2)
-      parser (>= 3.3.0.4)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.29.1)
+    rubocop-rspec (2.29.2)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
@@ -179,7 +181,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    super_diff (0.11.0)
+    super_diff (0.12.1)
       attr_extras (>= 6.2.4)
       diff-lcs
       patience_diff
@@ -195,6 +197,7 @@ GEM
     zeitwerk (2.6.13)
 
 PLATFORMS
+  arm64-darwin-23
   x86_64-darwin-19
   x86_64-darwin-20
   x86_64-darwin-21

data/lib/sdr_client/cli.rb

@@ -83,6 +83,8 @@ module SdrClient
     option :use_and_reproduction, desc: 'Use and reproduction statement'
     option :viewing_direction, enum: %w[left-to-right right-to-left], desc: 'Viewing direction (if a book)'
     option :view, enum: %w[world stanford location-based citation-only dark], desc: 'Access view level for the object'
+    option :download, enum: %w[world stanford location-based none], desc: 'Access download level for the object'
+    option :location, enum: %w[spec music ars art hoover m&m], desc: 'Access location for the object'
     option :files_metadata, desc: 'JSON string representing per-file metadata'
     option :grouping_strategy, enum: %w[default filename], desc: 'Strategy for grouping files into filesets'
     option :basepath, default: Dir.getwd, desc: 'Base path for the files'
@@ -103,6 +105,8 @@ module SdrClient
     option :use_and_reproduction, desc: 'Use and reproduction statement'
     option :viewing_direction, enum: %w[left-to-right right-to-left], desc: 'Viewing direction (if a book)'
     option :view, enum: %w[world stanford location-based citation-only dark], desc: 'Access view level for the object'
+    option :download, enum: %w[world stanford location-based none], desc: 'Access download level for the object'
+    option :location, enum: %w[spec music ars art hoover m&m], desc: 'Access location for the object'
     option :files_metadata, desc: 'JSON string representing per-file metadata'
     option :grouping_strategy, enum: %w[default filename], desc: 'Strategy for grouping files into filesets'
     option :basepath, default: Dir.getwd, desc: 'Base path for the files'

data/lib/sdr_client/deposit/create_resource.rb

@@ -5,8 +5,8 @@ module SdrClient
     # Creates a resource (metadata) in SDR
     class CreateResource
       DRO_PATH = '/v1/resources'
-      def self.run(**args)
-        new(**args).run
+      def self.run(...)
+        new(...).run
       end
 
       # @param [Boolean] accession should the accessionWF be started
@@ -15,14 +15,16 @@ module SdrClient
       # @param [Hash<Symbol,String>] the result of the metadata call
       # @param [String] priority what processing priority should be used
       #                          either 'low' or 'default'
+      # @param [String] user_versions action (none, new, update) to take for user version when closing version
       # rubocop:disable Metrics/ParameterLists
-      def initialize(accession:, metadata:, logger:, connection:, assign_doi: false, priority: nil)
+      def initialize(accession:, metadata:, logger:, connection:, assign_doi: false, priority: nil, user_versions: nil)
         @accession = accession
         @priority = priority
         @assign_doi = assign_doi
         @metadata = metadata
         @logger = logger
         @connection = connection
+        @user_versions = user_versions
       end
       # rubocop:enable Metrics/ParameterLists
 
@@ -39,7 +41,7 @@ module SdrClient
 
       private
 
-      attr_reader :metadata, :logger, :connection, :priority
+      attr_reader :metadata, :logger, :connection, :priority, :user_versions
 
       def metadata_request
         json = metadata.to_json
@@ -62,6 +64,7 @@ module SdrClient
         params = { accession: accession? }
         params[:priority] = priority if priority
         params[:assign_doi] = true if assign_doi? # false is default
+        params[:user_versions] = user_versions if user_versions.present?
         DRO_PATH + '?' + params.map { |k, v| "#{k}=#{v}" }.join('&')
       end
     end

data/lib/sdr_client/deposit/file.rb

@@ -6,7 +6,7 @@ module SdrClient
     class File
       # rubocop:disable Metrics/ParameterLists
       def initialize(external_identifier:, label:, filename:,
-                     view: 'dark', download: 'none', preserve: true, shelve: true,
+                     view: 'dark', download: 'none', location: nil, preserve: true, shelve: true,
                      publish: true, mime_type: nil, md5: nil, sha1: nil,
                      use: nil)
         @external_identifier = external_identifier
@@ -14,6 +14,7 @@ module SdrClient
         @filename = filename
         @view = view
         @download = download
+        @location = location
         @preserve = preserve
         @shelve = view == 'dark' ? false : shelve
         @publish = publish
@@ -44,6 +45,7 @@ module SdrClient
         }.tap do |json|
           json['hasMimeType'] = @mime_type if @mime_type
           json['use'] = @use if @use
+          json[:access][:location] = @location if @location
         end
       end
 

data/lib/sdr_client/deposit/files/direct_upload_request.rb

@@ -35,7 +35,7 @@ module SdrClient
           return 'application/octet-stream' if content_type.blank?
 
           # ActiveStorage is expecting "application/x-stata-dta" not "application/x-stata-dta;version=14"
-          content_type = content_type.split(';')&.first
+          content_type = content_type.split(';').first
 
           content_type == 'application/json' ? 'application/x-stanford-json' : content_type
         end

data/lib/sdr_client/deposit/request.rb

@@ -15,6 +15,7 @@ module SdrClient
       def initialize(label: nil,
                      view: 'dark',
                      download: 'none',
+                     location: nil,
                      use_and_reproduction: nil,
                      copyright: nil,
                      apo:,
@@ -40,6 +41,7 @@ module SdrClient
         @embargo_download = embargo_download
         @view = view
         @download = download
+        @location = location
         @use_and_reproduction = use_and_reproduction
         @copyright = copyright
         @apo = apo
@@ -66,6 +68,7 @@ module SdrClient
         Request.new(label: label,
                     view: view,
                     download: download,
+                    location: location,
                     apo: apo,
                     collection: collection,
                     copyright: copyright,
@@ -88,6 +91,7 @@ module SdrClient
         metadata = files_metadata.fetch(filename, {}).with_indifferent_access
         metadata[:view] = view unless metadata.key?(:view)
         metadata[:download] = download unless metadata.key?(:download)
+        metadata[:location] = location unless metadata.key?(:location)
         metadata
       end
 
@@ -97,7 +101,7 @@ module SdrClient
 
       attr_reader :view, :label, :file_sets, :source_id, :catkey, :folio_instance_hrid, :apo, :collection,
                   :files_metadata, :embargo_release_date, :embargo_access, :embargo_download,
-                  :viewing_direction, :use_and_reproduction, :copyright, :download
+                  :viewing_direction, :use_and_reproduction, :copyright, :download, :location
 
       def administrative
         {
@@ -132,6 +136,7 @@ module SdrClient
         }.tap do |json|
           json[:useAndReproductionStatement] = use_and_reproduction if use_and_reproduction
           json[:copyright] = copyright if copyright
+          json[:location] = location if location
 
           if embargo_release_date
             json[:embargo] = {

data/lib/sdr_client/deposit/update_resource.rb

@@ -6,18 +6,20 @@ module SdrClient
     class UpdateResource
       DRO_PATH = '/v1/resources/%<id>s'
 
-      def self.run(metadata:, logger:, connection:, version_description: nil)
-        new(metadata: metadata, logger: logger, connection: connection, version_description: version_description).run
+      def self.run(...)
+        new(...).run
       end
 
       # @param [Cocina::Models::DRO] metadata
       # @param [Hash<Symbol,String>] the result of the metadata call
       # @param [String] version_description
-      def initialize(metadata:, logger:, connection:, version_description: nil)
+      # @param [String] user_versions action (none, new, update) to take for user version when closing version
+      def initialize(metadata:, logger:, connection:, version_description: nil, user_versions: nil)
         @metadata = metadata
         @logger = logger
         @connection = connection
         @version_description = version_description
+        @user_versions = user_versions
       end
 
       # @param [Hash<Symbol,String>] the result of the metadata call
@@ -33,8 +35,9 @@ module SdrClient
 
       private
 
-      attr_reader :metadata, :logger, :connection, :version_description
+      attr_reader :metadata, :logger, :connection, :version_description, :user_versions
 
+      # rubocop:disable Metrics/AbcSize
       def metadata_request
         json = metadata.to_json
         logger.debug("Starting update metadata: #{json}")
@@ -43,8 +46,10 @@ module SdrClient
                        'Content-Type' => 'application/json',
                        'X-Cocina-Models-Version' => Cocina::Models::VERSION) do |req|
                          req.params['versionDescription'] = version_description if version_description
+                         req.params['user_versions'] = user_versions if user_versions.present?
                        end
       end
+      # rubocop:enable Metrics/AbcSize
 
       def path(metadata)
         format(DRO_PATH, id: metadata.externalIdentifier)

data/lib/sdr_client/deposit.rb

@@ -15,6 +15,7 @@ module SdrClient
                  viewing_direction: nil,
                  view: 'dark',
                  download: 'none',
+                 location: nil,
                  use_and_reproduction: nil,
                  copyright: nil,
                  apo:,
@@ -40,6 +41,7 @@ module SdrClient
                             type: type,
                             view: view,
                             download: download,
+                            location: location,
                             apo: apo,
                             use_and_reproduction: use_and_reproduction,
                             copyright: copyright,

data/lib/sdr_client/redesigned_client/cli/credentials.rb

@@ -9,25 +9,25 @@ module SdrClient
         def self.write(body)
           token = JSON.parse(body).fetch('token')
           FileUtils.mkdir_p(credentials_path, mode: 0o700)
-          File.atomic_write(credentials_file) { |file| file.write(token) }
-          File.chmod(0o600, credentials_file)
+          ::File.atomic_write(credentials_file) { |file| file.write(token) }
+          ::File.chmod(0o600, credentials_file)
         end
 
         def self.read
           return unless ::File.exist?(credentials_file)
 
-          creds = File.read(credentials_file, chomp: true)
+          creds = ::File.read(credentials_file, chomp: true)
           return if creds.nil?
 
           creds
         end
 
         def self.credentials_path
-          @credentials_path ||= File.join(Dir.home, '.sdr')
+          @credentials_path ||= ::File.join(Dir.home, '.sdr')
         end
 
         def self.credentials_file
-          File.join(credentials_path, 'credentials')
+          ::File.join(credentials_path, 'credentials')
         end
       end
     end

data/lib/sdr_client/redesigned_client/cli/update.rb

@@ -46,7 +46,7 @@ module SdrClient
         end
 
         def cocina_hash_from_file
-          @cocina_hash_from_file ||= JSON.parse(File.read(options[:cocina_file]), symbolize_names: true)
+          @cocina_hash_from_file ||= JSON.parse(::File.read(options[:cocina_file]), symbolize_names: true)
         end
 
         def cocina_hash_from_pipe
@@ -65,7 +65,7 @@ module SdrClient
         end
 
         def update_cocina_from_file(cocina_object)
-          if !File.file?(options[:cocina_file]) || !File.readable?(options[:cocina_file])
+          if !::File.file?(options[:cocina_file]) || !::File.readable?(options[:cocina_file])
             raise "File not found: #{options[:cocina_file]}"
           end
 

data/lib/sdr_client/redesigned_client/cli.rb

@@ -64,17 +64,26 @@ module SdrClient
         validate_druid!(druid)
         # Make sure client is configured
         client
-        job_id = CLI::Update.run(druid, **options)
+        job_id = Update.run(druid, **options)
         if options[:skip_polling]
           say "job ID #{job_id} queued (not polling because `-s` flag was supplied)"
           return
         end
 
+        # the extra args to `say` prevent appending a newline
+        say('SDR is processing your request.', nil, false)
+
         job_status = client.job_status(job_id: job_id)
-        if job_status.wait_until_complete
-          say "success! (druid: #{job_status.druid})"
+        job_status.wait_until_complete { say('.', nil, false) }
+
+        if job_status.complete?
+          if job_status.errors
+            say_error " errored! #{job_status.errors}"
+          else
+            say " success! (druid: #{job_status.druid})"
+          end
         else
-          say_error "errored! #{job_status.errors}"
+          say_error " job #{job_id} did not complete\n#{job_status.result.inspect}"
         end
       end
 
@@ -93,6 +102,8 @@ module SdrClient
       option :use_and_reproduction, desc: 'Use and reproduction statement'
       option :viewing_direction, enum: %w[left-to-right right-to-left], desc: 'Viewing direction (if a book)'
       option :view, enum: %w[world stanford location-based citation-only dark], desc: 'Access view level for the object'
+      option :download, enum: %w[world stanford location-based none], desc: 'Access download level for the object'
+      option :location, enum: %w[spec music ars art hoover m&m], desc: 'Access location for the object'
       option :files_metadata, desc: 'JSON string representing per-file metadata'
       option :grouping_strategy, enum: %w[default filename], desc: 'Strategy for grouping files into filesets'
       option :basepath, default: Dir.getwd, desc: 'Base path for the files'
@@ -115,6 +126,8 @@ module SdrClient
       option :use_and_reproduction, desc: 'Use and reproduction statement'
       option :viewing_direction, enum: %w[left-to-right right-to-left], desc: 'Viewing direction (if a book)'
       option :view, enum: %w[world stanford location-based citation-only dark], desc: 'Access view level for the object'
+      option :download, enum: %w[world stanford location-based none], desc: 'Access download level for the object'
+      option :location, enum: %w[spec music ars art hoover m&m], desc: 'Access location for the object'
       option :files_metadata, desc: 'JSON string representing per-file metadata'
       option :grouping_strategy, enum: %w[default filename], desc: 'Strategy for grouping files into filesets'
       option :basepath, default: Dir.getwd, desc: 'Base path for the files'
@@ -143,7 +156,7 @@ module SdrClient
         sleep 0.5
         token_string = ask('Paste token here:')
         expiry = JSON.parse(token_string)['exp']
-        CLI::Credentials.write(token_string)
+        Credentials.write(token_string)
         say "You are now authenticated for #{options[:url]} until #{expiry}"
         token_string
       end

data/lib/sdr_client/redesigned_client/create_resource.rb

@@ -14,11 +14,13 @@ module SdrClient
       # @param [Hash<Symbol,String>] the result of the metadata call
       # @param [String] priority what processing priority should be used
       #                          either 'low' or 'default'
-      def initialize(accession:, metadata:, assign_doi: false, priority: nil)
+      # @param [String] user_versions action (none, new, update) to take for user version when closing version
+      def initialize(accession:, metadata:, assign_doi: false, priority: nil, user_versions: nil)
         @accession = accession
         @priority = priority
         @assign_doi = assign_doi
         @metadata = metadata
+        @user_versions = user_versions
       end
 
       # @param [Hash<Symbol,String>] the result of the metadata call
@@ -41,7 +43,7 @@ module SdrClient
 
       private
 
-      attr_reader :metadata, :priority
+      attr_reader :metadata, :priority, :user_versions
 
       def logger
         SdrClient::RedesignedClient.config.logger
@@ -63,6 +65,7 @@ module SdrClient
         params = { accession: accession? }
         params[:priority] = priority if priority
         params[:assign_doi] = true if assign_doi? # false is default
+        params[:user_versions] = user_versions if user_versions.present?
         query_string = params.map { |k, v| "#{k}=#{v}" }.join('&')
         "/v1/resources?#{query_string}"
       end

data/lib/sdr_client/redesigned_client/direct_upload_request.rb

@@ -36,7 +36,7 @@ module SdrClient
         return 'application/octet-stream' if content_type.blank?
 
         # ActiveStorage is expecting "application/x-stata-dta" not "application/x-stata-dta;version=14"
-        content_type = content_type.split(';')&.first
+        content_type = content_type.split(';').first
 
         content_type == 'application/json' ? 'application/x-stanford-json' : content_type
       end

data/lib/sdr_client/redesigned_client/file.rb

@@ -10,6 +10,7 @@ module SdrClient
       # @param [Hash] options optional parameters
       # @option options [String] view the access level for viewing the object
       # @option options [String] download the access level for downloading the object
+      # @option options [String] location the location for location-based access
       # @option options [Boolean] preserve whether to preserve the file or not
       # @option options [Boolean] shelve whether to shelve the file or not
       # @option options [Boolean] publish whether to publish the file or not
@@ -44,6 +45,7 @@ module SdrClient
         }.tap do |json|
           json['hasMimeType'] = mime_type if mime_type
           json['use'] = use if use
+          json[:access]['location'] if location
         end
       end
 
@@ -66,6 +68,10 @@ module SdrClient
         options.fetch(:download, 'none')
       end
 
+      def location
+        options[:location]
+      end
+
       def preserve
         options.fetch(:preserve, true)
       end

data/lib/sdr_client/redesigned_client/job_status.rb

@@ -6,6 +6,8 @@ module SdrClient
   class RedesignedClient
     # Wraps operations waiting for results from jobs
     class JobStatus
+      attr_reader :result
+
       def initialize(job_id:)
         @job_id = job_id
         @result = {
@@ -35,11 +37,26 @@ module SdrClient
       # @param [Integer] timeout_in_secs (180) timeout after this many secs
       # @param [Float] backoff_factor (2.0) how quickly to backoff. This should be > 1.0 and probably ought to be <= 2.0
       # @return [Boolean] true if successful false if unsuccessful.
-      def wait_until_complete(secs_between_requests: 3.0,
+      def wait_until_complete(secs_between_requests: 3.0, # rubocop:disable Metrics/MethodLength
                               timeout_in_secs: 180,
                               backoff_factor: 2.0,
                               max_secs_between_requests: 60)
-        poll_until_complete(secs_between_requests, timeout_in_secs, backoff_factor, max_secs_between_requests)
+        begin
+          Timeout.timeout(timeout_in_secs) do
+            loop do
+              break if complete?
+
+              yield if block_given?
+
+              sleep(secs_between_requests)
+              # Exponential backoff, limited to max_secs_between_requests
+              secs_between_requests = [secs_between_requests * backoff_factor, max_secs_between_requests].min
+            end
+          end
+        rescue Timeout::Error
+          @result[:output][:errors] = ["Not complete after #{timeout_in_secs} seconds"]
+        end
+
         errors.nil?
       end
 
@@ -54,21 +71,6 @@ module SdrClient
       def path
         "/v1/background_job_results/#{job_id}"
       end
-
-      def poll_until_complete(secs_between_requests, timeout_in_secs, backoff_factor, max_secs_between_requests)
-        interval = secs_between_requests
-        Timeout.timeout(timeout_in_secs) do
-          loop do
-            break if complete?
-
-            sleep(interval)
-            # Exponential backoff, limited to max_secs_between_requests
-            interval = [interval * backoff_factor, max_secs_between_requests].min
-          end
-        end
-      rescue Timeout::Error
-        @result[:output][:errors] = ["Not complete after #{timeout_in_secs} seconds"]
-      end
     end
   end
 end

data/lib/sdr_client/redesigned_client/metadata.rb

@@ -35,6 +35,7 @@ module SdrClient
           model: request_builder.to_cocina,
           basepath: basepath,
           files: files,
+          accession: accession,
           request_builder: request_builder,
           **options
         )

data/lib/sdr_client/redesigned_client/request_builder.rb

@@ -10,6 +10,7 @@ module SdrClient
       # @option options [String] label the required object label
       # @option options [String] view the access level for viewing the object
       # @option options [String] download the access level for downloading the object
+      # @option options [String] location the location for location-based access
       # @option options [String] type (https://cocina.sul.stanford.edu/models/object) the required object type.
       # @option options [String] use_and_reproduction the use and reproduction statement
       # @option options [String] copyright the copyright statement
@@ -93,13 +94,14 @@ module SdrClient
         end
       end
 
-      def access_struct # rubocop:disable Metrics/MethodLength
+      def access_struct # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         {
           view: view,
           download: download
         }.tap do |json|
           json[:useAndReproductionStatement] = use_and_reproduction if use_and_reproduction
           json[:copyright] = copyright if copyright
+          json[:location] = location if location
 
           if embargo_release_date
             json[:embargo] = {
@@ -119,6 +121,10 @@ module SdrClient
         options.fetch(:download, 'none')
       end
 
+      def location
+        options[:location]
+      end
+
       def label
         options[:label]
       end

data/lib/sdr_client/redesigned_client/update_resource.rb

@@ -12,9 +12,11 @@ module SdrClient
 
       # @param [Cocina::Models::DRO] model
       # @param [String] version_description
-      def initialize(model:, version_description: nil)
+      # @param [String] user_versions action (none, new, update) to take for user version when closing version
+      def initialize(model:, version_description: nil, user_versions: nil)
         @model = model
         @version_description = version_description
+        @user_versions = user_versions
       end
 
       # @return [String] job id for the background job result
@@ -37,7 +39,7 @@ module SdrClient
 
       private
 
-      attr_reader :model, :version_description
+      attr_reader :model, :version_description, :user_versions
 
       def client
         SdrClient::RedesignedClient.instance
@@ -52,9 +54,10 @@ module SdrClient
       end
 
       def request_params
-        return { 'versionDescription' => version_description } if version_description
-
-        {}
+        {
+          versionDescription: version_description,
+          user_versions: user_versions
+        }.compact
       end
     end
   end

data/lib/sdr_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 2.13.1
+  version: 2.14.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-24 00:00:00.000000000 Z
+date: 2024-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.7
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: The CLI for https://github.com/sul-dlss/sdr-api