sdr-client 0.66.0 → 0.67.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37e3a32139e72d8eb278fb0039c959971faad4d88534acfc941169170cdc8e87
-  data.tar.gz: d9fc1fa3ffd7355744f4b455a4b7dc5d7b8569e0081b81f94ca3aa66a99c6a61
+  metadata.gz: a6f0cbe88719cea674e5568bc60da33b77819904cc062995161c5eb6443a4f07
+  data.tar.gz: d4dc7e51ac117cc54e0c9d988f0d482c836d090bad2c5c46c4941150eb845478
 SHA512:
-  metadata.gz: a0a1e0e97ad35ef638116a7e6f209ee4649718b2d0c315989ed9bc1eb1144a9ec7d351f3f895afeeb573085f3c089460b4b2dc833f77fc469b2b09dbb05cadde
-  data.tar.gz: 212ea2fcdc6fec50ae48a6776f1b827d4790796a73445a0c3c354e843fd6248f90f56df61f79c00fd34e4ea439288b3c0dc26756ba26db28c854cc7def511bc2
+  metadata.gz: cb349532c8a777f077e2f8bf22430b0777938447f60862a273e10b5cb09430ef6dabaa17b2c5f46a792ac8ea5a3671ec0d977c3c4e8dab0820181d9b9f3245d6
+  data.tar.gz: e846f06d0202c1272e4d82e2622bd02d8fee61f2df40d7c5d5477bd0f373e92fc2828053bede2b391b558bb00b1941cb5ebd55cfdbaa18256facb130d099a4c2

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude`
-# on 2022-01-14 01:45:54 UTC using RuboCop version 1.24.1.
+# on 2022-02-15 02:08:38 UTC using RuboCop version 1.25.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -18,6 +18,14 @@ Lint/NoReturnInBeginEndBlocks:
   Exclude:
     - 'lib/sdr_client/deposit/model_process.rb'
 
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
+Lint/UnusedMethodArgument:
+  Exclude:
+    - 'lib/sdr_client/deposit/file_type_file_set_strategy.rb'
+    - 'lib/sdr_client/deposit/image_file_set_strategy.rb'
+
 # Offense count: 10
 # Configuration parameters: CountComments, Max, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
@@ -52,16 +60,17 @@ RSpec/MessageSpies:
   Exclude:
     - 'spec/sdr_client/deposit_spec.rb'
 
-# Offense count: 9
+# Offense count: 10
 # Configuration parameters: Max.
 RSpec/MultipleExpectations:
   Exclude:
     - 'spec/sdr_client/connection_spec.rb'
+    - 'spec/sdr_client/deposit/metadata_builder_spec.rb'
     - 'spec/sdr_client/deposit_spec.rb'
     - 'spec/sdr_client/login_spec.rb'
     - 'spec/sdr_client/model_deposit_spec.rb'
 
-# Offense count: 21
+# Offense count: 22
 # Configuration parameters: AllowSubject, Max.
 RSpec/MultipleMemoizedHelpers:
   Exclude:
@@ -81,10 +90,11 @@ RSpec/NamedSubject:
     - 'spec/sdr_client/deposit/process_spec.rb'
     - 'spec/sdr_client/login_spec.rb'
 
-# Offense count: 11
+# Offense count: 12
 # Configuration parameters: Max.
 RSpec/NestedGroups:
   Exclude:
+    - 'spec/sdr_client/deposit/metadata_builder_spec.rb'
     - 'spec/sdr_client/deposit/model_process_spec.rb'
     - 'spec/sdr_client/deposit/process_spec.rb'
     - 'spec/sdr_client/login_spec.rb'
@@ -97,14 +107,14 @@ Style/KeywordParametersOrder:
     - 'lib/sdr_client/deposit/request.rb'
 
 # Offense count: 2
-# Cop supports --auto-correct.
+# Cop supports --auto-correct-all.
 # Configuration parameters: Mode.
 Style/StringConcatenation:
   Exclude:
     - 'lib/sdr_client/deposit/create_resource.rb'
     - 'spec/sdr_client/deposit_spec.rb'
 
-# Offense count: 19
+# Offense count: 16
 # Cop supports --auto-correct.
 # Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https

data/lib/sdr_client/deposit/file_set.rb

@@ -8,8 +8,10 @@ module SdrClient
       # @param [Array] uploads
       # @param [Hash<String,Hash<String,String>>] uploads_metadata the file level metadata
       # @param [Array] files
-      def initialize(label:, uploads: [], uploads_metadata: {}, files: [])
+      # @param [Class] type_strategy (FileTypeFileSetStrategy) a class that helps us determine how to type the fileset
+      def initialize(label:, uploads: [], uploads_metadata: {}, files: [], type_strategy: FileTypeFileSetStrategy)
         @label = label
+        @type_strategy = type_strategy
         @files = if uploads.empty?
                    files
                  else
@@ -21,7 +23,7 @@ module SdrClient
 
       def as_json
         {
-          type: 'http://cocina.sul.stanford.edu/models/resources/file.jsonld',
+          type: type_strategy.run(files: files),
           label: label,
           structural: {
             contains: files.map(&:as_json)
@@ -32,7 +34,7 @@ module SdrClient
 
       private
 
-      attr_reader :files, :label
+      attr_reader :files, :label, :type_strategy
 
       # This creates the metadata for each file and symbolizes the keys
       # @return [Hash<Symbol,String>]

data/lib/sdr_client/deposit/file_type_file_set_strategy.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module SdrClient
+  module Deposit
+    # This strategy is for building the type of a fileset
+    class FileTypeFileSetStrategy
+      # @param [Array<SdrClient::Deposit::Files>] files the files that are part of this strategy
+      # @return [String] The URI that represents the type of file_set
+      def self.run(files: [])
+        Cocina::Models::Vocab::Resources.file
+      end
+    end
+  end
+end

data/lib/sdr_client/deposit/image_file_set_strategy.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module SdrClient
+  module Deposit
+    # This strategy is for building the type of a fileset
+    class ImageFileSetStrategy
+      # @param [Array<SdrClient::Deposit::Files>] files the files that are part of this strategy
+      # @return [String] The URI that represents the type of file_set
+      def self.run(files: [])
+        Cocina::Models::Vocab::Resources.image
+      end
+    end
+  end
+end

data/lib/sdr_client/deposit/metadata_builder.rb

@@ -10,10 +10,11 @@ module SdrClient
       # @param [Class] grouping_strategy class whose run method groups an array of uploads
       # Additional metadata includes access, preserve, shelve, publish, md5, sha1
       # @param [Logger] logger the logger to use
-      def initialize(metadata:, grouping_strategy:, logger:)
+      def initialize(metadata:, grouping_strategy:, logger:, file_set_type_strategy: FileTypeFileSetStrategy)
         @metadata = metadata
         @logger = logger
         @grouping_strategy = grouping_strategy
+        @file_set_type_strategy = file_set_type_strategy
       end
 
       # @param [UploadFiles] upload_responses the uploaded file information
@@ -34,7 +35,8 @@ module SdrClient
         grouped_uploads.map.with_index(1) do |upload_group, i|
           FileSet.new(uploads: upload_group,
                       uploads_metadata: metadata_group(upload_group),
-                      label: label(i))
+                      label: label(i),
+                      type_strategy: @file_set_type_strategy)
         end
       end
 

data/lib/sdr_client/deposit.rb

@@ -73,6 +73,8 @@ require 'json'
 require 'sdr_client/deposit/create_resource'
 require 'sdr_client/deposit/single_file_grouping_strategy'
 require 'sdr_client/deposit/matching_file_grouping_strategy'
+require 'sdr_client/deposit/file_type_file_set_strategy'
+require 'sdr_client/deposit/image_file_set_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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 0.66.0
+  version: 0.67.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-08 00:00:00.000000000 Z
+date: 2022-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -214,8 +214,10 @@ files:
 - lib/sdr_client/deposit/file_metadata_builder_operations/mime_type.rb
 - lib/sdr_client/deposit/file_metadata_builder_operations/sha1.rb
 - lib/sdr_client/deposit/file_set.rb
+- lib/sdr_client/deposit/file_type_file_set_strategy.rb
 - lib/sdr_client/deposit/files/direct_upload_request.rb
 - lib/sdr_client/deposit/files/direct_upload_response.rb
+- lib/sdr_client/deposit/image_file_set_strategy.rb
 - lib/sdr_client/deposit/matching_file_grouping_strategy.rb
 - lib/sdr_client/deposit/metadata_builder.rb
 - lib/sdr_client/deposit/model_process.rb
@@ -254,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.4
 signing_key:
 specification_version: 4
 summary: The CLI for https://github.com/sul-dlss/sdr-api