sdr-client 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 565e7d34958ad818fcc048440816b0a360fa723ea6e62dc9437c6832ba8877c1
-  data.tar.gz: 14dfae8ecef2b6d05a256a8bdc7aebebfe801a278546c98bd3066169f7c98899
+  metadata.gz: 04b34e821d56af3fb15c920c9955df147ac75ed028d111a37fac03612f9cc556
+  data.tar.gz: ed5c6b78582aa9c61b4fce2e191556508b9d467fbd3a3c615c09c5ac02cea43a
 SHA512:
-  metadata.gz: bc629b8837567ee95b01ce673a1f1b49596c3665810ab8d59573012b3b9b6a674db12dde7d15461a279f87a4ef88ed23d65d2457bbc7c0479330f45b3f2c1649
-  data.tar.gz: fe176665dadd92ae291b7dbf5b461bb40606600383ad81c9824a8a4bad83344db5e74b6568a10eced02f4fa14894188122605ac2b7ecd5176d7b25b241963da4
+  metadata.gz: 6112ce1e149109355702197254a126ca340d35f45de00574d765d455daae52ff9fdc7214cc1716cf46020315482c9a39e0bd82b18433e5b803e7275f81e4d965
+  data.tar.gz: 9b242e5439bcb5e55c7272d2238b41c0284b29f482fbfe53205e2c7b9f5daab0bffc23f515d7785d4d18c654c3bf949356c3a36968c22f2d56c4017fd16cdc68

data/.rubocop.yml

@@ -15,3 +15,7 @@ Metrics/BlockLength:
     - '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/lib/sdr-client.rb

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

data/lib/sdr_client/deposit/file.rb

@@ -4,21 +4,25 @@ 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,
-                     md5: nil, sha1: nil)
+      # 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
-        json = {
+        {
           "type": 'http://cocina.sul.stanford.edu/models/file.jsonld',
           label: @label,
           filename: @filename,
@@ -30,9 +34,10 @@ module SdrClient
             sdrPreserve: @preserve,
             shelve: @shelve
           }
-        }
-        json['hasMessageDigests'] = message_digests unless message_digests.empty?
-        json
+        }.tap do |json|
+          json['hasMessageDigests'] = message_digests unless message_digests.empty?
+          json['hasMimeType'] = @mime_type if @mime_type
+        end
       end
       # rubocop:enable Metrics/MethodLength
 

data/lib/sdr_client/deposit/file_set.rb

@@ -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

data/lib/sdr_client/deposit/process.rb

@@ -16,6 +16,7 @@ module SdrClient
       # @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
+      # rubocop:disable Metrics/ParameterLists
       def initialize(metadata:, grouping_strategy: SingleFileGroupingStrategy, url:,
                      token:, files: [], files_metadata: {}, logger: Logger.new(STDOUT))
         @files = files
@@ -26,6 +27,7 @@ module SdrClient
         @grouping_strategy = grouping_strategy
         @files_metadata = files_metadata
       end
+      # rubocop:enable Metrics/ParameterLists
 
       def run
         check_files_exist

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
         {
@@ -65,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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-01-29 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