sdr-client 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0578c4fbb93d5b8118a9d55f9751f1b50b633d15405411a31b8a4376b3d2f297'
-  data.tar.gz: 0bc45cbbe780f1e386685bca4cd500ca8ed8b227ddd0377c290c36b918a5dd96
+  metadata.gz: fcebebb756bf3279381b14725819fe9580fe0e3526b6a6f57994dd1ad59e8c27
+  data.tar.gz: bec945fdf457d1d721a7fc3f708e3359a2bf50baa9cab69ebac036ca7328a495
 SHA512:
-  metadata.gz: 8cc065044b53e035c4eb73901ab635684c8b956ec280713ad50293e410a6525c5d15d274acaf7cf266f3a7f31a77309c85a9067449f03885ca1abde0b0e4d53a
-  data.tar.gz: 7a03cfd0cbf6a48e2fea9c71fb587c74e58b624a6ce1a299c55534c7fce9043d0a4dd0c4682f914ad54b4074bf4fda4ee95e3c70ac3d17d77d0b0a6c9a786bf0
+  metadata.gz: a6873936d630a75a1f0c1459aee9d96af00a7c2ffad15cd333ae996868bfd29f5c3e2b896ea3e53e54c4bbb1a2694525f35bedf08543059453478691c42a7078
+  data.tar.gz: d4dc87b636430d81d6db9fcc5aa63530f4e0b87284fcc92293f8dafa0dce3477b75d8177f62c6c0bd292bbdb870ba7fd0a7a3328a9127dab2f963df419bf1600

data/lib/sdr_client/deposit/process.rb

@@ -62,10 +62,10 @@ module SdrClient
       end
 
       def unexpected_response(response)
-        raise "unexpected response: #{response.inspect}" unless response.status == 400
+        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
 
-        puts "\nThere was an error with your request: #{response.body}"
-        exit(1)
+        raise "unexpected response: #{response.inspect}"
       end
 
       def connection

data/lib/sdr_client/deposit/request.rb

@@ -5,6 +5,7 @@ module SdrClient
     # This represents the metadata that we send to the server for doing a deposit
     class Request
       # @param [String] label the required object label
+      # @param [Time|nil] embargo_release_date when the item should be released from embargo or nil if no embargo
       # @param [String] type (http://cocina.sul.stanford.edu/models/object.jsonld) the required object type.
       # @param [Array<FileSet>] file_sets the file sets to attach.
       # @param [Hash<String, Hash<String, String>>] files_metadata file name, hash of additional file metadata
@@ -15,6 +16,7 @@ module SdrClient
                      collection:,
                      source_id:,
                      catkey: nil,
+                     embargo_release_date: nil,
                      type: 'http://cocina.sul.stanford.edu/models/object.jsonld',
                      file_sets: [],
                      files_metadata: {})
@@ -23,6 +25,7 @@ module SdrClient
         @source_id = source_id
         @collection = collection
         @catkey = catkey
+        @embargo_release_date = embargo_release_date
         @apo = apo
         @file_sets = file_sets
         @files_metadata = files_metadata
@@ -31,7 +34,7 @@ module SdrClient
 
       def as_json
         {
-          access: {},
+          access: access,
           type: type,
           administrative: administrative,
           identification: identification,
@@ -48,6 +51,7 @@ module SdrClient
                     collection: collection,
                     source_id: source_id,
                     catkey: catkey,
+                    embargo_release_date: embargo_release_date,
                     type: type,
                     file_sets: file_sets,
                     files_metadata: files_metadata)
@@ -62,7 +66,7 @@ module SdrClient
       private
 
       attr_reader :label, :file_sets, :source_id, :catkey, :apo, :collection,
-                  :type, :files_metadata
+                  :type, :files_metadata, :embargo_release_date
 
       def administrative
         {
@@ -82,6 +86,12 @@ module SdrClient
           contains: file_sets.map(&:as_json)
         }
       end
+
+      def access
+        {}.tap do |json|
+          json[:embargoReleaseDate] = embargo_release_date.strftime('%FT%T%:z') if embargo_release_date
+        end
+      end
     end
   end
 end

data/lib/sdr_client/deposit/upload_files.rb

@@ -47,13 +47,19 @@ module SdrClient
       def direct_upload(metadata_json)
         logger.info("Starting an upload request: #{metadata_json}")
         response = connection.post(BLOB_PATH, metadata_json, 'Content-Type' => 'application/json')
-        raise "unexpected response: #{response.inspect}" unless response.status == 200
+        unexpected_response(response) unless response.status == 200
 
         logger.info("Response from server: #{response.body}")
 
         Files::DirectUploadResponse.new(JSON.parse(response.body))
       end
 
+      def unexpected_response(response)
+        raise 'There was an error with your credentials. Perhaps they have expired?' if response.status == 401
+
+        raise "unexpected response: #{response.inspect}"
+      end
+
       # @param [Hash<String,Files::DirectUploadResponse>] upload_responses the filenames and their upload response
       def upload_files(upload_responses)
         upload_responses.each do |filename, response|

data/lib/sdr_client/deposit.rb

@@ -11,6 +11,7 @@ module SdrClient
                  apo:,
                  collection:,
                  catkey: nil,
+                 embargo_release_date: nil,
                  source_id:,
                  url:,
                  files: [],
@@ -25,6 +26,7 @@ module SdrClient
                              collection: collection,
                              source_id: source_id,
                              catkey: catkey,
+                             embargo_release_date: embargo_release_date,
                              files_metadata: files_metadata)
       Process.new(metadata: metadata, url: url, token: token, files: files,
                   grouping_strategy: grouping_strategy, logger: logger).run

data/lib/sdr_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-07 00:00:00.000000000 Z
+date: 2020-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-monads
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: The CLI for https://github.com/sul-dlss/sdr-api