paperclip-gcs 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0276c99a9ac183647cbb56a7e76a18e9628804f92d1cc43d065f30cf420025eb
-  data.tar.gz: 19cb24cc258aa9f7ce6da3f12d3ac10d30a9bdf7f884c8518743a6e40b976c1c
+  metadata.gz: a1d92a7ec7300528df2c69939eca97548b3cbb482427b15e3e8e63fcdccc456a
+  data.tar.gz: 36a2ca6b9a42f01266980f76c62443e0d5b68519fbd78d1e8229570b6614111e
 SHA512:
-  metadata.gz: b9db32a7a98bc072dba039c43b3bfdd938ce35a28d653a74ca235d5ab688eae1d38fafb3236d6da6fba22a9aba4552400a6d3df598dad78552a2a8922fb1c9a0
-  data.tar.gz: 39f21cb173009e17497c5581495900fd5213c8314efa2b09beaf6616004c282bc735fff119ec298a2960857b80d89a7c639dc02be73a24a20893d3c0b914ace0
+  metadata.gz: 8a35c54927a1920a05016b0f0053ced96374860164457786e4a9c30a18dbb60152cd28264019766cd93c2627eb1dde0ad328a4881d929f6f57dcb8b5881dfb84
+  data.tar.gz: 4a6a26ec94dcbec160fa73e3b709b601661ee6c514ac1728480654fba12d64e913d5506006351872d1e9544a76bf63d007db0e3c898b606755b3a30834a2ec83

data/README.md

@@ -184,6 +184,14 @@ gcs_storage_class: :multi_regional
 
 The Cache-Control metadata allows you to control whether and for how long browser and Internet caches are allowed to cache your objects.
 
+### gcs_content_disposition
+
+The Content-Disposition metadata allows you to specify the presentation of the object in the browser.
+
+### gcs_content_type
+
+The Content-Type metadata allows you to specify the content type of the object. By default it will use the file content type.
+
 ### Interpolates
 
 #### :gcs_alias_url

data/lib/paperclip/gcs/version.rb

@@ -1,5 +1,5 @@
 module Paperclip
   module Gcs
-    VERSION = "0.3.0"
+    VERSION = "0.3.2"
   end
 end

data/lib/paperclip/storage/gcs/client_repository.rb

@@ -14,7 +14,7 @@ module Paperclip
           clients[config] ||= Google::Cloud.storage(
             config[:project],
             config[:keyfile],
-            config.slice(:scope, :retries, :timeout)
+            **config.slice(:scope, :retries, :timeout)
           )
         end
 

data/lib/paperclip/storage/gcs.rb

@@ -23,6 +23,8 @@ module Paperclip
           @gcs_permissions    = normalize_style(@options[:gcs_permissions])
           @gcs_storage_class  = normalize_style(@options[:gcs_storage_class])
           @gcs_cache_control  = normalize_style(@options[:gcs_cache_control])
+          @gcs_content_type   = normalize_style(@options[:gcs_content_type])
+          @gcs_content_disposition = normalize_style(@options[:gcs_content_disposition])
 
           unless @options[:url].to_s.match(%r{\A:gcs_(alias|path|domain)_url\z}) || @options[:url] == ":asset_host".freeze
             @options[:path] = path_option.gsub(/:url/, @options[:url]).sub(%r{\A:rails_root/public/system}, "".freeze)
@@ -70,14 +72,15 @@ module Paperclip
           log("saving #{path(style)}")
 
           opts = {
-            content_type: file.content_type,
+            content_type: gcs_content_type(file, style),
+            content_disposition: gcs_content_disposition(style),
             cache_control: gcs_cache_control(style),
             encryption_key: gcs_encryption_key,
             acl: gcs_permissions(style),
             storage_class: gcs_storage_class(style),
             metadata: gcs_metadata(style),
           }
-          gcs_bucket.upload_file(file.path, path(style), opts)
+          gcs_bucket.upload_file(file.path, path(style), **opts)
         end
         after_flush_writes
         @queued_for_write = {}
@@ -141,6 +144,14 @@ module Paperclip
         unwrap_proc(@gcs_permissions[style] || @gcs_permissions[:default], self, style)
       end
 
+      def gcs_content_type(file, style = default_style)
+        unwrap_proc(@gcs_content_type[style] || @gcs_content_type[:default], self, style) || file.content_type
+      end
+
+      def gcs_content_disposition(style = default_style)
+        unwrap_proc(@gcs_content_disposition[style] || @gcs_content_disposition[:default], self, style)
+      end
+
       def gcs_storage_class(style = default_style)
         unwrap_proc(@gcs_storage_class[style] || @gcs_storage_class[:default], self, style)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-gcs
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Daichi HIRATA
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-13 00:00:00.000000000 Z
+date: 2023-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kt-paperclip