uc3-dmp-id 0.0.94 → 0.0.96

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e1f1181484200c982f852613b05b15f2e7a7e5ada500395d0c3d2dadc784f9e
-  data.tar.gz: c8edfcf737056d7e81f29545ccaefc6206da8e20a76ae42754206204a82145be
+  metadata.gz: c6623f79604248f9a0f7ea88837a0d75a85fb4b30766352bb68a6c5de08125cf
+  data.tar.gz: 6e51e71740077defbd9b456fa5557532fc143484ac75de58510cc25ac96d073b
 SHA512:
-  metadata.gz: eed9ebc90a13702268f189f24ae23909227adb2531a53f709599483d1075372b1ce0442d6e8b158e280d493e8a7dd6ab053fe2fd21f7b5f7ac9dd30608a4c914
-  data.tar.gz: fe1042e750a090a3e5d9f5447e17a7a2a378294a4dccd866c09d5fe76f21ce75db9cd6c72882dab7261758c2be687070b23f87044b14aa5219b5c42e20ad0718
+  metadata.gz: 254631a72b6bae0629df5f6b7606a9d0b2323071de9b573a9712225b73a3c2a1a514236edad355b6fd9241f3267397ac275b47e92759025b4bd5f41cb21bacdf
+  data.tar.gz: 8274ce2a62b81621cef098f70d8f62c10a3a56b09bb8b7832a4dd2fa16aa09af09ab9cc2d343c2a672ca6f8d70a6766a27aac0710d32df77221551ba694116bf

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

@@ -30,7 +30,7 @@ module Uc3DmpId
 
       # Find a DMP based on the contents of the incoming JSON
       # -------------------------------------------------------------------------
-      def by_json(json:, logger: nil)
+      def by_json(json:, cleanse: true, logger: nil)
         json = Helper.parse_json(json: json)&.fetch('dmp', {})
         raise FinderError, MSG_INVALID_ARGS if json.nil? || (json['PK'].nil? && json['dmp_id'].nil?)
 
@@ -44,7 +44,7 @@ module Uc3DmpId
         # return by_provenance_identifier(json: json, client: client, logger: logger) if p_key.nil?
 
         # find_by_PK
-        p_key.nil? ? nil : by_pk(p_key: p_key, s_key: json['SK'], client: client, logger: logger)
+        p_key.nil? ? nil : by_pk(p_key: p_key, s_key: json['SK'], client: client, cleanse: cleanse, logger: logger)
       end
 
       # Find the DMP by its PK and SK
@@ -88,7 +88,7 @@ module Uc3DmpId
       # Attempt to find the DMP item by the provenance system's identifier
       # -------------------------------------------------------------------------
       # rubocop:disable Metrics/AbcSize
-      def by_provenance_identifier(json:, client: nil, logger: nil)
+      def by_provenance_identifier(json:, client: nil, cleanse: true, logger: nil)
         raise FinderError, MSG_MISSING_PROV_ID if json.nil? || json.fetch('dmp_id', {})['identifier'].nil?
 
         args = {
@@ -110,7 +110,7 @@ module Uc3DmpId
         return nil if dmp['dmp']['PK'].nil?
 
         # If we got a hit, fetch the DMP and return it.
-        by_pk(p_key: dmp['dmp']['PK'], s_key: dmp['dmp']['SK'])
+        by_pk(p_key: dmp['dmp']['PK'], s_key: dmp['dmp']['SK'], cleanse: cleanse, logger: logger)
       end
       # rubocop:enable Metrics/AbcSize
 

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

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

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

@@ -36,16 +36,16 @@ module Uc3DmpId
 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)
+        return nil unless p_key.is_a?(String) && !p_key.strip.empty? && _versionable?(p_key: p_key, dmp: latest_version['dmp'])
 
         client = Uc3DmpDynamo::Client.new if client.nil?
 
         owner = latest_version['dmphub_provenance_id']
         updater = provenance['PK']
-        prior = _generate_version(client: client, latest_version: latest_version, owner: owner, updater: updater)
+        prior = _generate_version(client: client, latest_version: latest_version['dmp'], owner: owner, updater: updater)
         return nil if prior.nil?
 
-        args = { owner: owner, updater: updater, base: prior, mods: dmp, logger: logger }
+        args = { owner: owner, updater: updater, base: prior, mods: dmp['dmp'], logger: logger }
         logger.debug(message: "#{SOURCE} record prior to splicing", details: dmp) if logger.respond_to?(:debug)
 
         # If the system of provenance is making the change then just use the
@@ -85,9 +85,10 @@ puts dmp
 
       # Determine whether the specified DMP metadata is versionable - returns boolean
       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
+
+puts "PK MATCH? #{dmp['PK'] == p_key}, SK IS LATEST? #{dmp['SK'] == Helper::DMP_LATEST_VERSION}, DMP ID PRESENT? #{!dmp.fetch('dmp_id', {})['identifier'].nil?}"
+
+        return false unless dmp.is_a?(Hash) && dmp['PK'] == p_key && 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.94
+  version: 0.0.96
 platform: ruby
 authors:
 - Brian Riley