sdr-client 0.23.0 → 0.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26eecb6134b706eb60ac7623c53576d6ae93f18d7bb9399b8e18c07f04e6da99
-  data.tar.gz: 9c2a3d384225a21571ef5618e0bf1606599a44f429a0c81735c8c7f0f04172a3
+  metadata.gz: f2f9928c696ecb5051e4f6ba708985a2448aaa3189f93df4fcd0b85ab733ea87
+  data.tar.gz: 457989602bdece5c31cbcc95276531721a6c5682c040176de7645c1730be4326
 SHA512:
-  metadata.gz: adadb90117ec098b281ff87b03796fd20fed3772fd03e3aa165f8c97b8c05a5510ed7980d9321effa15757cd505bbae8ba30bbdb3dd2c57257b24ce7bf40aa0e
-  data.tar.gz: 06ee1f2f6b22e364cfe1fe32059619b527026e7f9dd2dd2e05a6e30865c07946d8e9d1c8b98d1fbb91b68f7867400534a9eb83c3406942e54438947c2eed1ed3
+  metadata.gz: 94ed5ab0d789c3d2669979bb8753bd60d0f1a51f6434f6c8b28e210fc04dc4ffcd2af9125ef3b08e4e49996c5d05c2e53b5e8348794fbad351cc5dc57e4b0b0f
+  data.tar.gz: a816a3c86dccc3f90939a81eecf5cf46ef659b3fcc5d4c97948e41796bf13a1b2d5da8de958c0f58c5a46d0ab16f56fa813ef3d3c796671d7dd4b04fd591168f

data/.github/pull_request_template.md

@@ -2,4 +2,11 @@
 
 
 
-## Was the documentation (README, wiki) updated?
+## How was this change tested?
+
+
+
+## Which documentation and/or configurations were updated?
+
+
+

data/.rubocop_todo.yml

@@ -1,16 +1,17 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-03-02 15:54:47 -0600 using RuboCop version 0.79.0.
+# on 2020-04-27 08:24:29 -0400 using RuboCop version 0.82.0.
 # 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
+# Offense count: 2
+# Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
   Max: 16
 
-# Offense count: 4
+# Offense count: 7
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
-  Max: 14
+  Max: 15

data/lib/sdr_client.rb

@@ -15,6 +15,7 @@ require 'sdr_client/login'
 require 'sdr_client/login_prompt'
 require 'sdr_client/cli'
 require 'sdr_client/connection'
+require 'sdr_client/background_job_results'
 
 module SdrClient
   class Error < StandardError; end

data/lib/sdr_client/background_job_results.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module SdrClient
+  # API calls around background job results from dor-services-app
+  module BackgroundJobResults
+    # Get status/result of a background job
+    # @param url [String] url for the service
+    # @param job_id [String] required string representing a job identifier
+    # @return [Hash] result of background job
+    def self.show(url:, job_id:)
+      connection = Connection.new(url: "#{url}/v1/background_job_results/#{job_id}").connection
+      resp = connection.get
+
+      raise "unexpected response: #{resp.status} #{resp.body}" unless resp.success?
+
+      JSON.parse(resp.body).with_indifferent_access
+    end
+  end
+end

data/lib/sdr_client/deposit.rb

@@ -8,10 +8,12 @@ module SdrClient
     BOOK_TYPE = 'http://cocina.sul.stanford.edu/models/book.jsonld'
     # rubocop:disable Metrics/ParameterLists
     # rubocop:disable Metrics/MethodLength
+    # @return [String] job id for the background job result
     def self.run(label: nil,
                  type: BOOK_TYPE,
                  viewing_direction: nil,
                  access: 'dark',
+                 download: 'none',
                  use_statement: nil,
                  copyright: nil,
                  apo:,
@@ -30,6 +32,7 @@ module SdrClient
       metadata = Request.new(label: label,
                              type: type,
                              access: access,
+                             download: download,
                              apo: apo,
                              use_statement: use_statement,
                              copyright: copyright,

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:,
-                     access: 'dark', preserve: false, shelve: false,
+                     access: 'world', preserve: true, shelve: true,
                      mime_type: nil, md5: nil, sha1: nil, use: nil)
         @external_identifier = external_identifier
         @label = label

data/lib/sdr_client/deposit/process.rb

@@ -26,6 +26,7 @@ module SdrClient
       # rubocop:enable Metrics/ParameterLists
 
       # rubocop:disable Metrics/AbcSize
+      # @return [String] job id for the background job result
       def run
         check_files_exist
         upload_responses = UploadFiles.new(files: files,

data/lib/sdr_client/deposit/request.rb

@@ -14,6 +14,7 @@ module SdrClient
       # rubocop:disable Metrics/ParameterLists
       def initialize(label: nil,
                      access: 'dark',
+                     download: 'none',
                      use_statement: nil,
                      copyright: nil,
                      apo:,
@@ -34,6 +35,7 @@ module SdrClient
         @embargo_release_date = embargo_release_date
         @embargo_access = embargo_access
         @access = access
+        @download = download
         @use_statement = use_statement
         @copyright = copyright
         @apo = apo
@@ -59,6 +61,7 @@ module SdrClient
       def with_file_sets(file_sets)
         Request.new(label: label,
                     access: access,
+                    download: download,
                     apo: apo,
                     collection: collection,
                     copyright: copyright,
@@ -85,7 +88,7 @@ module SdrClient
 
       attr_reader :access, :label, :file_sets, :source_id, :catkey, :apo, :collection,
                   :files_metadata, :embargo_release_date, :embargo_access,
-                  :viewing_direction, :use_statement, :copyright
+                  :viewing_direction, :use_statement, :copyright, :download
 
       def administrative
         {
@@ -108,7 +111,10 @@ module SdrClient
       end
 
       def access_struct
-        { access: access }.tap do |json|
+        {
+          access: access,
+          download: download
+        }.tap do |json|
           json[:useAndReproductionStatement] = use_statement if use_statement
           json[:copyright] = copyright if copyright
 

data/lib/sdr_client/deposit/upload_resource.rb

@@ -21,14 +21,14 @@ module SdrClient
       end
 
       # @param [Hash<Symbol,String>] the result of the metadata call
-      # @return [Hash<Symbol,String>] the result of the metadata call
+      # @return [String] job id for the background job result
       def run
         response = metadata_request
         unexpected_response(response) unless response.status == 201
 
         logger.info("Response from server: #{response.body}")
 
-        { druid: JSON.parse(response.body)['druid'], background_job: response.headers['Location'] }
+        JSON.parse(response.body)['jobId']
       end
 
       private

data/lib/sdr_client/model_deposit.rb

@@ -8,9 +8,14 @@ module SdrClient
     def self.model_run(request_dro:,
                        files: [],
                        url:,
+                       accession:,
                        logger: Logger.new(STDOUT))
       connection = Connection.new(url: url)
-      ModelProcess.new(request_dro: request_dro, connection: connection, files: files, logger: logger).run
+      ModelProcess.new(request_dro: request_dro,
+                       connection: connection,
+                       files: files,
+                       logger: logger,
+                       accession: accession).run
     end
   end
 end

data/lib/sdr_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SdrClient
-  VERSION = '0.23.0'
+  VERSION = '0.26.1'
 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.31.0'
+  spec.add_dependency 'cocina-models', '~> 0.32.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.23.0
+  version: 0.26.1
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-21 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.31.0
+        version: 0.32.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.31.0
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: dry-monads
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +188,7 @@ files:
 - exe/sdr
 - lib/sdr-client.rb
 - lib/sdr_client.rb
+- lib/sdr_client/background_job_results.rb
 - lib/sdr_client/cli.rb
 - lib/sdr_client/connection.rb
 - lib/sdr_client/credentials.rb
@@ -234,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The CLI for https://github.com/sul-dlss/sdr-api