uc3-dmp-id 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3f3549ad23c4656916e7e6daf8f9152eb755d46279b7a3b689a26dd7d02d26b
-  data.tar.gz: 41a955d7b0e97e1094be9fd9d80b8f7ca45d17b901464aaae6816d09b757aa5a
+  metadata.gz: 7ae3b97965d06d3157328d0c23441eb32b63013b52d78f631cb8bd5a9459eebd
+  data.tar.gz: 4d731209d7649e2ed868d00cb7f69b061545edd75f36b73e7e0356aadae34a41
 SHA512:
-  metadata.gz: 2dd968c76f1e6fc0af048385872b93d7b3764b0f11bbfd7925c23233235b61b83a6678daec0544dcf6f0625797733b2de04e98691aff56359228caca849b1269
-  data.tar.gz: be3757e058012feaa9d9f0e11c0b0a75730031ad80f76793bb6f916247bff4c60f001bec49db41466e9aacc8a3b8dbbfcde303b73e5849855b119413fe202bc4
+  metadata.gz: 236e174f59feb0b53bf812c7baf81eaa505e041e01fc9e5b5a689f402b746c9b53652aff506742a1210b9265e5341119d1e52d816e2fce99fac58e59132cf427
+  data.tar.gz: 3daabef6a600a9b490100b6a09db742c7e44e28368a9e936914371b34d25c8f2df996fbe3a19577cb64973c8f5a38a4c2d784563ceed4acd147779785277ee4b

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

@@ -36,17 +36,18 @@ module Uc3DmpId
     def add_modifications(works:)
       mod_hash = _generate_mod_header
 
-      works.fetch('publications', []).each do |publication|
-        # Skip the entry if we already know about this identifier
-        next if @known_works.include?(publication['id'])
-
-        work_hash = _work_to_mod_entry(type: 'publication', work: publication)
-        mod_hash.fetch('dmproadmap_related_identifiers', []) << work_hash unless work_hash.nil?
-        fundings = publication.fetch('fundingReferences', [])
-        next unless fundings.any?
-
-        award_hash = fundings.map { |funding| _funding_to_mod_entry(work: publication, funding:) }
-        mod_hash.fetch('funding', []) << award_hash unless award_hash.nil?
+      %w[publications datasets softwares].each do |work_type|
+        works.fetch(work_type, []).each do |work|
+          next if @known_works.include?(work['id'])
+
+          work_hash = _work_to_mod_entry(type: work_type[0..work_type.length - 2], work:)
+          mod_hash.fetch('dmproadmap_related_identifiers', []) << work_hash unless work_hash.nil?
+          fundings = publication.fetch('fundingReferences', [])
+          next unless fundings.any?
+
+          award_hash = fundings.map { |funding| _funding_to_mod_entry(work:, funding:) }
+          mod_hash.fetch('funding', []) << award_hash unless award_hash.nil?
+        end
       end
       return 0 unless mod_hash['dmproadmap_related_identifiers'].any? || mod_hash.fetch('funding', []).any?
 
@@ -107,7 +108,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 = {
@@ -116,16 +117,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

@@ -143,7 +143,7 @@ module Uc3DmpId
         @details_hash[:identifiers] << grant&.split('/')&.last&.downcase&.strip
         @details_hash[:identifiers] << opportunity&.downcase&.strip
 
-        @details_hash[:funder_names] << funding['name']&.downcase&.strip
+        @details_hash[:funder_names] << funding['name']&.downcase&.split(' (').first&.strip
         @details_hash[:funder_ids] << fundref
         @details_hash[:opportunity_ids] << opportunity&.downcase&.strip
         @details_hash[:grant_ids] << [grant&.downcase&.strip, grant&.split('/')&.last&.downcase&.strip]

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

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

metadata

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