uc3-dmp-id 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3606c442db889879cd08cfe0b089cc08a6b9a114492eceb94763a9629ddc230c
-  data.tar.gz: ca879f0baf683c9320ed092bb96f615df74ee43585e5ecf9c678347391a1acad
+  metadata.gz: fb6a21e1fcad936e84cad2d4067084a823104c99d68c4acf037a623c01fcf55e
+  data.tar.gz: 01256a0949cc0625912d4c86309375f4c9abfd4ff9d3b5c6f713c798d70161ac
 SHA512:
-  metadata.gz: acb587285f96b9a186f9492f79ed3e6230dcd7a8d1cbcbf9efd08b4466aecc94ed1fca751a4b4790150aed3096722e66a3107e7d92afdf2c9c0c4bd4b6ac2c22
-  data.tar.gz: b765980ac431f60180fc5996d0dbb2094e08b5bcb77057c480e74f9b24c93d118b5095d8201454ee5afe8155fa7be3009f2ec556445acc91129be9a0016a9f5a
+  metadata.gz: b7fec6aaddcd4f9d8029731c37a0363e55a1a66679a0359c07662c1f12fdc1d213695fa5a67f4c25e5a0fb059cd9cd3b195f7c7fd14beb771bf23a2f4fd1f19f
+  data.tar.gz: 51e8b4a4d987673b551a3b53b435ec057f61f1b43e10d6829a26977d1c7af1d1db3d7ea1ed61f140903288fc9b766841ebfb30ed4b2ed7244ed2caad3b4269c8

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

@@ -23,7 +23,7 @@ module Uc3DmpId
 
       # Find the DMP's versions
       # -------------------------------------------------------------------------
-      def versions(p_key:)
+      def versions(p_key:, client: nil, log_writer: 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 = Uc3DmpDynamo::Client.new
+        client = client.nil? ? Uc3DmpDynamo::Client.new(log_writer: log_writer, debug: debug) : client
         client.query(**args)
       end
 
       # Find a DMP based on the contents of the incoming JSON
       # -------------------------------------------------------------------------
-      def by_json(json:)
+      def by_json(json:, log_writer: nil, 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?
-
-        # find_by_PK
-        resp = by_pk(p_key: p_key, s_key: json['SK']) unless p_key.nil?
-        return resp unless resp.nil?
+        client = client.nil? ? Uc3DmpDynamo::Client.new(log_writer: log_writer, debug: debug) : client
 
         # find_by_dmphub_provenance_id -> if no PK and no dmp_id result
-        by_dmphub_provenance_identifier(json: json)
+        return by_provenance_identifier(json: json, client: client, log_writer: log_writer, 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)
       end
 
       # Find the DMP by its PK and SK
       # -------------------------------------------------------------------------
-      def by_pk(p_key:, s_key: Helper::DMP_LATEST_VERSION)
+      def by_pk(p_key:, s_key: Helper::DMP_LATEST_VERSION, client: nil, log_writer: 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 = Uc3DmpDynamo::Client.new
+        client = client.nil? ? Uc3DmpDynamo::Client.new(log_writer: log_writer, 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)
+        _append_versions(p_key: resp['dmp']['PK'], dmp: resp, client: client)
       end
 
       # Attempt to find the DMP item by the provenance system's identifier
       # -------------------------------------------------------------------------
       # rubocop:disable Metrics/AbcSize
-      def by_dmphub_provenance_identifier(json:)
+      def by_provenance_identifier(json:, client: nil, log_writer: 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 = Uc3DmpDynamo::Client.new
+        client = client.nil? ? Uc3DmpDynamo::Client.new(log_writer: log_writer, 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:)
+      def _append_versions(p_key:, dmp:, client: nil, log_writer: log_writer, debug: false)
         return dmp if p_key.nil? || !dmp.is_a?(Hash) || dmp['dmp'].nil?
 
-        results = find_dmp_versions(p_key: p_key)
+        results = versions(p_key: p_key, client: client, log_writer: log_writer, 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.3'
+  VERSION = '0.0.5'
 end

data/lib/uc3-dmp-id.rb

@@ -13,6 +13,13 @@ require 'uc3-dmp-id/validator'
 require 'uc3-dmp-id/versioner'
 
 module Uc3DmpId
-
+  MSG_DMP_EXISTS = 'DMP already exists. Try :update instead.'
+  MSG_DMP_UNKNOWN = 'DMP does not exist. Try :create instead.'
+  MSG_DMP_NOT_FOUND = 'DMP does not exist.'
+  MSG_DMP_FORBIDDEN = 'You do not have permission.'
+  MSG_DMP_NO_DMP_ID = 'A DMP ID could not be registered at this time.'
+  MSG_DMP_INVALID_DMP_ID = 'Invalid DMP ID format.'
+  MSG_DMP_NO_HISTORICALS = 'You cannot modify a historical version of the DMP.'
+  MSG_DMP_UNABLE_TO_VERSION = 'Unable to version this DMP.'
 end
 # rubocop:enable Naming/FileName

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-id
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Brian Riley
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement