uc3-dmp-id 0.0.41 → 0.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a083adf1ce95bf86fe7775c5c76fa12758f90747502daa8a9f2140cc9b50743b
-  data.tar.gz: 3fdf9a0f471daa92bcd663892cb4b40f306be417fbab94a0a9bad6a65a600134
+  metadata.gz: '00945fc509b066babd974cddaf43c65bfa031abe384515c7ea44daa9af532bda'
+  data.tar.gz: 285ccacf79b362c1d75102217f905fd9c0e50c94f9388944a8379c72433ac2bc
 SHA512:
-  metadata.gz: 4c7b1e2f15ee9408b07d42902025bfe99f9c8dbf533ad013289147fefe21f6c42ccdff322417ec98ee1473ee424339905d71429a3fb1f2dded7b9cf55d997864
-  data.tar.gz: 59175eb9fd83d0dea579e030db380ce7fb45a632edcc339739c0c57dd564dde03f93e5274974e3d3a28fd4f6a76172b1fccb6d10dd63d5d937e32ae32904f8e6
+  metadata.gz: 163f3b6170b2abbd52e33b44da555e6d079fd1efec50f86fe58b7645cae82e4b2d85aa0db05dc7a93ba3c11e3eec196d5b24371ef88230cfad39262f8f74debf
+  data.tar.gz: 1adc6464f455dff57420cd008de1ff42bc0e74f7c999ec29b1db4f5133f537975451864e7b4ec246aff7da69280e7ca70d31e503e1a55a4ef03fca331837448d

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

@@ -19,7 +19,8 @@ module Uc3DmpId
         raise DeleterError, MSG_DMP_FORBIDDEN unless provenance.is_a?(Hash) && !provenance['PK'].nil?
 
         # Validate the incoming JSON first
-        errs = Validator.validate(mode: 'author', json: Helper.parse_json(json: json))
+        json = Helper.parse_json(json: json)
+        errs = Validator.validate(mode: 'author', json: json)
         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
@@ -32,7 +33,8 @@ module Uc3DmpId
         # raise CreatorError, Uc3DmpId::MSG_DMP_EXISTS if result.is_a?(Hash)
         raise CreatorError, Uc3DmpId::MSG_DMP_EXISTS unless json['PK'].nil?
 
-        p_key = _preregister_dmp_id(json: json, debug: debug)
+        client = Uc3DmpDynamo::Client.new(debug: debug)
+        p_key = _preregister_dmp_id(client: client, json: json, debug: debug)
         raise CreatorError, MSG_UNABLE_TO_MINT if p_key.nil?
 
         # Add the DMPHub specific attributes and then save
@@ -41,7 +43,6 @@ module Uc3DmpId
         puts annotated if debug
 
         # Create the item
-        client = Uc3DmpDynamo::Client.new(debug: debug)
         resp = client.put_item(json: annotated, debug: debug)
         raise CreatorError, Uc3DmpId::MSG_DMP_NO_DMP_ID if resp.nil?
 
@@ -51,18 +52,18 @@ module Uc3DmpId
 
       private
 
-      def _preregister_dmp_id(json:, debug: false)
+      def _preregister_dmp_id(client:, json:, debug: false)
         # Use the specified DMP ID if the provenance has permission
         existing = json.fetch('dmp_id', {})
         id = existing['identifier'].gsub(%r{https?://}, Helper::PK_DMP_PREFIX) if existing.is_a?(Hash) &&
                                                                                   !existing['identifier'].nil?
-        return id if existing['type'].downcase == 'doi' && !id.nil? && !Finder.exists?(p_key: id)
+        return id if !id.nil? && existing['type'].downcase == 'doi' && !Finder.exists?(client: client, p_key: id)
 
         dmp_id = ''
         counter = 0
         while dmp_id == '' && counter <= 10
           prefix = "#{ENV['DMP_ID_SHOULDER']}#{SecureRandom.hex(2).upcase}#{SecureRandom.hex(2)}"
-          dmp_id = prefix unless Finder.exists?(p_key: prefix)
+          dmp_id = prefix unless Finder.exists?(client: client, p_key: prefix)
           counter += 1
         end
         # Something went wrong and it was unable to identify a unique id

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

@@ -64,9 +64,10 @@ module Uc3DmpId
 
       # Fetch just the PK to see if a record exists
       # -------------------------------------------------------------------------
-      def exists?(p_key:)
+      def exists?(client:, p_key:)
         raise FinderError, MSG_MISSING_PK if p_key.nil?
 
+        client = client.nil? ? Uc3DmpDynamo::Client.new(debug: debug) : client
         resp = client.get_item(
           key: {
             PK: Helper.append_pk_prefix(p_key: p_key),

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

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

metadata

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