uc3-dmp-id 0.0.76 → 0.0.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f769de6ae77fa371a710f13351629a90092a596131b31f82d7ad5161e792f12
-  data.tar.gz: a3da20ecdce90334053349c726f4d4ed78abe00d5b915366957963be82ccbd40
+  metadata.gz: 46b976e1a1b1c6778fab08b24b77ce59e140b8bc40ae913fd6bca412e5eb3949
+  data.tar.gz: 3e3e704bed2b5781f3721237d91fe898d972338a7c235357afcde470e4d8b0fc
 SHA512:
-  metadata.gz: f4a350af34ae4eff82a0c24c2de1e309b62ece8b268d53b23014ed05505dbe646c0a40f126a5a346c88047a30e790e52375cfed3956b879ee2ba5f2b94cf5ccc
-  data.tar.gz: 9cda04030ef741a7f1f66eb62a7124755b572ae9791f8485a5081ac72c0efcd181b36e88f409b472078655bf7c2226f28b2956f16fb31e781ed362165ca4729d
+  metadata.gz: 915115311a1d724470f2239b686cb82cfede0ccb0d52b312e3f3331be18927f75a5e07f900388baaf6b38c43f10259d0a39c318ef29d47153bac45f41672c7b8
+  data.tar.gz: 725027220b0481dc90ebfa0dd5b851190da6382f16012f161278ba766a0d91beb02c94dda0f889a376f5ae7f133582d2fce7b184ae1982990ee875492926d101

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

@@ -13,12 +13,18 @@ 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)
-        errs = _updateable?(provenance: provenance, p_key: p_key, dmp: dmp)
+        errs = _updateable?(provenance: provenance, p_key: p_key, json: dmp)
+
+puts "Updateable? #{errs}"
+
         raise UpdaterError, errs if errs.is_a?(Array) && errs.any?
 
         # Add the DMPHub specific attributes
         annotated = Helper.annotate_dmp(provenance: provenance, json: dmp['dmp'], p_key: p_key)
 
+puts 'Annotated:'
+puts annotated
+
         # fetch the existing latest version of the DMP ID
         client = Uc3DmpDynamo::Client.new(debug: debug)
         existing = Finder.by_pk(p_key: p_key, client: client, debug: debug)
@@ -27,6 +33,10 @@ module Uc3DmpId
 
         # 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)
+
+puts 'DMP after splicing all changes:'
+puts new_version
+
         raise UpdaterError, MSG_DMP_UNABLE_TO_VERSION if new_version.nil?
 
         # Save the changes as the new latest version

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

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

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

@@ -46,7 +46,7 @@ module Uc3DmpId
 
         args = { owner: owner, updater: updater, base: prior, mods: dmp, debug: debug }
         puts 'DMP ID update prior to splicing changes' if debug
-        puts dmp
+        puts dmp if debug
 
         args = { owner: owner, updater: updater, base: prior, mods: dmp, debug: debug }
         # If the system of provenance is making the change then just use the
@@ -96,9 +96,15 @@ module Uc3DmpId
         # Only create a version if the Updater is not the Owner OR the changes have happened on a different day
         mod_time = Time.parse(latest_version.fetch('dmphub_updated_at', Time.now.iso8601))
         now = Time.now
+
+puts "_generate_version -- mod_time: #{mod_time} --> !(now - mod_time).is_a?(Float)"
+
         return latest_version if mod_time.nil? || !(now - mod_time).is_a?(Float)
 
         same_hour = (now - mod_time).round <= 3600
+
+puts "_generate_version -- owner is updater? #{owner == updater}, same hour? #{same_hour}"
+
         return latest_version if owner != updater || (owner == updater && same_hour)
 
         latest_version['SK'] = "#{Helper::SK_DMP_PREFIX}#{latest_version['dmphub_updated_at'] || Time.now.iso8601}"

metadata

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