sdr-client 0.66.0 → 0.68.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37e3a32139e72d8eb278fb0039c959971faad4d88534acfc941169170cdc8e87
-  data.tar.gz: d9fc1fa3ffd7355744f4b455a4b7dc5d7b8569e0081b81f94ca3aa66a99c6a61
+  metadata.gz: 56d9c570c19831deea82ad5c2591705f30a92a92ed93b2c8183a029613cffb35
+  data.tar.gz: 603460d6cd1fa94a3a8acac42ae5da6162bd3e64234b0a1927ee39075552d828
 SHA512:
-  metadata.gz: a0a1e0e97ad35ef638116a7e6f209ee4649718b2d0c315989ed9bc1eb1144a9ec7d351f3f895afeeb573085f3c089460b4b2dc833f77fc469b2b09dbb05cadde
-  data.tar.gz: 212ea2fcdc6fec50ae48a6776f1b827d4790796a73445a0c3c354e843fd6248f90f56df61f79c00fd34e4ea439288b3c0dc26756ba26db28c854cc7def511bc2
+  metadata.gz: 4ab960d543b9f21c76233ee0bddfeb0be18a0161a38f2ee87c02b3d52fd525617807767d3e1fa497edcab1400bf370a458fd262b7f2612b02ff45187a7df926a
+  data.tar.gz: b71e409b03e83ece3241ff20613d2e1c5f44be0d406248d932ede20bea8c6b4e6d192c49a4e45e6c7d1f6ad890a560bba426964412f52ed022108e1f75b2d42e

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,12 @@ 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:)
+      # @param [Class] file_set_type_strategy class whose run method determines file_set type
+      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 +36,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/process.rb

@@ -10,6 +10,7 @@ module SdrClient
       # @param [String] connection the server connection to use
       # @param [Boolean] accession should the accessionWF be started
       # @param [Class] grouping_strategy class whose run method groups an array of uploads
+      # @param [Class] file_set_type_strategy class whose run method determines file_set type
       # @param [Array<String>] files a list of file names to upload
       # @param [Boolean] assign_doi should a DOI be assigned to this item
       # @param [Logger] logger the logger to use
@@ -19,6 +20,7 @@ module SdrClient
                      connection:,
                      accession:,
                      grouping_strategy: SingleFileGroupingStrategy,
+                     file_set_type_strategy: FileTypeFileSetStrategy,
                      files: [],
                      assign_doi: false,
                      logger: Logger.new($stdout))
@@ -27,6 +29,7 @@ module SdrClient
         @metadata = metadata
         @logger = logger
         @grouping_strategy = grouping_strategy
+        @file_set_type_strategy = file_set_type_strategy
         @accession = accession
         @assign_doi = assign_doi
       end
@@ -43,6 +46,7 @@ module SdrClient
                                               connection: connection)
         metadata_builder = MetadataBuilder.new(metadata: metadata,
                                                grouping_strategy: grouping_strategy,
+                                               file_set_type_strategy: file_set_type_strategy,
                                                logger: logger)
         request = metadata_builder.with_uploads(upload_responses)
         model = Cocina::Models.build_request(request.as_json.with_indifferent_access)
@@ -56,7 +60,7 @@ module SdrClient
 
       private
 
-      attr_reader :metadata, :files, :connection, :logger, :grouping_strategy
+      attr_reader :metadata, :files, :connection, :logger, :grouping_strategy, :file_set_type_strategy
 
       def check_files_exist
         logger.info('checking to see if files exist')

data/lib/sdr_client/deposit.rb

@@ -28,6 +28,7 @@ module SdrClient
                  files_metadata: {},
                  accession: false,
                  grouping_strategy: SingleFileGroupingStrategy,
+                 file_set_type_strategy: FileTypeFileSetStrategy,
                  logger: Logger.new($stdout))
       augmented_metadata = FileMetadataBuilder.build(files: files, files_metadata: files_metadata)
       metadata = Request.new(label: label,
@@ -48,6 +49,7 @@ module SdrClient
       connection = Connection.new(url: url)
       Process.new(metadata: metadata, connection: connection, files: files,
                   grouping_strategy: grouping_strategy,
+                  file_set_type_strategy: file_set_type_strategy,
                   accession: accession,
                   logger: logger).run
     end
@@ -73,6 +75,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.68.0'
 end

data/sdr-client.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'cocina-models', '~> 0.65.0'
+  spec.add_dependency 'cocina-models', '~> 0.66.0'
   spec.add_dependency 'dry-monads'
   spec.add_dependency 'faraday', '>= 0.16'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 0.66.0
+  version: 0.68.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-08 00:00:00.000000000 Z
+date: 2022-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.65.0
+        version: 0.66.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.65.0
+        version: 0.66.0
 - !ruby/object:Gem::Dependency
   name: dry-monads
   requirement: !ruby/object:Gem::Requirement
@@ -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