cloudinary 1.27.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46b21a3d7dd2411acaaeb35016f2ff7b648aeae5c1d077870f38e858ce1abedf
-  data.tar.gz: 5825bea0988e97e71df1d93fde04739b502230cda987f90415cb46f55df8b6b7
+  metadata.gz: 1244ab3ce91f6fda0b07e5438ed79f896cde743306efb9c3ac58e5a5f1d4a6dc
+  data.tar.gz: a36510b3d2a2e1b788c2455e5def6f314b78b0b94def573a75a4750e96498b6c
 SHA512:
-  metadata.gz: 24c1334398c9c24ce9b0b536e991fb76aa633e1bda93b5e8dcccc1d2ac2f747e4645f52b61ad3b6db7bb9a59a092df602c35b964a05661c151fb6026cd1954c0
-  data.tar.gz: f8f3cdbe7b7374532f5dae2f5dca3543697a2fb2398050b4a7874d6527b3e87ffc84970684aefe25c65f255ba9ec89e15470e28658c28287df781e4ee2144799
+  metadata.gz: 7ba876181927174ec445d3abd04c79cc03af3837713c234ea9a89651131b6dd4c4be6e3ec02d155596d4f2ce821b269600adda74210408af066b04e0671169fb
+  data.tar.gz: 8bcbb47be56d985537d237fcd5989979555ba0d622bf8a6a3f60484e8b31ffd7d0682353ce4768e4f732edb3fe1a909e001640226fc8fe085ff35cc321b662c6

data/.travis.yml

@@ -1,22 +1,16 @@
-dist: focal
+dist: jammy
 language: ruby
 rvm:
-  - 2.6.7
-  - 2.7.4
-  - 3.0.2
+  - 3.1.4
+  - 3.2.2
+  - 3.3.0
 
 matrix:
   include:
-    - name: "Ruby 1.9"
-      dist: precise
-      rvm: 1.9.3
-      before_install:
-        - gem install bundler -v 1.17.3
-    - name: "Ruby 2.5.9"
-      dist: xenial
-      rvm: ruby-2.5.9
-      before_install:
-        - gem install bundler -v 2.3.26
+    # There is an OpenSSL issue on Jammy with Ruby 3.0
+    - name: "Ruby: 3.0.6"
+      dist: focal
+      rvm: 3.0.6
 
 before_script: >
   export CLOUDINARY_URL=$(bash tools/get_test_cloud.sh);

data/CHANGELOG.md

@@ -1,3 +1,129 @@
+2.3.0 / 2025-02-20
+==================
+
+New functionality and features
+------------------------------
+
+  * Add support for `429 Too Many Requests` HTTP status code
+  * Add support for `allow_dynamic_list_values` parameter in `MetadataField`
+  * Add support for `config` Admin API
+
+2.2.0 / 2024-09-08
+==================
+
+New functionality and features
+------------------------------
+
+  * Add support for ActiveStorage model service configuration
+
+Other Changes
+-------------
+
+  * Fix asset type detection in ActiveStorage
+  * Add explicit `ostruct` dependency
+
+2.1.2 / 2024-08-18
+==================
+
+  * Fix ActiveStorage type detection for email files
+  * Add `changelog_uri` to `gemspec`
+
+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
+==================
+
+  * Fix CarrierWave `store!` method
+
+2.0.1 / 2024-04-09
+==================
+
+  * Fix rake tasks
+
+2.0.0 / 2024-04-08
+==================
+
+Breaking Changes
+----------------
+
+* Set minimal Ruby version to `3.0`
+  * For older Rubies use version `1.x` of this library
+* Replace `rest-client` with `faraday`
+* Set config `secure` to `true` by default
+  * All delivery URLs are set to be `https://` by default 
+  * To disable - set `secure` to `false` in config/options
+* Add support for URL Analytics
+  * Adds analytics signature query parameter to the delivery URLs 
+  * To disable - set `analytics` to `false` in config/options
+* Remove deprecated methods
+  * `Cloudinary::Utils.unsigned_download_url`
+    * use `Cloudinary::Utils.cloudinary_url` instead
+  * `Cloudinary::Utils.signed_download_url`
+    * use `Cloudinary::Utils.cloudinary_url` instead
+  * `Cloudinary::Utils.zip_download_url`
+    * use `Cloudinary::Utils.download_zip_url` instead
+  * `cl_zip_download_url`
+    * use `cl_download_zip_url` instead
+* Remove deprecated constants
+
+New functionality and features
+------------------------------
+
+  * Add support for `analyze` API
+  * Support chunked uploads with CarrierWave
+  * Filter users by last login in `users` Provisioning API
+
+1.29.0 / 2024-02-26
+==================
+
+New functionality and features
+------------------------------
+
+  * Add support for `context` parameter in `url_for_direct_upload`
+  * Add support for `use_fetch_format` parameter in `cl_video_tag`
+  * Add support for `fields` parameter in Search and Admin APIs
+  * Add support for access keys management in Account Provisioning API
+
+Other Changes
+-------------
+
+  * Avoid early loading of `ActionView::Base`
+  * Fix `sqlite3` dependency version
+  * Add Rails 7.x to supported versions on `README.md`
+
+1.28.0 / 2023-11-06
+==================
+
+New functionality and features
+------------------------------
+
+  * Add support for `image_file` parameter in `visual_search` Admin API
+  * Add support for `on_success` upload parameter
+
+Other Changes
+-------------
+
+  * Replace `update_all` to `update_column` in CarrierWave storage
+
 1.27.0 / 2023-07-31
 ==================
 

data/README.md

@@ -40,11 +40,13 @@ the [Ruby on Rails SDK Guide](https://cloudinary.com/documentation/rails_integra
 
 | SDK Version | Ruby 1.9.3 | Ruby 2.x | Ruby 3.x |
 |-------------|------------|----------|----------|
-| 1.x         | v          | v        | v        |
+| 1.x         | ✔          | ✔        | ✔        |
+| 2.x         | ✘          | ✘        | ✔        |
 
-| SDK Version | Rails 5.x | Rails 6.x |
-|-------------|-----------|-----------|
-| 1.x         | v         | v         |
+| SDK Version | Rails 5.x | Rails 6.x | Rails 7.x |
+|-------------|-----------|-----------|-----------|
+| 1.x         | ✔         | ✔         | ✔         |
+| 2.x         | ✘         | ✔         | ✔         |
 
 ## Installation
 
@@ -64,7 +66,7 @@ require 'cloudinary'
 - [See full documentation](https://cloudinary.com/documentation/rails_image_manipulation).
 
 ```ruby
- cl_image_tag("sample.jpg", :width => 100, :height => 150, :crop => :fill)
+ cl_image_tag("sample.jpg", width: 100, height: 150, crop: "fill")
 ```
 
 ### Upload

data/cloudinary.gemspec

@@ -7,63 +7,38 @@ Gem::Specification.new do |s|
   s.version     = Cloudinary::VERSION
   s.authors     = ["Nadav Soferman","Itai Lahan","Tal Lev-Ami"]
   s.email       = ["nadav.soferman@cloudinary.com","itai.lahan@cloudinary.com","tal.levami@cloudinary.com"]
-  s.homepage    = "http://cloudinary.com"
+  s.homepage    = "https://cloudinary.com"
   s.license     = "MIT"
 
   s.summary     = %q{Client library for easily using the Cloudinary service}
   s.description = %q{Client library for easily using the Cloudinary service}
 
-  s.rubyforge_project = "cloudinary"
+  s.metadata = {
+    "changelog_uri" => "https://github.com/cloudinary/cloudinary_gem/blob/master/CHANGELOG.md"
+  }
 
-  s.files         = `git ls-files`.split("\n").select { |f| !f.start_with?("test", "spec", "features", "samples") } + Dir.glob("vendor/assets/javascripts/*/*") + Dir.glob("vendor/assets/html/*")
+  s.files         = `git ls-files`.split("\n").select { |f| !f.start_with?("test", "spec", "features", "samples") } +
+    Dir.glob("vendor/assets/javascripts/*/*") + Dir.glob("vendor/assets/html/*")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "aws_cf_signer"
-
-  if RUBY_VERSION >= "2.0.0"
-    s.add_dependency "rest-client", ">= 2.0.0"
-  else
-    s.add_dependency "rest-client"
-  end
-
-  if RUBY_VERSION >= "3.0.0"
-    s.add_development_dependency "rexml"
-  end
-
-  s.add_development_dependency "actionpack"
-  s.add_development_dependency "nokogiri"
-
-  if RUBY_VERSION >= "2.2.0"
-    s.add_development_dependency "rake", ">= 13.0.1"
-  else
-    s.add_development_dependency "rake", "<= 12.2.1"
-  end
-  if RUBY_VERSION >= "2.7.0"
-    s.add_development_dependency "sqlite3"
-  else
-    s.add_development_dependency "sqlite3", "< 1.6.0"
-  end
-
-  s.add_development_dependency "rspec", '>=3.5'
-  s.add_development_dependency "rspec-retry"
-
-  if RUBY_VERSION >= "3.0.0"
-    s.add_development_dependency "rails", "~> 6.0.3"
-  elsif RUBY_VERSION >= "2.2.2"
-    s.add_development_dependency "rails", "~> 5.2"
-  end
-
-  s.add_development_dependency "railties", "<= 4.2.7" if RUBY_VERSION <= "1.9.3"
-  s.add_development_dependency "rspec-rails"
-
-  s.add_development_dependency "rubyzip"
-
-  if RUBY_VERSION <= "2.4.0"
-    s.add_development_dependency "simplecov", "<= 0.17.1" # support testing Ruby 1.9
-    s.add_development_dependency 'loofah', '~>2.19.1'
-    s.add_development_dependency "rails-html-sanitizer", "<1.5.0"
-  else
-    s.add_development_dependency "simplecov", "> 0.18.0"
-  end
+  s.required_ruby_version = '~> 3'
+
+  s.add_dependency "faraday", ">= 2.0.1", "< 3.0.0"
+  s.add_dependency "faraday-multipart", "~> 1.0", ">= 1.0.4"
+  s.add_dependency 'faraday-follow_redirects', '~> 0.3.0'
+  s.add_dependency "ostruct"
+
+  s.add_development_dependency "rails", ">= 6.1.7", "< 8.0.0"
+  s.add_development_dependency "rexml", ">= 3.2.5", "< 4.0.0"
+  s.add_development_dependency "actionpack", ">= 6.1.7", "< 8.0.0"
+  s.add_development_dependency "nokogiri", ">= 1.12.5", "< 2.0.0"
+  s.add_development_dependency "rake", ">= 13.0.6", "< 14.0.0"
+  s.add_development_dependency "sqlite3", ">= 1.4.2", "< 2.0.0"
+  s.add_development_dependency "rspec", ">= 3.11.2", "< 4.0.0"
+  s.add_development_dependency "rspec-retry", ">= 0.6.2", "< 1.0.0"
+  s.add_development_dependency "railties", ">= 6.0.4", "< 8.0.0"
+  s.add_development_dependency "rspec-rails", ">= 6.0.4", "< 7.0.0"
+  s.add_development_dependency "rubyzip", ">= 2.3.0", "< 3.0.0"
+  s.add_development_dependency "simplecov", ">= 0.21.2", "< 1.0.0"
 end

data/lib/active_storage/service/cloudinary_service.rb

@@ -17,7 +17,13 @@ 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
+    service_instance, options = ActiveStorage::Service::CloudinaryService.fetch_service_instance_and_config(source, options)
+    service_instance ||= ActiveStorage::Blob.service
+
+    if defined?(service_instance.public_id) && options.fetch(:type, "").to_s != "fetch"
+      source = service_instance.public_id(source)
+    end
+
     cloudinary_url_internal_original(source, options)
   end
 end
@@ -39,10 +45,12 @@ module ActiveStorage
         begin
           extra_headers = checksum.nil? ? {} : {Headers::CONTENT_MD5 => checksum}
           options = @options.merge(options)
+          resource_type = resource_type(io, key)
+          options[:format] = ext_for_file(key) if resource_type == "raw"
           Cloudinary::Uploader.upload_large(
             io,
             public_id: public_id_internal(key),
-            resource_type: resource_type(io, key),
+            resource_type: resource_type,
             context: {active_storage_key: key, checksum: checksum},
             extra_headers: extra_headers,
             **options
@@ -54,9 +62,10 @@ module ActiveStorage
     end
 
     def url(key, filename: nil, content_type: '', **options)
+      key = find_blob_or_use_key(key)
       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)
@@ -81,7 +90,9 @@ module ActiveStorage
         # 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"
+        context = options.delete(:context)
         options[:context] = {active_storage_key: key}
+        options[:context].reverse_merge!(context) if context.respond_to?(:merge)
         options.delete(:file)
         payload[:url] = api_uri("upload", options)
       end
@@ -95,6 +106,7 @@ module ActiveStorage
     end
 
     def delete(key)
+      key = find_blob_or_use_key(key)
       instrument :delete, key: key do
         options = {
           resource_type: resource_type(nil, key),
@@ -111,6 +123,7 @@ module ActiveStorage
     end
 
     def exist?(key)
+      key = find_blob_or_use_key(key)
       instrument :exist, key: key do |payload|
         begin
           options = {
@@ -147,8 +160,7 @@ module ActiveStorage
 
     # Return the partial content in the byte +range+ of the file at the +key+.
     def download_chunk(key, range)
-      url = Cloudinary::Utils.unsigned_download_url(public_id(key), resource_type: resource_type(nil, key))
-      uri = URI(url)
+      uri = URI(url(key))
       instrument :download, key: key do
         req = Net::HTTP::Get.new(uri)
         range_end = case
@@ -184,6 +196,33 @@ module ActiveStorage
       full_public_id_internal(public_id)
     end
 
+    def self.fetch_service_instance_and_config(source, options)
+      return [nil, options] unless defined?(ActiveStorage::BlobKey) && source.is_a?(ActiveStorage::BlobKey) &&
+        source.respond_to?(:attributes) && source.attributes.key?(:service_name)
+
+      service_name = source.attributes[:service_name]
+
+      begin
+        service_instance = ActiveStorage::Blob.services.fetch(service_name.to_sym)
+
+        unless service_instance.instance_of?(ActiveStorage::Service::CloudinaryService)
+          Rails.logger.error "Expected service instance #{service_instance.class.name} to be of type ActiveStorage::Service::CloudinaryService."
+          return [nil, options]
+        end
+
+        service_config = Rails.application.config.active_storage.service_configurations.fetch(service_name)
+        options        = service_config.merge(options)
+      rescue NameError => e
+        Rails.logger.error "Failed to retrieve the service instance for #{service_name}: #{e.message}"
+        return [nil, options]
+      rescue => e
+        Rails.logger.error "An unexpected error occurred: #{e.message}"
+        return [nil, options]
+      end
+
+      [service_instance, options]
+    end
+
     private
 
     def api_uri(action, options)
@@ -227,10 +266,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
@@ -247,7 +288,7 @@ module ActiveStorage
       case type
       when 'video', 'audio'
         'video'
-      when 'text'
+      when 'text', 'message'
         'raw'
       when 'application'
         case subtype
@@ -270,5 +311,19 @@ module ActiveStorage
       end
       content_type_to_resource_type(content_type)
     end
+
+    def find_blob_or_use_key(key)
+      if key.is_a?(ActiveStorage::BlobKey)
+        key
+      else
+        begin
+          blob = ActiveStorage::Blob.find_by(key: key)
+          blob ? ActiveStorage::BlobKey.new(blob.attributes.as_json) : key
+        rescue ActiveRecord::StatementInvalid => e
+          # Return the original key if an error occurs
+          key
+        end
+      end
+    end
   end
 end

data/lib/cloudinary/account_api.rb

@@ -13,10 +13,10 @@ class Cloudinary::AccountApi
   # @param [Object] options additional options
   def self.create_sub_account(name, cloud_name = nil, custom_attributes = {}, enabled = nil, base_account = nil, options = {})
     params = {
-      name: name,
-      cloud_name: cloud_name,
-      custom_attributes: custom_attributes,
-      enabled: enabled,
+      name:                name,
+      cloud_name:          cloud_name,
+      custom_attributes:   custom_attributes,
+      enabled:             enabled,
       base_sub_account_id: base_account
     }
 
@@ -35,10 +35,10 @@ class Cloudinary::AccountApi
   # @param [Object] options additional options
   def self.update_sub_account(sub_account_id, name = nil, cloud_name = nil, custom_attributes = nil, enabled = nil, options = {})
     params = {
-      name: name,
-      cloud_name: cloud_name,
+      name:              name,
+      cloud_name:        cloud_name,
       custom_attributes: custom_attributes,
-      enabled: enabled
+      enabled:           enabled
     }
 
     call_account_api(:put, ['sub_accounts', sub_account_id], params, options.merge(content_type: :json))
@@ -53,8 +53,8 @@ class Cloudinary::AccountApi
   def self.sub_accounts(enabled = nil, ids = [], prefix = nil, options = {})
     params = {
       enabled: enabled,
-      ids: ids,
-      prefix: prefix
+      ids:     ids,
+      prefix:  prefix
     }
 
     call_account_api(:get, 'sub_accounts', params, options.merge(content_type: :json))
@@ -84,9 +84,9 @@ class Cloudinary::AccountApi
   # @param [Object] options additional options
   def self.create_user(name, email, role, sub_account_ids = [], options = {})
     params = {
-      name: name,
-      email: email,
-      role: role,
+      name:            name,
+      email:           email,
+      role:            role,
       sub_account_ids: sub_account_ids
     }
 
@@ -111,9 +111,9 @@ class Cloudinary::AccountApi
   # @param [Object] options additional options
   def self.update_user(user_id, name = nil, email = nil, role = nil, sub_account_ids = nil, options = {})
     params = {
-      name: name,
-      email: email,
-      role: role,
+      name:            name,
+      email:           email,
+      role:            role,
       sub_account_ids: sub_account_ids
     }
 
@@ -127,18 +127,30 @@ class Cloudinary::AccountApi
     call_account_api(:get, ['users', user_id], {}, options.merge(content_type: :json))
   end
 
-  # Lists users in the account.
-  # @param [Boolean] pending Limit results to pending users (true), users that are not pending (false), or all users (nil, the default)
-  # @param [Array<String>] user_ids A list of up to 100 user IDs. When provided, other parameters are ignored.
-  # @param [String] prefix Returns users where the name or email address begins with the specified case-insensitive string.
-  # @param [String] sub_account_id Only returns users who have access to the specified account.
-  # @param [Object] options additional options
+  # Get a list of the users according to filters.
+  #
+  # @param [Boolean]        pending        Optional. Limit results to pending users (true), users that are not pending (false), or all users (null)
+  # @param [Array<String>]  user_ids       Optional. List of user IDs. Up to 100
+  # @param [String]         prefix         Optional. Search by prefix of the user's name or email. Case-insensitive
+  # @param [String]         sub_account_id Optional. Return only users who have access to the given sub-account
+  # @param [Object]         options        Generic advanced options map, see online documentation.
+  # @option options [Boolean] :last_login  Optional. Return only users that last logged in in the specified range of dates (true),
+  #                                                users that didn't last logged in in that range (false), or all users (null).
+  # @option options [Date]    :from        Optional. Last login start date.
+  # @option options [Date]    :to          Optional. Last login end date.
+  #
+  # @return [Cloudinary::Api::Response] the users' details.
+  #
+  # @raise [Cloudinary::Api::Error] If the request fails.
   def self.users(pending = nil, user_ids = [], prefix = nil, sub_account_id = nil, options = {})
     params = {
-      ids: user_ids,
-      prefix: prefix,
+      ids:            user_ids,
+      prefix:         prefix,
       sub_account_id: sub_account_id,
-      pending: pending
+      pending:        pending,
+      last_login:     options[:last_login].to_s,
+      from:           Cloudinary::Utils.to_usage_api_date_format(options[:from]),
+      to:             Cloudinary::Utils.to_usage_api_date_format(options[:to])
     }
 
     call_account_api(:get, 'users', params, options.merge(content_type: :json))
@@ -210,16 +222,73 @@ class Cloudinary::AccountApi
     call_account_api(:get, ['user_groups', group_id, 'users'], {}, options.merge(content_type: :json))
   end
 
+  # Lists access keys.
+  #
+  # @param [String] sub_account_id  The ID of the sub-account.
+  # @param [Object] options         Additional options.
+  def self.access_keys(sub_account_id, options = {})
+    params = Cloudinary::Api.only(options, :page_size, :page, :sort_by, :sort_order)
+    call_account_api(:get, ['sub_accounts', sub_account_id, 'access_keys'], params, options)
+  end
+
+  # Generates access key.
+  #
+  # @param [String]   sub_account_id  The ID of the sub-account.
+  # @param [String]   name            The display name as shown in the management console.
+  # @param [Boolean]  enabled         Whether to create the access key as enabled (default is enabled).
+  # @param [Object]   options         Additional options.
+  def self.generate_access_key(sub_account_id, name = nil, enabled = nil, options = {})
+    params = {
+      name:    name,
+      enabled: enabled,
+    }
+    call_account_api(:post, ['sub_accounts', sub_account_id, 'access_keys'], params, options.merge(content_type: :json))
+  end
+
+  # Updates access key.
+  #
+  # @param [String]   sub_account_id  The ID of the sub-account.
+  # @param [String]   api_key         The API key.
+  # @param [String]   name            The display name as shown in the management console.
+  # @param [Boolean]  enabled         Enable or disable the access key.
+  # @param [Object]   options         Additional options.
+  def self.update_access_key(sub_account_id, api_key, name = nil, enabled = nil, options = {})
+    params = {
+      name:    name,
+      enabled: enabled,
+    }
+    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')
     api_secret = options[:provisioning_api_secret] || Cloudinary.account_config.provisioning_api_secret || raise('Must supply provisioning api_secret')
+    api_version = options[:api_version] || Cloudinary.config.api_version || 'v1_1'
 
     params.reject! { |_, v| v.nil? }
     auth = { :key => api_key, :secret => api_secret }
 
     call_cloudinary_api(method, uri, auth, params, options) do |cloudinary, inner_uri|
-      [cloudinary, 'v1_1', 'provisioning', 'accounts', account_id, inner_uri]
+      [cloudinary, api_version, 'provisioning', 'accounts', account_id, inner_uri]
     end
   end