sdr-client 0.16.1 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6d44bbb8b087e0045328a2b8625654ad9f7eaadf7c968c5ee5402683dc04d26
-  data.tar.gz: 9808626f7cad4548ccce883253245c80fc18fac9cd14353dcb008cb8c1cf365a
+  metadata.gz: 065c4f605e60c45bb76c98eac741d67f5b7e848a5b59402396b4c7273ba80334
+  data.tar.gz: f826dad9e9e758242672f92baffde17f65c347f05013d7420a5ff69459344935
 SHA512:
-  metadata.gz: e14bf4032db046e886a7ef02cc1183fab23806bf0b450527ad8e33f396d3cac1f2d254644e9f9e2179d38c04d200a4cdf09eb07515aabf0e8a7a2c7ad9367fd1
-  data.tar.gz: 39e311b8bb036dd2abff468086103be8e55516b1490d219c4c34e5b68b0c80322af47efd0dcc198ee11e3e24e484d7d206102f20e415ccfa171abd7d61d6fde5
+  metadata.gz: '06295472bb1577491a3ea0f40a89cd904c14bb19c2064c226e129487d74828c0335109b2818bd280eed1d80af266d2352a72bc4b4838fa1fea7ff9830f81f1d8'
+  data.tar.gz: 6830c8249d6ae651fdbf1c6a62e582db254f663fe6d4316de84c7a1d6a2ba17fd516a129991ca8634a98ccd5857fe59ba56b12341412d0f7732232e93e78fa2d

data/.rubocop.yml

@@ -13,6 +13,7 @@ Layout/LineLength:
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/*'
+    -  'sdr-client.gemspec'
   ExcludedMethods:
     - 'OptionParser.new'
 

data/lib/sdr_client.rb

@@ -5,6 +5,7 @@ require 'faraday'
 
 require 'sdr_client/version'
 require 'sdr_client/deposit'
+require 'sdr_client/model_deposit'
 require 'sdr_client/credentials'
 require 'sdr_client/login'
 require 'sdr_client/login_prompt'

data/lib/sdr_client/deposit/model_process.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require 'logger'
+
+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 [String] url the server to send to
+      # @param [String] token the bearer auth token for the server
+      # @param [Array<String>] files a list of file names to upload
+      # @param [Logger] logger the logger to use
+      def initialize(request_dro:, url:,
+                     token:, files: [], logger: Logger.new(STDOUT))
+        @files = files
+        @url = url
+        @token = token
+        @request_dro = request_dro
+        @logger = logger
+      end
+
+      def run
+        check_files_exist
+        UploadFiles.new(files: files,
+                        logger: logger,
+                        connection: connection,
+                        mime_types: mime_types).run
+        upload_request_dro
+      end
+
+      private
+
+      attr_reader :request_dro, :files, :url, :token, :logger
+
+      def check_files_exist
+        logger.info('checking to see if files exist')
+        files.each do |file_name|
+          raise Errno::ENOENT, file_name unless ::File.exist?(file_name)
+        end
+      end
+
+      # @return [Hash<Symbol,String>] the result of the metadata call
+      # rubocop:disable Metrics/AbcSize
+      def upload_request_dro
+        request_json = request_dro.to_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
+      # rubocop:enable Metrics/AbcSize
+
+      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 connection
+        @connection ||= Faraday.new(url: url) do |conn|
+          conn.authorization :Bearer, token
+          conn.adapter :net_http
+        end
+      end
+
+      def mime_types
+        @mime_types ||=
+          Hash[
+            request_dro.structural.contains.map do |file_set|
+              file_set.structural.contains.map do |file|
+                [file.filename, file.hasMimeType || 'application/octet-stream']
+              end
+            end.flatten(1)
+          ]
+      end
+    end
+  end
+end

data/lib/sdr_client/deposit/process.rb

@@ -30,7 +30,7 @@ module SdrClient
         upload_responses = UploadFiles.new(files: files,
                                            logger: logger,
                                            connection: connection,
-                                           metadata: metadata).run
+                                           mime_types: mime_types).run
         metadata_builder = MetadataBuilder.new(metadata: metadata,
                                                grouping_strategy: grouping_strategy,
                                                logger: logger)
@@ -74,6 +74,16 @@ module SdrClient
           conn.adapter :net_http
         end
       end
+
+      def mime_types
+        @mime_types ||=
+          Hash[
+            files.map do |filepath|
+              filename = ::File.basename(filepath)
+              [filename, metadata.for(filename)['mime_type']]
+            end
+          ]
+      end
     end
   end
 end

data/lib/sdr_client/deposit/upload_files.rb

@@ -7,13 +7,13 @@ module SdrClient
     # The file uploading part of a deposit
     class UploadFiles
       BLOB_PATH = '/v1/direct_uploads'
-      # @param [Array<String>] files a list of file names to upload
+      # @param [Array<String>] files a list of filepaths to upload
       # @param [Logger] logger the logger to use
       # @param [Faraday::Connection] connection
-      # @param [Request] metadata information about the object
-      def initialize(files:, metadata:, logger:, connection:)
+      # @param [Hash<String,String] mime_types a map of filenames to mime types
+      def initialize(files:, mime_types:, logger:, connection:)
         @files = files
-        @metadata = metadata
+        @mime_types = mime_types
         @logger = logger
         @connection = connection
       end
@@ -28,14 +28,14 @@ module SdrClient
 
       private
 
-      attr_reader :files, :metadata, :logger, :connection
+      attr_reader :files, :mime_types, :logger, :connection
 
       def collect_file_metadata
         files.each_with_object({}) do |path, obj|
           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: mime_types[file_name])
         end
       end
 

data/lib/sdr_client/model_deposit.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'logger'
+
+module SdrClient
+  # The namespace for the "deposit" command
+  module Deposit
+    def self.model_run(request_dro:,
+                       files: [],
+                       url:,
+                       logger: Logger.new(STDOUT))
+      token = Credentials.read
+
+      ModelProcess.new(request_dro: request_dro, url: url, token: token, files: files, logger: logger).run
+    end
+  end
+end
+require 'sdr_client/deposit/model_process'

data/lib/sdr_client/version.rb

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

data/sdr-client.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'faraday', '>= 0.16'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'cocina-models'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.79.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.17.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2020-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-monads
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: cocina-models
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -173,12 +187,14 @@ files:
 - lib/sdr_client/deposit/files/direct_upload_response.rb
 - lib/sdr_client/deposit/matching_file_grouping_strategy.rb
 - lib/sdr_client/deposit/metadata_builder.rb
+- lib/sdr_client/deposit/model_process.rb
 - lib/sdr_client/deposit/process.rb
 - 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/login.rb
 - lib/sdr_client/login_prompt.rb
+- lib/sdr_client/model_deposit.rb
 - lib/sdr_client/version.rb
 - sdr-client.gemspec
 homepage: https://github.com/sul-dlss/sdr-client