uc3-dmp-provenance 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6a82bbb7e1b2b0e5e6e7a917a1d5356cdf0d73b63f5c9a61b3423093aa09c2d
-  data.tar.gz: 682482122e0cd16c5ec9dd1d15656c9107dc50af912d33aeef6232af6e9d5bf3
+  metadata.gz: 453eb4ad07288ccd9ad6311160d2fe231af0655167d4156cb7139699ad31d302
+  data.tar.gz: 60527fa8a203482bc5e38a1d8d731dca514c0cc4a9f578123a95164530a83284
 SHA512:
-  metadata.gz: 0a51d2021d22d798d024a23b7c88a7f6142afaf163d68b296e0237d7d6fe486400cca32876c2250beef798439fff547ef38c85caa1737c82a35de16c6e2031a2
-  data.tar.gz: ae852a0a5d87de997f9b76e293fa225c00fa4eba0e358f2aca62d69344cd6acb6038fdef250dba5d55746432571bd3b64227712080faa40bbbbcd0289c2c6e43
+  metadata.gz: 0f4b522b6575def616403c0fbe399614418882bc6180bfc8a48293a03345470d6628ea80feaca7c495bdb023ecb8cfb017ad80b5e5510650405ad991a6a6328f
+  data.tar.gz: 42f2c2487bbcc7c22d4711ad49708268367608a7f30acc24188467c0fcbd97ff9107eb251910237fbbfe354139ad3642dd9ce810d08531de5e5a0d68b5c7c8f2

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

@@ -27,15 +27,15 @@ module Uc3DmpProvenance
       #    "client_id": "abcdefghijklmnopqrstuvwxyz"
       #  }
       # -------------------------------------------------------------------------------------------
-      def from_lambda_cotext(identity:, logger: nil)
+      def from_lambda_cotext(identity:, client: nil, logger: nil)
         return nil unless identity.is_a?(Hash) && !identity['iss'].nil? && !identity['client_id'].nil?
 
-        client = Uc3DmpDynamo::Client.new
-        client_name = _cognito_client_id_to_name(claim: identity, logger: logger)
+        client = client.nil? ? Uc3DmpDynamo::Client.new : client
+        client_name = _cognito_client_id_to_name(claim: identity, logger:)
 
         resp = client.get_item(
           key: { PK: Helper.append_pk_prefix(provenance: client_name), SK: Helper::SK_PROVENANCE_PREFIX },
-          logger: logger
+          logger:
         )
         resp.nil? || resp.empty? ? nil : resp
       end
@@ -43,13 +43,13 @@ module Uc3DmpProvenance
       # Fetch the Provenance by it's PK.
       #
       # Expecting either the name (e.g. `dmptool` or the qualified PK (e.g. `PROVENANCE#dmptool`)
-      def from_pk(pk:, logger: nil)
-        return nil if pk.nil?
+      def from_pk(p_key:, logger: nil)
+        return nil if p_key.nil?
 
-        pk = Helper.append_pk_prefix(provenance: pk)
+        p_key = Helper.append_pk_prefix(provenance: p_key)
         resp = client.get_item(
-          key: { PK: Helper.append_pk_prefix(provenance: pk), SK: Helper::SK_PROVENANCE_PREFIX },
-          logger: logger
+          key: { PK: Helper.append_pk_prefix(provenance: p_key), SK: Helper::SK_PROVENANCE_PREFIX },
+          logger:
         )
         resp.nil? || resp.empty? ? nil : resp
       end
@@ -61,7 +61,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
-        logger.debug(message: "Cognito User Pool: #{user_pool_id}, ClientId: #{claim['client_id']}") if logger.respond_to?(:debug)
+        logger&.debug(message: "Cognito User Pool: #{user_pool_id}, ClientId: #{claim['client_id']}")
         Uc3DmpCognito::Client.get_client_name(client_id: claim['client_id'])
       end
     end

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

@@ -8,14 +8,14 @@ module Uc3DmpProvenance
     PK_PROVENANCE_PREFIX = 'PROVENANCE#'
     SK_PROVENANCE_PREFIX = 'PROFILE'
 
-    DOI_REGEX = %r{[0-9]{2}\.[0-9]{5}/[a-zA-Z0-9/_.-]+}.freeze
-    URL_REGEX = %r{(https?://)?([a-zA-Z0-9\-_]\.)+[a-zA-Z0-9\-_]{2,3}(:[0-9]+)?/?}.freeze
+    DOI_REGEX = %r{[0-9]{2}\.[0-9]{5}/[a-zA-Z0-9/_.-]+}
+    URL_REGEX = %r{(https?://)?([a-zA-Z0-9\-_]\.)+[a-zA-Z0-9\-_]{2,3}(:[0-9]+)?/?}
 
     class << self
       # Append the PK prefix for the object
       # -------------------------------------------------------------------------------------
       def append_pk_prefix(provenance:)
-        provenance.is_a?(String) ? "#{PK_PROVENANCE_PREFIX}#{remove_pk_prefix(provenance: provenance)}" : nil
+        provenance.is_a?(String) ? "#{PK_PROVENANCE_PREFIX}#{remove_pk_prefix(provenance:)}" : nil
       end
 
       # Strip off the PK prefix
@@ -44,8 +44,8 @@ module Uc3DmpProvenance
 
         # Remove the homepage or callbackUri because we will add this when needed. we just want the id
         val = value.downcase
-                  .gsub(provenance.fetch('callbackUri', '').downcase, '')
-                  .gsub(provenance.fetch('homepage', '').downcase, '')
+                   .gsub(provenance.fetch('callbackUri', '').downcase, '')
+                   .gsub(provenance.fetch('homepage', '').downcase, '')
         val = val.gsub(%r{https?://}, '')
         val = val[1..val.length] if val.start_with?('/')
         id = provenance['PK']&.gsub(PK_PROVENANCE_PREFIX, '')

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

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

data/lib/uc3-dmp-provenance.rb

@@ -9,6 +9,7 @@ require 'uc3-dmp-dynamo'
 require 'uc3-dmp-provenance/finder'
 require 'uc3-dmp-provenance/helper'
 
+# Entrypoint for the uc3-dmp-provenance gem
 module Uc3DmpProvenance
   MSG_PROVENANCE_NOT_FOUND = 'Provenance does not exist.'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-provenance
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Brian Riley
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-07 00:00:00.000000000 Z
+date: 2023-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -126,7 +126,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'false'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -134,15 +134,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: DMPTool gem that provides support for Provenance records
 test_files: []