sdr-client 0.16.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51cea2d7a34db14a8fbef003f8e02b8db1483344724e2d1201fce2b3075f7fb7
-  data.tar.gz: 0654575a55dca1ee8bc9764c02a5d512e90cba6ad257780f1938643968e8dd58
+  metadata.gz: 8e763b0d86f9518951eff07ede0ff51629423c8b6855f98eb04225dbdf5b050b
+  data.tar.gz: e1fe1931e7e31cf0d35e647a606a01c7613a1ffcdaf2e4632c0a2291fa03636f
 SHA512:
-  metadata.gz: 6b304533c8b61c34b03a4e40875b2bd3c8d2e50bf5fba6c104327a769248aaaaace4151e5a8033f2b214e87316f8065b63c880057a0a631adb94a74ff779097a
-  data.tar.gz: b43e02b8160340b06bebf30642f65f885f73c25398d5f5190bd7453f0a99939f1d824535eefe83601b572f7e221b79069459d2959bef7401bd45bf5600ef2fd9
+  metadata.gz: 4ee835ce52cdf35db4b1216ceac46b8bba2cae28f4c6ae4dec0dfeb58d1a258cb9070b3187d96ae367788f6d69084279a401dd5f72e2f57f5fbb26d9e39ee84c
+  data.tar.gz: bfb5da340dd85568daa1c367e374619d12a871900242da31b68f404ff38afc8068a8999fced8f965eafb47d7a4cfbe65e26e10fbea8cdbf8853313176a554f88

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,9 +2,12 @@
 
 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'

data/lib/sdr_client/deposit.rb

@@ -5,10 +5,11 @@ require 'logger'
 module SdrClient
   # The namespace for the "deposit" command
   module Deposit
+    BOOK_TYPE = 'http://cocina.sul.stanford.edu/models/book.jsonld'
     # rubocop:disable Metrics/ParameterLists
     # rubocop:disable Metrics/MethodLength
     def self.run(label: nil,
-                 type: 'http://cocina.sul.stanford.edu/models/book.jsonld',
+                 type: BOOK_TYPE,
                  viewing_direction: nil,
                  access: 'dark',
                  use_statement: nil,

data/lib/sdr_client/deposit/metadata_builder.rb

@@ -16,6 +16,8 @@ module SdrClient
         @grouping_strategy = grouping_strategy
       end
 
+      # @param [UploadFiles] upload_responses the uploaded file information
+      # @return [Request] the metadata with fileset information added in.
       def with_uploads(upload_responses)
         file_sets = build_filesets(uploads: upload_responses)
         metadata.with_file_sets(file_sets)
@@ -32,7 +34,16 @@ module SdrClient
         grouped_uploads.map.with_index(1) do |upload_group, i|
           FileSet.new(uploads: upload_group,
                       uploads_metadata: metadata_group(upload_group),
-                      label: "Object #{i}")
+                      label: label(i))
+        end
+      end
+
+      def label(index)
+        case metadata.type
+        when BOOK_TYPE
+          "Page #{index}"
+        else
+          "Object #{index}"
         end
       end
 

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

@@ -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/request.rb

@@ -79,10 +79,12 @@ module SdrClient
         files_metadata.fetch(filename, {})
       end
 
+      attr_reader :type
+
       private
 
       attr_reader :access, :label, :file_sets, :source_id, :catkey, :apo, :collection,
-                  :type, :files_metadata, :embargo_release_date, :embargo_access,
+                  :files_metadata, :embargo_release_date, :embargo_access,
                   :viewing_direction, :use_statement, :copyright
 
       def administrative

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.0'
+  VERSION = '0.18.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.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-03-13 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
@@ -173,12 +201,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