uc3-dmp-id 0.0.99 → 0.0.101

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3bcba612098c1d0acd9a553f25549a198bbefb0f28c9c0ef166038382c17c07
-  data.tar.gz: 5ba9be2055b9c39a4c887930b5250860cd9dc986ddf4d0248d25e786f932c9fe
+  metadata.gz: 9e0229f8a4684d78c921445d06df169216d6694a88264f8f1be8db079c4939f2
+  data.tar.gz: 991ec4969b516f29a5302b0700d73be81d15fc7aedfcbdd41e3bb590a399953a
 SHA512:
-  metadata.gz: f3b3e728a5c532fb024dddd69a366fc9867e3a05856562c863b89059a38a320d63e70b9d0241249b2a8d419bf8898e894bd93617c681b3601ea82e701433f558
-  data.tar.gz: 5401aba365595519141ea7f2115366bdaf53b47183ee2fcd3ecba219c9625f8148cc1042faa8f67737f4fb750d60dfe62d2a334ed8e7449a02b8edbd2023744f
+  metadata.gz: 287a1c8dac5441229f937dd7e08ace46d8cf0395c4fbdbc43a874f95ff6d1baa0e782b6a98d68c45334ea0eb82390c6c84ae631231cfa8966a04ae1e0a4f4e2c
+  data.tar.gz: ecb4bc1d8a8d989cda2b44808f8bfb8f2b883d506884c2fe83b662f7493141fcfa32909f64fed8822d71eec01bf710d41cea0fdb930ba89adf5158dc5a274dff

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

@@ -7,6 +7,9 @@ module Uc3DmpId
     class << self
       # Add assertions to a DMP ID - this is performed by non-provenance systems
       def add(updater:, dmp:, mods:, note: nil, logger: nil)
+
+puts "ADDING ASSERTIONS: #{mods}"
+
         # If the updater and provenance are the same just return the :dmp as-is
         return dmp if updater.nil? || !dmp.is_a?(Hash) || !mods.is_a?(Hash) ||
                       updater&.gsub('PROVENANCE#', '') == dmp['dmphub_provenance_id']&.gsub('PROVENANCE#', '')
@@ -29,9 +32,15 @@ module Uc3DmpId
 
       # Splice together assertions made while the user was updating the DMP ID
       def splice(latest_version:, modified_version:, logger: nil)
+
+puts "LATEST_VERSION ASSERTIONS: #{latest_version['dmphub_assertions']}"
+puts "MODIFIED_VERSION ASSERTIONS: #{modified_version['dmphub_assertions']}"
+
         # Return the modified_version if the timestamps are the same (meaning no new assertions were made while the
-        # user was working on the DMP ID)
-        return modified_version if latest_version['dmphub_updated_at'] == modified_version['dmphub_updated_at']
+        # user was working on the DMP ID) OR neither version has assertions
+        return modified_version if latest_version['dmphub_updated_at'] == modified_version['dmphub_updated_at'] ||
+                                   (latest_version.fetch('dmphub_assertions', []).empty? &&
+                                    modified_version.fetch('dmphub_assertions', []).empty?)
 
         # Clone any existing assertions on the current DMP ID so we can manipulate them
         existing_assertions = Helper.deep_copy_dmp(obj: latest_version.fetch('dmphub_assertions', []))

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

@@ -100,6 +100,9 @@ module Uc3DmpId
       end
 
       def _process_modifications(owner:, updater:, version:, mods:, note: nil, logger: nil)
+
+puts "OWNER: #{owner}, UPDATER #{updater}, Version is Hash? #{version.is_a?(Hash)}, Mods is Hash? #{mods.is_a?(Hash)}"
+
         return version unless mods.is_a?(Hash) && !updater.nil?
         return mods unless version.is_a?(Hash) && !owner.nil?
 

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

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

metadata

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