uc3-dmp-s3 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 806dbb2a9821958ce5b6d32219023f671ea6119e837ae1de29753a6d5acf4ce2
-  data.tar.gz: 2ff4c8cafe89cb3169dc44d0feaa8ea77268ad109213f58bede51a0a0c65ffd9
+  metadata.gz: e3e776ef35e7b2dc7c1a9e1cc20d931ecec09bebe00abce098644da697b50738
+  data.tar.gz: 0e74d753a882b403edaf0ab8f1bd8da77b4f7ebae18abb0f96e56567bc660818
 SHA512:
-  metadata.gz: ea6d083e9e2b7f1907c019ac450232cb33cd0c060b0f71aa23a84099b9d45f8b476458598d2be36d9d4061da88f8b702cc9e8fbfcc38dd50446198d2f2741f22
-  data.tar.gz: 553ca24e53f1a98b30a782ae58d2a0005139675e1f6de23f6d2b0dae2d92553de690b6eb5642d6567204890c59a4be8ec1c15eff868963264951271b0c2c0cda
+  metadata.gz: 000d1fbda9b863ec5fe30424a8897a749f275eb7350d6c9c11ac4dc91409b9fc59bc9028d4f3a98b03e43455a900844ee291bcc35c993d733549d8196b0fee36
+  data.tar.gz: 398629554803738dfba8b7aad596bbf7013dba43863f653237563fdd4581977884e2e19fa44b53ff1882791f88eb1ef9e103c6ffbb7cadbdf745aab66027dd92

data/lib/uc3-dmp-s3/client.rb

@@ -25,13 +25,13 @@ module Uc3DmpS3
 
     class << self
       # Put the narrative file into the S3 bucket
-      def put_resource_file(file:, explorer_details:, base64: false)
+      def put_resource_file(file:, explorer_details:)
         return nil if File.nil? || !explorer_details.is_a?(Hash) || ENV['S3_BUCKET'].nil? ||
                       explorer_details.fetch('file_metadata', {})['filename'].nil?
 
         filename = "#{explorer_details['ID']}_#{explorer_details['file_metadata']['filename']}"
         key = "#{RESOURCE_KEY_PREFIX}#{filename}"
-        tg = "RESOURCE_TYPE=#{explorer_details['RESOURCE_TYPE']}&ID=#{explorer_details['ID']}&tstamp=#{file.mtime}"
+        tg = "RESOURCE_TYPE=#{explorer_details['RESOURCE_TYPE']}&ID=#{explorer_details['ID']}"
 
         _put_object(key:, tags: tg, payload: file)
       rescue Aws::Errors::ServiceError => e
@@ -39,6 +39,15 @@ module Uc3DmpS3
         raise ClientError, "#{msg} - #{e.message}"
       end
 
+      # Fetch the narrative file from the S3 bucket
+      def get_resource_file(key:)
+        return nil unless key.is_a?(String) && !key.strip.empty? && !ENV['S3_BUCKET'].nil?
+
+        obj = _get_object(key: key.start_with?(RESOURCE_KEY_PREFIX) ? key : "#{RESOURCE_KEY_PREFIX}#{key}")
+      rescue Aws::Errors::ServiceError => e
+        raise ClientError, "Unable to fetch External Resource file from S3 bucket (key: #{key}) - #{e.message}"
+      end
+
       # Put the narrative file into the S3 bucket
       def put_narrative(document:, dmp_id: nil, base64: false)
         return nil if !document.is_a?(String) || document.strip.empty? || ENV['S3_BUCKET'].nil?

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-s3
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Brian Riley