uc3-dmp-id 0.0.81 → 0.0.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5cfc6c3d13bb4d5245abcef1ad55a340f866ae63a11374bff55ec1ea976fa0a
-  data.tar.gz: fc1084accea4f2a55677a83657e28bd5733b8fee518e90f44fa040738fb48a46
+  metadata.gz: b007856ad5a2979b663ac9bca26022d13aa08c854d36db99f6b5073f3d96c914
+  data.tar.gz: 96b951823afd6c995b824ce8047792a5e90b56fc9f6636a0a33c20ce05101796
 SHA512:
-  metadata.gz: e522c602ba745a0f06e5e7c858758c13053b8bdd79564f7dc2ba0223a92ed383db887fb95ba76426d9f058109109cbf4ce053cbc466423e8c67b3f4288cf079a
-  data.tar.gz: b6246a0c62f810d5a629d2e60bc32aae767881e6dc5284aaf0351c2a419c83366fe2f8e49f79b337ccd402c2cc73d7390e7cb6b5e04c46229bc57d321a922910
+  metadata.gz: 25266f1a148076550a27e53813b5ee074e6379505d894715532d6945cfb299ce6aa1002fa1a3fc02490429421db7256e10459bcc791d2115134d56aa18e7988d
+  data.tar.gz: 54102b178db027bd0e496cdc1ee703e3180d2a1a020a20da113dc919f1479bb15311c50c892198ae8d47a8de5473e5d636d98e6903c28c8c8c12ee548d898a03

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

@@ -13,7 +13,6 @@ module Uc3DmpId
         raise UpdaterError, MSG_DMP_INVALID_DMP_ID unless p_key.is_a?(String) && !p_key.strip.empty?
 
         dmp = Helper.parse_json(json: json)
-        dmp = dmp['dmp'].nil? ? dmp : dmp['dmp']
         p_key = Helper.append_pk_prefix(p_key: p_key)
         errs = _updateable?(provenance: provenance, p_key: p_key, json: dmp)
 
@@ -34,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
@@ -85,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.81'
+  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.81
+  version: 0.0.82
 platform: ruby
 authors:
 - Brian Riley