uc3-dmp-s3 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03efe791449211289f51da782f9dacf96b17603806b43bafd196c6d9ce8ddf90
-  data.tar.gz: 6a43ca699de4458f0090420886192bf3b7627241875a463d9e6c093bb135d4e6
+  metadata.gz: 806dbb2a9821958ce5b6d32219023f671ea6119e837ae1de29753a6d5acf4ce2
+  data.tar.gz: 2ff4c8cafe89cb3169dc44d0feaa8ea77268ad109213f58bede51a0a0c65ffd9
 SHA512:
-  metadata.gz: c14bbf7a03c2476e1521a5c47499edf2603def467bc24be8309f5ba7aeaf6c67e9023a0b6419c5e8561608c97b4c826234869b80736219e26347b98f414c4567
-  data.tar.gz: 2c01db4e521000aadb18285830d2007642310d4d882b9acda8454c071792c9e4a87cab6ce9528fca22eba1f8a194d0b5e753d0c38d864f74fbe71ad488851792
+  metadata.gz: ea6d083e9e2b7f1907c019ac450232cb33cd0c060b0f71aa23a84099b9d45f8b476458598d2be36d9d4061da88f8b702cc9e8fbfcc38dd50446198d2f2741f22
+  data.tar.gz: 553ca24e53f1a98b30a782ae58d2a0005139675e1f6de23f6d2b0dae2d92553de690b6eb5642d6567204890c59a4be8ec1c15eff868963264951271b0c2c0cda

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

@@ -19,25 +19,39 @@ module Uc3DmpS3
   #
   class Client
     NARRATIVE_KEY_PREFIX = 'narratives/'
+    RESOURCE_KEY_PREFIX = 'external_resources/'
 
     MSG_S3_FAILURE = 'Unable to save the object at this time'
 
     class << self
       # Put the narrative file into the S3 bucket
-      # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+      def put_resource_file(file:, explorer_details:, base64: false)
+        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}"
+
+        _put_object(key:, tags: tg, payload: file)
+      rescue Aws::Errors::ServiceError => e
+        msg = "Unable to write External Resource file to S3 bucket (#{tg})"
+        raise ClientError, "#{msg} - #{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?
 
         key = "#{NARRATIVE_KEY_PREFIX}#{SecureRandom.hex(8)}.pdf"
-        tg = dmp_id.nil? ? "PRE-DMP_ID=#{Time.now.strftime('%Y-%m-%d')}" : "DMP_ID=#{CGI.escape(dmp_id)}"
+        tg = "DMP_ID=#{CGI.escape(dmp_id)}" unless dmp_id.nil?
         body = base64 ? Base64.decode64(document) : document
 
-        _put_object(key: key, tags: tg, payload: body)
+        _put_object(key:, tags: tg, payload: body)
       rescue Aws::Errors::ServiceError => e
-        msg = "Unable to write PDF narrative to S3 bucket (dmp_id: #{dmp_id.nil? ? 'PRE-DMP_ID' : dmp_id})"
+        msg = "Unable to write PDF narrative to S3 bucket (dmp_id: #{dmp_id})"
         raise ClientError, "#{msg} - #{e.message}"
       end
-      # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
 
       # Fetch the narrative file from the S3 bucket
       def get_narrative(key:)
@@ -57,7 +71,7 @@ module Uc3DmpS3
 
         client = Aws::S3::Client.new(region: ENV.fetch('AWS_REGION', nil))
         bucket = ENV['S3_BUCKET'].gsub('arn:aws:s3:::', '')
-        resp = client.put_object({ body: payload, bucket: bucket, key: key, tagging: tags })
+        resp = client.put_object({ body: payload, bucket:, key:, tagging: tags })
         resp.successful? ? key : nil
       end
 
@@ -68,7 +82,7 @@ module Uc3DmpS3
 
         client = Aws::S3::Client.new(region: ENV.fetch('AWS_REGION', 'us-west-2'))
         bucket = ENV['S3_BUCKET'].gsub('arn:aws:s3:::', '')
-        resp = client.get_object({ bucket: bucket, key: key })
+        resp = client.get_object({ bucket:, key: })
         return nil if resp.nil? || !resp.content_length.positive?
 
         resp.body.is_a?(String) ? resp.body : resp.body.read

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-s3
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Brian Riley
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-17 00:00:00.000000000 Z
+date: 2023-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -138,7 +138,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'false'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -146,15 +146,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 general support for accessing the DMPTool S3 Bucket
 test_files: []