uc3-dmp-id 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b5c0aa471073de5389e6c43c002e0d755770a92e843c1c14dd79de9282076ef
-  data.tar.gz: 8eb5f9aad1727ddc546d3f93464feef2a1052bf8f4baa470601eb24ce12536f0
+  metadata.gz: 4246dcd22bffa17f20b22217a7b2dbd5cf205bf6e062197bbc179d8bd15663df
+  data.tar.gz: 1427526f7079ee63b3b0ea769557bf28b0c680124860a31e3c4ec36255b1fd11
 SHA512:
-  metadata.gz: 3a0eb1bea68002ba01b1c1d8f857d89fbff26cd058ffab31379bbc28e5c237c5b530dfbbfc9d3d8eb1a106e306b74a7c394d10b6dd2f261f2ae6d996e9d8794c
-  data.tar.gz: 33a52715b9fcfa8564b6f3e44245013918e26b8fae8af771cddbe96e47c771168884a5bc74cd2ef95baa1bf4404eaa1fb4540dcc850bb741dd04b491ec9a39f4
+  metadata.gz: 5a110c35c6fb293ff7e4ad7d47e21fc1fe20ca9f21a5830f3fb151af13c9e3c30e6caf9c7412802736d7909c53d43fade84c00d175228698ff65f2cadc23a1e6
+  data.tar.gz: cdb727bf7a72f06d0cf9310bbf7c8710a8ce27b4bb3b1d57eed932d50e4620edfd65d318acd673e448d733fd3bcef75b7496cc49493f01f72ffd7d04264c2722

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

@@ -23,7 +23,7 @@ module Uc3DmpId
 
       # Find the DMP's versions
       # -------------------------------------------------------------------------
-      def versions(p_key:, client: nil, log_writer: nil, debug: false)
+      def versions(p_key:, client: nil, debug: false)
         raise Uc3DmpIdFinderError, MSG_MISSING_PK if p_key.nil?
 
         args = {
@@ -33,36 +33,36 @@ module Uc3DmpId
           projection_expression: 'modified',
           scan_index_forward: false
         }
-        client = client.nil? ? Uc3DmpDynamo::Client.new(log_writer: log_writer, debug: debug) : client
+        client = client.nil? ? Uc3DmpDynamo::Client.new(debug: debug) : client
         client.query(**args)
       end
 
       # Find a DMP based on the contents of the incoming JSON
       # -------------------------------------------------------------------------
-      def by_json(json:, log_writer: nil, debug: false)
+      def by_json(json:, debug: false)
         json = Validator.parse_json(json: json)&.fetch('dmp', {})
         raise Uc3DmpIdFinderError, MSG_INVALID_ARGS if json.nil? || (json['PK'].nil? && json['dmp_id'].nil?)
 
         p_key = json['PK']
         # Translate the incoming :dmp_id into a PK
         p_key = Helper.dmp_id_to_pk(json: json.fetch('dmp_id', {})) if p_key.nil?
-        client = client.nil? ? Uc3DmpDynamo::Client.new(log_writer: log_writer, debug: debug) : client
+        client = client.nil? ? Uc3DmpDynamo::Client.new(debug: debug) : client
 
         # find_by_dmphub_provenance_id -> if no PK and no dmp_id result
-        return by_provenance_identifier(json: json, client: client, log_writer: log_writer, debug: debug) if p_key.nil?
+        return by_provenance_identifier(json: json, client: client, debug: debug) if p_key.nil?
 
         # find_by_PK
-        by_pk(p_key: p_key, s_key: json['SK'], client: client, log_writer: log_writer, debug: debug)
+        by_pk(p_key: p_key, s_key: json['SK'], client: client, debug: debug)
       end
 
       # Find the DMP by its PK and SK
       # -------------------------------------------------------------------------
-      def by_pk(p_key:, s_key: Helper::DMP_LATEST_VERSION, client: nil, log_writer: nil, debug: false)
+      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?
 
-        client = client.nil? ? Uc3DmpDynamo::Client.new(log_writer: log_writer, debug: debug) : client
+        client = client.nil? ? Uc3DmpDynamo::Client.new(debug: debug) : client
         resp = client.get_item(
           key: {
             PK: Helper.append_pk_prefix(dmp: p_key),
@@ -71,13 +71,13 @@ module Uc3DmpId
         )
         return nil if resp.nil? || resp.fetch('dmp', {})['PK'].nil?
 
-        _append_versions(p_key: resp['dmp']['PK'], dmp: resp, client: client)
+        _append_versions(p_key: resp['dmp']['PK'], dmp: resp, client: client, debug: debug)
       end
 
       # Attempt to find the DMP item by the provenance system's identifier
       # -------------------------------------------------------------------------
       # rubocop:disable Metrics/AbcSize
-      def by_provenance_identifier(json:, client: nil, log_writer: nil, debug: false)
+      def by_provenance_identifier(json:, client: nil, debug: false)
         raise Uc3DmpIdFinderError, MSG_MISSING_PROV_ID if json.nil? || json.fetch('dmp_id', {})['identifier'].nil?
 
         args = {
@@ -90,7 +90,7 @@ module Uc3DmpId
           filter_expression: 'SK = :version',
           expression_attribute_values: { ':version': KeyHelper::DMP_LATEST_VERSION }
         }
-        client = client.nil? ? Uc3DmpDynamo::Client.new(log_writer: log_writer, debug: debug) : client
+        client = client.nil? ? Uc3DmpDynamo::Client.new(debug: debug) : client
         resp = client.query(**args)
         return resp if resp.nil? || resp['dmp'].nil?
 
@@ -103,10 +103,10 @@ module Uc3DmpId
 
       # Build the dmphub_versions array and attach it to the dmp
       # rubocop:disable Metrics/AbcSize
-      def _append_versions(p_key:, dmp:, client: nil, log_writer: log_writer, debug: false)
+      def _append_versions(p_key:, dmp:, client: nil, debug: false)
         return dmp if p_key.nil? || !dmp.is_a?(Hash) || dmp['dmp'].nil?
 
-        results = versions(p_key: p_key, client: client, log_writer: log_writer, debug: debug)
+        results = versions(p_key: p_key, client: client, debug: debug)
         return dmp unless results.length > 1
 
         versions = results.map do |version|

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

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

metadata

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