sdr-client 0.16.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6d44bbb8b087e0045328a2b8625654ad9f7eaadf7c968c5ee5402683dc04d26
-  data.tar.gz: 9808626f7cad4548ccce883253245c80fc18fac9cd14353dcb008cb8c1cf365a
+  metadata.gz: 1ae3d332b62dd4908555f961ffa5f9ebc12e0388836f36f855672731d8b940a1
+  data.tar.gz: 97c3c18fc7e4ed98b5577ea24390eef9f2ecbf8c24970c92fd3d3097a13b5492
 SHA512:
-  metadata.gz: e14bf4032db046e886a7ef02cc1183fab23806bf0b450527ad8e33f396d3cac1f2d254644e9f9e2179d38c04d200a4cdf09eb07515aabf0e8a7a2c7ad9367fd1
-  data.tar.gz: 39e311b8bb036dd2abff468086103be8e55516b1490d219c4c34e5b68b0c80322af47efd0dcc198ee11e3e24e484d7d206102f20e415ccfa171abd7d61d6fde5
+  metadata.gz: f03baa42607cd68d3b814e46df38dda0567ca78082292faaf5ec47dfe518b68e0399f25305a89bed835bf68cde2e680f553646b4c921490ae06c7e426a812c5f
+  data.tar.gz: d392e1bfda994e6266ca4e6e1834036e76a5cfd37008c6ceda87ed6c20d4cbae9becef1fe8f47e3631f824dae7ae883735e0718dec7161488763d891f9d57121

data/.rubocop.yml

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

data/lib/sdr_client.rb

@@ -2,13 +2,17 @@
 
 require 'dry/monads'
 require 'faraday'
+require 'active_support'
+require 'active_support/core_ext/object/json'
 
 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'
 require 'sdr_client/cli'
+require 'sdr_client/connection'
 
 module SdrClient
   class Error < StandardError; end

data/lib/sdr_client/connection.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module SdrClient
+  # The connection to the server
+  class Connection
+    def initialize(url:, token: Credentials.read)
+      @url = url
+      @token = token
+    end
+
+    def connection
+      @connection ||= Faraday.new(url: url) do |conn|
+        conn.authorization :Bearer, token
+        conn.adapter :net_http
+      end
+    end
+
+    delegate :put, :post, to: :connection
+
+    private
+
+    attr_reader :url, :token
+  end
+end

data/lib/sdr_client/deposit.rb

@@ -25,8 +25,6 @@ module SdrClient
                  files_metadata: {},
                  grouping_strategy: SingleFileGroupingStrategy,
                  logger: Logger.new(STDOUT))
-      token = Credentials.read
-
       augmented_metadata = FileMetadataBuilder.build(files: files, files_metadata: files_metadata)
       metadata = Request.new(label: label,
                              type: type,
@@ -41,7 +39,8 @@ module SdrClient
                              embargo_access: embargo_access,
                              viewing_direction: viewing_direction,
                              files_metadata: augmented_metadata)
-      Process.new(metadata: metadata, url: url, token: token, files: files,
+      connection = Connection.new(url: url)
+      Process.new(metadata: metadata, connection: connection, files: files,
                   grouping_strategy: grouping_strategy, logger: logger).run
     end
     # rubocop:enable Metrics/MethodLength

data/lib/sdr_client/deposit/model_process.rb

@@ -0,0 +1,124 @@
+# 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
+        child_files_match
+
+        upload_responses = UploadFiles.new(files: files,
+                                           logger: logger,
+                                           connection: connection,
+                                           mime_types: mime_types).run
+        new_request_dro = with_external_identifiers(upload_responses)
+        upload_request_dro(new_request_dro.to_json)
+      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
+
+      def child_files_match
+        # Files without request files.
+        files.each do |filepath|
+          filename = ::File.basename(filepath)
+
+          raise "Request file not provided for #{filepath}" if request_files[filename].nil?
+        end
+
+        # Request files without files
+        filenames = files.map { |filepath| ::File.basename(filepath) }
+        request_files.keys.each do |request_filename|
+          raise "File not provided for request file #{request_filename}" unless filenames.include?(request_filename)
+        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
+
+      def connection
+        @connection ||= Faraday.new(url: url) do |conn|
+          conn.authorization :Bearer, token
+          conn.adapter :net_http
+        end
+      end
+
+      # Map of filenames to mimetypes
+      def mime_types
+        @mime_types ||=
+          Hash[
+            request_files.map do |filename, file|
+              [filename, file.hasMimeType || 'application/octet-stream']
+            end
+          ]
+      end
+
+      # Map of filenames to request files
+      def request_files
+        @request_files ||=
+          Hash[
+              request_dro.structural.contains.map do |file_set|
+                file_set.structural.contains.map do |file|
+                  [file.filename, file]
+                end
+              end.flatten(1)
+          ]
+      end
+
+      def with_external_identifiers(upload_responses)
+        signed_id_map = Hash[upload_responses.map { |response| [response.filename, response.signed_id] }]
+
+        # Manipulating request_dro as hash since immutable
+        request_dro_hash = request_dro.to_h
+        request_dro_hash[:structural][:contains].each do |file_set|
+          file_set[:structural][:contains].each do |file|
+            file[:externalIdentifier] = signed_id_map[file[:filename]]
+          end
+        end
+
+        Cocina::Models::RequestDRO.new(request_dro_hash)
+      end
+    end
+  end
+end

data/lib/sdr_client/deposit/process.rb

@@ -9,28 +9,24 @@ module SdrClient
       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] url the server to send to
-      # @param [String] token the bearer auth token for the server
+      # @param [String] connection the server connection to use
       # @param [Array<String>] files a list of file names to upload
       # @param [Logger] logger the logger to use
-      # rubocop:disable Metrics/ParameterLists
-      def initialize(metadata:, grouping_strategy: SingleFileGroupingStrategy, url:,
-                     token:, files: [], logger: Logger.new(STDOUT))
+      def initialize(metadata:, grouping_strategy: SingleFileGroupingStrategy,
+                     connection:, files: [], logger: Logger.new(STDOUT))
         @files = files
-        @url = url
-        @token = token
+        @connection = connection
         @metadata = metadata
         @logger = logger
         @grouping_strategy = grouping_strategy
       end
-      # rubocop:enable Metrics/ParameterLists
 
       def run
         check_files_exist
         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)
@@ -40,7 +36,7 @@ module SdrClient
 
       private
 
-      attr_reader :metadata, :files, :url, :token, :logger, :grouping_strategy
+      attr_reader :metadata, :files, :connection, :logger, :grouping_strategy
 
       def check_files_exist
         logger.info('checking to see if files exist')
@@ -68,11 +64,14 @@ module SdrClient
         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
+      def mime_types
+        @mime_types ||=
+          Hash[
+            files.map do |filepath|
+              filename = ::File.basename(filepath)
+              [filename, metadata.for(filename)['mime_type']]
+            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 [Connection] 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.19.0'
 end

data/sdr-client.gemspec

@@ -27,6 +27,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'activesupport'
+  spec.add_dependency 'cocina-models', '~> 0.29.0'
   spec.add_dependency 'dry-monads'
   spec.add_dependency 'faraday', '>= 0.16'
 

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.19.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2020-03-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cocina-models
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.29.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.29.0
 - !ruby/object:Gem::Dependency
   name: dry-monads
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +189,7 @@ files:
 - lib/sdr-client.rb
 - lib/sdr_client.rb
 - lib/sdr_client/cli.rb
+- lib/sdr_client/connection.rb
 - lib/sdr_client/credentials.rb
 - lib/sdr_client/deposit.rb
 - lib/sdr_client/deposit/file.rb
@@ -173,12 +202,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