uc3-dmp-id 0.0.12 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0a0a7c8a7c2ec3b7bfdc0051c323b85ba6f7bb14aa0bc1f77e499b7682b3814
-  data.tar.gz: 9bb5fa376caa1d07bd243cebad4b5757771eb996a4723c200366c034fdf56b2c
+  metadata.gz: db1f76572c527c11eaf8e14afa51c095eab796c53c631d6fe1b78bca2c5f3395
+  data.tar.gz: 671c4b0a629837069b23286876b2cd871caab2f9df1bc011b91e68f68bf45bff
 SHA512:
-  metadata.gz: 8b8ff1171c5127af8fedbfe85bf2c74b4a61f25dc4bab73e42fa1903bbe36c9a20adb0f9db2b1906c6542f7172496ea9173b05c047b20392577d5cc9341002db
-  data.tar.gz: '079687ec9e07dddde7afcbcd9d1b6dc0b3606276f735e4040ca0183e378f1bc0c72017747d48dde140c32b922e7ce6825afc5b3961d6b93503ce4c2052226495'
+  metadata.gz: 76c00b9f95b7b5fefac06ba75696e6b5fc6b1ddb244093888b08899b79d2df98996a70c7c3026bcebcc3bf91030fced1172587dc1494419dad101cd30e1a87bf
+  data.tar.gz: 4664882d1dbf1ef2ba593b8ca4858829b4c05e767bb94e107a7db6b24370ca6739983b53b66eef56909bb7f713fdaeba05f8d71217ae181ad87ef43824d6d64d

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

@@ -60,21 +60,26 @@ module Uc3DmpId
       def by_pk(p_key:, s_key: Helper::DMP_LATEST_VERSION, client: nil, debug: false)
         raise Uc3DmpIdFinderError, MSG_MISSING_PK if p_key.nil?
 
-        s_key = Helper::DMP_LATEST_VERSION if s_key.nil? || s_key.strip.empty?
+        s_key = Helper::DMP_LATEST_VERSION if s_key.nil? || s_key.to_s.strip.empty?
+
+puts "PK: #{p_key}, SK: #{s_key}"
 
         client = client.nil? ? Uc3DmpDynamo::Client.new(debug: debug) : client
         resp = client.get_item(
           key: {
             PK: Helper.append_pk_prefix(p_key: p_key),
-            SK: s_key.nil? || s_key.strip.empty? ? Helper::DMP_LATEST_VERSION : s_key
+            SK: s_key
           }
         )
         return resp unless resp.is_a?(Hash)
 
+puts "FETCHED:"
+puts resp
+
         dmp = resp['dmp'].nil? ? JSON.parse({ dmp: resp }.to_json) : resp
-        return nil if resp['dmp']['PK'].nil?
+        return nil if dmp['dmp']['PK'].nil?
 
-        _append_versions(p_key: resp['dmp']['PK'], dmp: dmp, client: client, debug: debug)
+        _append_versions(p_key: dmp['dmp']['PK'], dmp: dmp, client: client, debug: debug)
       end
 
       # Attempt to find the DMP item by the provenance system's identifier
@@ -98,7 +103,7 @@ module Uc3DmpId
         return resp unless resp.is_a?(Hash)
 
         dmp = resp['dmp'].nil? ? JSON.parse({ dmp: resp }.to_json) : resp
-        return nil if resp['dmp']['PK'].nil?
+        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'])
@@ -112,10 +117,16 @@ module Uc3DmpId
       def _append_versions(p_key:, dmp:, client: nil, debug: false)
         return dmp if p_key.nil? || !dmp.is_a?(Hash) || dmp['dmp'].nil?
 
+puts "FETCHING VERSIONS"
+
         results = versions(p_key: p_key, client: client, debug: debug)
         return dmp unless results.length > 1
 
-        versions = results.map do |version|
+        versions = results.map do |ver|
+
+puts version
+
+          version = ver['dmp'].nil? ? JSON.parse({ dmp: ver }.to_json) : ver
           next if version.fetch('dmp', {})['modified'].nil?
 
           timestamp = version['dmp']['modified']
@@ -125,6 +136,10 @@ module Uc3DmpId
           }
         end
         dmp['dmp']['dmphub_versions'] = JSON.parse(versions.to_json)
+
+puts "AFTER APPENDING VERSIONS:"
+puts dmp
+
         dmp
       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.12'
+  VERSION = '0.0.14'
 end

metadata

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