uc3-dmp-id 0.0.80 → 0.0.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49be29fe52616c95e8cb9a58221caf8ae2931a418a019f874e3c1ea311b8487a
-  data.tar.gz: 73643d8ac5c0058c554fb4679ace24e200dc97d12ac4a5a1d5d32725e259118d
+  metadata.gz: b007856ad5a2979b663ac9bca26022d13aa08c854d36db99f6b5073f3d96c914
+  data.tar.gz: 96b951823afd6c995b824ce8047792a5e90b56fc9f6636a0a33c20ce05101796
 SHA512:
-  metadata.gz: 1afdda10f4f785f5b9e4b2ace0851ca431ef7e91d88d16e98901f704e00a3d286e8febe161be736cf2f3576e6d5fe2b04d1ede420231bde5bcedaf17c1775170
-  data.tar.gz: 630b9efacc9bfdf7f52a620f6f29cf7e4452783ef153cf2e34b1aeb590fc2a99f13bb94805ecd34dddfc4fa32c7eb3c4a4869da0e851bcd7b8b316d4fa39b844
+  metadata.gz: 25266f1a148076550a27e53813b5ee074e6379505d894715532d6945cfb299ce6aa1002fa1a3fc02490429421db7256e10459bcc791d2115134d56aa18e7988d
+  data.tar.gz: 54102b178db027bd0e496cdc1ee703e3180d2a1a020a20da113dc919f1479bb15311c50c892198ae8d47a8de5473e5d636d98e6903c28c8c8c12ee548d898a03

data/lib/uc3-dmp-id/updater.rb

@@ -33,7 +33,7 @@ puts annotated
         raise UpdaterError, MSG_NO_CHANGE if Helper.eql?(dmp_a: existing, dmp_b: annotated)
 
         # Generate a new version of the DMP. This involves versioning the current latest version
-        new_version = versioner.new_version(p_key: p_key, dmp: json)
+        new_version = versioner.new_version(p_key: p_key, dmp: annotated)
 
 puts 'DMP after splicing all changes:'
 puts new_version
@@ -84,13 +84,13 @@ puts new_version
         errs = Validator.validate(mode: 'author', json: json)
         return errs.join(', ') if errs.is_a?(Array) && errs.any? && errs.first != Validator::MSG_VALID_JSON
 
-puts "Provenance: #{provenance['PK']}, DMP_ID to PK #{Helper.dmp_id_to_pk(json: json.fetch('dmp_id', {}))} == P_KEY: #{p_key}"
+puts "Provenance: #{provenance['PK']}, DMP_ID to PK #{Helper.dmp_id_to_pk(json: json['dmp'].fetch('dmp_id', {}))} == P_KEY: #{p_key}"
 
         # Fail if the provenance is not defined
         return [MSG_DMP_FORBIDDEN] unless provenance.is_a?(Hash) && !provenance['PK'].nil?
 
         # Verify that the JSON is for the same DMP in the PK
-        dmp_id = json.fetch('dmp_id', {})
+        dmp_id = json['dmp'].fetch('dmp_id', {})
         return [MSG_DMP_FORBIDDEN] unless Helper.dmp_id_to_pk(json: dmp_id) == p_key
         # Make sure they're not trying to update a historical copy of the DMP
         return [MSG_DMP_NO_HISTORICALS] if json['SK'] != Helper::DMP_LATEST_VERSION

data/lib/uc3-dmp-id/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uc3DmpId
-  VERSION = '0.0.80'
+  VERSION = '0.0.82'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-id
 version: !ruby/object:Gem::Version
-  version: 0.0.80
+  version: 0.0.82
 platform: ruby
 authors:
 - Brian Riley