sdr-client 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c634551367640a9eb3647e55fcac169a61b40af1a111582d3e857bc2cc1f020
-  data.tar.gz: 75f3a024adf97dad2cf85a8e8b117a232c71b2f644655b98752c1320af005e17
+  metadata.gz: b1d76c1422877b6b5f25f0a1cb46641e32771496771576f8f7c8fd2697c14b0e
+  data.tar.gz: eb116e73a114a3966254a0996c5d843fc960e1454146214ca68fae11eff89bda
 SHA512:
-  metadata.gz: 04a14d2edbb8334fbcc13b7ae131d7bf1697869c580395c2ea8c2971c18b911d55b7b0128e0cdff25b7a5844333f11eb2af23bc435ab7c6e692e4951092e22ed
-  data.tar.gz: 6c3369f015d8e3201ba1f58664c4d9b15208064eb5fdd24deca2de26ae7d4575889d22f7aa25eacb2e1232cfd2068d288771c6ba0c04737b7e5fc6c7508d2ba8
+  metadata.gz: acf219c807f4f22f87437f779cf4d3ab2bb8091bc810a616146a302a9e2bab4b5be99685c91ea072056344a59b5b0f37e9ed5008105d836078d1b70032720c75
+  data.tar.gz: b6ec07336e2014a6fbf02470c08649c426384a51c40ee32a164f29c96ab75cd2057615ee5ee8081f7a70f406f794fed6c100fb93aba7848d629e8933fa91f589

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/lib/sdr_client/deposit.rb

@@ -23,6 +23,7 @@ module SdrClient
   end
 end
 require 'json'
+require 'sdr_client/deposit/default_file_set_builder'
 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/default_file_set_builder.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module SdrClient
+  module Deposit
+    # This strategy is for building one file set per uploaded file
+    class DefaultFileSetBuilder
+      # @return [Request] request The initial request
+      # @param [Array<SdrClient::Deposit::Files::DirectUploadResponse>] uploads the uploaded files to attach.
+      # @return [Request] a clone of this request with the uploads added
+      def self.run(request:, uploads: [])
+        file_sets = uploads.each_with_index.map do |upload, i|
+          FileSet.new(uploads: [upload], label: "Object #{i + 1}")
+        end
+        request.with_file_sets(file_sets)
+      end
+    end
+  end
+end

data/lib/sdr_client/deposit/process.rb

@@ -9,16 +9,19 @@ module SdrClient
       BLOB_PATH = '/v1/direct_uploads'
       DRO_PATH = '/v1/resources'
       # @param [Request] metadata information about the object
+      # @param [#build] file_set_builder a strategy for constructing FileSets
       # @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(metadata:, url:, token:, files: [], logger: Logger.new(STDOUT))
+      def initialize(metadata:, file_set_builder: DefaultFileSetBuilder, url:,
+                     token:, files: [], logger: Logger.new(STDOUT))
         @files = files
         @url = url
         @token = token
         @metadata = metadata
         @logger = logger
+        @file_set_builder = file_set_builder
       end
 
       def run
@@ -26,13 +29,13 @@ module SdrClient
         file_metadata = collect_file_metadata
         upload_responses = upload_file_metadata(file_metadata)
         upload_files(upload_responses)
-        request = metadata.with_uploads(upload_responses.values)
+        request = file_set_builder.run(request: metadata, uploads: upload_responses.values)
         upload_metadata(request.as_json)
       end
 
       private
 
-      attr_reader :metadata, :files, :url, :token, :logger
+      attr_reader :metadata, :files, :url, :token, :logger, :file_set_builder
 
       def check_files_exist
         logger.info('checking to see if files exist')

data/lib/sdr_client/deposit/request.rb

@@ -35,13 +35,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 +46,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

data/lib/sdr_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-23 00:00:00.000000000 Z
+date: 2020-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-monads
@@ -162,6 +162,7 @@ files:
 - lib/sdr_client/cli.rb
 - lib/sdr_client/credentials.rb
 - lib/sdr_client/deposit.rb
+- lib/sdr_client/deposit/default_file_set_builder.rb
 - lib/sdr_client/deposit/file.rb
 - lib/sdr_client/deposit/file_set.rb
 - lib/sdr_client/deposit/files/direct_upload_request.rb