Fix direct upload of raw files

Author: const-cloudinary

lib/active_storage/service/cloudinary_service.rb

@@ -72,6 +72,14 @@ def url_for_direct_upload(key, **options)
       instrument :url, key: key do |payload|
         options = {:resource_type => resource_type(nil, key)}.merge(@options.merge(options.symbolize_keys))
         options[:public_id] = public_id_internal(key)
+        # Provide file format for raw files, since js client does not include original file name.
+        #
+        # When the file is uploaded from the server, the request includes original filename. That allows Cloudinary
+        # to identify file extension and append it to the public id of the file (raw files include file extension
+        # in their public id, opposed to transformable assets (images/video) that use only basename). When uploading
+        # through direct upload (client side js), filename is missing, and that leads to inconsistent/broken URLs.
+        # To avoid that, we explicitly pass file format in options.
+        options[:format] = ext_for_file(key) if options[:resource_type] == "raw"
         options[:context] = {active_storage_key: key}
         options.delete(:file)
         payload[:url] = api_uri("upload", options)
@@ -174,7 +182,7 @@ def api_uri(action, options)
     # @param [string]                   content_type The content type of the file.
     #
     # @return [string] The extension of the filename.
-    def ext_for_file(key, filename, content_type)
+    def ext_for_file(key, filename = nil, content_type = nil)
       if filename.blank?
         options = key.respond_to?(:attributes) ? key.attributes : {}
         filename = ActiveStorage::Filename.new(options[:filename]) if options.has_key?(:filename)
@@ -200,6 +208,8 @@ def public_id_internal(key)
     end
 
     def content_type_to_resource_type(content_type)
+      return 'image' if content_type.nil?
+
       type, subtype = content_type.split('/')
       case type
       when 'video', 'audio'

spec/active_storage/service/cloudinary_service_spec.rb

@@ -36,6 +36,12 @@
         url = @service.url_for_direct_upload(key)
         expect(url).to include("context=active_storage_key%3D#{key}")
       end
+
+      it "should include format for raw file" do
+        key = ActiveStorage::BlobKey.new key: SecureRandom.base58(24), filename: TEST_RAW
+        url = @service.url_for_direct_upload(key, resource_type: "raw")
+        expect(url).to include("format=" + File.extname(TEST_RAW).delete('.'))
+      end
     end
 
     it "should support uploading to Cloudinary" do