uc3-dmp-id 0.1.11 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61f1c9dd64fdec4ec98c5e8a703bba452ba7b17ede2e477d86523fab1c99a94d
-  data.tar.gz: 74fefb026abdfed228bad9b4a5c37847bb46c083e125727e0a6ed37f886d4ae2
+  metadata.gz: d66a6f468a0f6d8db5ae871ca3981e7eb88e78a31dd4ee3c156532c9afd546fe
+  data.tar.gz: 92b20512b11ab92808db115a40b8cf5a1e7c5369d890f591fc4745c73f93c3d7
 SHA512:
-  metadata.gz: 644e193728347314563daeb6874c86128f434e29b3f9ceb160b256c4e98a3fa26f37da90f5815afde631e15e6f2898ec268aca4e28f5b15ee0efa969cd32bc34
-  data.tar.gz: eb046b292e018c428a4d0a332f92f9e96e7a8bc4158b163c0ec657771646bfe3368e325c3442802612fb2df19f66193ad92779cec57d5211c7a6d0ccee2457e3
+  metadata.gz: 858aaabd9f1cf699257b076309851ea26a44a8262bddd0ad0c99956f2c872ba6a7a705c8edd45cadd45b64097caa8ad9a16b9caa896490e2a2f23622664a4986
+  data.tar.gz: 37b83f9bd35d43285879c57d59af76b836ad49c5fc6708c81c34d04685db3238bac1f8e4a80abfbbdc992b7c67560341806c28f80bbfdb696646b4696da89a9d

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

@@ -11,7 +11,7 @@ module Uc3DmpId
   # Class that adds items to the :dmphub_modifications array or directly to the
   # :dmpraodmap_related_identifiers array if the confidence level was 'Absolute'
   class Augmenter
-    attr_accessor :augmenter, :dmp, :known_mods, :known_works, :known_awards, :logger
+    attr_accessor :augmenter, :run_id, :dmp, :known_mods, :known_works, :known_awards, :logger
 
     MSG_MISSING_ANNOTATIONS = 'DMP must have its DMPHub specific annotations!'
     MSG_MISSING_AUGMENTER = 'No Augmenter specified!'
@@ -21,6 +21,7 @@ module Uc3DmpId
     def initialize(**args)
       @logger = args[:logger]
       @augmenter = args[:augmenter]
+      @run_id = args.fetch(:run_id, 'None')
       raise AugmenterError, MSG_MISSING_AUGMENTER unless @augmenter.is_a?(Hash) && !@augmenter['PK'].nil?
 
       @dmp = args.fetch(:dmp, {})['dmp'].nil? ? args[:dmp] : args.fetch(:dmp, {})['dmp']
@@ -54,7 +55,6 @@ module Uc3DmpId
 
       # Save the DMP
       @dmp['dmphub_modifications'] = (@known_mods.nil? ? [] : @known_mods) << mod_hash
-
       client = Uc3DmpDynamo::Client.new
       resp = client.put_item(json: @dmp, logger:)
       raise AugmenterError, Helper::MSG_DMP_NO_DMP_ID if resp.nil?
@@ -70,6 +70,7 @@ module Uc3DmpId
       JSON.parse({
         id: "#{Time.now.utc.strftime('%Y-%m-%d')}-#{SecureRandom.hex(4)}",
         provenance: @augmenter['name'],
+        augmenter_run_id: @run_id,
         timestamp: Time.now.utc.iso8601,
         dmproadmap_related_identifiers: [],
         funding: []
@@ -106,7 +107,7 @@ module Uc3DmpId
       return nil unless funding.is_a?(Hash) && (!funding['awardUri'] || !funding['awardNumber'])
       return nil if @known_awards.include?(funding['awardUri']) || @known_awards.include?(funding['awardNumber'])
 
-      id = funding['awardUri'] if funding.fetch('awardUri', '').start_with?('http')
+      id = funding['awardUri'] if funding.fetch('awardUri', '')&.start_with?('http')
       id = funding['awardNumber'] if id.nil?
 
       ret = {
@@ -115,16 +116,11 @@ module Uc3DmpId
         score: work['score'],
         notes: work['notes'],
         name: funding['funderName'],
-        funding_status: 'granted',
-        grant_id: {
-          type: if id.start_with?('http')
-                  id.include?('doi') ? 'doi' : 'url'
-                else
-                  'other'
-                end,
-          identifier: id
-        }
+        funding_status: id.nil? ? 'planned' : 'granted'
       }
+      id_type = id.start_with?('http') ? (id.include?('doi') ? 'doi' : 'url') : 'other' unless id.nil?
+      ret[:grant_id] = { type: id_type, identifier: id } unless id.nil?
+
       funder_id = funding['funderIdentifier']
       @logger&.debug(message: "Assessing Work: #{work['id']} (pre funder_id)", details: ret)
       return JSON.parse(ret.to_json) if funder_id.nil?

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

@@ -101,6 +101,7 @@ module Uc3DmpId
         keywords: dmp.fetch('dataset', []).map { |ds| ds.fetch('keyword', []) }.flatten.compact.uniq,
         identifiers: [dmp.fetch('dmp_id', {})['identifier']],
         last_names: [],
+        orcids: [],
         affiliation_ids: [],
         affiliations: [],
         funder_names: [],
@@ -165,6 +166,7 @@ module Uc3DmpId
         name = entry.fetch('name', '')&.downcase&.strip
         last_name = name.include?(', ') ? name.split(', ').first : name.split.last
 
+        @details_hash[:orcids] << id unless id.nil?
         @details_hash[:identifiers] << [id, ror&.downcase&.strip]
         @details_hash[:last_names] << last_name
         @details_hash[:affiliation_ids] << ror

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

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

metadata

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