cloudinary 1.27.0 → 2.3.0

data/lib/cloudinary/utils.rb

@@ -4,15 +4,14 @@
 require 'digest/sha1'
 require 'zlib'
 require 'uri'
-require 'aws_cf_signer'
 require 'json'
 require 'cgi'
+require 'faraday'
+require 'faraday/multipart'
 require 'cloudinary/auth_token'
 require 'cloudinary/responsive'
 
 class Cloudinary::Utils
-  # @deprecated Use Cloudinary::SHARED_CDN
-  SHARED_CDN = Cloudinary::SHARED_CDN
   MODE_DOWNLOAD = "download"
   DEFAULT_RESPONSIVE_WIDTH_TRANSFORMATION = {:width => :auto, :crop => :limit}
   CONDITIONAL_OPERATORS = {
@@ -98,7 +97,6 @@ class Cloudinary::Utils
       secure_distribution
       shorten
       sign_url
-      ssl_detected
       type
       url_suffix
       use_root_path
@@ -155,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
@@ -513,7 +511,7 @@ class Cloudinary::Utils
   end
 
   # Warning: options are being destructively updated!
-  def self.unsigned_download_url(source, options = {})
+  def self.cloudinary_url(source, options = {})
 
     patch_fetch_format(options)
     type = options.delete(:type)
@@ -530,7 +528,6 @@ class Cloudinary::Utils
 
     sign_url = config_option_consume(options, :sign_url)
     secret = config_option_consume(options, :api_secret)
-    sign_version = config_option_consume(options, :sign_version) # Deprecated behavior
     url_suffix = options.delete(:url_suffix)
     use_root_path = config_option_consume(options, :use_root_path)
     auth_token = config_option_consume(options, :auth_token)
@@ -578,7 +575,7 @@ class Cloudinary::Utils
     transformation = transformation.gsub(%r(([^:])//), '\1/')
     if sign_url && ( !auth_token || auth_token.empty?)
       raise(CloudinaryException, "Must supply api_secret") if (secret.nil? || secret.empty?)
-      to_sign = [transformation, sign_version && version, source_to_sign].reject(&:blank?).join("/")
+      to_sign = [transformation, source_to_sign].reject(&:blank?).join("/")
       to_sign = fully_unescape(to_sign)
       signature_algorithm = long_url_signature ? ALGO_SHA256 : signature_algorithm
       hash = hash("#{to_sign}#{secret}", signature_algorithm)
@@ -590,12 +587,22 @@ class Cloudinary::Utils
     prefix = build_distribution_domain(options)
 
     source = [prefix, resource_type, type, signature, transformation, version, source].reject(&:blank?).join("/")
+
+    token = nil
     if sign_url && auth_token && !auth_token.empty?
       auth_token[:url] = URI.parse(source).path
       token = Cloudinary::AuthToken.generate auth_token
-      source += "?#{token}"
     end
 
+    analytics = config_option_consume(options, :analytics, true)
+    analytics_token = nil
+    if analytics && ! original_source.include?("?") # Disable analytics for public IDs containing query params.
+      analytics_token = Cloudinary::Analytics.sdk_analytics_query_param
+    end
+
+    query_params = [token, analytics_token].compact.join("&")
+
+    source += "?#{query_params}" unless query_params.empty?
     source
   end
 
@@ -678,7 +685,7 @@ class Cloudinary::Utils
     shared_domain = !private_cdn
 
     if secure
-      if secure_distribution.nil? || secure_distribution == Cloudinary::OLD_AKAMAI_SHARED_CDN
+      if secure_distribution.nil?
         secure_distribution = private_cdn ? "#{cloud_name}-res.cloudinary.com" : Cloudinary::SHARED_CDN
       end
       shared_domain ||= secure_distribution == Cloudinary::SHARED_CDN
@@ -705,9 +712,7 @@ class Cloudinary::Utils
     cloud_name = config_option_consume(options, :cloud_name) || raise(CloudinaryException, "Must supply cloud_name in tag or in configuration")
 
     source = options.delete(:source)
-    secure = options.delete(:secure)
-    ssl_detected = options.delete(:ssl_detected)
-    secure = ssl_detected || Cloudinary.config.secure if secure.nil?
+    secure = config_option_consume(options, :secure, true)
     private_cdn = config_option_consume(options, :private_cdn)
     secure_distribution = config_option_consume(options, :secure_distribution)
     cname = config_option_consume(options, :cname)
@@ -726,8 +731,9 @@ class Cloudinary::Utils
   def self.base_api_url(path, options = {})
     cloudinary = options[:upload_prefix] || Cloudinary.config.upload_prefix || UPLOAD_PREFIX
     cloud_name = options[:cloud_name] || Cloudinary.config.cloud_name || raise(CloudinaryException, 'Must supply cloud_name')
+    api_version = options[:api_version] || Cloudinary.config.api_version || 'v1_1'
 
-    [cloudinary, 'v1_1', cloud_name, path].join('/')
+    [cloudinary, api_version, cloud_name, path].join('/')
   end
 
   def self.cloudinary_api_url(action = 'upload', options = {})
@@ -796,14 +802,6 @@ class Cloudinary::Utils
     return Cloudinary::Utils.cloudinary_api_url("download", options) + "?" + hash_query_params(cloudinary_params)
   end
 
-  # Utility method that uses the deprecated ZIP download API.
-  # @deprecated Replaced by {download_zip_url} that uses the more advanced and robust archive generation and download API
-  def self.zip_download_url(tag, options = {})
-    warn "zip_download_url is deprecated. Please use download_zip_url instead."
-    cloudinary_params = sign_request({:timestamp=>Time.now.to_i, :tag=>tag, :transformation=>generate_transformation_string(options)}, options)
-    return Cloudinary::Utils.cloudinary_api_url("download_tag.zip", options) + "?" + hash_query_params(cloudinary_params)
-  end
-
   # Returns a URL that when invokes creates an archive and returns it.
   # @param options [Hash]
   # @option options [String|Symbol] :resource_type  The resource type of files to include in the archive. Must be one of :image | :video | :raw
@@ -853,31 +851,6 @@ class Cloudinary::Utils
     download_archive_url(options.merge(:resource_type => resource_type, :prefixes => folder_path))
   end
 
-  def self.signed_download_url(public_id, options = {})
-    aws_private_key_path = options[:aws_private_key_path] || Cloudinary.config.aws_private_key_path
-    if aws_private_key_path
-      aws_key_pair_id = options[:aws_key_pair_id] || Cloudinary.config.aws_key_pair_id || raise(CloudinaryException, "Must supply aws_key_pair_id")
-      authenticated_distribution = options[:authenticated_distribution] || Cloudinary.config.authenticated_distribution || raise(CloudinaryException, "Must supply authenticated_distribution")
-      @signers ||= Hash.new{|h,k| path, id = k; h[k] = AwsCfSigner.new(path, id)}
-      signer = @signers[[aws_private_key_path, aws_key_pair_id]]
-      url = Cloudinary::Utils.unsigned_download_url(public_id, {:type=>:authenticated}.merge(options).merge(:secure=>true, :secure_distribution=>authenticated_distribution, :private_cdn=>true))
-      expires_at = options[:expires_at] || (Time.now+3600)
-      return signer.sign(url, :ending => expires_at)
-    else
-      return Cloudinary::Utils.unsigned_download_url( public_id, options)
-    end
-
-  end
-
-  def self.cloudinary_url(public_id, options = {})
-    if options[:type].to_s == 'authenticated' && !options[:sign_url]
-      result = signed_download_url(public_id, options)
-    else
-      result = unsigned_download_url(public_id, options)
-    end
-    return result
-  end
-
   def self.asset_file_name(path)
     data = Cloudinary.app_root.join(path).read(:mode=>"rb")
     ext = path.extname
@@ -998,6 +971,12 @@ class Cloudinary::Utils
     option_value.nil? ? default_value : option_value
   end
 
+  def self.config_option_fetch(options, option_name, default_value = nil)
+    return options.fetch(option_name) if options.include?(option_name)
+    option_value = Cloudinary.config.send(option_name)
+    option_value.nil? ? default_value : option_value
+  end
+
   def self.as_bool(value)
     case value
     when nil then nil
@@ -1250,7 +1229,8 @@ class Cloudinary::Utils
   # @param options url and transformation options. This argument may be changed by the function!
   #
   def self.patch_fetch_format(options={})
-    if options[:type] === :fetch
+    use_fetch_format = config_option_consume(options, :use_fetch_format)
+    if options[:type] === :fetch || use_fetch_format
       format_arg = options.delete(:format)
       options[:fetch_format] ||= format_arg
     end
@@ -1295,6 +1275,31 @@ class Cloudinary::Utils
     }
   end
 
+  # Handles file parameter.
+  #
+  # @param [Pathname, StringIO, File, String, int, _ToPath] file
+  # @return [StringIO, File, String] A File object.
+  #
+  # @private
+  def self.handle_file_param(file, options = {})
+    original_filename = options[:original_filename] || "cloudinaryfile"
+    content_type = options[:content_type] || "application/octet-stream"
+    if file.is_a?(Pathname)
+      return Faraday::FilePart.new(file.to_s, content_type)
+    elsif file.is_a?(Cloudinary::Blob)
+      return Faraday::FilePart.new(file, file.content_type, file.original_filename)
+    elsif file.is_a?(StringIO)
+      file.rewind
+      return Faraday::FilePart.new(file, content_type, original_filename)
+    elsif file.respond_to?(:read)
+      return Faraday::FilePart.new(file, content_type, original_filename)
+    elsif Cloudinary::Utils.is_remote?(file)
+      return file.to_s
+    end
+    # we got file path
+    Faraday::FilePart.new(file.to_s, content_type)
+  end
+
   # The returned url should allow downloading the backedup asset based on the version and asset id
   #
   # asset and version id are returned with resource(<PUBLIC_ID1>, { versions: true })

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.27.0"
+  VERSION = "2.3.0"
 end

data/lib/cloudinary/video_helper.rb

@@ -53,7 +53,7 @@ module CloudinaryHelper
   #     }
   #   ])
   def cl_video_tag(source, options = {}, &block)
-    source = strip_known_ext(source)
+    source = strip_known_ext(source) unless Cloudinary::Utils.config_option_fetch(options, :use_fetch_format)
     video_attributes = [:autoplay,:controls,:loop,:muted,:poster, :preload]
     options = Cloudinary::Utils.deep_symbolize_keys(DEFAULT_VIDEO_OPTIONS.merge(options))
 
@@ -155,8 +155,9 @@ module CloudinaryHelper
       content_tag('video', tag_options.merge(video_options)) do
         source_tags = sources.map do |source|
           type = source[:type]
+          options[:format] = type
           transformation = source[:transformations] || {}
-          cloudinary_tag("#{source_name}.#{type}", options.merge(transformation)) do |url, _tag_options|
+          cloudinary_tag(source_name, options.merge(transformation)) do |url, _tag_options|
             mime_type = "video/#{(type == 'ogv' ? 'ogg' : type)}"
             if source[:codecs]
               codecs = source[:codecs].is_a?(Array) ? source[:codecs].join(", ") : source[:codecs]

data/lib/cloudinary.rb

@@ -1,10 +1,6 @@
 # Copyright Cloudinary
-if RUBY_VERSION > "2"
-  require "ostruct"
-else
-  require "cloudinary/ostruct2"
-end
 
+require "ostruct"
 require "pathname"
 require "yaml"
 require "uri"
@@ -29,11 +25,9 @@ module Cloudinary
   autoload :CarrierWave, "cloudinary/carrier_wave"
   autoload :Search, "cloudinary/search"
   autoload :SearchFolders, "cloudinary/search_folders"
+  autoload :Analytics, "cloudinary/analytics"
 
-  CF_SHARED_CDN         = "d3jpl91pxevbkh.cloudfront.net"
-  AKAMAI_SHARED_CDN     = "res.cloudinary.com"
-  OLD_AKAMAI_SHARED_CDN = "cloudinary-a.akamaihd.net"
-  SHARED_CDN            = AKAMAI_SHARED_CDN
+  SHARED_CDN      = "res.cloudinary.com"
 
   USER_AGENT      = "CloudinaryRuby/#{VERSION} (Ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL})"
   @@user_platform = defined?(Rails.version) ? "Rails/#{Rails.version}" : ""

data/lib/tasks/cloudinary/fetch_assets.rake

@@ -1,7 +1,9 @@
 require 'tmpdir'
-require 'rest_client'
+require 'faraday'
+require 'faraday/follow_redirects'
 require 'json'
 require 'rubygems/package'
+require 'stringio'
 
 unless Rake::Task.task_defined?('cloudinary:fetch_assets') # prevent double-loading/execution
   namespace :cloudinary do
@@ -11,7 +13,7 @@ unless Rake::Task.task_defined?('cloudinary:fetch_assets') # prevent double-load
       processing_files = %w[canvas-to-blob.min.js load-image.all.min.js jquery.fileupload-process.js jquery.fileupload-image.js jquery.fileupload-validate.js]
       files = index_files + processing_files
 
-      release = JSON(RestClient.get("https://api.github.com/repos/cloudinary/cloudinary_js/releases/latest"))
+      release = JSON(Faraday.get("https://api.github.com/repos/cloudinary/cloudinary_js/releases/latest").body)
 
       FileUtils.rm_rf 'vendor/assets'
       html_folder = 'vendor/assets/html'
@@ -20,7 +22,11 @@ unless Rake::Task.task_defined?('cloudinary:fetch_assets') # prevent double-load
       FileUtils.mkdir_p js_folder
 
       puts "Fetching cloudinary_js version #{release["tag_name"]}\n\n"
-      sio = StringIO.new(RestClient.get(release["tarball_url"]).body)
+      conn = Faraday.new do |faraday|
+        faraday.response :follow_redirects
+        faraday.adapter Faraday.default_adapter
+      end
+      sio = StringIO.new(conn.get(release["tarball_url"]).body)
       file = Zlib::GzipReader.new(sio)
       tar = Gem::Package::TarReader.new(file)
       tar.each_entry do |entry|

data/vendor/assets/javascripts/cloudinary/jquery.cloudinary.js

@@ -422,7 +422,7 @@ var slice = [].slice,
    * @returns {boolean} true if item is empty
    */
   isEmpty = function(item) {
-    return (item == null) || (jQuery.isArray(item) || Util.isString(item)) && item.length === 0 || (jQuery.isPlainObject(item) && jQuery.isEmptyObject(item));
+    return (item == null) || (Array.isArray(item) || Util.isString(item)) && item.length === 0 || (jQuery.isPlainObject(item) && jQuery.isEmptyObject(item));
   };
 
   /**
@@ -565,7 +565,7 @@ var slice = [].slice,
     setData: setData,
     width: width,
     isString: isString,
-    isArray: jQuery.isArray,
+    isArray: Array.isArray,
     isEmpty: isEmpty,
 
     /**
@@ -4728,7 +4728,7 @@ var slice = [].slice,
           return k + '=' + v;
         }).join('|');
       } else if (Util.isArray(value)) {
-        if (value.length > 0 && jQuery.isArray(value[0])) {
+        if (value.length > 0 && Array.isArray(value[0])) {
           upload_params[key] = jQuery.map(value, function(array_value) {
             return array_value.join(',');
           }).join('|');