uc3-dmp-id 0.0.40 → 0.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16e0d5fad73a2b02661468888f39eb9931dcfa3a41d6f4b1c3c4b9caac5270b7
-  data.tar.gz: a76046c80b46aaab3705af222eeca787d7f821766057c9d18982a9b64fb1b105
+  metadata.gz: a0fef469bbcc71541818da66343150f5f8d836da7fea95e584814676504fc0ab
+  data.tar.gz: d33e5f4b658a3cc10af320a43712c39dc8876e94d463ca610b1c35f3845c8781
 SHA512:
-  metadata.gz: 43bc65f4d35e2efea4e77e1cbea24ca4d15f9968a73a01cb3aac39c043ba42512422ec1481f97f9f7a57dc40145ef55b0a4db5371a45871730ff44897e6dc321
-  data.tar.gz: bf07e780828b16f0cafea980538510c15a8b8c725afb19d4459d4428ab9d424fdd843493d65f4986a335e1c9b37a9c6381ce91fca593c24a78ff7885a017001d
+  metadata.gz: e2b2393f62e7a78df241ef998107817fe569c0de4362ca2e2451a471bb8e029717acad65dc48a4c12840885060110f750864d14a2d9ffaf3bd34f1eb78c59a05
+  data.tar.gz: 76b1ad4c83ebceccea8fdb0932615dfd930b306bfd604d240a39d42b21ffbcb694c17455d1596393f7ff71a00700c2b82c488d31739a07eca340d86c966b2c13

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

@@ -19,16 +19,19 @@ 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
         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?
 
+        # TODO: Swap this out with the Finder search once the Dynamo indexes are working
         # Try to find it first and Fail if found
-        result = Finder.by_json(json: json, debug: debug)
-        raise CreatorError, Uc3DmpId::MSG_DMP_EXISTS if result.is_a?(Hash)
+        # result = Finder.by_json(json: json, debug: debug)
+        # 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)
         raise CreatorError, MSG_UNABLE_TO_MINT if p_key.nil?
@@ -54,7 +57,7 @@ module Uc3DmpId
         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?(p_key: id)
 
         dmp_id = ''
         counter = 0

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

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

metadata

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