uc3-dmp-id 0.0.90 → 0.0.92

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13c2a01e8e979f1cc3a4e9fe003cb8429d742c0e5b9d217d78e2d93bd36c276c
-  data.tar.gz: 5541be19755ac0850166d14fd4e02408d02db1e35caf83cddab527729c061a54
+  metadata.gz: 55e15684bfc0ccb76cb498ccddfae9b83c8ce935240efbb5ad1112ddbf791ab8
+  data.tar.gz: 2a729a50e838d4e25a4921d5a33f6b12b3e786e2da4c91b12016340b6d5a158b
 SHA512:
-  metadata.gz: 0d9e65edacb5d45bef33510718f50023fb14abf271859ca07910bd2b60941ebb7219e662efcead0a818141e7e2349f5e57c81e705162685dbe7cd6d736c60238
-  data.tar.gz: f5e2103aa8360d25a73ec5af6415a3087c73afdfc63c03983cbdf798e107e1bb086f0effc7c00ca3ddd71e4859e48832e03d441a2d092ff11ab4c0f0db053fcc
+  metadata.gz: 70315b0ebd96129ec4c7ba051e39d5e385952079f20a565e000bd7b4812be60687a2cde3c414c66db71bda2ccb35a67e06dfcf90aa21b65dee22cb26786ddbfb
+  data.tar.gz: '0481364645a94de5cb4178bd4657b7d7e1622016cbc7bb0ff9cd3e2082efe2424f5bc98cf47d4b36f2e59515399e7dbd237f4e62ba49b025e788ae0c705bb135'

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

@@ -38,16 +38,14 @@ module Uc3DmpId
         # Delete the Latest version
         resp = client.delete_item(p_key: p_key, s_key: Helper::SK_DMP_PREFIX, logger: logger)
 
-# TODO: We should do a check here to see if it was successful!
-puts resp.inspect
+        # TODO: We should do a check here to see if it was successful!
 
         # Notify EZID about the removal
         _post_process(json: dmp, logger: logger)
         # Return the tombstoned record
         Helper.cleanse_dmp_json(json: JSON.parse({ dmp: dmp }.to_json))
       rescue Aws::Errors::ServiceError => e
-        puts "ERROR in Uc3DmpId::Deleter - #{e.message}"
-        puts e.backtrace
+        logger.error(message: e.message, details: e.backtrace) unless logger.nil?
         { status: 500, error: Messages::MSG_SERVER_ERROR }
       end
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity

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

@@ -135,7 +135,7 @@ module Uc3DmpId
           filter_expression: 'SK = :version',
           expression_attribute_values: { ':version': Helper::DMP_LATEST_VERSION }
         }
-        puts "Querying _by_owner with #{args}" if debug
+        logger.info(message: "Querying _by_owner with #{args}") unless logger.nil?
         client = client.nil? ? Uc3DmpDynamo::Client.new : client
         _process_search_response(response: client.query(args: args, logger: logger))
       end
@@ -159,7 +159,7 @@ module Uc3DmpId
           filter_expression: 'SK = :version',
           expression_attribute_values: { ':version': Helper::DMP_LATEST_VERSION }
         }
-        puts "Querying _by_owner_org with #{args}" if debug
+        logger.info(message: "Querying _by_owner_org with #{args}") unless logger.nil?
         client = client.nil? ? Uc3DmpDynamo::Client.new : client
         _process_search_response(response: client.query(args: args, logger: logger))
       end
@@ -180,7 +180,7 @@ module Uc3DmpId
           filter_expression: 'SK = :version',
           expression_attribute_values: { ':version': Helper::DMP_LATEST_VERSION }
         }
-        puts "Querying _by_mod_day with #{args}" if debug
+        logger.info(message: "Querying _by_mod_day with #{args}") unless logger.nil?
         client = client.nil? ? Uc3DmpDynamo::Client.new : client
         _process_search_response(response: client.query(args: args, logger: logger))
       end

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

@@ -45,7 +45,7 @@ module Uc3DmpId
       # ------------------------------------------------------------------------------------
       def _load_schema(mode:)
         # Instatiate the matching schema
-        schema = "Uc3DmpId::Schemas::#{mode.to_s.downcase.capitalize}".split('::').inject(Object) { |o,c| p o; o.const_get c }
+        schema = "Uc3DmpId::Schemas::#{mode.to_s.downcase.capitalize}".split('::').inject(Object) { |o,c| o.const_get c }
         schema.respond_to?(:load) ? schema.load : nil
       end
 

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

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

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

@@ -38,12 +38,9 @@ module Uc3DmpId
         latest_version = Finder.by_p_key(client: client, p_key: p_key) unless latest_version.is_a?(Hash) &&
                                                                               !latest_version['PK'].nil?
 
-        # Only continue if there was an existing record and its the latest version
-        return nil unless latest['SK'] != Helper::DMP_LATEST_VERSION
-
-        owner = latest['dmphub_provenance_id']
+        owner = latest_version['dmphub_provenance_id']
         updater = provenance['PK']
-        prior = _generate_version(client: client, latest_version: latest, owner: owner, updater: updater)
+        prior = _generate_version(client: client, latest_version: latest_version, owner: owner, updater: updater)
         return nil if prior.nil?
 
         args = { owner: owner, updater: updater, base: prior, mods: dmp, logger: logger }
@@ -111,7 +108,6 @@ module Uc3DmpId
         resp = client.put_item(json: latest_version, logger: logger)
         return nil if resp.nil?
 
-        puts "Created new version #{latest_version['PK']} - #{latest_version['SK']}" if debug
         msg = "#{SOURCE} created version PK: #{latest_version['PK']} SK: #{latest_version['SK']}"
         logger.info(message: msg, details: latest_version) if logger.respond_to?(:debug)
         latest_version

metadata

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