uc3-dmp-s3 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 012b85ca0ad4be2d1cc1ee135f15198316202b5ff52f8192831838fd62f576a4
-  data.tar.gz: ca34a6e7221a1290f8a50224b60c5e2b33255b5a348460c5cb43d7fc52f596cd
+  metadata.gz: c92a65afbb3240d8b8f8c743335c59f39251d969c9b4a68b2181af490fb08b62
+  data.tar.gz: 39ea2a070012dac95f25a22e02941037fbc699e61705c5c0f277d1d70659f68d
 SHA512:
-  metadata.gz: ad81d5cc37ffccafdcebb9e8d7c695055e2b929ae401f807f207d9599b93101114dc5f514fb732ece2b4743556c8bf8ef726c3364d31598b7b8981852701302c
-  data.tar.gz: 35d294452bbd39c6f183cdd9f57d3698f12a799c085bd11d4a585b2aad4fb4fdf33e1cf1f42cf15abac4f163ca6548209532f52bd71759b5f4241f35fabad9c5
+  metadata.gz: 36e24653e806818a64ec7cee55eb97b95697e7aa277305ccb33cc6efe6c022fe04588c3d861669f021145264fc24175c7968e4b0b815662c6b2ed741a5430db9
+  data.tar.gz: 9f834984c644f01f5a2c1b011ad49bdbe9c4a19889ebef49147c481795e7af34ee23788e441e40fc9bd1db789e3e954e98a2c6190779b579d410f37947dec122

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

@@ -20,30 +20,29 @@ module Uc3DmpS3
   class Client
     NARRATIVE_KEY_PREFIX = 'narratives/'
 
-    MSG_S3_FAILURE = 'Unable to save the PDF file at this time'
+    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_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:)
         return nil unless key.is_a?(String) && !key.strip.empty? && !ENV['S3_BUCKET'].nil?
 
-        _get_object(key: key.start_with?(NARRATIVE_KEY_PREFIX) ? key : "#{NARRATIVE_KEY_PREFIX}#{key}")
+        obj = _get_object(key: key.start_with?(NARRATIVE_KEY_PREFIX) ? key : "#{NARRATIVE_KEY_PREFIX}#{key}")
+        Base64.encode64(obj)
       rescue Aws::Errors::ServiceError => e
         raise ClientError, "Unable to fetch PDF narrative from S3 bucket (key: #{key}) - #{e.message}"
       end
@@ -56,7 +55,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
 
@@ -67,7 +66,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.1'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-s3
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Brian Riley
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-16 00:00:00.000000000 Z
+date: 2023-10-04 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: []