glib-web 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5022fe611c19e51340f145ab4bb5577c208211186b575a2e784f8f50de06860c
-  data.tar.gz: c1fc17633202ac17023f5040129165779283654334212168933608ed7df12e4f
+  metadata.gz: bbf47486dbe68678b731438238a642383682ac7fa2b5fd85c40784a46dd8b05e
+  data.tar.gz: 48745d3666ada734c838020fc10828187d22c0d06b8f95ad8d45b942ad922518
 SHA512:
-  metadata.gz: d42b359a6e270fcdadfb8592af408974defc48bbd632d9cf91116f3a37fba4c47ac4bd54f53417c07ccb36afc883b1cbb72cd4afc1e0378b7a7dff283079c365
-  data.tar.gz: 2b96d286b67a6e6faa900a474ea93d34a060eef45c0c1d85a493993757497ba8c0a14a624ba3e0764ad9c599bf35518c761f3c061af7a9ec20fa22c6948fd8ae
+  metadata.gz: 8bb4e390bb6058cfa4e262ca6da33770fe934508865790a08cfb42425603e3480ccc928f92ed81493fae82a953a15946f68231310a9983cfa42446361f8d56a7
+  data.tar.gz: c62be0278b0a8f13005d250ffe06beb52cae2fc500eee818995209c8acde78174fc00b449a126ef37eae5f0336be611dbbbcbd4cdf7a0aa7359b7afdcd419bcb

data/app/helpers/glib/json_ui/view_builder/fields.rb

@@ -321,7 +321,7 @@ class Glib::JsonUi::ViewBuilder
 
       string :storagePrefix
       hash :metadata
-      hash :tags
+      string :tagging
 
       required :accepts, :directUploadUrl
 

data/app/views/json_ui/garage/forms/file_upload.json.jbuilder

@@ -50,6 +50,7 @@ page.form options.merge(childViews: ->(form) do
       foo: 'bar',
       zoo: 'baz'
     },
+    tagging: 'key=value&key1=value1',
     files: [
       { name: 'File (Example)', signed_id: ActiveStorage::Attachment.last&.signed_id }
     ]

data/lib/glib/blob.rb

@@ -1,15 +1,23 @@
 ::ActiveStorage::Blob.class_eval do
+  attr_accessor :tagging
+
+  # removing custom_metadata and add tagging
   def service_headers_for_direct_upload
-    service.headers_for_direct_upload key, filename: filename, content_type: content_type, content_length: byte_size, checksum: checksum
+    service.headers_for_direct_upload key, filename: filename, content_type: content_type, content_length: byte_size, checksum: checksum, tagging: tagging
+  end
+  def service_url_for_direct_upload(expires_in: ActiveStorage.service_urls_expire_in)
+    service.url_for_direct_upload key, expires_in: expires_in, content_type: content_type, content_length: byte_size, checksum: checksum, custom_metadata: custom_metadata, tagging: tagging
   end
 
   class << self
-    def create_before_direct_upload!(key: nil, filename:, byte_size:, checksum:, content_type: nil, metadata: nil, service_name: nil, record: nil, prefix: nil)
+    def create_before_direct_upload!(key: nil, filename:, byte_size:, checksum:, content_type: nil, metadata: nil, service_name: nil, record: nil, prefix: nil, tagging: nil)
       key_name = key || generate_unique_secure_token
       if prefix.present?
         key_name = "#{prefix}/#{key_name}"
       end
-      create! key: key_name, filename: filename, byte_size: byte_size, checksum: checksum, content_type: content_type, metadata: metadata, service_name: service_name
+      blob = create! key: key_name, filename: filename, byte_size: byte_size, checksum: checksum, content_type: content_type, metadata: metadata, service_name: service_name
+      blob.tagging = tagging
+      blob
     end
   end
 end

data/lib/glib/direct_uploads_controller.rb

@@ -19,7 +19,7 @@
 
   private
     def blob_args
-      params.require(:blob).permit(:filename, :byte_size, :checksum, :content_type, :prefix, metadata: {}).to_h.symbolize_keys
+      params.require(:blob).permit(:filename, :byte_size, :checksum, :content_type, :prefix, :tagging, metadata: {}).to_h.symbolize_keys
     end
 
     def authenticate_user!

data/lib/glib/engine.rb

@@ -5,8 +5,9 @@ module Glib
 
       # modify direct upload
       config.to_prepare do
+        require_relative 's3_service'
         require_relative 'blob'
-        require_relative 'direct_uploads_controller' 
+        require_relative 'direct_uploads_controller'
       end
     end
   end

data/lib/glib/s3_service.rb

@@ -0,0 +1,30 @@
+require 'active_storage/service/s3_service'
+
+::ActiveStorage::Service::S3Service.class_eval do
+  attr_reader :headers_for_request
+
+  # Change presigned_url to presigned_request
+  # appearently presigned_url hoist all header `x-amz-` to query params.
+  # This is cause problem because S3 server ignore `x-amz-tagging` query params so it fails to tagging an object
+  # API: https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Presigner.html#presigned_request-instance_method
+  # Detail about problem: https://github.com/aws/aws-sdk/issues/782
+  def url_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:, tagging: nil, custom_metadata: {})
+    instrument :url, key: key do |payload|
+      generated_url, headers = object_for(key).presigned_request :put, expires_in: expires_in.to_i,
+        content_type: content_type, content_length: content_length, content_md5: checksum,
+        metadata: custom_metadata, whitelist_headers: ['content-length'], tagging: tagging, **upload_options
+
+      payload[:url] = generated_url
+      @headers_for_request = headers
+
+      generated_url
+    end
+  end
+
+  def headers_for_direct_upload(key, content_type:, checksum:, filename: nil, disposition: nil, tagging: nil, custom_metadata: {}, **)
+    content_disposition = content_disposition_with(type: disposition, filename: filename) if filename
+
+    headers = { 'Content-Type' => content_type, 'Content-MD5' => checksum, 'Content-Disposition' => content_disposition, **custom_metadata_headers(custom_metadata) }
+    headers.merge(headers_for_request)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - ''
@@ -328,6 +328,7 @@ files:
 - lib/glib/json_crawler/http.rb
 - lib/glib/json_crawler/router.rb
 - lib/glib/mailer_tester.rb
+- lib/glib/s3_service.rb
 - lib/glib/test_helpers.rb
 - lib/glib/time_freezable_mailer.rb
 - lib/glib/time_returning_mailer.rb
@@ -352,8 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: ''