uc3-dmp-id 0.0.67 → 0.0.69

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4d8cadb560081925dec360c3e5915a3c211f75ca821ce6df00333e5848f30e1
-  data.tar.gz: 2338fed516beee598ca8d8e98cd71d22c5d521c1fa9eed3d6e97557d4a6c74b1
+  metadata.gz: add557c6bfad4f39ab0fcc4b164b4a50dd2f33c9fefa823ad95145e40d2d2495
+  data.tar.gz: 8b1fb5ab9edbb3e783d95419eac15f645fab8c91804a24f24996dfabb74f130a
 SHA512:
-  metadata.gz: ab2b07a1dae559c3dc8600a8441db376ae6d9badbe6971588a136e60058b7933dee052f71c592d630079703474ece421972530ba69ce2ff92ec85a130ea31639
-  data.tar.gz: 7189facf0e52c45617b4c4e2231ffad72e596f088f0694fd7197529351608e6fd7e656000c53641465b2c5c543e461d963674752bc719311c320b108c57b1764
+  metadata.gz: 937ecb14c0178243e8c91ec21af41343cc6f9b898104587fa856723a2b9b87d335819f9838f7838382dbc65661c753e6836f526e526954bdaa1c159621d1df1f
+  data.tar.gz: 4d0adec75e6ad372d21a9a2d56565381e5cf898366f55474465c046801ae067c753eda2a4b00e2a69e70116016532d4ee9b3aaf16952a6d216ddb4de3a5e032b

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

@@ -11,7 +11,7 @@ module Uc3DmpId
     MSG_UNABLE_TO_MINT = 'Unable to mint a unique DMP ID.'
 
     class << self
-      def create(provenance:, owner_org:, json:, debug: false)
+      def create(provenance:, json:, debug: false)
         raise CreatorError, MSG_NO_SHOULDER if ENV['DMP_ID_SHOULDER'].nil?
         raise CreatorError, MSG_NO_BASE_URL if ENV['DMP_ID_BASE_URL'].nil?
 
@@ -24,8 +24,7 @@ module Uc3DmpId
         raise CreatorError, errs.join(', ') if errs.is_a?(Array) && errs.any? && errs.first != Validator::MSG_VALID_JSON
 
         # Fail if the provenance or owner affiliation are not defined
-        raise CreatorError, MSG_NO_PROVENANCE_OWNER if provenance.nil? || owner_org.nil?
-        raise CreatorError, MSG_NO_OWNER_ORG unless owner_org.is_a?(String) && !owner_org.strip.empty?
+        raise CreatorError, MSG_NO_PROVENANCE_OWNER if provenance.nil?
 
         # TODO: Swap this out with the Finder search once the Dynamo indexes are working
         # Try to find it first and Fail if found

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

@@ -138,7 +138,8 @@ module Uc3DmpId
         return nil unless json.is_a?(Hash)
 
         dmp = json['dmp'].nil? ? json : json['dmp']
-        owner_org = dmp.fetch('contact', {}).fetch('contact_id', {})['identifier']
+        id = dmp.fetch('contact', {}).fetch('contact_id', {})['identifier']
+        return id unless id.nil?
 
         dmp.fetch('contributor', []).map { |contributor| contributor.fetch('contact_id', {})['identifier'] }.first
       end
@@ -160,7 +161,7 @@ module Uc3DmpId
       # Add DMPHub specific fields to the DMP ID JSON
       def annotate_dmp_json(provenance:, p_key:, json:)
         json = parse_json(json: json)
-        return json if provenance.nil? || owner_org.nil? || p_key.nil? || !json.is_a?(Hash)
+        return json if provenance.nil? || p_key.nil? || !json.is_a?(Hash)
 
         # Fail the json as is if the :PK does not match the :dmp_id if the json has a :PK
         id = dmp_id_to_pk(json: json.fetch('dmp_id', {}))

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

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

metadata

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