cloudinary 1.21.0 → 1.22.0

data/lib/cloudinary/auth_token.rb

@@ -43,7 +43,7 @@ module Cloudinary
       token << "exp=#{expiration}"
       token << "acl=#{escape_to_lower(acl)}" if acl
       to_sign = token.clone
-      to_sign << "url=#{escape_to_lower(url)}" if url
+      to_sign << "url=#{escape_to_lower(url)}" if url && acl.blank?
       auth = digest(to_sign.join(SEPARATOR), key)
       token << "hmac=#{auth}"
       "#{name}=#{token.join(SEPARATOR)}"

data/lib/cloudinary/base_api.rb

@@ -59,13 +59,14 @@ module Cloudinary::BaseApi
 
   private
 
-  def call_cloudinary_api(method, uri, user, password, params, options, &api_url_builder)
+  def call_cloudinary_api(method, uri, auth, params, options, &api_url_builder)
     cloudinary = options[:upload_prefix] || Cloudinary.config.upload_prefix || 'https://api.cloudinary.com'
     api_url    = Cloudinary::Utils.smart_escape(api_url_builder.call(cloudinary, uri).flatten.join('/'))
     timeout    = options[:timeout] || Cloudinary.config.timeout || 60
     proxy      = options[:api_proxy] || Cloudinary.config.api_proxy
 
     headers = { "User-Agent" => Cloudinary::USER_AGENT }
+    headers.merge!("Authorization" => get_authorization_header_value(auth))
 
     if options[:content_type] == :json
       payload = params.to_json
@@ -74,6 +75,21 @@ module Cloudinary::BaseApi
       payload = params.reject { |_, v| v.nil? || v == "" }
     end
 
-    call_json_api(method, api_url, payload, timeout, headers, proxy, user, password)
+    call_json_api(method, api_url, payload, timeout, headers, proxy)
+  end
+
+  def get_authorization_header_value(auth)
+    if auth[:oauth_token].present?
+      "Bearer #{auth[:oauth_token]}"
+    else
+      "Basic #{Base64.urlsafe_encode64("#{auth[:key]}:#{auth[:secret]}")}"
+    end
+  end
+
+  def validate_authorization(api_key, api_secret, oauth_token)
+    return if oauth_token.present?
+
+    raise("Must supply api_key") if api_key.nil?
+    raise("Must supply api_secret") if api_secret.nil?
   end
 end

data/lib/cloudinary/uploader.rb

@@ -21,6 +21,7 @@ class Cloudinary::Uploader
       :access_control            => Cloudinary::Utils.json_array_param(options[:access_control]),
       :access_mode               => options[:access_mode],
       :allowed_formats           => Cloudinary::Utils.build_array(options[:allowed_formats]).join(","),
+      :asset_folder              => options[:asset_folder],
       :async                     => Cloudinary::Utils.as_safe_bool(options[:async]),
       :auto_tagging              => options[:auto_tagging] && options[:auto_tagging].to_f,
       :background_removal        => options[:background_removal],
@@ -33,6 +34,7 @@ class Cloudinary::Uploader
       :custom_coordinates        => Cloudinary::Utils.encode_double_array(options[:custom_coordinates]),
       :detection                 => options[:detection],
       :discard_original_filename => Cloudinary::Utils.as_safe_bool(options[:discard_original_filename]),
+      :display_name              => options[:display_name],
       :eager                     => Cloudinary::Utils.build_eager(options[:eager]),
       :eager_async               => Cloudinary::Utils.as_safe_bool(options[:eager_async]),
       :eager_notification_url    => options[:eager_notification_url],
@@ -53,6 +55,7 @@ class Cloudinary::Uploader
       :phash                     => Cloudinary::Utils.as_safe_bool(options[:phash]),
       :proxy                     => options[:proxy],
       :public_id                 => options[:public_id],
+      :public_id_prefix          => options[:public_id_prefix],
       :quality_analysis          => Cloudinary::Utils.as_safe_bool(options[:quality_analysis]),
       :quality_override          => options[:quality_override],
       :raw_convert               => options[:raw_convert],
@@ -66,6 +69,7 @@ class Cloudinary::Uploader
       :unique_filename           => Cloudinary::Utils.as_safe_bool(options[:unique_filename]),
       :upload_preset             => options[:upload_preset],
       :use_filename              => Cloudinary::Utils.as_safe_bool(options[:use_filename]),
+      :use_filename_as_display_name => Cloudinary::Utils.as_safe_bool(options[:use_filename_as_display_name]),
       :accessibility_analysis    => Cloudinary::Utils.as_safe_bool(options[:accessibility_analysis]),
       :metadata                  => Cloudinary::Utils.encode_context(options[:metadata])
     }
@@ -363,11 +367,19 @@ class Cloudinary::Uploader
     options      = options.clone
     return_error = options.delete(:return_error)
     use_cache = options[:use_cache] || Cloudinary.config.use_cache
-
     params, non_signable = yield
     non_signable         ||= []
 
-    unless options[:unsigned]
+    headers                       = { "User-Agent" => Cloudinary::USER_AGENT }
+    headers['Content-Range']      = options[:content_range] if options[:content_range]
+    headers['X-Unique-Upload-Id'] = options[:unique_upload_id] if options[:unique_upload_id]
+    headers.merge!(options[:extra_headers]) if options[:extra_headers]
+
+    oauth_token = options[:oauth_token] || Cloudinary.config.oauth_token
+
+    if oauth_token
+      headers["Authorization"] = "Bearer #{oauth_token}"
+    elsif !options[:unsigned]
       api_key             = options[:api_key] || Cloudinary.config.api_key || raise(CloudinaryException, "Must supply api_key")
       api_secret          = options[:api_secret] || Cloudinary.config.api_secret || raise(CloudinaryException, "Must supply api_secret")
       signature_algorithm = options[:signature_algorithm]
@@ -379,11 +391,7 @@ class Cloudinary::Uploader
 
     result = nil
 
-    api_url                  = Cloudinary::Utils.cloudinary_api_url(action, options)
-    headers                  = { "User-Agent" => Cloudinary::USER_AGENT }
-    headers['Content-Range'] = options[:content_range] if options[:content_range]
-    headers['X-Unique-Upload-Id'] = options[:unique_upload_id] if options[:unique_upload_id]
-    headers.merge!(options[:extra_headers]) if options[:extra_headers]
+    api_url = Cloudinary::Utils.cloudinary_api_url(action, options)
     RestClient::Request.execute(:method => :post, :url => api_url, :payload => params.reject { |k, v| v.nil? || v=="" }, :timeout => timeout, :headers => headers, :proxy => proxy) do
     |response, request, tmpresult|
       raise CloudinaryException, "Server returned unexpected status code - #{response.code} - #{response.body}" unless [200, 400, 401, 403, 404, 500].include?(response.code)

data/lib/cloudinary/utils.rb

@@ -352,18 +352,30 @@ class Cloudinary::Utils
   # @return [string] layer transformation string
   # @private
   def self.process_layer(layer)
+     if layer.is_a? String and layer.start_with?("fetch:")
+      layer = {:url => layer[6..-1]} # omit "fetch:" prefix
+     end
      if layer.is_a? Hash
        layer = symbolize_keys layer
        public_id     = layer[:public_id]
        format        = layer[:format]
+       fetch         = layer[:url]
        resource_type = layer[:resource_type] || "image"
-       type          = layer[:type] || "upload"
+       type          = layer[:type]
        text          = layer[:text]
        text_style    = nil
        components    = []
 
+       if type.nil?
+         if fetch.nil?
+           type = "upload"
+         else
+           type = "fetch"
+         end
+       end
+
        if public_id.present?
-          if type == "fetch" && public_id.match(%r(^https?:/)i)
+          if type == "fetch" and public_id.match(%r(^https?:/)i)
             public_id = Base64.urlsafe_encode64(public_id)
           else
             public_id = public_id.gsub("/", ":")
@@ -371,14 +383,15 @@ class Cloudinary::Utils
           end
        end
 
-       if text.blank? && resource_type != "text"
-         if public_id.blank?
+       if fetch.present? && fetch.match(%r(^https?:/)i)
+         fetch = Base64.urlsafe_encode64(fetch)
+       elsif text.blank? && resource_type != "text"
+         if public_id.blank? && type != "fetch"
            raise(CloudinaryException, "Must supply public_id for resource_type layer_parameter")
          end
          if resource_type == "subtitles"
            text_style = text_style(layer)
          end
-
        else
          resource_type = "text"
          type          = nil
@@ -404,6 +417,7 @@ class Cloudinary::Utils
        components.push(type) if type != "upload"
        components.push(text_style)
        components.push(public_id)
+       components.push(fetch)
        components.push(text)
        layer = components.reject(&:blank?).join(":")
      end
@@ -1089,7 +1103,7 @@ class Cloudinary::Utils
     Cloudinary::AuthToken.generate options
 
   end
-  
+
   private
 
 
@@ -1106,24 +1120,24 @@ class Cloudinary::Utils
     source
   end
   private_class_method :fully_unescape
-  
+
   def self.hash_query_params(hash)
     if hash.respond_to?("to_query")
       hash.to_query
     else
-      flat_hash_to_query_params(hash)      
+      flat_hash_to_query_params(hash)
     end
   end
 
   def self.flat_hash_to_query_params(hash)
-    hash.collect do |key, value|      
+    hash.collect do |key, value|
       if value.is_a?(Array)
         value.map{|v| "#{CGI.escape(key.to_s)}[]=#{CGI.escape(v.to_s)}"}.join("&")
-      else  
+      else
         "#{CGI.escape(key.to_s)}=#{CGI.escape(value.to_s)}"
-      end        
+      end
     end.compact.sort!.join('&')
-  end  
+  end
 
   def self.number_pattern
     "([0-9]*)\\.([0-9]+)|([0-9]+)"

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.21.0"
+  VERSION = "1.22.0"
 end

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

@@ -802,7 +802,7 @@ var slice = [].slice,
     function TextLayer(options) {
       var keys;
       TextLayer.__super__.constructor.call(this, options);
-      keys = ["resourceType", "resourceType", "fontFamily", "fontSize", "fontWeight", "fontStyle", "textDecoration", "textAlign", "stroke", "letterSpacing", "lineSpacing", "fontHinting", "fontAntialiasing", "text"];
+      keys = ["resourceType", "resourceType", "fontFamily", "fontSize", "fontWeight", "fontStyle", "textDecoration", "textAlign", "stroke", "letterSpacing", "lineSpacing", "fontHinting", "fontAntialiasing", "text", "textStyle"];
       if (options != null) {
         keys.forEach((function(_this) {
           return function(key) {
@@ -886,6 +886,11 @@ var slice = [].slice,
       return this;
     };
 
+    TextLayer.prototype.textStyle = function(textStyle) {
+      this.options.textStyle = textStyle;
+      return this;
+    };
+
 
     /**
      * generate the string representation of the layer
@@ -921,6 +926,10 @@ var slice = [].slice,
     };
 
     TextLayer.prototype.textStyleIdentifier = function() {
+      // Note: if a text-style argument is provided as a whole, it overrides everything else, no mix and match.
+      if (!Util.isEmpty(this.options.textStyle)) {
+        return this.options.textStyle;
+      }
       var components;
       components = [];
       if (this.options.fontWeight !== "normal") {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 1.22.0
 platform: ruby
 authors:
 - Nadav Soferman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-23 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws_cf_signer
@@ -276,7 +276,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubyforge_project: cloudinary
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Client library for easily using the Cloudinary service