sdr-client 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52457756d6413fcbb3d78c6778e705dd000f73d4bfd9be51b4455c91f861f2cf
-  data.tar.gz: 2e3fbb925f332ddbf6f70a011f708ed659bb768bf3cea618e3b40cea70b7e1a8
+  metadata.gz: 26eecb6134b706eb60ac7623c53576d6ae93f18d7bb9399b8e18c07f04e6da99
+  data.tar.gz: 9c2a3d384225a21571ef5618e0bf1606599a44f429a0c81735c8c7f0f04172a3
 SHA512:
-  metadata.gz: cdaa5ce7b1c83361d33911f02191d4a34c97c24113ffc01e4594a2300b966ef7b0ff399ea56ee033650be0eb808dd3a363dbf04357c2e124ebfe378d78a69459
-  data.tar.gz: 238c7ff0047034134d1a3c4421bed157e09b97692ec6d57226edfc2e4e5ef0a7be3a88a39b9c10f816ae6e53dc7f44d10dea7d38a1f7424bb9a6a5c9b3ea7fd2
+  metadata.gz: adadb90117ec098b281ff87b03796fd20fed3772fd03e3aa165f8c97b8c05a5510ed7980d9321effa15757cd505bbae8ba30bbdb3dd2c57257b24ce7bf40aa0e
+  data.tar.gz: 06ee1f2f6b22e364cfe1fe32059619b527026e7f9dd2dd2e05a6e30865c07946d8e9d1c8b98d1fbb91b68f7867400534a9eb83c3406942e54438947c2eed1ed3

data/lib/sdr_client/deposit.rb

@@ -59,6 +59,7 @@ require 'sdr_client/deposit/file'
 require 'sdr_client/deposit/file_metadata_builder'
 require 'sdr_client/deposit/file_set'
 require 'sdr_client/deposit/request'
-require 'sdr_client/deposit/upload_files'
 require 'sdr_client/deposit/metadata_builder'
 require 'sdr_client/deposit/process'
+require 'sdr_client/deposit/upload_files'
+require 'sdr_client/deposit/upload_resource'

data/lib/sdr_client/deposit/model_process.rb

@@ -6,16 +6,18 @@ module SdrClient
   module Deposit
     # The process for doing a deposit from a Cocina Model
     class ModelProcess
-      DRO_PATH = '/v1/resources'
       # @param [Cocina::Model::RequestDRO] request_dro for depositing
       # @param [Connection] connection the connection to use
       # @param [Array<String>] files a list of file names to upload
+      # @param [Boolean] accession should the accessionWF be started
       # @param [Logger] logger the logger to use
-      def initialize(request_dro:, connection:, files: [], logger: Logger.new(STDOUT))
+      def initialize(request_dro:, connection:,
+                     files: [], accession:, logger: Logger.new(STDOUT))
         @files = files
         @connection = connection
         @request_dro = request_dro
         @logger = logger
+        @accession = accession
       end
 
       def run
@@ -27,7 +29,10 @@ module SdrClient
                                            connection: connection,
                                            mime_types: mime_types).run
         new_request_dro = with_external_identifiers(upload_responses)
-        upload_request_dro(new_request_dro.to_json)
+        UploadResource.run(accession: @accession,
+                           metadata: new_request_dro.to_json,
+                           logger: logger,
+                           connection: connection)
       end
 
       private
@@ -56,24 +61,6 @@ module SdrClient
         end
       end
 
-      # @return [Hash<Symbol,String>] the result of the metadata call
-      def upload_request_dro(request_json)
-        logger.info("Starting upload metadata: #{request_json}")
-        response = connection.post(DRO_PATH, request_json, 'Content-Type' => 'application/json')
-        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'] }
-      end
-
-      def unexpected_response(response)
-        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.status} #{response.body}"
-      end
-
       # Map of filenames to mimetypes
       def mime_types
         @mime_types ||=

data/lib/sdr_client/deposit/process.rb

@@ -6,7 +6,6 @@ module SdrClient
   module Deposit
     # The process for doing a deposit
     class Process
-      DRO_PATH = '/v1/resources'
       # @param [Request] metadata information about the object
       # @param [Class] grouping_strategy class whose run method groups an array of uploads
       # @param [String] connection the server connection to use
@@ -38,7 +37,10 @@ module SdrClient
                                                logger: logger)
         request = metadata_builder.with_uploads(upload_responses)
         model = Cocina::Models.build_request(request.as_json.with_indifferent_access)
-        upload_metadata(model.to_h)
+        UploadResource.run(accession: @accession,
+                           metadata: JSON.generate(model.to_h),
+                           logger: logger,
+                           connection: connection)
       end
       # rubocop:enable Metrics/AbcSize
 
@@ -53,41 +55,6 @@ module SdrClient
         end
       end
 
-      def accession?
-        @accession
-      end
-
-      # @param [Hash<Symbol,String>] the result of the metadata call
-      # @param [Boolean] accession should the accessionWF be started
-      # @return [Hash<Symbol,String>] the result of the metadata call
-      def upload_metadata(metadata)
-        response = metadata_request(metadata)
-        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'] }
-      end
-
-      def metadata_request(metadata)
-        logger.debug("Starting upload metadata: #{metadata}")
-
-        connection.post(path, JSON.generate(metadata), 'Content-Type' => 'application/json')
-      end
-
-      def path
-        path = DRO_PATH
-        path += '?accession=true' if accession?
-        path
-      end
-
-      def unexpected_response(response)
-        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.status} #{response.body}"
-      end
-
       def mime_types
         @mime_types ||=
           Hash[

data/lib/sdr_client/deposit/upload_resource.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module SdrClient
+  module Deposit
+    # Uploads a resource (metadata) to the server
+    class UploadResource
+      DRO_PATH = '/v1/resources'
+
+      def self.run(accession:, metadata:, logger:, connection:)
+        new(accession: accession, metadata: metadata, logger: logger, connection: connection).run
+      end
+
+      # @param [Boolean] accession should the accessionWF be started
+      # @param [String] metadata
+      # @param [Hash<Symbol,String>] the result of the metadata call
+      def initialize(accession:, metadata:, logger:, connection:)
+        @accession = accession
+        @metadata = metadata
+        @logger = logger
+        @connection = connection
+      end
+
+      # @param [Hash<Symbol,String>] the result of the metadata call
+      # @return [Hash<Symbol,String>] the result of the metadata call
+      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'] }
+      end
+
+      private
+
+      attr_reader :metadata, :logger, :connection
+
+      def metadata_request
+        logger.debug("Starting upload metadata: #{metadata}")
+
+        connection.post(path, metadata, 'Content-Type' => 'application/json')
+      end
+
+      def unexpected_response(response)
+        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.status} #{response.body}"
+      end
+
+      def accession?
+        @accession
+      end
+
+      def path
+        path = DRO_PATH
+        path += '?accession=true' if accession?
+        path
+      end
+    end
+  end
+end

data/lib/sdr_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2020-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -207,6 +207,7 @@ files:
 - lib/sdr_client/deposit/request.rb
 - lib/sdr_client/deposit/single_file_grouping_strategy.rb
 - lib/sdr_client/deposit/upload_files.rb
+- lib/sdr_client/deposit/upload_resource.rb
 - lib/sdr_client/login.rb
 - lib/sdr_client/login_prompt.rb
 - lib/sdr_client/model_deposit.rb