uc3-dmp-id 0.0.136 → 0.0.138

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 923c11f7d07a58856658a7484c2c562af05941be6cda5b15d1cd253b2bd06e5f
-  data.tar.gz: d42a7e17ed468de27520f551ca04bf3172809edb523f262a870535fd7503edcd
+  metadata.gz: '02680b9c04b11bccb85df84a1284b131303a62f6d71a2f1c69916cb3354e8b6b'
+  data.tar.gz: 82bf4da553ab4d395d245bd35299ce92e157ee400da63cccbced150e5aa115b6
 SHA512:
-  metadata.gz: 5d4f0d5200530bbb813595b9b833d9225db0b9e6615843af0c5814a113cd283edfcba7931215496de42d20ed29e039bde92bf2995ea967d68f6e235743e65b24
-  data.tar.gz: 41d074dd9f5666c028de8f05707d438cef2a80b87b5e3a05122fffcb1fe85063690a95b207303257198cdff432e829bfae40b224267be64c96161bd1f874ae87
+  metadata.gz: d4770d6f0635fb199aa1a11e0a69a22afaad6bb283068bcc83341d335fae1cc74ae33c9c129c78f8f237313fd8b9d9f8874477c73560980fe6de4b6542a7cbba
+  data.tar.gz: b03d6992d814a990bed40637a9f3b653273692f5cc0ede5859674d00d5332dd8d5822ab8f91568701fc8506dd8c64fc42efacd9606870cc6e6ef77b3da3f95c4

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

@@ -22,42 +22,42 @@ puts "ADDING ASSERTIONS: #{mods}"
         # Return the DMP ID as-is if there are no assertable changes
         return dmp if contact.nil? && contributor.empty? && project.empty?
 
-        # Clone any existing assertions on the current DMP ID so we can manipulate them
-        assertions = Helper.deep_copy_dmp(obj: dmp.fetch('dmphub_assertions', []))
+        # Clone any existing pending_assertions on the current DMP ID so we can manipulate them
+        assertions = Helper.deep_copy_dmp(obj: dmp.fetch('dmphub_modifications', []))
         # Return the DMP ID as-is if the assertion is already on the record
-        return dmp if assertions.select { |entry| entry['provenance'] == updater && entry['assertions'] == mods }
+        return dmp if assertions.select { |entry| entry['provenance'] == updater && entry['pending_assertions'] == mods }
 
         assertions << _generate_assertion(updater: updater, mods: mods, note: note)
-        dmp['dmphub_assertions'] = assertions.flatten
+        dmp['dmphub_modifications'] = assertions.flatten
         dmp
       end
 
       # 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']}"
+puts "LATEST_VERSION ASSERTIONS: #{latest_version['dmphub_modifications']}"
+puts "MODIFIED_VERSION ASSERTIONS: #{modified_version['dmphub_modifications']}"
 
         # 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) OR neither version has assertions
         return modified_version if latest_version['modified'] == modified_version['modified'] ||
-                                   (latest_version.fetch('dmphub_assertions', []).empty? &&
-                                    modified_version.fetch('dmphub_assertions', []).empty?)
+                                   (latest_version.fetch('dmphub_modifications', []).empty? &&
+                                    modified_version.fetch('dmphub_modifications', []).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', []))
-        incoming_assertions = Helper.deep_copy_dmp(obj: modified_version.fetch('dmphub_assertions', []))
+        existing_assertions = Helper.deep_copy_dmp(obj: latest_version.fetch('dmphub_modifications', []))
+        incoming_assertions = Helper.deep_copy_dmp(obj: modified_version.fetch('dmphub_modifications', []))
         logger.debug(message: "Existing assertions", details: existing_assertions) if logger.respond_to?(:debug)
         logger.debug(message: "Incoming modifications", details: incoming_assertions) if logger.respond_to?(:debug)
 
         # Keep any assetions that were made after the modified on the incoming changes
-        modified_version['dmphub_assertions'] = existing_assertions.select do |entry|
+        modified_version['dmphub_modifications'] = existing_assertions.select do |entry|
           !entry['timestamp'].nil? && Time.parse(entry['timestamp']) > Time.parse(modified_version['modified'])
         end
         return modified_version unless incoming_assertions.any?
 
         # Add any of the assertions still on the incoming record back to the latest record
-        incoming_assertions.each { |entry| modified_version['dmphub_assertions'] << entry }
+        incoming_assertions.each { |entry| modified_version['dmphub_modifications'] << entry }
         modified_version
       end
 
@@ -70,7 +70,7 @@ puts "MODIFIED_VERSION ASSERTIONS: #{modified_version['dmphub_assertions']}"
       #    "provenance": "dmphub",
       #    "timestamp": "2023-07-07T14:50:23+00:00",
       #    "note": "data received from the NIH API",
-      #    "assertions": {
+      #    "pending_assertions": {
       #      "contact": {
       #        "name": "Wrong Person"
       #      },
@@ -80,6 +80,14 @@ puts "MODIFIED_VERSION ASSERTIONS: #{modified_version['dmphub_assertions']}"
       #          "role": ["Investigation"]
       #        }
       #      ],
+      #      "dmproadmap_related_identifiers": [
+      #        {
+      #          "work_type": "article",
+      #          "descriptor": "is_cited_by",
+      #          "type": "doi",
+      #          "identifier": "https://dx.doi.org/99.9876/ZYX987.V6"
+      #        }
+      #      ],
       #      "project": [
       #        {
       #          "start": "2024-01-01T00:00:00+07:00",
@@ -110,7 +118,7 @@ puts "MODIFIED_VERSION ASSERTIONS: #{modified_version['dmphub_assertions']}"
           timestamp: Time.now.utc.iso8601,
           status: 'new',
           note: note,
-          assertions: mods
+          pending_assertions: mods
         }.to_json)
       end
     end

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

@@ -15,7 +15,7 @@ module Uc3DmpId
     SK_DMP_REGEX = /VERSION#\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2}/.freeze
 
     # TODO: Verify the assumed structure of the DOI is valid
-    DOI_REGEX = %r{[0-9]{2}\.[0-9]{5}/[a-zA-Z0-9/_.-]+}.freeze
+    DOI_REGEX = %r{[0-9]{2}\.[0-9]{4,}/[a-zA-Z0-9/_.-]+}.freeze
     URL_REGEX = %r{(https?://)?([a-zA-Z0-9\-_]\.)+[a-zA-Z0-9\-_]{2,3}(:[0-9]+)?/?}.freeze
 
     DMP_LATEST_VERSION = "#{SK_DMP_PREFIX}latest"

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-id
 version: !ruby/object:Gem::Version
-  version: 0.0.136
+  version: 0.0.138
 platform: ruby
 authors:
 - Brian Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-14 00:00:00.000000000 Z
+date: 2023-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json