uc3-dmp-provenance 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7297f187a4c3383140979caf659f8d6609905b1d71aaf132931c47c1d78fc50b
-  data.tar.gz: 644eddd6e21ef2bca1cee80ef9f1352233bee5cf29572ce007e8f7cfcdc2bfcb
+  metadata.gz: 2a50454ca4755fe1e5a1d28c2453dba6a8b16d3b38e52d29b72977b603f1dd87
+  data.tar.gz: 96211ed122d90a542237c4dbd11f1c1bee717abf218034762872cd4c80f5d05b
 SHA512:
-  metadata.gz: b470c7add0f67f9bc1ddbcd5087a912a4a92f4b6855b5d4cbdf852975076137355074d7f372f6124e18bdb4e0eb43bce61b49e9731fc855632c61dbfdc2736f3
-  data.tar.gz: 6c448352d785575a609e14e83b3b9efacb7d8e7b742d5767633e5b62fd4c33f4a24111ce36fc3d87c7224aedbb6e8cc53c6e1eb92eb71555426c47b0c00d1883
+  metadata.gz: b6b8f9153f155c64015ea0f6cd5a2687bac9f10968536d9b302768c7500a676f0ae7e51d95862e4097331365086d9b78cbb5abf1829524b9c7aff5f1aa59ecdf
+  data.tar.gz: 9abd42ad27019bc4e57c435b0b19c7104569087a00524404e5d2389bcc855fd34b378bad605e8934592ab08dbf100149fbde6c6495b486284235f89415901d22

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

@@ -5,7 +5,7 @@ require 'uc3-dmp-dynamo'
 
 module Uc3DmpProvenance
   # Standard Error Message from Uc3DmpProvenance
-  class Uc3DmpProvenanceError < StandardError; end
+  class FinderError < StandardError; end
 
   # Helper for fetching Provenance JSON records
   class Finder
@@ -59,7 +59,7 @@ module Uc3DmpProvenance
         return nil if claim.nil? || !claim.is_a?(Hash) || claim['iss'].nil? || claim['client_id'].nil?
 
         user_pool_id = claim['iss'].split('/').last
-        Uc3DmpCognito.get_client_name(client_id: claim['client_id'])
+        Uc3DmpCognito::Client.get_client_name(client_id: claim['client_id'])
       end
     end
   end

data/lib/uc3-dmp-provenance/helper.rb

@@ -36,7 +36,7 @@ module Uc3DmpProvenance
       # rubocop:disable Metrics/AbcSize
       def format_provenance_callback_url(provenance:, value:)
         # return it as-is if there is no provenance or it's already a URL
-        return value if provenance.nil?
+        return value if provenance.nil? || provenance.fetch('callbackUri', provenance['homepage']).nil?
 
         # return it as-is if it's a DOI
         doi = value.match(DOI_REGEX).to_s
@@ -49,7 +49,7 @@ module Uc3DmpProvenance
         val = val.gsub(%r{https?://}, '')
         val = val[1..val.length] if val.start_with?('/')
         id = provenance['PK']&.gsub(PK_PROVENANCE_PREFIX, '')
-        "#{id}##{val}"
+        id.nil? ? val : "#{id}##{val}"
       end
       # rubocop:enable Metrics/AbcSize
     end

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uc3DmpProvenance
-  VERSION = '0.0.4'
+  VERSION = '0.0.6'
 end

data/lib/uc3-dmp-provenance.rb

@@ -3,6 +3,7 @@
 
 require 'json'
 
+require 'uc3-dmp-cognito'
 require 'uc3-dmp-dynamo'
 
 require 'uc3-dmp-provenance/finder'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-provenance
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Brian Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-09 00:00:00.000000000 Z
+date: 2023-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: logger
+  name: uc3-dmp-cognito
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: uc3-dmp-dynamo
   requirement: !ruby/object:Gem::Requirement