sdr-client 0.54.0 → 0.58.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9375d3bf71081aaff025a3764f1243af12e4e323fd919ebef214aeb6033fb293
-  data.tar.gz: ecd3081f5f90861b3c59eddeb13b053db1d954c54d7495f2f015ffbbff7aa4cd
+  metadata.gz: d0aeb8a257ee16931c449f5255f927b242fa1c9893303ae3b76feefa433adb24
+  data.tar.gz: b00a06552dcff58238a57e2f13b500f48960861daf4567490d567d5598b01415
 SHA512:
-  metadata.gz: '0907a883ccaab8795077b8d5b077d7c71ae956d939867cbfaf801baf95116ea619a18f62de962c8d9d346d8e8df8f0f4852ad59b3474f0eabe702b3a4951aabf'
-  data.tar.gz: 61b65826d6aaf4aac4db476ccc5978c353c2c8694ea71552debe5469df182538a26248a11fc3eee110b08ebf6fbd696b9503e4fc0517ea4eb2c7008b0d693618
+  metadata.gz: 045fa4dd33fce4c171c27dea01e0cbb12de8d91408eff404b2121f68690018549d26d6a43cb9792a8cae56f4953353952e0301b8b3a802215bc23d9ad7d2d730
+  data.tar.gz: c15e6aecf2652ce4eb42f1433d3baab4d2cf7605e3e1f60a9b1ed5c5c8a4d7069c8f76ca9aa594741535b6bb3177582375d28280617f7c1096820cb344e3bf9d

data/.rubocop.yml

@@ -13,6 +13,10 @@ Metrics/BlockLength:
   ExcludedMethods:
     - 'OptionParser.new'
 
+Metrics/ClassLength:
+  Exclude:
+    - 'lib/sdr_client/deposit/request.rb'
+
 Naming/FileName:
   Exclude:
     - 'lib/sdr-client.rb'

data/.rubocop_todo.yml

@@ -1,19 +1,33 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2021-03-12 13:21:16 -0600 using RuboCop version 0.79.0.
+# `rubocop --auto-gen-config --auto-gen-only-exclude`
+# on 2021-04-15 12:18:21 -0700 using RuboCop version 0.79.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
+# Configuration parameters: Max.
 Metrics/AbcSize:
-  Max: 16
+  Exclude:
+    - 'lib/sdr_client/deposit/model_process.rb'
+
+# Offense count: 1
+# Configuration parameters: Max.
+Metrics/CyclomaticComplexity:
+  Exclude:
+    - 'lib/sdr_client/cli.rb'
 
 # Offense count: 9
-# Configuration parameters: CountComments, ExcludedMethods.
+# Configuration parameters: CountComments, Max, ExcludedMethods.
 Metrics/MethodLength:
-  Max: 15
+  Exclude:
+    - 'lib/sdr_client/cli.rb'
+    - 'lib/sdr_client/deposit/file.rb'
+    - 'lib/sdr_client/deposit/model_process.rb'
+    - 'lib/sdr_client/deposit/process.rb'
+    - 'lib/sdr_client/deposit/request.rb'
+    - 'lib/sdr_client/login.rb'
 
 # Offense count: 231
 # Cop supports --auto-correct.

data/README.md

@@ -51,3 +51,8 @@ View the object:
 sdr --service-url https://sdr-api-server:3000 get druid:bw581ng3176
 {"type":"http://cocina.sul.stanford.edu/models/document.jsonld","externalIdentifier":"druid:bw581ng3176","label":"Something something better title","version":1,"access":{"access":"stanford","copyright":"This work is copyrighted by the creator.","download":"stanford","useAndReproductionStatement":"This document is available only to the Stanford faculty, staff and student community."},"administrative":{"hasAdminPolicy":"druid:zx485kb6348"},"description":{"title":[{"value":"Something something better title"}],"contributor":[{"name":[{"value":"Hodge, Amy"}],"type":"person","role":[{"value":"Author"},{"value":"author","uri":"http://id.loc.gov/vocabulary/relators/aut","source":{"code":"marcrelator","uri":"http://id.loc.gov/vocabulary/relators/"}},{"value":"Creator"}]}],"form":[{"structuredValue":[{"value":"Text","type":"type"},{"value":"Report","type":"subtype"}],"type":"resource type","source":{"value":"Stanford self-deposit resource types"}},{"value":"reports","type":"genre","uri":"http://vocab.getty.edu/aat/300027267","source":{"code":"aat"}},{"value":"text","type":"resource type","source":{"value":"MODS resource types"}}],"note":[{"value":";alkdfjlsadkjf;l","type":"summary"},{"value":"amyhodge@stanford.edu","type":"contact","displayLabel":"Contact"}],"subject":[{"value":"lkfj","type":"topic"},{"value":";kfj","type":"topic"},{"value":"fjwelkb","type":"topic"}]},"identification":{"sourceId":"hydrus:20"},"structural":{"contains":[{"type":"http://cocina.sul.stanford.edu/models/resources/file.jsonld","externalIdentifier":"bw581ng3176_1","label":"Test file","version":1,"structural":{"contains":[{"type":"http://cocina.sul.stanford.edu/models/file.jsonld","externalIdentifier":"druid:bw581ng3176/test.txt","label":"test.txt","filename":"test.txt","size":11,"version":1,"hasMimeType":"text/plain","hasMessageDigests":[{"type":"sha1","digest":"5d39343e4bb48abd97f759828282f5ebbac56c5e"},{"type":"md5","digest":"63b8812b0c05722a9d6c51cbd2bfb54b"}],"access":{"access":"world","download":"world"},"administrative":{"sdrPreserve":true,"shelve":true}}]}}]}}
 ```
+
+Display version of sdr-client:
+```
+sdr version
+```

data/exe/sdr

@@ -19,9 +19,6 @@ end
 global.order!
 command = ARGV.shift
 
-retrieve_options = OptionParser.new do |opts|
-end
-
 deposit_options = OptionParser.new do |opts|
   opts.banner = "Usage: sdr #{command} [options]"
   opts.on('--label LABEL', 'The object label') do |label|
@@ -97,10 +94,11 @@ end
 SdrClient::CLI.help unless command
 
 subcommands = {
-  'get' => retrieve_options,
+  'get' => OptionParser.new,
   'deposit' => deposit_options,
   'register' => deposit_options,
-  'login' => OptionParser.new
+  'login' => OptionParser.new,
+  'version' => OptionParser.new
 }
 
 unless subcommands.key?(command)

data/lib/sdr_client/cli.rb

@@ -35,6 +35,9 @@ module SdrClient
         login
           Will prompt for email & password and exchange it for an login token, which it saves in ~/.sdr/token
 
+        version
+          Display the sdr-client version
+
     HELP
 
     def self.start(command, options, arguments = [])
@@ -46,6 +49,8 @@ module SdrClient
       when 'login'
         status = SdrClient::Login.run(options)
         puts status.failure if status.failure?
+      when 'version'
+        puts SdrClient::VERSION
       else
         raise "Unknown command #{command}"
       end

data/lib/sdr_client/deposit.rb

@@ -21,6 +21,7 @@ module SdrClient
                  catkey: nil,
                  embargo_release_date: nil,
                  embargo_access: 'world',
+                 embargo_download: 'world',
                  source_id:,
                  url:,
                  files: [],
@@ -41,6 +42,7 @@ module SdrClient
                              catkey: catkey,
                              embargo_release_date: embargo_release_date,
                              embargo_access: embargo_access,
+                             embargo_download: embargo_download,
                              viewing_direction: viewing_direction,
                              files_metadata: augmented_metadata)
       connection = Connection.new(url: url)

data/lib/sdr_client/deposit/create_resource.rb

@@ -39,7 +39,9 @@ module SdrClient
         json = metadata.to_json
         logger.debug("Starting upload metadata: #{json}")
 
-        connection.post(path, json, 'Content-Type' => 'application/json')
+        connection.post(path, json,
+                        'Content-Type' => 'application/json',
+                        'X-Cocina-Models-Version' => Cocina::Models::VERSION)
       end
 
       def accession?

data/lib/sdr_client/deposit/file.rb

@@ -6,15 +6,16 @@ module SdrClient
     class File
       # rubocop:disable Metrics/ParameterLists
       def initialize(external_identifier:, label:, filename:,
-                     access: 'world', preserve: true, shelve: true,
+                     access: 'dark', download: 'none', preserve: true, shelve: true,
                      publish: true, mime_type: nil, md5: nil, sha1: nil,
                      use: nil)
         @external_identifier = external_identifier
         @label = label
         @filename = filename
         @access = access
+        @download = download
         @preserve = preserve
-        @shelve = shelve
+        @shelve = access == 'dark' ? false : shelve
         @publish = publish
         @mime_type = mime_type
         @md5 = md5
@@ -23,7 +24,6 @@ module SdrClient
       end
       # rubocop:enable Metrics/ParameterLists
 
-      # rubocop:disable Metrics/MethodLength
       def as_json
         {
           "type": 'http://cocina.sul.stanford.edu/models/file.jsonld',
@@ -31,7 +31,8 @@ module SdrClient
           filename: @filename,
           externalIdentifier: @external_identifier,
           access: {
-            access: @access
+            access: @access,
+            download: @download
           },
           administrative: {
             sdrPreserve: @preserve,
@@ -45,7 +46,6 @@ module SdrClient
           json['use'] = @use if @use
         end
       end
-      # rubocop:enable Metrics/MethodLength
 
       private
 

data/lib/sdr_client/deposit/file_set.rb

@@ -5,7 +5,7 @@ module SdrClient
     # This represents the FileSet metadata that we send to the server for doing a deposit
     class FileSet
       # @param [Array] uploads
-      # @param [Hash<String,Hash<String,String>>] the file level metadata
+      # @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:)

data/lib/sdr_client/deposit/request.rb

@@ -12,6 +12,7 @@ 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',
@@ -23,6 +24,7 @@ module SdrClient
                      catkey: nil,
                      embargo_release_date: nil,
                      embargo_access: 'world',
+                     embargo_download: 'world',
                      type: 'http://cocina.sul.stanford.edu/models/object.jsonld',
                      viewing_direction: nil,
                      file_sets: [],
@@ -34,6 +36,7 @@ module SdrClient
         @catkey = catkey
         @embargo_release_date = embargo_release_date
         @embargo_access = embargo_access
+        @embargo_download = embargo_download
         @access = access
         @download = download
         @use_statement = use_statement
@@ -44,6 +47,7 @@ module SdrClient
         @viewing_direction = viewing_direction
       end
       # rubocop:enable Metrics/ParameterLists
+      # rubocop:enable Metrics/AbcSize
 
       def as_json
         {
@@ -58,6 +62,7 @@ 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,
@@ -69,17 +74,22 @@ module SdrClient
                     catkey: catkey,
                     embargo_release_date: embargo_release_date,
                     embargo_access: embargo_access,
+                    embargo_download: embargo_download,
                     type: type,
                     use_statement: use_statement,
                     viewing_direction: viewing_direction,
                     file_sets: file_sets,
                     files_metadata: files_metadata)
       end
+      # rubocop:enable Metrics/AbcSize
 
       # @param [String] filename
       # @return [Hash] the metadata for the file
       def for(filename)
-        files_metadata.fetch(filename, {})
+        metadata = files_metadata.fetch(filename, {}).with_indifferent_access
+        metadata[:access] = access unless metadata.key?(:access)
+        metadata[:download] = download unless metadata.key?(:download)
+        metadata
       end
 
       attr_reader :type
@@ -87,7 +97,7 @@ module SdrClient
       private
 
       attr_reader :access, :label, :file_sets, :source_id, :catkey, :apo, :collection,
-                  :files_metadata, :embargo_release_date, :embargo_access,
+                  :files_metadata, :embargo_release_date, :embargo_access, :embargo_download,
                   :viewing_direction, :use_statement, :copyright, :download
 
       def administrative
@@ -121,7 +131,8 @@ module SdrClient
           if embargo_release_date
             json[:embargo] = {
               releaseDate: embargo_release_date.strftime('%FT%T%:z'),
-              access: embargo_access
+              access: embargo_access,
+              download: embargo_download
             }
           end
         end

data/lib/sdr_client/deposit/update_resource.rb

@@ -37,7 +37,9 @@ module SdrClient
         json = metadata.to_json
         logger.debug("Starting upload metadata: #{json}")
 
-        connection.put(path(metadata), json, 'Content-Type' => 'application/json')
+        connection.put(path(metadata), json,
+                       'Content-Type' => 'application/json',
+                       'X-Cocina-Models-Version' => Cocina::Models::VERSION)
       end
 
       def path(metadata)

data/lib/sdr_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SdrClient
-  VERSION = '0.54.0'
+  VERSION = '0.58.0'
 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.57.0'
+  spec.add_dependency 'cocina-models', '~> 0.61.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.54.0
+  version: 0.58.0
 platform: ruby
 authors:
 - Justin Coyne
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2021-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.0
+        version: 0.61.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.0
+        version: 0.61.0
 - !ruby/object:Gem::Dependency
   name: dry-monads
   requirement: !ruby/object:Gem::Requirement
@@ -224,7 +224,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
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -239,8 +239,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: The CLI for https://github.com/sul-dlss/sdr-api
 test_files: []