cloudinary 1.13.1 → 1.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bd2d8e8b2dc86a6dfd91a1d47cceacd541c46b71dc2ac10bb6972674067cea0
-  data.tar.gz: a3af6a9f260fa2a3c3390e5640535ec916c3c4487a806fe9e187b620551d92d1
+  metadata.gz: ab5096280e7accb34f68e18a4979931fa98f0c03bfae01913b388679e499f332
+  data.tar.gz: 6d6afe81d600578d1741d5f4fb0b3a04c98bde8d9320cea260a4b371e8cd3a02
 SHA512:
-  metadata.gz: 0761a1868f2c4fe403b874d510ea44df4b164bc1cf9f30b44d55f074b066fd1634accf98e2adf6bb3e76ee081790f26bc833781371272302cc4c9c41c7c3c190
-  data.tar.gz: 13291d1b0e99402d7cb043fc63d200444646785f1d812e6b323c8e82db2b3034caad6b75796ddaee4d3ab0f99389fecb6445df513e09ce01e6213f492c6e7d6b
+  metadata.gz: 577d651df8534d2a1e294b6b86040507fff83d3af3176c91d436c528145459c110786ae49793a3aa589ae8d9d6107606a2854e5b494ba2207f74174390cb39e7
+  data.tar.gz: 9e8857df349c08949ad9e3327e2d4acad3f7bd4c4f36a667a9e5940f47555df92522ddd9e5cbe55387674994364b1087913bc5e7674f530eacd35a592470ef42

data/CHANGELOG.md

@@ -1,4 +1,9 @@
 
+1.13.2 / 2020-01-19
+===================
+
+  * Fix asset extension detection in active storage service `url` method
+
 1.13.1 / 2019-11-24
 ===================
 

data/lib/active_storage/service/cloudinary_service.rb

@@ -48,9 +48,10 @@ module ActiveStorage
         url = Cloudinary::Utils.cloudinary_url(
           public_id(key),
           resource_type: resource_type(nil, key),
-          format: ext_for_content_type(content_type),
+          format: ext_for_file(filename, content_type),
           **@options.merge(options.symbolize_keys)
         )
+
         payload[:url] = url
 
         url
@@ -149,7 +150,22 @@ module ActiveStorage
       "#{base_url}?#{upload_params.to_query}"
     end
 
-    def ext_for_content_type(content_type)
+    # Helper method for getting the filename extension.
+    #
+    # It does the best effort when original filename does not include extension, but we know the mime-type.
+    #
+    # @param [ActiveStorage::Filename]  filename     The original filename.
+    # @param [string]                   content_type The content type of the file.
+    #
+    # @return [string] The extension of the filename.
+    def ext_for_file(filename, content_type)
+      ext = filename.respond_to?(:extension_without_delimiter) ? filename.extension_without_delimiter : nil
+      return ext unless ext.blank?
+
+      # Raw files are not convertible, no extension guessing for them
+      return nil if content_type_to_resource_type(content_type).eql?('raw')
+
+      # Fallback when there is no extension.
       @formats ||= Hash.new do |h, key|
         ext = Rack::Mime::MIME_TYPES.invert[key]
         h[key] = ext.slice(1..-1) unless ext.nil?
@@ -162,9 +178,7 @@ module ActiveStorage
       key
     end
 
-    def resource_type(io, key = "")
-      options = key.respond_to?(:attributes) ? key.attributes : {}
-      content_type = options[:content_type] || (io.nil? ? '' : Marcel::MimeType.for(io))
+    def content_type_to_resource_type(content_type)
       type, subtype = content_type.split('/')
       case type
       when 'video', 'audio'
@@ -184,5 +198,11 @@ module ActiveStorage
         'image'
       end
     end
+
+    def resource_type(io, key = "")
+      options = key.respond_to?(:attributes) ? key.attributes : {}
+      content_type = options[:content_type] || (io.nil? ? '' : Marcel::MimeType.for(io))
+      content_type_to_resource_type(content_type)
+    end
   end
 end

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.13.1"
+  VERSION = "1.13.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.13.2
 platform: ruby
 authors:
 - Nadav Soferman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-24 00:00:00.000000000 Z
+date: 2020-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws_cf_signer