sdr-client 0.3.1 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c634551367640a9eb3647e55fcac169a61b40af1a111582d3e857bc2cc1f020
-  data.tar.gz: 75f3a024adf97dad2cf85a8e8b117a232c71b2f644655b98752c1320af005e17
+  metadata.gz: 85bf3bb61e2edeca3fd59c4bcb72e65c0ca8a6fa2555095059c774d6adbb5cd9
+  data.tar.gz: 29ef71e2e7778c28b8db875e7c910ee4f477857422d61d59774ab09b0fdb5852
 SHA512:
-  metadata.gz: 04a14d2edbb8334fbcc13b7ae131d7bf1697869c580395c2ea8c2971c18b911d55b7b0128e0cdff25b7a5844333f11eb2af23bc435ab7c6e692e4951092e22ed
-  data.tar.gz: 6c3369f015d8e3201ba1f58664c4d9b15208064eb5fdd24deca2de26ae7d4575889d22f7aa25eacb2e1232cfd2068d288771c6ba0c04737b7e5fc6c7508d2ba8
+  metadata.gz: 61cc5ce0d28aeddbcd20273a7086d9b4dc0482b76f91b19002496b80e4db7d32471f9b8e827ffc800c58172fb3cf7d1f2ccdf920ca11bd88f5ac141002406703
+  data.tar.gz: c2149a463c52831fee474f8c43e00982fce4ea9f56da629f8b87f1889bb59630419ed6c8c5296b56b6985324195ff1bb700277cbdfa91e9de89388319689b461

data/.rubocop.yml

@@ -13,3 +13,9 @@ Layout/LineLength:
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/*'
+  ExcludedMethods:
+    - 'OptionParser.new'
+
+Naming/FileName:
+  Exclude:
+    - 'lib/sdr-client.rb'

data/.rubocop_todo.yml

@@ -14,8 +14,3 @@ Metrics/AbcSize:
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 13
-
-# Offense count: 2
-# Configuration parameters: CountKeywordArgs.
-Metrics/ParameterLists:
-  Max: 8

data/README.md

@@ -8,6 +8,10 @@
 This is a CLI for interacting with the Stanford Digital Repository API.
 The code for the SDR API server is at https://github.com/sul-dlss/sdr-api
 
+## Install
+
+`gem install sdr-client`
+
 ## Usage
 
 Log in:

data/exe/sdr

@@ -3,6 +3,7 @@
 
 $LOAD_PATH.unshift 'lib'
 require 'optparse'
+require 'sdr_client'
 
 options = {}
 global = OptionParser.new do |opts|
@@ -60,6 +61,20 @@ subcommands = {
       options[:source_id] = source_id
     end
 
+    opts.on('--strategy STRATEGY',
+            'The strategy to use for distributing files into filesets. Either "default" or "filename"') do |strategy|
+      strategy_class = case strategy
+                       when 'filename'
+                         SdrClient::Deposit::MatchingFileGroupingStrategy
+                       when 'default'
+                         SdrClient::Deposit::SingleFileGroupingStrategy
+                       else
+                         warn "Unknown strategy #{strategy}"
+                         exit(1)
+                       end
+      options[:grouping_strategy] = strategy_class
+    end
+
     opts.on('-h', '--help', 'Display this screen') do
       puts opts
       exit
@@ -75,6 +90,5 @@ end
 
 subcommands[command].order!
 
-require 'sdr_client'
 options[:files] = ARGV unless ARGV.empty?
 SdrClient::CLI.start(command, options)

data/lib/sdr-client.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require 'sdr_client'

data/lib/sdr_client/deposit.rb

@@ -1,15 +1,22 @@
 # frozen_string_literal: true
 
+require 'logger'
+
 module SdrClient
   # The namespace for the "deposit" command
   module Deposit
+    # rubocop:disable Metrics/ParameterLists
     def self.run(label: nil,
                  type: 'http://cocina.sul.stanford.edu/models/book.jsonld',
                  apo:,
                  collection:,
                  catkey: nil,
                  source_id:,
-                 url:, files: [])
+                 url:,
+                 files: [],
+                 files_metadata: {},
+                 grouping_strategy: SingleFileGroupingStrategy,
+                 logger: Logger.new(STDOUT))
       token = Credentials.read
 
       metadata = Request.new(label: label,
@@ -18,11 +25,15 @@ module SdrClient
                              collection: collection,
                              source_id: source_id,
                              catkey: catkey)
-      Process.new(metadata: metadata, url: url, token: token, files: files).run
+      Process.new(metadata: metadata, url: url, token: token, files: files,
+                  files_metadata: files_metadata, grouping_strategy: grouping_strategy, logger: logger).run
     end
+    # rubocop:enable Metrics/ParameterLists
   end
 end
 require 'json'
+require 'sdr_client/deposit/single_file_grouping_strategy'
+require 'sdr_client/deposit/matching_file_grouping_strategy'
 require 'sdr_client/deposit/files/direct_upload_request'
 require 'sdr_client/deposit/files/direct_upload_response'
 require 'sdr_client/deposit/file'

data/lib/sdr_client/deposit/file.rb

@@ -4,15 +4,23 @@ module SdrClient
   module Deposit
     # This represents the File metadata that we send to the server for doing a deposit
     class File
-      def initialize(external_identifier:, label:, filename:, access: 'dark', preserve: false, shelve: false)
+      # rubocop:disable Metrics/ParameterLists
+      def initialize(external_identifier:, label:, filename:,
+                     access: 'dark', preserve: false, shelve: false,
+                     mime_type: nil, md5: nil, sha1: nil)
         @external_identifier = external_identifier
         @label = label
         @filename = filename
         @access = access
         @preserve = preserve
         @shelve = shelve
+        @mime_type = mime_type
+        @md5 = md5
+        @sha1 = sha1
       end
+      # rubocop:enable Metrics/ParameterLists
 
+      # rubocop:disable Metrics/MethodLength
       def as_json
         {
           "type": 'http://cocina.sul.stanford.edu/models/file.jsonld',
@@ -26,6 +34,26 @@ module SdrClient
             sdrPreserve: @preserve,
             shelve: @shelve
           }
+        }.tap do |json|
+          json['hasMessageDigests'] = message_digests unless message_digests.empty?
+          json['hasMimeType'] = @mime_type if @mime_type
+        end
+      end
+      # rubocop:enable Metrics/MethodLength
+
+      private
+
+      def message_digests
+        @message_digests ||= [].tap do |message_digests|
+          message_digests << create_message_digest('md5', @md5) unless @md5.nil?
+          message_digests << create_message_digest('sha1', @sha1) unless @sha1.nil?
+        end
+      end
+
+      def create_message_digest(algorithm, digest)
+        {
+          "type": algorithm,
+          digest: digest
         }
       end
     end

data/lib/sdr_client/deposit/file_set.rb

@@ -4,11 +4,11 @@ module SdrClient
   module Deposit
     # This represents the FileSet metadata that we send to the server for doing a deposit
     class FileSet
-      def initialize(uploads: [], files: [], label:)
+      def initialize(uploads: [], uploads_metadata: {}, files: [], label:)
         @label = label
         @files = if !uploads.empty?
                    uploads.map do |upload|
-                     File.new(external_identifier: upload.signed_id, label: upload.filename, filename: upload.filename)
+                     File.new(file_args(upload, uploads_metadata.fetch(upload.filename, {})))
                    end
                  else
                    files
@@ -20,7 +20,7 @@ module SdrClient
           "type": 'http://cocina.sul.stanford.edu/models/fileset.jsonld',
           "label": label,
           structural: {
-            hasMember: files.map(&:as_json)
+            contains: files.map(&:as_json)
           }
         }
       end
@@ -28,6 +28,15 @@ module SdrClient
       private
 
       attr_reader :files, :label
+
+      def file_args(upload, upload_metadata)
+        args = {
+          external_identifier: upload.signed_id,
+          label: upload.filename,
+          filename: upload.filename
+        }
+        args.merge(upload_metadata)
+      end
     end
   end
 end

data/lib/sdr_client/deposit/matching_file_grouping_strategy.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module SdrClient
+  module Deposit
+    # This strategy is for building one file set per set of similarly prefixed uploaded files
+    class MatchingFileGroupingStrategy
+      # @param [Array<SdrClient::Deposit::Files::DirectUploadResponse>] uploads the uploaded files to attach.
+      # @return [Array<Array<SdrClient::Deposit::Files::DirectUploadResponse>>] uploads the grouped uploaded files.
+      def self.run(uploads: [])
+        # Call `#values` on the result of the grouping operation because 1)
+        # `Process#build_filesets` expects an array of arrays, not an array of
+        # hashes, and 2) the keys aren't used anywhere
+        uploads.group_by { |ul| ::File.basename(ul.filename, '.*') }.values
+      end
+    end
+  end
+end

data/lib/sdr_client/deposit/process.rb

@@ -9,30 +9,39 @@ module SdrClient
       BLOB_PATH = '/v1/direct_uploads'
       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 [Array<String>] files a list of file names to upload
+      # @param [Hash<String, Hash<String, String>>] files_metadata file name, hash of additional file metadata
+      # Additional metadata includes access, preserve, shelve, md5, sha1
       # @param [Logger] logger the logger to use
-      def initialize(metadata:, url:, token:, files: [], logger: Logger.new(STDOUT))
+      # rubocop:disable Metrics/ParameterLists
+      def initialize(metadata:, grouping_strategy: SingleFileGroupingStrategy, url:,
+                     token:, files: [], files_metadata: {}, logger: Logger.new(STDOUT))
         @files = files
         @url = url
         @token = token
         @metadata = metadata
         @logger = logger
+        @grouping_strategy = grouping_strategy
+        @files_metadata = files_metadata
       end
+      # rubocop:enable Metrics/ParameterLists
 
       def run
         check_files_exist
         file_metadata = collect_file_metadata
         upload_responses = upload_file_metadata(file_metadata)
         upload_files(upload_responses)
-        request = metadata.with_uploads(upload_responses.values)
+        file_sets = build_filesets(uploads: upload_responses.values, files_metadata: files_metadata)
+        request = metadata.with_file_sets(file_sets)
         upload_metadata(request.as_json)
       end
 
       private
 
-      attr_reader :metadata, :files, :url, :token, :logger
+      attr_reader :metadata, :files, :url, :token, :logger, :grouping_strategy, :files_metadata
 
       def check_files_exist
         logger.info('checking to see if files exist')
@@ -111,6 +120,18 @@ module SdrClient
           conn.adapter :net_http
         end
       end
+
+      # @param [Array<SdrClient::Deposit::Files::DirectUploadResponse>] uploads the uploaded files to attach.
+      # @param [Hash<String,Hash<String, String>>] files_metadata filename, hash of additional file metadata.
+      # @return [Array<SdrClient::Deposit::FileSet>] the uploads transformed to filesets
+      def build_filesets(uploads:, files_metadata:)
+        grouped_uploads = grouping_strategy.run(uploads: uploads)
+        grouped_uploads.map.with_index(1) do |upload_group, i|
+          metadata_group = {}
+          upload_group.each { |upload| metadata_group[upload.filename] = files_metadata.fetch(upload.filename, {}) }
+          FileSet.new(uploads: upload_group, uploads_metadata: metadata_group, label: "Object #{i}")
+        end
+      end
     end
   end
 end

data/lib/sdr_client/deposit/request.rb

@@ -7,6 +7,7 @@ module SdrClient
       # @param [String] label the required object label
       # @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.
+      # rubocop:disable Metrics/ParameterLists
       def initialize(label: nil,
                      apo:,
                      collection:,
@@ -22,6 +23,7 @@ module SdrClient
         @apo = apo
         @file_sets = file_sets
       end
+      # rubocop:enable Metrics/ParameterLists
 
       def as_json
         {
@@ -35,13 +37,8 @@ module SdrClient
         end
       end
 
-      # @param [Array<SdrClient::Deposit::Files::DirectUploadResponse>] uploads the uploaded files to attach.
-      # @return [Request] a clone of this request with the uploads added
-      def with_uploads(uploads)
-        file_sets = uploads.each_with_index.map do |upload, i|
-          FileSet.new(uploads: [upload], label: "Object #{i + 1}")
-        end
-
+      # @return [Request] a clone of this request with the file_sets added
+      def with_file_sets(file_sets)
         Request.new(label: label,
                     apo: apo,
                     collection: collection,
@@ -51,11 +48,6 @@ module SdrClient
                     file_sets: file_sets)
       end
 
-      # In this case there is a 1-1 mapping between Files and FileSets,
-      # but this doesn't always have to be the case.  We could change this in the
-      # future so that we have one FileSet that has an Image and its OCR file.
-      def add_uploads_each_as_resource(uploads); end
-
       private
 
       attr_reader :label, :file_sets, :source_id, :catkey, :apo, :collection, :type
@@ -75,7 +67,7 @@ module SdrClient
       def structural
         {
           isMemberOf: collection,
-          hasMember: file_sets.map(&:as_json)
+          contains: file_sets.map(&:as_json)
         }
       end
     end

data/lib/sdr_client/deposit/single_file_grouping_strategy.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module SdrClient
+  module Deposit
+    # This strategy is for building one file set per uploaded file
+    class SingleFileGroupingStrategy
+      # @param [Array<SdrClient::Deposit::Files::DirectUploadResponse>] uploads the uploaded files to attach.
+      # @return [Array<Array<SdrClient::Deposit::Files::DirectUploadResponse>>] uploads the grouped uploaded files.
+      def self.run(uploads: [])
+        uploads.map { |upload| [upload] }
+      end
+    end
+  end
+end

data/lib/sdr_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.7.1
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-23 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-monads
@@ -158,6 +158,7 @@ files:
 - bin/console
 - bin/setup
 - exe/sdr
+- lib/sdr-client.rb
 - lib/sdr_client.rb
 - lib/sdr_client/cli.rb
 - lib/sdr_client/credentials.rb
@@ -166,8 +167,10 @@ files:
 - lib/sdr_client/deposit/file_set.rb
 - lib/sdr_client/deposit/files/direct_upload_request.rb
 - lib/sdr_client/deposit/files/direct_upload_response.rb
+- lib/sdr_client/deposit/matching_file_grouping_strategy.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/login.rb
 - lib/sdr_client/login_prompt.rb
 - lib/sdr_client/version.rb
@@ -193,7 +196,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