activestorage-openstack 1.1.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08cb71cda986de0a17ccb980ce6ff47269904271b531bc180096feb482f1fad4'
-  data.tar.gz: 37d0306d80d740309e78e572654feb170ac77dd6fba0e0381bc13f54f5bc0b80
+  metadata.gz: cce4c99f0a5a3c5cbdef328ae3633196657a04a8c9ba801fe82904b1f0283abf
+  data.tar.gz: 2cf3bcee0842a884a11ae611e7c39cd0a059e690cb2f9872e647999274b68490
 SHA512:
-  metadata.gz: cfaad4fba29cd40fb8f1e17dd917b442bf5759ba740f0a90f8ccb23a5ba2fe56693bd96d6d2973fd0cc4da59b88fcae6a1b52df575a6d48f3fafb4639e013232
-  data.tar.gz: e31cf4aa8e0925af9357bf9c814533f08222436bf6e0f1041067120d8742a8910bbfa89ef9f578b32d542204362a20f7a6246710158e506346c62e93af045a9c
+  metadata.gz: 9a467d3b91dd8c2be7cad76e02f223b43bb4ccbe82b26b19459fb9388f7c21e2e5d31ce051ab325d225159c377157fb96d3701d58b2e0b870edeb4aea5ea2660
+  data.tar.gz: a4ee1f33629ee2ad84ccba999290f27c495a412e867242a97ff5952e2dde22baab641ad1600db2afa47b2aa671f6a22917a79cd576168cd38bf349b246923788

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.1.0'
+    VERSION = '1.4.2'
   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)
@@ -35,7 +39,7 @@ module ActiveStorage
         end
       end
     rescue Fog::OpenStack::Storage::NotFound
-      raise ActiveStorage::FileNotFoundError
+      raise ActiveStorage::FileNotFoundError if defined?(ActiveStorage::FileNotFoundError)
     end
 
     def download_chunk(key, range)
@@ -48,16 +52,15 @@ module ActiveStorage
 
         chunk_buffer.join[range]
       rescue Fog::OpenStack::Storage::NotFound
-        raise ActiveStorage::FileNotFoundError
+        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 = head_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,18 +125,28 @@ 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
+    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.wrap(filename))
+        end
+        client.post_object(container,
+                           key,
+                           params)
+        true
+      rescue Fog::OpenStack::Storage::NotFound
+        raise ActiveStorage::FileNotFoundError if defined?(ActiveStorage::FileNotFoundError)
+      end
     end
 
   private
 
+    def head_for(key)
+      client.head_object(container, key)
+    end
+
     def object_for(key, &block)
       client.get_object(container, key, &block)
     end
@@ -143,7 +154,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.1.0
+  version: 1.4.2
 platform: ruby
 authors:
 - Chedli Bourguiba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-25 00:00:00.000000000 Z
+date: 2020-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-openstack
@@ -56,16 +56,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: 5.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: 5.2.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: ActiveStorage wrapper for OpenStack Storage