sdr-client 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e40c3f7aec5b647a05dd4c2e3289a7ed3173c2b18ac57fb74dd218cb7226db0f
-  data.tar.gz: 9c5029ae7bdcde2e2fd2d9261a4a282b46fc6dff09be20c7622f80413bbccb01
+  metadata.gz: 8dab3e033cd3f0fd0eae7045c3565f7c24300d99ebcd7141777eb0d005847497
+  data.tar.gz: 25a76561f9aafdcc4a575030ca9bb750e8cdf036b60c14cc92f413bbde4668d2
 SHA512:
-  metadata.gz: 9d270769997103bac784faaba63e49616c980170696de6aaa6d5c428f3fa97a5e6d14ab53572cb0b61a05efb1398d819b3b5d1caa116c7138555f4f95f6bcf99
-  data.tar.gz: 791d45aa87675605a7facb2ccee548780e9a6863c4c62f8f428d0b182dfdbc4c087b546e71c60a868765ab47736acb048d23fdcc46b572b47ab769946d9c19cb
+  metadata.gz: fa6080f541ce480fc8ca31f5f063404090235e8edce6849aa10c4f50f1a00ef83a166ea1c97ad579e094fbf9b5d8f24df73debc68ce567e1a7886dc7a491b643
+  data.tar.gz: a915029ed2f58221fe4c2418e8fef194f11eb6bde24af289dc9f52da438841a4bab90fec7a95a94eeaa22334e2e72897a6047f01c5909ed995d371473b1c0295

data/.rubocop.yml

@@ -9,6 +9,8 @@ AllCops:
 
 Layout/LineLength:
   Max: 120
+  Exclude:
+    - 'spec/sdr_client/deposit/process_spec.rb'
 
 Metrics/BlockLength:
   Exclude:

data/lib/sdr_client.rb

@@ -4,6 +4,8 @@ require 'dry/monads'
 require 'faraday'
 require 'active_support'
 require 'active_support/core_ext/object/json'
+require 'active_support/core_ext/hash/indifferent_access'
+require 'cocina/models'
 
 require 'sdr_client/version'
 require 'sdr_client/deposit'

data/lib/sdr_client/deposit/file.rb

@@ -34,9 +34,10 @@ module SdrClient
           administrative: {
             sdrPreserve: @preserve,
             shelve: @shelve
-          }
+          },
+          version: 1,
+          hasMessageDigests: message_digests
         }.tap do |json|
-          json['hasMessageDigests'] = message_digests unless message_digests.empty?
           json['hasMimeType'] = @mime_type if @mime_type
           json['use'] = @use if @use
         end

data/lib/sdr_client/deposit/file_set.rb

@@ -25,7 +25,8 @@ module SdrClient
           "label": label,
           structural: {
             contains: files.map(&:as_json)
-          }
+          },
+          version: 1
         }
       end
 

data/lib/sdr_client/deposit/process.rb

@@ -21,6 +21,7 @@ module SdrClient
         @grouping_strategy = grouping_strategy
       end
 
+      # rubocop:disable Metrics/AbcSize
       def run
         check_files_exist
         upload_responses = UploadFiles.new(files: files,
@@ -31,8 +32,10 @@ module SdrClient
                                                grouping_strategy: grouping_strategy,
                                                logger: logger)
         request = metadata_builder.with_uploads(upload_responses)
-        upload_metadata(request.as_json)
+        model = Cocina::Models.build_request(request.as_json.with_indifferent_access)
+        upload_metadata(model.to_h)
       end
+      # rubocop:enable Metrics/AbcSize
 
       private
 

data/lib/sdr_client/deposit/request.rb

@@ -49,10 +49,10 @@ module SdrClient
           type: type,
           administrative: administrative,
           identification: identification,
-          structural: structural
-        }.tap do |json|
-          json[:label] = label if label
-        end
+          structural: structural,
+          version: 1,
+          label: label.nil? ? ':auto' : label
+        }
       end
 
       # @return [Request] a clone of this request with the file_sets added

data/lib/sdr_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2020-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport