uc3-dmp-id 0.0.93 → 0.0.94

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: effd6e9f621b4a0a2ff038e01a9db04f39284eebe520c18df70b6a224984e030
-  data.tar.gz: be8087477ee5ae03e4c82b24cecf4f8b92b5fb4fa090520277738b0538d3324c
+  metadata.gz: 6e1f1181484200c982f852613b05b15f2e7a7e5ada500395d0c3d2dadc784f9e
+  data.tar.gz: c8edfcf737056d7e81f29545ccaefc6206da8e20a76ae42754206204a82145be
 SHA512:
-  metadata.gz: 31d8ab61ec9adef5daba45bb25d26bfbb5559b5ac468bc3b05231e814e24e0670d84644040006ab723049f7c7b469e13a4ac53a9fd34c88ba8473232b0beb93e
-  data.tar.gz: 1c2b1e95f0f01ca0ef7e641338eac0ab18e59b1137980dd912cb8b7321d7311a0dfa4f7458d796d73040e73ba91768399f19f9320be2a7da4b8941026337783e
+  metadata.gz: eed9ebc90a13702268f189f24ae23909227adb2531a53f709599483d1075372b1ce0442d6e8b158e280d493e8a7dd6ab053fe2fd21f7b5f7ac9dd30608a4c914
+  data.tar.gz: fe1042e750a090a3e5d9f5447e17a7a2a378294a4dccd866c09d5fe76f21ce75db9cd6c72882dab7261758c2be687070b23f87044b14aa5219b5c42e20ad0718

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

@@ -49,7 +49,7 @@ module Uc3DmpId
 
       # Find the DMP by its PK and SK
       # -------------------------------------------------------------------------
-      def by_pk(p_key:, s_key: Helper::DMP_LATEST_VERSION, client: nil, logger: nil)
+      def by_pk(p_key:, s_key: Helper::DMP_LATEST_VERSION, client: nil, cleanse: true, logger: nil)
         raise FinderError, MSG_MISSING_PK if p_key.nil?
 
         s_key = Helper::DMP_LATEST_VERSION if s_key.nil? || s_key.to_s.strip.empty?
@@ -67,7 +67,7 @@ module Uc3DmpId
         return nil if dmp['dmp']['PK'].nil?
 
         dmp = Versioner.append_versions(p_key: dmp['dmp']['PK'], dmp: dmp, client: client, logger: logger)
-        Helper.cleanse_dmp_json(json: dmp)
+        cleanse ? Helper.cleanse_dmp_json(json: dmp) : dmp
       end
 
       # Fetch just the PK to see if a record exists

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

@@ -21,7 +21,7 @@ module Uc3DmpId
 
         # fetch the existing latest version of the DMP ID
         client = Uc3DmpDynamo::Client.new(logger: logger)
-        existing = Finder.by_pk(p_key: p_key, client: client, logger: logger)
+        existing = Finder.by_pk(p_key: p_key, client: client, logger: logger, cleanse: false)
         logger.debug(message: "Existing latest record", details: existing) if logger.respond_to?(:debug)
 
         errs = _updateable?(provenance: provenance, p_key: p_key, json: annotated)

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

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

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

@@ -36,11 +36,9 @@ module Uc3DmpId
 puts "Provenance: #{provenance}, PK: #{p_key}"
 puts dmp
 
-        return nil unless p_key.is_a?(String) && !p_key.strip.empty? && _versionable?(dmp: dmp)
+        return nil unless p_key.is_a?(String) && !p_key.strip.empty? && _versionable?(p_key: p_key, dmp: latest_version)
 
         client = Uc3DmpDynamo::Client.new if client.nil?
-        latest_version = Finder.by_p_key(client: client, p_key: p_key) unless latest_version.is_a?(Hash) &&
-                                                                              !latest_version['PK'].nil?
 
         owner = latest_version['dmphub_provenance_id']
         updater = provenance['PK']
@@ -86,8 +84,10 @@ puts dmp
       private
 
       # Determine whether the specified DMP metadata is versionable - returns boolean
-      def _versionable?(dmp:)
-        return false unless dmp.is_a?(Hash) && dmp['PK'].nil? && dmp['SK'].nil?
+      def _versionable?(p_key:, dmp:)
+        return false unless dmp.is_a?(Hash) &&
+                            dmp['PK']&.to_s&.downcase == p_key&.to_s&.downcase &&
+                            dmp['SK'] == Helper::DMP_LATEST_VERSION
 
         # It's versionable if it has a DMP ID
         !dmp.fetch('dmp_id', {})['identifier'].nil?

metadata

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