cloudinary 2.0.2 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0eb913c34bb7e22bdd7c72d748ce67956a73923772932137b4b3c3e58b922df
-  data.tar.gz: b2d8aac422d47d0777b132c87649379d0a9535a83a84245202fecbd477d06803
+  metadata.gz: 7c9fd54c62a8ad7408044ceb1be3178c98a250a3d874fc9b8f6f47f4e24b676c
+  data.tar.gz: 5b8b38c41734a1250c23f312e9afff293acddddc2ee86d506b1c0d0a16391520
 SHA512:
-  metadata.gz: f224ae816b6485ae1abec08b6658037765139f46946f3679a4589083049d498121ff62a3af71f0d9b4ef2a918490dec0c3ffd0177439405037afe10e85138f06
-  data.tar.gz: b6ad12381140938aa3f46342c36d0faba9350e9556e97d29c0a9db949d6e9bf84f709887072876cedd6e9190c60f141b96287db011aadef670717ceaae819e41
+  metadata.gz: a4d6c84719bb67ab74ce7575374bfcfee1e3364fa86df4734a7a4146777b05b0f233aa8b3962b6ef86222bf2e91ee1b59be16ba8b7c00166c54da16c875669d0
+  data.tar.gz: a3af6962c29d2112425b55170a90b63309b1d11418f380b8151988e96f0a8d895fc44a6d1615f4eb0b3eab1d0dfdd47f5fcf6e3d1e2adcd06f7be261e7634d39

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+2.1.1 / 2024-05-28
+==================
+
+  * Fix regression in `cloudinary_url` generation
+
+2.1.0 / 2024-05-27
+==================
+
+New functionality and features
+------------------------------
+
+  * Add support for `rename_folder` Admin API
+  * Add support for `delete_access_key` in Provisioning API
+
+Other Changes
+-------------
+
+  * Fix detection of base64 encoded files with complex MIME type
+  * Fix `fetch` url generation with Active Storage `folder` configuration
+  * Fix usage of deprecated `File.exists?` method
+
 2.0.2 / 2024-04-09
 ==================
 

data/lib/active_storage/service/cloudinary_service.rb

@@ -17,7 +17,9 @@ module CloudinaryHelper
   alias cloudinary_url_internal_original cloudinary_url_internal
 
   def cloudinary_url_internal(source, options = {})
-    source = ActiveStorage::Blob.service.public_id(source) if defined? ActiveStorage::Blob.service.public_id
+    if defined?(ActiveStorage::Blob.service.public_id) && options.fetch(:type, "").to_s != "fetch"
+      source = ActiveStorage::Blob.service.public_id(source)
+    end
     cloudinary_url_internal_original(source, options)
   end
 end
@@ -58,7 +60,7 @@ module ActiveStorage
     def url(key, filename: nil, content_type: '', **options)
       instrument :url, key: key do |payload|
         url = Cloudinary::Utils.cloudinary_url(
-          full_public_id_internal(key),
+          full_public_id_internal(key, options),
           resource_type: resource_type(nil, key, content_type),
           format: ext_for_file(key, filename, content_type),
           **@options.merge(options.symbolize_keys)
@@ -231,10 +233,12 @@ module ActiveStorage
     end
 
     # Returns the full public id including folder.
-    def full_public_id_internal(key)
+    def full_public_id_internal(key, options = {})
       public_id = public_id_internal(key)
 
-      return public_id unless @options[:folder]
+      options = @options.merge(options)
+
+      return public_id if !options[:folder] || options.fetch(:type, "").to_s == "fetch"
 
       File.join(@options.fetch(:folder), public_id)
     end

data/lib/cloudinary/account_api.rb

@@ -260,6 +260,24 @@ class Cloudinary::AccountApi
     call_account_api(:put, ['sub_accounts', sub_account_id, 'access_keys', api_key], params, options.merge(content_type: :json))
   end
 
+  # Deletes access key.
+  #
+  # @param [String]        sub_account_id  The ID of the sub-account.
+  # @param [String, nil]   api_key         The API key.
+  # @param [String, nil]   name            The display name as shown in the management console.
+  # @param [Object]        options         Additional options.
+  def self.delete_access_key(sub_account_id, api_key = nil, name = nil, options = {})
+    uri = ['sub_accounts', sub_account_id, 'access_keys']
+    unless api_key.blank?
+      uri.append(api_key)
+    end
+
+    params = {
+      name: name,
+    }
+    call_account_api(:delete, uri, params, options.merge(content_type: :json))
+  end
+
   def self.call_account_api(method, uri, params, options)
     account_id = options[:account_id] || Cloudinary.account_config.account_id || raise('Must supply account_id')
     api_key    = options[:provisioning_api_key] || Cloudinary.account_config.provisioning_api_key || raise('Must supply provisioning api_key')

data/lib/cloudinary/api.rb

@@ -731,6 +731,21 @@ class Cloudinary::Api
     call_api(:post, "folders/#{folder_name}", {}, options)
   end
 
+  # Renames existing asset folder.
+  #
+  # @param [String] from_path The full path of an existing asset folder.
+  # @param [String] to_path   The full path of the new asset folder.
+  # @param [Hash]   options   The optional parameters.
+  #
+  # @return [Cloudinary::Api::Response]
+  #
+  # @raise [Cloudinary::Api::Error]
+  #
+  # @see https://cloudinary.com/documentation/admin_api#rename_folder
+  def self.rename_folder(from_path, to_path, options={})
+    call_api(:put, "folders/#{from_path}", {:to_folder => to_path}, options)
+  end
+
   # Lists upload mappings by folder and its mapped template (URL).
   #
   # @param [Hash] options The optional parameters. See the

data/lib/cloudinary/helper.rb

@@ -179,7 +179,7 @@ module CloudinaryHelper
     version_store = options.delete(:version_store)
     if options[:version].blank? && (version_store == :file) && defined?(Rails) && defined?(Rails.root)
       file_name = "#{Rails.root}/tmp/cloudinary/cloudinary_sprite_#{source.sub(/\..*/, '')}.version"
-      if File.exists?(file_name)
+      if File.exist?(file_name)
         options[:version] = File.read(file_name).chomp
       end
     end

data/lib/cloudinary/utils.rb

@@ -153,7 +153,7 @@ class Cloudinary::Utils
       zoom
   ].map(&:to_sym)
 
-  REMOTE_URL_REGEX = %r(^ftp:|^https?:|^s3:|^gs:|^data:([\w-]+\/[\w-]+(\+[\w-]+)?)?(;[\w-]+=[\w-]+)*;base64,([a-zA-Z0-9\/+\n=]+)$)
+  REMOTE_URL_REGEX = %r(^ftp:|^https?:|^s3:|^gs:|^data:([\w-]+\/[\w-]+(\.[\w-]+)*(\+[\w-]+)?)?(;[\w-]+=[\w-]+)*;base64,([a-zA-Z0-9\/+\n=]+)$)
 
   LONG_URL_SIGNATURE_LENGTH = 32
   SHORT_URL_SIGNATURE_LENGTH = 8

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "2.0.2"
+  VERSION = "2.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.1
 platform: ruby
 authors:
 - Nadav Soferman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-09 00:00:00.000000000 Z
+date: 2024-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday