cloudinary 1.29.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ec56a8224fa9a3318d7e0d3e7ce7747c888767a4b365a752310e38b7747f4a3
-  data.tar.gz: 58f0148449592fb70e8a87bc292ddeea43a09b0f879fca9c62c1594b3ff487cc
+  metadata.gz: 6d6f32cb53d97a60e6d0ec304b1dbee2a80e7d1610c9007a9a0331bf80c3f882
+  data.tar.gz: 29863f2c682c9800cef486624985a8d4f8959b7da19ce0f53b4377bdc0312eaf
 SHA512:
-  metadata.gz: 44e6c4cefaebd3853f8da9c40123d05205b6fa57fd58eb22e1a8a419bad658b3184eb2bd068f79b8d54601793295c333e6a02720d6a5bdbcb699b234432603e2
-  data.tar.gz: de7032533e031e15c51ccc17ff8e77a2aabc6f9aea4958a58d2313b30aeadc8b14574e36090c99a9e58788e3a376bc9330cfdd0e8d77fcb96d3d4deea7cbfd57
+  metadata.gz: 8b7ac1b9edaeb3d8faad6dc1d75442f41cadef751400840c27ff176d370ca0739f68eda398c05efe56b7bfaa04376a0154f17840e15ac670fd4cc9d673527cb0
+  data.tar.gz: c3ba9122af7accec3abf2b9388b62be44e1e483a6f229e13ba40d1d283e9eef75c7179235b2674011e7d49d1fc12284c83b59f0dcfb0eed38e73195815123294

data/.travis.yml

@@ -1,7 +1,6 @@
 dist: jammy
 language: ruby
 rvm:
-  - 2.7.8
   - 3.1.4
   - 3.2.2
   - 3.3.0

data/CHANGELOG.md

@@ -1,3 +1,36 @@
+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
 ==================
 

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 | Rails 7.x |
 |-------------|-----------|-----------|-----------|
-| 1.x         | v         | v         | v         |
+| 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,33 @@ 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.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 >= "3.0.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_development_dependency 'faraday-follow_redirects', '~> 0.3.0'
+  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

@@ -39,10 +39,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
@@ -149,7 +151,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))
+      url = Cloudinary::Utils.cloudinary_url(public_id(key), resource_type: resource_type(nil, key))
       uri = URI(url)
       instrument :download, key: key do
         req = Net::HTTP::Get.new(uri)

data/lib/cloudinary/account_api.rb

@@ -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,
       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))
@@ -252,12 +264,13 @@ class Cloudinary::AccountApi
     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
 

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

@@ -649,7 +649,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
 
@@ -664,7 +664,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
 
@@ -1222,6 +1222,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.
@@ -1236,13 +1255,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
 
@@ -1254,7 +1274,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.

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 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.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

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

@@ -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])