uc3-dmp-id 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3f3549ad23c4656916e7e6daf8f9152eb755d46279b7a3b689a26dd7d02d26b
-  data.tar.gz: 41a955d7b0e97e1094be9fd9d80b8f7ca45d17b901464aaae6816d09b757aa5a
+  metadata.gz: d66a6f468a0f6d8db5ae871ca3981e7eb88e78a31dd4ee3c156532c9afd546fe
+  data.tar.gz: 92b20512b11ab92808db115a40b8cf5a1e7c5369d890f591fc4745c73f93c3d7
 SHA512:
-  metadata.gz: 2dd968c76f1e6fc0af048385872b93d7b3764b0f11bbfd7925c23233235b61b83a6678daec0544dcf6f0625797733b2de04e98691aff56359228caca849b1269
-  data.tar.gz: be3757e058012feaa9d9f0e11c0b0a75730031ad80f76793bb6f916247bff4c60f001bec49db41466e9aacc8a3b8dbbfcde303b73e5849855b119413fe202bc4
+  metadata.gz: 858aaabd9f1cf699257b076309851ea26a44a8262bddd0ad0c99956f2c872ba6a7a705c8edd45cadd45b64097caa8ad9a16b9caa896490e2a2f23622664a4986
+  data.tar.gz: 37b83f9bd35d43285879c57d59af76b836ad49c5fc6708c81c34d04685db3238bac1f8e4a80abfbbdc992b7c67560341806c28f80bbfdb696646b4696da89a9d

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

@@ -107,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 = {
@@ -116,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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-id
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Brian Riley