uc3-dmp-id 0.0.92 → 0.0.94

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55e15684bfc0ccb76cb498ccddfae9b83c8ce935240efbb5ad1112ddbf791ab8
-  data.tar.gz: 2a729a50e838d4e25a4921d5a33f6b12b3e786e2da4c91b12016340b6d5a158b
+  metadata.gz: 6e1f1181484200c982f852613b05b15f2e7a7e5ada500395d0c3d2dadc784f9e
+  data.tar.gz: c8edfcf737056d7e81f29545ccaefc6206da8e20a76ae42754206204a82145be
 SHA512:
-  metadata.gz: 70315b0ebd96129ec4c7ba051e39d5e385952079f20a565e000bd7b4812be60687a2cde3c414c66db71bda2ccb35a67e06dfcf90aa21b65dee22cb26786ddbfb
-  data.tar.gz: '0481364645a94de5cb4178bd4657b7d7e1622016cbc7bb0ff9cd3e2082efe2424f5bc98cf47d4b36f2e59515399e7dbd237f4e62ba49b025e788ae0c705bb135'
+  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.92'
+  VERSION = '0.0.94'
 end

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

@@ -32,11 +32,13 @@ module Uc3DmpId
       #    - Splicing in the current changes onto the existing `VERSION#latest` item
       #    - Returning the spliced `VERSION#latest` back to this method
       def new_version(provenance:, p_key:, client: nil, dmp:, latest_version: {}, logger: nil)
-        return nil unless p_key.is_a?(String) && !p_key.strip.empty? && _versionable?(dmp: dmp)
 
-        client = Uc3DmpDynamo::Client.new(logger: logger) 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?
+puts "Provenance: #{provenance}, PK: #{p_key}"
+puts 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?
 
         owner = latest_version['dmphub_provenance_id']
         updater = provenance['PK']
@@ -82,8 +84,10 @@ module Uc3DmpId
       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.92
+  version: 0.0.94
 platform: ruby
 authors:
 - Brian Riley