uc3-dmp-id 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d988ee80dfa85fc4f592a30bb6d53cb20b47e64998b06111e441343e286c5f9
-  data.tar.gz: 86c974744aee06dd4d5b790159e018f63399438d46a9f131e56babf02cef51e6
+  metadata.gz: d3f3549ad23c4656916e7e6daf8f9152eb755d46279b7a3b689a26dd7d02d26b
+  data.tar.gz: 41a955d7b0e97e1094be9fd9d80b8f7ca45d17b901464aaae6816d09b757aa5a
 SHA512:
-  metadata.gz: 9aad86fe76210fc8255b0513d74737e31884fe7827aa6a66edabf2fa24aaae8ed99eb8f7fabfd34a2f04a340b2a127d2f26d4bdac3ceabf596e115e925e54748
-  data.tar.gz: 7496d05bcc65128c8ff645280994a2e430f0b7ca9ee80224defe1331ea27033af4e29c7ddcdcc3815df5640a9f02e41bad7b13036114fdda18a3a6f4f486dec9
+  metadata.gz: 2dd968c76f1e6fc0af048385872b93d7b3764b0f11bbfd7925c23233235b61b83a6678daec0544dcf6f0625797733b2de04e98691aff56359228caca849b1269
+  data.tar.gz: be3757e058012feaa9d9f0e11c0b0a75730031ad80f76793bb6f916247bff4c60f001bec49db41466e9aacc8a3b8dbbfcde303b73e5849855b119413fe202bc4

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: []
@@ -94,7 +95,7 @@ module Uc3DmpId
       @logger&.debug(message: "Assessing Work: #{work['id']} (pre citation)", details: ret)
       return JSON.parse(ret.to_json) if work['bibtex'].nil?
 
-      ret[:citation] = Uc3DmpCitation::Citer.bibtex_to_citation(bibtex_as_string: work['bibtex'])
+      ret[:citation] = Uc3DmpCitation::Citer.bibtex_to_citation(uri: work['id'], bibtex_as_string: work['bibtex'])
       JSON.parse(ret.to_json)
     end
     # rubocop:enable Metrics/AbcSize

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.10'
+  VERSION = '0.1.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-id
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.12
 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