activestorage-openstack 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e42af67ec68c44713e827b53fbd86a383c9c599b03542ff8c650f325e3a1220c
-  data.tar.gz: 18f57c93f3a9d969fa64bb795ab7d244d5af6e5da047220fd3dc2889a0ed54e1
+  metadata.gz: 3390c8414d007e1749912a22a4a4f623fc294bc7f593e072f7ddd08f30539c69
+  data.tar.gz: a1c065e79ddecd4453a9ee22c034a43244b5438524987f107ff613ba76c52a3d
 SHA512:
-  metadata.gz: 1e30746492e4cc1ff5e1b684c8035a29a9d5a6c671d80e603fef64bbf6e423db38757dc9b3cbef6573d1d50ff27160049901e6451095b9b69243ff203141bf21
-  data.tar.gz: ddc2e4804076f775b9441d4ed7302fe8261c5825eab97d2e3a6b914b919f828b2fa985b49d6a09ace64ad97402ed4152204081611a131b02bc4eda0230ad60ec
+  metadata.gz: dbe91b3011e8b76a7ce85bc9a6d935f8ea84fffee1071e1d251e0385bde15377cb0629954fa07d6f21ea24fa6fbad9734cdefd920b552acdb7dd6317f4663426
+  data.tar.gz: 9d15421fabffbbaefa8b44f572af04e953201b3e56ef8082de29f7978eb866a5a85b7639ea986c3aaab8371ea43ae3c38c42333d6c4d391e79e043a2ac1dd996

data/lib/active_storage/openstack/railtie.rb

@@ -1,18 +1,6 @@
 module ActiveStorage
   module Openstack
     class Railtie < ::Rails::Railtie
-      initializer "active_storage_openstack.blob" do
-        ActiveSupport.on_load(:active_storage_blob) do |klass|
-          klass.after_commit do |blob|
-            # overwrite content type if identification run and
-            # the service responds to change_content_type
-            if blob.identified? && !blob.content_type.blank? &&
-               blob.service.respond_to?(:change_content_type)
-              blob.service.change_content_type(blob.key, blob.content_type)
-            end
-          end
-        end
-      end
     end
   end
 end

data/lib/active_storage/openstack/version.rb

@@ -1,5 +1,5 @@
 module ActiveStorage
   module Openstack
-    VERSION = '1.2.0'
+    VERSION = '1.3.0'
   end
 end

data/lib/active_storage/service/open_stack_service.rb

@@ -11,10 +11,14 @@ module ActiveStorage
       @container = Fog::OpenStack.escape(container)
     end
 
-    def upload(key, io, checksum: nil, **)
+    def upload(key, io, checksum: nil, disposition: nil, content_type: nil, filename: nil, **)
       instrument :upload, key: key, checksum: checksum do
-        params = { 'Content-Type' => guess_content_type(io) }
+        params = { 'Content-Type' => content_type || guess_content_type(io) }
         params['ETag'] = convert_base64digest_to_hexdigest(checksum) if checksum
+        if disposition && filename
+          params['Content-Disposition'] =
+            content_disposition_with(type: disposition, filename: filename)
+        end
 
         begin
           client.put_object(container, key, io, params)
@@ -51,13 +55,12 @@ module ActiveStorage
         raise ActiveStorage::FileNotFoundError if defined?(ActiveStorage::FileNotFoundError)
       end
     end
+
     def delete(key)
       instrument :delete, key: key do
-        begin
-          client.delete_object(container, key)
-        rescue Fog::OpenStack::Storage::NotFound
-          false
-        end
+        client.delete_object(container, key)
+      rescue Fog::OpenStack::Storage::NotFound
+        false
       end
     end
 
@@ -73,12 +76,10 @@ module ActiveStorage
 
     def exist?(key)
       instrument :exist, key: key do |payload|
-        begin
-          answer = object_for(key)
-          payload[:exist] = answer.present?
-        rescue Fog::OpenStack::Storage::NotFound
-          payload[:exist] = false
-        end
+        answer = object_for(key)
+        payload[:exist] = answer.present?
+      rescue Fog::OpenStack::Storage::NotFound
+        payload[:exist] = false
       end
     end
 
@@ -91,7 +92,7 @@ module ActiveStorage
             key,
             expire_at,
             filename: filename
-        )
+          )
         generated_url += '&inline' if disposition.to_s != 'attachment'
         # unfortunately OpenStack Swift cannot overwrite the content type of an object via a temp url
         # so we just ignore the content_type argument here
@@ -124,14 +125,20 @@ module ActiveStorage
       }
     end
 
-    # Non-standard method to change the content type of an existing object
-    def change_content_type(key, content_type)
-      client.post_object(container,
-                         key,
-                         'Content-Type' => content_type)
-      true
-    rescue Fog::OpenStack::Storage::NotFound
-      raise ActiveStorage::FileNotFoundError if defined?(ActiveStorage::FileNotFoundError)
+    def update_metadata(key, content_type:, disposition: nil, filename: nil, **)
+      instrument :update_metadata, key: key, content_type: content_type, disposition: disposition do
+        params = { 'Content-Type' => content_type }
+        if disposition && filename
+          params['Content-Disposition'] =
+            content_disposition_with(type: disposition, filename: ActiveStorage::Filename.new(filename))
+        end
+        client.post_object(container,
+                           key,
+                           params)
+        true
+      rescue Fog::OpenStack::Storage::NotFound
+        raise ActiveStorage::FileNotFoundError if defined?(ActiveStorage::FileNotFoundError)
+      end
     end
 
   private
@@ -143,7 +150,7 @@ module ActiveStorage
     # ActiveStorage sends a `Digest::MD5.base64digest` checksum
     # OpenStack expects a `Digest::MD5.hexdigest` ETag
     def convert_base64digest_to_hexdigest(base64digest)
-      base64digest.unpack('m0').first.unpack('H*').first
+      base64digest.unpack1('m0').unpack1('H*')
     end
 
     def unix_timestamp_expires_at(seconds_from_now)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activestorage-openstack
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Chedli Bourguiba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-openstack