sdr-client 0.13.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e15faf788690b47e50e64e7af7ff83dcf048022e86a1456d440d82bf9ac52b9
-  data.tar.gz: a0d50861d360ef14016a98a944b76d3b95e0aa2655b90b5ee2ce0559d63b641a
+  metadata.gz: 4fbf18f89def752a295fe6004aef3a08aed6809d023041aad877619a8309865f
+  data.tar.gz: 608e8c9670b3c929f8a7639c20ed34f4b924f561aed295a42162620ef007d146
 SHA512:
-  metadata.gz: 0f4affedfd3e35fc4374f02a954bd1be820cb317b4b47cb741ba2acf650eece79eeadf34f404df73b60495c16d34a43103845dc28ce9cacfc9a8722f8d12a863
-  data.tar.gz: 78c3eea15dca5e75dbd70022a871214376b9fe9ca84cea7bbb9b0c2adacbe56f365f3aaf0fda7e4f8c010d6a399609b1576261636913891d05a13659bf5efbe7
+  metadata.gz: 65633ede9a98646d7e722a6b7d42c761c2a8bc04aec21010ba7187ccfdd3fc5ebd79781140f566b0733a2cb9b87c1f0d14f2cf05de3a483dc45d2ea9fa3c6ed5
+  data.tar.gz: 752f5ce61da771161af8e66e7e0f2ad98ba9e2b6cdf406aa4f82cbf35d9b3ca77926fc5a3a4615393abe67aebd0368342f93145b6137b0f212e9611c39fd5c4c

data/.rubocop_todo.yml

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

data/exe/sdr

@@ -70,11 +70,24 @@ subcommands = {
       options[:source_id] = source_id
     end
 
+    opts.on('--copyright COPYRIGHT', 'The copyright statement') do |copyright|
+      options[:copyright] = copyright
+    end
+
+    opts.on('--use-statement STATEMENT', 'The use and reproduction statement') do |use_statement|
+      options[:use_statement] = use_statement
+    end
+
     opts.on('--viewing-direction DIRECTION', 'The viewing direction (if a book). ' \
             '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|
+      options[:access] = level if %w[world stanford location-based citation-only dark].include?(level)
+    end
+
     opts.on('--files-metadata FILES_METADATA', 'A JSON object representing per-file metadata') do |files_metadata|
       options[:files_metadata] = JSON.parse(files_metadata)
     end

data/lib/sdr_client/deposit.rb

@@ -6,9 +6,13 @@ module SdrClient
   # The namespace for the "deposit" command
   module Deposit
     # rubocop:disable Metrics/ParameterLists
+    # rubocop:disable Metrics/MethodLength
     def self.run(label: nil,
                  type: 'http://cocina.sul.stanford.edu/models/book.jsonld',
                  viewing_direction: nil,
+                 access: 'dark',
+                 use_statement: nil,
+                 copyright: nil,
                  apo:,
                  collection: nil,
                  catkey: nil,
@@ -24,7 +28,10 @@ module SdrClient
 
       metadata = Request.new(label: label,
                              type: type,
+                             access: access,
                              apo: apo,
+                             use_statement: use_statement,
+                             copyright: copyright,
                              collection: collection,
                              source_id: source_id,
                              catkey: catkey,
@@ -35,6 +42,7 @@ module SdrClient
       Process.new(metadata: metadata, url: url, token: token, files: files,
                   grouping_strategy: grouping_strategy, logger: logger).run
     end
+    # rubocop:enable Metrics/MethodLength
     # rubocop:enable Metrics/ParameterLists
   end
 end

data/lib/sdr_client/deposit/process.rb

@@ -65,7 +65,7 @@ module SdrClient
         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.inspect}"
+        raise "unexpected response: #{response.status} #{response.body}"
       end
 
       def connection

data/lib/sdr_client/deposit/request.rb

@@ -13,6 +13,9 @@ module SdrClient
       # Additional metadata includes access, preserve, shelve, md5, sha1
       # rubocop:disable Metrics/ParameterLists
       def initialize(label: nil,
+                     access: 'dark',
+                     use_statement: nil,
+                     copyright: nil,
                      apo:,
                      collection: nil,
                      source_id:,
@@ -30,6 +33,9 @@ module SdrClient
         @catkey = catkey
         @embargo_release_date = embargo_release_date
         @embargo_access = embargo_access
+        @access = access
+        @use_statement = use_statement
+        @copyright = copyright
         @apo = apo
         @file_sets = file_sets
         @files_metadata = files_metadata
@@ -39,7 +45,7 @@ module SdrClient
 
       def as_json
         {
-          access: access,
+          access: access_struct,
           type: type,
           administrative: administrative,
           identification: identification,
@@ -52,13 +58,16 @@ module SdrClient
       # @return [Request] a clone of this request with the file_sets added
       def with_file_sets(file_sets)
         Request.new(label: label,
+                    access: access,
                     apo: apo,
                     collection: collection,
+                    copyright: copyright,
                     source_id: source_id,
                     catkey: catkey,
                     embargo_release_date: embargo_release_date,
                     embargo_access: embargo_access,
                     type: type,
+                    use_statement: use_statement,
                     viewing_direction: viewing_direction,
                     file_sets: file_sets,
                     files_metadata: files_metadata)
@@ -72,9 +81,9 @@ module SdrClient
 
       private
 
-      attr_reader :label, :file_sets, :source_id, :catkey, :apo, :collection,
+      attr_reader :access, :label, :file_sets, :source_id, :catkey, :apo, :collection,
                   :type, :files_metadata, :embargo_release_date, :embargo_access,
-                  :viewing_direction
+                  :viewing_direction, :use_statement, :copyright
 
       def administrative
         {
@@ -96,8 +105,11 @@ module SdrClient
         end
       end
 
-      def access
-        {}.tap do |json|
+      def access_struct
+        { access: access }.tap do |json|
+          json[:useAndReproductionStatement] = use_statement if use_statement
+          json[:copyright] = copyright if copyright
+
           if embargo_release_date
             json[:embargo] = {
               releaseDate: embargo_release_date.strftime('%FT%T%:z'),

data/lib/sdr_client/deposit/upload_files.rb

@@ -35,7 +35,7 @@ module SdrClient
           file_name = ::File.basename(path)
           obj[path] = Files::DirectUploadRequest.from_file(path,
                                                            file_name: file_name,
-                                                           content_type: metadata.for(file_name)[:mime_type])
+                                                           content_type: metadata.for(file_name)['mime_type'])
         end
       end
 

data/lib/sdr_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-monads