uc3-dmp-id 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d66a6f468a0f6d8db5ae871ca3981e7eb88e78a31dd4ee3c156532c9afd546fe
-  data.tar.gz: 92b20512b11ab92808db115a40b8cf5a1e7c5369d890f591fc4745c73f93c3d7
+  metadata.gz: 7ae3b97965d06d3157328d0c23441eb32b63013b52d78f631cb8bd5a9459eebd
+  data.tar.gz: 4d731209d7649e2ed868d00cb7f69b061545edd75f36b73e7e0356aadae34a41
 SHA512:
-  metadata.gz: 858aaabd9f1cf699257b076309851ea26a44a8262bddd0ad0c99956f2c872ba6a7a705c8edd45cadd45b64097caa8ad9a16b9caa896490e2a2f23622664a4986
-  data.tar.gz: 37b83f9bd35d43285879c57d59af76b836ad49c5fc6708c81c34d04685db3238bac1f8e4a80abfbbdc992b7c67560341806c28f80bbfdb696646b4696da89a9d
+  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?
 

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.13'
+  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.13
+  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