cloudinary 1.27.0 → 2.3.0

data/lib/cloudinary/analytics.rb

@@ -0,0 +1,157 @@
+# frozen_string_literal: true
+
+module Cloudinary
+  module Analytics
+    extend self
+
+    QUERY_KEY    = '_a'
+    ALGO_VERSION = 'B' # The version of the algorithm
+    SDK_CODE     = 'C' # Cloudinary Ruby SDK
+
+    @product      = 'A' # Official SDK. Set to 'B' for integrations.
+    @sdk_code     = SDK_CODE
+    @sdk_version  = Cloudinary::VERSION
+    @tech_version = "#{RUBY_VERSION[/\d+\.\d+/]}"
+
+    CHARS           = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
+    BINARY_PAD_SIZE = 6
+
+    @char_codes = nil
+    @signature  = nil
+
+    # Gets the SDK analytics signature query parameter.
+    #
+    # @return [String] The SDK signature query parameter.
+    def sdk_analytics_query_param
+      "#{QUERY_KEY}=#{self.sdk_analytics_signature}"
+    end
+
+    # Gets the SDK signature by encoding the SDK version and tech version.
+    #
+    # @return [String] The SDK signature.
+    def sdk_analytics_signature
+      return @signature unless @signature.nil?
+
+      begin
+        @signature = ALGO_VERSION + @product + @sdk_code + encode_version(@sdk_version) + encode_version(@tech_version)
+      rescue RangeError
+        @signature = 'E'
+      end
+
+      @signature
+    end
+
+    # Sets the product code.
+    #
+    # Used for integrations.
+    #
+    # @param [String] product The product code to set. 'A' is for the official SDK. 'B' for integrations.
+    #
+    # @return [void]
+    #
+    # @internal
+    def product(product)
+      @product = product
+    end
+
+    # Sets the SDK code.
+    #
+    # Used for integrations.
+    #
+    # @param [String] sdk_code The SDK code to set.
+    #
+    # @return [void]
+    #
+    # @internal
+    def sdk_code(sdk_code)
+      @sdk_code = sdk_code
+    end
+
+    # Sets the SDK version.
+    #
+    # Used for integrations.
+    #
+    # @param [String] sdk_version The SDK version to set (MAJOR.MINOR.PATCH), for example: "1.0.0".
+    #
+    # @return [void]
+    #
+    # @internal
+    def sdk_version(sdk_version)
+      @sdk_version = sdk_version
+    end
+
+    # Sets the tech version.
+    #
+    # Used for integrations.
+    #
+    # @param [String] tech_version The tech version to set (MAJOR.MINOR), for example: "1.0".
+    #
+    # @return [void]
+    #
+    # @internal
+    def tech_version(tech_version)
+      @tech_version = tech_version.split('.').first(2).join('.')
+    end
+
+    # Encodes a semVer-like version string.
+    #
+    # Example:
+    #  input:      '1.24.0'
+    #  explode:    ['1','24','0']
+    #  pad:        ['01','24','00']
+    #  reverse:    ['00', '24', '01']
+    #  implode:    '002401'
+    #  int:        2401
+    #  binary:     '100101100001'
+    #  padded:     '000000100101100001'
+    #  str_split:  ['000000', '100101', '100001']
+    #  getKey:     ['A', 'l', 'h']
+    #  implode:    'Alh'
+    #
+    # @param [String] version Can be either x.y.z or x.y
+    #
+    # @return [String] A string built from 3 characters of the base64 table
+    #
+    # @raise [RangeError] when version is larger than 43.21.26
+    def encode_version(version)
+      parts = version.split('.')
+
+      padded_parts  = parts.map { |part| part.rjust(2, '0') }
+      number        = padded_parts.reverse.join.to_i
+      padded_binary = int_to_padded_bin(number, parts.length * BINARY_PAD_SIZE)
+
+      raise RangeError, 'Version must be smaller than 43.21.26' if padded_binary.length % BINARY_PAD_SIZE != 0
+
+      encoded_chars = padded_binary.chars.each_slice(BINARY_PAD_SIZE).map { |slice| get_key(slice.join) }
+
+      encoded_chars.join
+    end
+
+    # Gets the key for binary value.
+    #
+    # @param [String] binary_value The value.
+    #
+    # @return [Array, Object] The key for the binary value.
+    def get_key(binary_value)
+      @char_codes ||= initialize_char_codes
+
+      @char_codes[binary_value] || ''
+    end
+
+    def initialize_char_codes
+      char_codes = {}
+      CHARS.chars.each_with_index { |char, idx| char_codes[int_to_padded_bin(idx, BINARY_PAD_SIZE)] = char }
+      char_codes
+    end
+
+    # Converts integer to left padded binary string.
+    #
+    # @param [Integer] integer The input.
+    # @param [Integer] pad_num  The num of padding chars.
+    #
+    # @return [String] The padded binary string.
+    def int_to_padded_bin(integer, pad_num)
+      integer.to_s(2).rjust(pad_num, '0')
+    end
+  end
+end

data/lib/cloudinary/api.rb

@@ -14,6 +14,22 @@ class Cloudinary::Api
     call_api(:get, "ping", {}, options)
   end
 
+  # Retrieves account configuration details.
+  #
+  # @param [Hash] options The optional parameters.
+  #
+  # @return [Cloudinary::Api::Response]
+  #
+  # @raise [Cloudinary::Api::Error]
+  #
+  # @see https://cloudinary.com/documentation/admin_api#config
+  def self.config(options={})
+    uri = "config"
+    params = only(options, :settings)
+
+    call_api(:get, uri, params, options)
+  end
+
   # Gets cloud usage details.
   #
   # Returns a report detailing your current Cloudinary cloud usage details, including
@@ -68,7 +84,7 @@ class Cloudinary::Api
     type          = options[:type]
     uri           = "resources/#{resource_type}"
     uri           += "/#{type}" unless type.blank?
-    call_api(:get, uri, only(options, :next_cursor, :max_results, :prefix, :tags, :context, :moderations, :direction, :start_at, :metadata), options)
+    call_api(:get, uri, list_resources_params(options).merge(only(options, :prefix, :start_at)), options)
   end
 
   # Lists assets with the specified tag.
@@ -87,7 +103,7 @@ class Cloudinary::Api
   def self.resources_by_tag(tag, options={})
     resource_type = options[:resource_type] || "image"
     uri           = "resources/#{resource_type}/tags/#{tag}"
-    call_api(:get, uri, only(options, :next_cursor, :max_results, :tags, :context, :moderations, :direction, :metadata), options)
+    call_api(:get, uri, list_resources_params(options), options)
   end
 
   # Lists assets currently in the specified moderation queue and status.
@@ -107,7 +123,7 @@ class Cloudinary::Api
   def self.resources_by_moderation(kind, status, options={})
     resource_type = options[:resource_type] || "image"
     uri           = "resources/#{resource_type}/moderations/#{kind}/#{status}"
-    call_api(:get, uri, only(options, :next_cursor, :max_results, :tags, :context, :moderations, :direction, :metadata), options)
+    call_api(:get, uri, list_resources_params(options), options)
   end
 
   # Lists assets with the specified contextual metadata.
@@ -129,30 +145,9 @@ class Cloudinary::Api
   def self.resources_by_context(key, value=nil, options={})
     resource_type = options[:resource_type] || "image"
     uri           = "resources/#{resource_type}/context"
-    params = only(options, :next_cursor, :max_results, :tags, :context, :moderations, :direction, :key, :value, :metadata)
-    params[:key] = key
-    params[:value] = value
-    call_api(:get, uri, params, options)
+    call_api(:get, uri, list_resources_params(options, :key => key, :value => value), options)
   end
 
-  # Returns the details of the specified asset and all its derived assets by asset id.
-  # 
-  # Note that if you only need details about the original asset,
-  # you can also use the Uploader::upload or Uploader::explicit methods, which return the same information and
-  # are not rate limited.
-  # 
-  # @param [String] asset_id The Asset ID of the asset.
-  # @param [Hash]   options  The optional parameters. See the <a href=https://cloudinary.com/documentation/admin_api#get_the_details_of_a_single_resource target="_blank"> Admin API</a> documentation.
-  # 
-  # @return [Cloudinary::Api::Response]
-  # 
-  # @see https://cloudinary.com/documentation/admin_api#get_the_details_of_a_single_resource
-  def self.resource_by_asset_id(asset_id, options={})
-    uri    = "resources/#{asset_id}"
-    params = prepare_resource_details_params(options)
-    call_api(:get, uri, params, options)
-  end
-  
   # Lists assets with the specified public IDs.
   #
   # @param [String|Array] public_ids The requested public_ids (up to 100).
@@ -168,7 +163,7 @@ class Cloudinary::Api
     resource_type = options[:resource_type] || "image"
     type          = options[:type] || "upload"
     uri           = "resources/#{resource_type}/#{type}"
-    call_api(:get, uri, only(options, :tags, :context, :moderations).merge(:public_ids => public_ids), options)
+    call_api(:get, uri, resources_params(options, :public_ids => public_ids), options)
   end
 
   # Lists assets with the specified asset IDs.
@@ -184,9 +179,7 @@ class Cloudinary::Api
   # @see https://cloudinary.com/documentation/admin_api#get_resources
   def self.resources_by_asset_ids(asset_ids, options={})
     uri = "resources/by_asset_ids"
-    params = only(options, :public_ids, :tags, :moderations, :context)
-    params[:asset_ids] = asset_ids
-    call_api(:get, uri, params, options)
+    call_api(:get, uri, resources_params(options, :asset_ids => asset_ids), options)
   end
 
   # Returns all assets stored directly in a specified asset folder, regardless of the public ID paths of those assets.
@@ -202,9 +195,7 @@ class Cloudinary::Api
   # @see https://cloudinary.com/documentation/dynamic_folders#new_admin_api_endpoints
   def self.resources_by_asset_folder(asset_folder, options={})
     uri = "resources/by_asset_folder"
-    params = only(options, :next_cursor, :max_results, :tags, :context, :moderations, :direction, :key, :value, :metadata)
-    params[:asset_folder] = asset_folder
-    call_api(:get, uri, params, options)
+    call_api(:get, uri, list_resources_params(options, :asset_folder => asset_folder), options)
   end
 
   # Find images based on their visual content.
@@ -216,8 +207,9 @@ class Cloudinary::Api
   # @raise [Cloudinary::Api::Error]
   def self.visual_search(options = {})
     uri    = "resources/visual_search"
-    params = only(options, :image_url, :image_asset_id, :text)
-    call_api(:get, uri, params, options)
+    params = only(options, :image_url, :image_asset_id, :text, :image_file)
+    params[:image_file] = Cloudinary::Utils.handle_file_param(params[:image_file]) if params.has_key?(:image_file)
+    call_api(:post, uri, params, options)
   end
 
   # Returns the details of the specified asset and all its derived assets.
@@ -242,6 +234,23 @@ class Cloudinary::Api
     call_api(:get, uri, prepare_resource_details_params(options), options)
   end
 
+  # Returns the details of the specified asset and all its derived assets by asset id.
+  #
+  # Note that if you only need details about the original asset,
+  # you can also use the Uploader::upload or Uploader::explicit methods, which return the same information and
+  # are not rate limited.
+  #
+  # @param [String] asset_id The Asset ID of the asset.
+  # @param [Hash]   options  The optional parameters. See the <a href=https://cloudinary.com/documentation/admin_api#get_the_details_of_a_single_resource target="_blank"> Admin API</a> documentation.
+  #
+  # @return [Cloudinary::Api::Response]
+  #
+  # @see https://cloudinary.com/documentation/admin_api#get_the_details_of_a_single_resource
+  def self.resource_by_asset_id(asset_id, options={})
+    uri    = "resources/#{asset_id}"
+    call_api(:get, uri, prepare_resource_details_params(options), options)
+  end
+
   # Reverts to the latest backed up version of the specified deleted assets.
   #
   # @param [String|Array] public_ids The public IDs of the backed up assets to restore. They can be existing or
@@ -656,7 +665,7 @@ class Cloudinary::Api
   #
   # @see https://cloudinary.com/documentation/admin_api#update_an_upload_preset
   def self.update_upload_preset(name, options={})
-    params = Cloudinary::Uploader.build_upload_params(options)
+    params = Cloudinary::Uploader.build_upload_params(options, true)
     call_api(:put, "upload_presets/#{name}", params.merge(only(options, :unsigned, :disallow_public_id, :live)), options)
   end
 
@@ -671,7 +680,7 @@ class Cloudinary::Api
   #
   # @see https://cloudinary.com/documentation/admin_api#create_an_upload_preset
   def self.create_upload_preset(options={})
-    params = Cloudinary::Uploader.build_upload_params(options)
+    params = Cloudinary::Uploader.build_upload_params(options, true)
     call_api(:post, "upload_presets", params.merge(only(options, :name, :unsigned, :disallow_public_id, :live)), options)
   end
 
@@ -738,6 +747,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
@@ -1013,9 +1037,7 @@ class Cloudinary::Api
   #
   # @see https://cloudinary.com/documentation/admin_api#create_a_metadata_field
   def self.add_metadata_field(field, options = {})
-    params = only(field, :type, :external_id, :label, :mandatory, :default_value, :validation, :datasource)
-
-    call_metadata_api(:post, [], params, options)
+    call_metadata_api(:post, [], prepare_metadata_field_params(field), options)
   end
 
   # Updates a metadata field by external ID.
@@ -1032,10 +1054,19 @@ class Cloudinary::Api
   #
   # @see https://cloudinary.com/documentation/admin_api#update_a_metadata_field_by_external_id
   def self.update_metadata_field(field_external_id, field, options = {})
-    uri = [field_external_id]
-    params = only(field, :label, :mandatory, :default_value, :validation)
+    uri    = [field_external_id]
 
-    call_metadata_api(:put, uri, params, options)
+    call_metadata_api(:put, uri, prepare_metadata_field_params(field), options)
+  end
+
+  # Prepares optional parameters for add/update_metadata_field API calls.
+  # @param  [Hash]   options Additional options
+  # @return [Object]         Optional parameters
+  def self.prepare_metadata_field_params(field)
+    only(field,
+         :type, :external_id, :label, :mandatory, :restrictions, :default_value, :default_disabled,
+         :validation, :datasource, :allow_dynamic_list_values
+    )
   end
 
   # Deletes a metadata field definition by external ID.
@@ -1229,6 +1260,25 @@ class Cloudinary::Api
     call_metadata_rules_api(:delete, uri, {}, options)
   end
 
+  # Analyzes an asset with the requested analysis type.
+  #
+  # @param [Object] input_type    The type of input for the asset to analyze ('uri').
+  # @param [Object] analysis_type The type of analysis to run ('google_tagging', 'captioning', 'fashion').
+  # @param [Hash] options         The optional parameters.
+  #
+  # @return [Cloudinary::Api::Response]
+  #
+  # @raise [Cloudinary::Api::Error]
+  def self.analyze(input_type, analysis_type, options = {})
+    api_uri = ["analysis", "analyze", input_type]
+    params = only(options, :uri, :parameters)
+    params["analysis_type"] = analysis_type
+
+    options[:api_version] = 'v2'
+
+    call_api(:post, api_uri, params, options)
+  end
+
   protected
 
   # Execute a call api for input params.
@@ -1243,13 +1293,14 @@ class Cloudinary::Api
     api_key     = options[:api_key] || Cloudinary.config.api_key
     api_secret  = options[:api_secret] || Cloudinary.config.api_secret
     oauth_token = options[:oauth_token] || Cloudinary.config.oauth_token
+    api_version = options[:api_version] || Cloudinary.config.api_version || 'v1_1'
 
     validate_authorization(api_key, api_secret, oauth_token)
 
     auth = { :key => api_key, :secret => api_secret, :oauth_token => oauth_token }
 
     call_cloudinary_api(method, uri, auth, params, options) do |cloudinary, inner_uri|
-      [cloudinary, 'v1_1', cloud_name, inner_uri]
+      [cloudinary, api_version, cloud_name, inner_uri]
     end
   end
 
@@ -1261,7 +1312,7 @@ class Cloudinary::Api
     return Cloudinary::Utils.json_decode(response.body)
   rescue => e
     # Error is parsing json
-    raise GeneralError.new("Error parsing server response (#{response.code}) - #{response.body}. Got - #{e}")
+    raise GeneralError.new("Error parsing server response (#{response.status}) - #{response.body}. Got - #{e}")
   end
 
   # Protected function that assists with performing an API call to the metadata_fields part of the Admin API.
@@ -1398,4 +1449,19 @@ class Cloudinary::Api
     params[by_key] = value
     call_api("post", "resources/#{resource_type}/#{type}/update_access_mode", params, options)
   end
+
+  private
+
+  RESOURCES_PARAMS = [:tags, :context, :metadata, :moderations, :fields].freeze
+  LIST_RESOURCES_PARAMS = [:next_cursor, :max_results, :direction].freeze
+
+  def self.resources_params(options, params = {})
+    params.merge!(only(options, *RESOURCES_PARAMS))
+    params[:fields] = Cloudinary::Utils.build_array(options[:fields]).join(",") unless params[:fields].nil?
+    params
+  end
+
+  def self.list_resources_params(options, params = {})
+    params.merge(resources_params(options)).merge!(only(options, *LIST_RESOURCES_PARAMS))
+  end
 end

data/lib/cloudinary/auth_token.rb

@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
 require 'openssl'
-if RUBY_VERSION > "2"
-  require "ostruct"
-else
-  require "cloudinary/ostruct2"
-end
+require "ostruct"
 
 
 module Cloudinary

data/lib/cloudinary/base_api.rb

@@ -1,7 +1,8 @@
-require "rest_client"
+require "faraday"
 require "json"
 
 module Cloudinary::BaseApi
+  @adapter = nil
   class Error < CloudinaryException; end
   class NotFound < Error; end
   class NotAllowed < Error; end
@@ -15,17 +16,19 @@ module Cloudinary::BaseApi
     attr_reader :rate_limit_reset_at, :rate_limit_remaining, :rate_limit_allowed
 
     def initialize(response=nil)
-      if response
-        # This sets the instantiated self as the response Hash
-        update Cloudinary::Api.parse_json_response response
+      unless response
+        return
+      end
 
-        # According to RFC 2616, header names are case-insensitive.
-        lc_headers = response.headers.transform_keys(&:downcase)
+      # This sets the instantiated self as the response Hash
+      update Cloudinary::Api.parse_json_response response
 
-        @rate_limit_allowed   = lc_headers[:x_featureratelimit_limit].to_i if lc_headers[:x_featureratelimit_limit]
-        @rate_limit_reset_at  = Time.parse(lc_headers[:x_featureratelimit_reset]) if lc_headers[:x_featureratelimit_reset]
-        @rate_limit_remaining = lc_headers[:x_featureratelimit_remaining].to_i if lc_headers[:x_featureratelimit_remaining]
-      end
+      # According to RFC 2616, header names are case-insensitive.
+      lc_headers            = response.headers.transform_keys(&:downcase)
+
+      @rate_limit_allowed   = lc_headers["x-featureratelimit-limit"].to_i if lc_headers["x-featureratelimit-limit"]
+      @rate_limit_reset_at  = Time.parse(lc_headers["x-featureratelimit-reset"]) if lc_headers["x-featureratelimit-reset"]
+      @rate_limit_remaining = lc_headers["x-featureratelimit-remaining"].to_i if lc_headers["x-featureratelimit-remaining"]
     end
   end
 
@@ -36,28 +39,30 @@ module Cloudinary::BaseApi
   end
 
   def call_json_api(method, api_url, payload, timeout, headers, proxy = nil, user = nil, password = nil)
-    RestClient::Request.execute(method: method,
-                                url: api_url,
-                                payload: payload,
-                                timeout: timeout,
-                                headers: headers,
-                                proxy: proxy,
-                                user: user,
-                                password: password) do |response|
-      return Response.new(response) if response.code == 200
-      exception_class = case response.code
-                        when 400 then BadRequest
-                        when 401 then AuthorizationRequired
-                        when 403 then NotAllowed
-                        when 404 then NotFound
-                        when 409 then AlreadyExists
-                        when 420 then RateLimited
-                        when 500 then GeneralError
-                        else raise GeneralError.new("Server returned unexpected status code - #{response.code} - #{response.body}")
-                        end
-      json = Cloudinary::Api.parse_json_response(response)
-      raise exception_class.new(json["error"]["message"])
+    conn = Faraday.new(url: api_url) do |faraday|
+      faraday.proxy = proxy if proxy
+      faraday.request :json
+      faraday.adapter @adapter || Faraday.default_adapter
     end
+
+    response = conn.run_request(method.downcase.to_sym, nil, payload, headers) do |req|
+      req.options.timeout = timeout if timeout
+      req.basic_auth(user, password) if user && password
+    end
+
+    return Response.new(response) if response.status == 200
+    exception_class = case response.status
+                      when 400 then BadRequest
+                      when 401 then AuthorizationRequired
+                      when 403 then NotAllowed
+                      when 404 then NotFound
+                      when 409 then AlreadyExists
+                      when 420, 429 then RateLimited
+                      when 500 then GeneralError
+                      else raise GeneralError.new("Server returned unexpected status code - #{response.status} - #{response.body}")
+                      end
+    json = Cloudinary::Api.parse_json_response(response)
+    raise exception_class.new(json["error"]["message"])
   end
 
   private

data/lib/cloudinary/carrier_wave/storage.rb

@@ -36,7 +36,8 @@ class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
       params[:type]=uploader.class.storage_type
 
       params[:resource_type] ||= :auto
-      uploader.metadata = Cloudinary::Uploader.upload(data, params)
+      upload_method = uploader.respond_to?(:upload_chunked?) && uploader.upload_chunked? ? "upload_large" : "upload"
+      uploader.metadata = Cloudinary::Uploader.send(upload_method, data, params)
       if uploader.metadata["error"]
         raise Cloudinary::CarrierWave::UploadError.new(uploader.metadata["error"]["message"], uploader.metadata["error"]["http_code"])
       end
@@ -82,14 +83,7 @@ class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
     end
 
     if defined?(ActiveRecord::Base) && uploader.model.is_a?(ActiveRecord::Base)
-      primary_key = model_class.primary_key.to_sym
-      if defined?(::ActiveRecord::VERSION::MAJOR) && ::ActiveRecord::VERSION::MAJOR > 2
-        model_class.where(primary_key=>uploader.model.send(primary_key)).update_all(column=>name)
-      else
-        # Removed since active record version 3.0.0
-        model_class.update_all({column=>name}, {primary_key=>uploader.model.send(primary_key)})
-      end
-      uploader.model.send :write_attribute, column, name
+      uploader.model.update_column(column, name)
     elsif defined?(Mongoid::Document) && uploader.model.is_a?(Mongoid::Document)
       # Mongoid support
       if Mongoid::VERSION.split(".").first.to_i >= 4

data/lib/cloudinary/carrier_wave.rb

@@ -192,11 +192,6 @@ module Cloudinary::CarrierWave
 
   end
 
-  # @deprecated
-  def self.split_format(identifier)
-    return Cloudinary::PreloadedFile.split_format(identifier)
-  end
-
   def default_format
     "png"
   end

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
@@ -286,13 +286,6 @@ module CloudinaryHelper
     Cloudinary::Utils.private_download_url(public_id, format, options)
   end
 
-  # Helper method that uses the deprecated ZIP download API.
-  # Replaced by cl_download_zip_url that uses the more advanced and robust archive generation and download API
-  # @deprecated
-  def cl_zip_download_url(tag, options = {})
-    Cloudinary::Utils.zip_download_url(tag, options)
-  end
-
   # @see {Cloudinary::Utils.download_archive_url}
   def cl_download_archive_url(options = {})
     Cloudinary::Utils.download_archive_url(options)
@@ -304,13 +297,13 @@ module CloudinaryHelper
   end
 
   def cl_signed_download_url(public_id, options = {})
-    Cloudinary::Utils.signed_download_url(public_id, options)
+    Cloudinary::Utils.cloudinary_url(public_id, options)
   end
 
   def self.included(base)
     ActionView::Helpers::FormBuilder.send(:include, Cloudinary::FormBuilder)
     base.class_eval do
-      if !method_defined?(:image_tag)
+      unless method_defined?(:image_tag)
         include ActionView::Helpers::AssetTagHelper
       end
       alias_method :image_tag_without_cloudinary, :image_tag unless public_method_defined? :image_tag_without_cloudinary
@@ -325,7 +318,6 @@ module CloudinaryHelper
   private
 
   def cloudinary_url_internal(source, options = {})
-    options[:ssl_detected] = request.ssl? if defined?(request) && request && request.respond_to?(:ssl?)
     if defined?(CarrierWave::Uploader::Base) && source.is_a?(CarrierWave::Uploader::Base)
       if source.version_name.present?
         options[:transformation] = Cloudinary::Utils.build_array(source.transformation) + Cloudinary::Utils.build_array(options[:transformation])