sdr-client 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04b34e821d56af3fb15c920c9955df147ac75ed028d111a37fac03612f9cc556
-  data.tar.gz: ed5c6b78582aa9c61b4fce2e191556508b9d467fbd3a3c615c09c5ac02cea43a
+  metadata.gz: bb3f20e21233ef1ef0f4d72f4d7dcd0e4bb52968b955152e62259e023b730b7b
+  data.tar.gz: ecbb08752fcd3c71b4868404bc48871eaba138c852304678a466cd85de3fe4bd
 SHA512:
-  metadata.gz: 6112ce1e149109355702197254a126ca340d35f45de00574d765d455daae52ff9fdc7214cc1716cf46020315482c9a39e0bd82b18433e5b803e7275f81e4d965
-  data.tar.gz: 9b242e5439bcb5e55c7272d2238b41c0284b29f482fbfe53205e2c7b9f5daab0bffc23f515d7785d4d18c654c3bf949356c3a36968c22f2d56c4017fd16cdc68
+  metadata.gz: '08307c141dd01737019f40e1a999b8fd9aa41abca57379f655a9ac5773eba55f974c4d3c34c804e44cd7c8a8792c292e84f5d8c7bf62dd2021b32dd87832420b'
+  data.tar.gz: 928ba2d1377cf11bc1e1cfaff2891748ac916d3a3d9e83fca0ac07e0efdbd450ceb895a066bcc3c3a7a4355f186717efb4f5c4d6540867336a21095064f02cb2

data/lib/sdr_client/deposit.rb

@@ -12,6 +12,7 @@ module SdrClient
                  source_id:,
                  url:,
                  files: [],
+                 files_metadata: {},
                  grouping_strategy: SingleFileGroupingStrategy)
       token = Credentials.read
 
@@ -21,7 +22,8 @@ module SdrClient
                              collection: collection,
                              source_id: source_id,
                              catkey: catkey)
-      Process.new(metadata: metadata, url: url, token: token, files: files, grouping_strategy: grouping_strategy).run
+      Process.new(metadata: metadata, url: url, token: token,
+                  files: files, files_metadata: files_metadata, grouping_strategy: grouping_strategy).run
     end
     # rubocop:enable Metrics/ParameterLists
   end

data/lib/sdr_client/deposit/matching_file_grouping_strategy.rb

@@ -7,7 +7,10 @@ module SdrClient
       # @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.group_by { |ul| ::File.basename(ul.filename, '.*') }
+        # 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

data/lib/sdr_client/deposit/process.rb

@@ -126,10 +126,10 @@ module SdrClient
       # @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.each_with_index.map do |upload_group, i|
+        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 + 1}")
+          FileSet.new(uploads: upload_group, uploads_metadata: metadata_group, label: "Object #{i}")
         end
       end
     end

data/lib/sdr_client/version.rb

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

metadata

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