cloudinary 1.20.0 → 1.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b641514503d45c3a6c4e8ba5ed87f0f5b8e521260eda789212543be5ccf77a1
-  data.tar.gz: 0f65e99aa08e446f01d783af5284a1265aaa4f28a1e95c284addd30beb36ec8c
+  metadata.gz: fbc5f576707d33b684e97610585e92838695cbd373cace7c16b0078021b46871
+  data.tar.gz: a5fc7e5d8f0930223cb03b4ca07910ba3b8a6e8ac18b5d6028f9a8963311f8d8
 SHA512:
-  metadata.gz: 191f627013b5f97fca44e748fd1c4631f9af58a69680b02fdc6b4604e2ddf31216542fcb88e2d1daa825c0ff22a138f2c7d0b41d4895a69cc1b7eaa42a1ab16a
-  data.tar.gz: 8a5abe09f562e188e1e6d43d05f462939c62c4070ac50e93c3acaf876998e651aa2fc50775a10c5fb324d388fac9d599c5fe0e60480cdbbebeb7eedf699057e8
+  metadata.gz: 888d693726c91cba5113ca6d4e13f89b859fc01fde5603ace994eb13a907881d4d5e84a7150501c970b1792c47286ae4a9d889f61b1e41408e25a4aea20cf11d
+  data.tar.gz: 6a76cfcc6187c87314f1676a769b8fbfcfda08a5a22d00403f689056a680e4acb15d7360b919a2132c254295c8439e2072be74a8a2891362920f217d387d14ef

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -3,7 +3,7 @@ name: Bug report
 about: Bug report for Cloudinary Ruby SDK
 title: ''
 labels: ''
-assignees: const-cloudinary
+assignees: ''
 
 ---
 
@@ -14,11 +14,11 @@ Before proceeding, please update to latest version and test if the issue persist
 …
 
 ## Issue Type (Can be multiple)
-[ ] Build - Can’t install or import the SDK
-[ ] Performance - Performance issues
-[ ] Behaviour - Functions aren’t working as expected (Such as generate URL)
-[ ] Documentation - Inconsistency between the docs and behaviour
-[ ] Other (Specify)
+- [ ] Build - Cannot install or import the SDK
+- [ ] Performance - Performance issues
+- [ ] Behaviour - Functions are not working as expected (such as generate URL)
+- [ ] Documentation - Inconsistency between the docs and behaviour
+- [ ] Other (Specify)
 
 ## Steps to reproduce
 … if applicable
@@ -27,16 +27,17 @@ Before proceeding, please update to latest version and test if the issue persist
 …
 
 ## Operating System
-[ ] Linux
-[ ] Windows
-[ ] OSX
-[ ] All
+- [ ] Linux
+- [ ] Windows
+- [ ] macOS
+- [ ] All
 
 ## Environment and Libraries (fill in the version numbers)
-Cloudinary Ruby SDK version - 0.0.0
-Ruby Version - 0.0.0
-Rails Version - 0.0.0 
-Other Libraries (Carrierwave, ActiveStorage, etc) - 0.0.0
+- Cloudinary Ruby SDK version - 0.0.0
+- Ruby Version - 0.0.0
+- Rails Version - 0.0.0 
+- Other Libraries (Carrierwave, ActiveStorage, etc) - 0.0.0
 
 ## Repository
+
 If possible, please provide a link to a reproducible repository that showcases the problem

data/.github/ISSUE_TEMPLATE/feature_request.md

@@ -3,7 +3,7 @@ name: Feature request
 about: Feature request for Cloudinary Ruby SDK
 title: ''
 labels: ''
-assignees: const-cloudinary
+assignees: ''
 
 ---
 

data/.github/pull_request_template.md

@@ -4,21 +4,28 @@ Provide some context as to what was changed, from an implementation standpoint.
 -->
 
 #### What does this PR address?
-[ ] Gitub issue (Add reference - #XX)
-[ ] Refactoring
-[ ] New feature
-[ ] Bug fix
-[ ] Adds more tests
+- [ ] GitHub issue (Add reference - #XX)
+- [ ] Refactoring
+- [ ] New feature
+- [ ] Bug fix
+- [ ] Adds more tests
 
 #### Are tests included?
-[ ] Yes
-[ ] No
+- [ ] Yes
+- [ ] No
 
-#### Reviewer, Please Note:
+#### Reviewer, please note:
 <!--
 List anything here that the reviewer should pay special attention to. This might
 include, for example:
-• Dependence on other PRs
-• Reference to other Cloudinary SDKs
-• Changes that seem arbitrary without further explanations
+* Dependence on other PRs
+* Reference to other Cloudinary SDKs
+* Changes that seem arbitrary without further explanations
 -->
+
+#### Checklist:
+<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
+<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
+- [ ] My code follows the code style of this project.
+- [ ] My change requires a change to the documentation.
+- [ ] I ran the full test suite before pushing the changes and all the tests pass.

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+1.21.0 / 2021-08-23
+==================
+
+New functionality and features
+------------------------------
+
+  * Add support for `create_slideshow` Upload API
+  * Add support for variables in text style
+  * Add support for `context` and `metadata` in `rename` Upload API
+  * Add support for `reorder_metadata_field_datasource` Admin API
+  * Add `verify_api_response_signature` and `verify_notification_signature` helpers
+  * Add `download_generated_sprite` and `download_multi` methods
+  * Add support for `urls` in multi and sprite APIs
+  * Add support for `live` parameter in upload presets
+  * Add support for `metadata` parameter in `resources` Admin APIs
+
+Other Changes
+-------------
+
+  * Fix `transformations` API call
+  * Fix named parameters normalization issue
+  * Remove duplicates in Search Api fields
+  * Improve configuration tests
+  * Add tests for Provisioning API
+  * Refactor metadata usage in tests
+  * Update GitHub templates
+
 1.20.0 / 2021-03-26
 ==================
 

data/lib/cloudinary.rb

@@ -133,13 +133,22 @@ module Cloudinary
   #
   # @return [OpenStruct]
   def self.make_new_config(config_module)
-    OpenStruct.new((YAML.load(ERB.new(IO.read(config_dir.join("cloudinary.yml"))).result)[config_env] rescue {})).tap do |config|
+    import_settings_from_file.tap do |config|
       config.extend(config_module)
       config.load_config_from_env
     end
   end
 
   private_class_method :make_new_config
+
+  # Import settings from yaml file
+  #
+  # @return [OpenStruct]
+  def self.import_settings_from_file
+    OpenStruct.new((YAML.load(ERB.new(IO.read(config_dir.join("cloudinary.yml"))).result)[config_env] rescue {}))
+  end
+
+  private_class_method :import_settings_from_file
 end
   # Prevent require loop if included after Rails is already initialized.
   require "cloudinary/helper" if defined?(::ActionView::Base)

data/lib/cloudinary/account_api.rb

@@ -128,23 +128,18 @@ class Cloudinary::AccountApi
   end
 
   # Lists users in the account.
-  # @param [Boolean] pending Whether to only return pending users. Default: all users
+  # @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
   def self.users(pending = nil, user_ids = [], prefix = nil, sub_account_id = nil, options = {})
-    params = if user_ids && user_ids.count > 0
-               {
-                 ids: user_ids
-               }
-             else
-               {
-                 prefix: prefix,
-                 sub_account_id: sub_account_id,
-                 pending: pending
-               }
-             end
+    params = {
+      ids: user_ids,
+      prefix: prefix,
+      sub_account_id: sub_account_id,
+      pending: pending
+    }
 
     call_account_api(:get, 'users', params, options.merge(content_type: :json))
   end

data/lib/cloudinary/api.rb

@@ -34,25 +34,25 @@ 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), options)
+    call_api(:get, uri, only(options, :next_cursor, :max_results, :prefix, :tags, :context, :moderations, :direction, :start_at, :metadata), options)
   end
 
   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), options)
+    call_api(:get, uri, only(options, :next_cursor, :max_results, :tags, :context, :moderations, :direction, :metadata), options)
   end
 
   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), options)
+    call_api(:get, uri, only(options, :next_cursor, :max_results, :tags, :context, :moderations, :direction, :metadata), options)
   end
 
   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)
+    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)
@@ -177,24 +177,32 @@ class Cloudinary::Api
   end
 
   def self.transformation(transformation, options={})
-    call_api(:get, "transformations/#{transformation_string(transformation)}", only(options, :next_cursor, :max_results), options)
+    params                  = only(options, :next_cursor, :max_results)
+    params[:transformation] = Cloudinary::Utils.build_eager(transformation)
+    call_api(:get, "transformations", params, options)
   end
 
   def self.delete_transformation(transformation, options={})
-    call_api(:delete, "transformations/#{transformation_string(transformation)}", {}, options)
+    call_api(:delete, "transformations", {:transformation => Cloudinary::Utils.build_eager(transformation)}, options)
   end
 
   # updates - supports:
   #   "allowed_for_strict" boolean
   #   "unsafe_update" transformation params - updates a named transformation parameters without regenerating existing images
   def self.update_transformation(transformation, updates, options={})
-    params                 = only(updates, :allowed_for_strict)
-    params[:unsafe_update] = transformation_string(updates[:unsafe_update]) if updates[:unsafe_update]
-    call_api(:put, "transformations/#{transformation_string(transformation)}", params, options)
+    params                  = only(updates, :allowed_for_strict)
+    params[:unsafe_update]  = Cloudinary::Utils.build_eager(updates[:unsafe_update]) if updates[:unsafe_update]
+    params[:transformation] = Cloudinary::Utils.build_eager(transformation)
+    call_api(:put, "transformations", params, options)
   end
 
   def self.create_transformation(name, definition, options={})
-    call_api(:post, "transformations/#{name}", { :transformation => transformation_string(definition) }, options)
+    params = {
+      :name => name,
+      :transformation => Cloudinary::Utils.build_eager(definition)
+    }
+
+    call_api(:post, "transformations", params, options)
   end
 
   # upload presets
@@ -212,12 +220,12 @@ class Cloudinary::Api
 
   def self.update_upload_preset(name, options={})
     params = Cloudinary::Uploader.build_upload_params(options)
-    call_api(:put, "upload_presets/#{name}", params.merge(only(options, :unsigned, :disallow_public_id)), options)
+    call_api(:put, "upload_presets/#{name}", params.merge(only(options, :unsigned, :disallow_public_id, :live)), options)
   end
 
   def self.create_upload_preset(options={})
     params = Cloudinary::Uploader.build_upload_params(options)
-    call_api(:post, "upload_presets", params.merge(only(options, :name, :unsigned, :disallow_public_id)), options)
+    call_api(:post, "upload_presets", params.merge(only(options, :name, :unsigned, :disallow_public_id, :live)), options)
   end
 
   def self.root_folders(options={})
@@ -478,6 +486,23 @@ class Cloudinary::Api
     call_metadata_api(:post, uri, params, options)
   end
 
+  # Reorders metadata field datasource. Currently supports only value.
+  #
+  # @param [String] field_external_id The ID of the metadata field
+  # @param [String] order_by          Criteria for the order. Currently supports only value
+  # @param [String] direction         Optional (gets either asc or desc)
+  # @param [Hash]   options           Configuration options
+  #
+  # @return [Cloudinary::Api::Response]
+  #
+  # @raise [Cloudinary::Api::Error]
+  def self.reorder_metadata_field_datasource(field_external_id, order_by, direction = nil, options = {})
+    uri    = [field_external_id, "datasource", "order"]
+    params = { :order_by => order_by, :direction => direction }
+
+    call_metadata_api(:post, uri, params, options)
+  end
+
   protected
 
   def self.call_api(method, uri, params, options)

data/lib/cloudinary/search.rb

@@ -1,9 +1,14 @@
 class Cloudinary::Search
+  SORT_BY    = :sort_by
+  AGGREGATE  = :aggregate
+  WITH_FIELD = :with_field
+  KEYS_WITH_UNIQUE_VALUES = [SORT_BY, AGGREGATE, WITH_FIELD].freeze
+
   def initialize
     @query_hash = {
-      :sort_by    => [],
-      :aggregate  => [],
-      :with_field   => []
+      SORT_BY    => {},
+      AGGREGATE  => {},
+      WITH_FIELD => {}
     }
   end
 
@@ -28,23 +33,51 @@ class Cloudinary::Search
     self
   end
 
+  # Sets the `sort_by` field.
+  #
+  # @param [String] field_name   The field to sort by. You can specify more than one sort_by parameter;
+  #                              results will be sorted according to the order of the fields provided.
+  # @param [String] dir          Sort direction. Valid sort directions are 'asc' or 'desc'. Default: 'desc'.
+  #
+  # @return [Cloudinary::Search]
   def sort_by(field_name, dir = 'desc')
-    @query_hash[:sort_by].push(field_name => dir)
+    @query_hash[SORT_BY][field_name] = { field_name => dir }
     self
   end
 
+  # The name of a field (attribute) for which an aggregation count should be calculated and returned in the response.
+  #
+  # You can specify more than one aggregate parameter.
+  #
+  # @param [String] value  Supported values: resource_type, type, pixels (only the image assets in the response are
+  #                        aggregated), duration (only the video assets in the response are aggregated), format, and
+  #                        bytes. For aggregation fields without discrete values, the results are divided into 
+  #                        categories.
+  # @return [Cloudinary::Search]
   def aggregate(value)
-    @query_hash[:aggregate].push(value)
+    @query_hash[AGGREGATE][value] = value
     self
   end
 
+  # The name of an additional asset attribute to include for each asset in the response.
+  #
+  # @param [String] value Possible value: context, tags, and for Tier 2 also image_metadata, and image_analysis.
+  #
+  # @return [Cloudinary::Search]
   def with_field(value)
-    @query_hash[:with_field].push(value)
+    @query_hash[WITH_FIELD][value] = value
     self
   end
 
+  # Returns the query as an hash.
+  #
+  # @return [Hash]
   def to_h
-    @query_hash.select { |_, value| !value.nil? && !(value.is_a?(Array) && value.empty?) }
+    @query_hash.each_with_object({}) do |(key, value), query|
+      next if value.nil? || ((value.is_a?(Array) || value.is_a?(Hash)) && value.blank?)
+
+      query[key] = KEYS_WITH_UNIQUE_VALUES.include?(key) ? value.values : value
+    end
   end
 
   def execute(options = {})

data/lib/cloudinary/uploader.rb

@@ -159,7 +159,9 @@ class Cloudinary::Uploader
         :from_public_id => from_public_id,
         :to_public_id   => to_public_id,
         :to_type        => options[:to_type],
-        :invalidate     => Cloudinary::Utils.as_safe_bool(options[:invalidate])
+        :invalidate     => Cloudinary::Utils.as_safe_bool(options[:invalidate]),
+        :context        => options[:context],
+        :metadata       => options[:metadata]
       }
     end
   end
@@ -207,17 +209,42 @@ class Cloudinary::Uploader
     end
   end
 
-  def self.generate_sprite(tag, options={})
+  SLIDESHOW_PARAMS = [:notification_url, :public_id, :upload_preset]
+
+  # Creates auto-generated video slideshow.
+  #
+  # @param [Hash] options Additional options.
+  #
+  # @return [Hash] Hash with meta information URLs of generated slideshow resources.
+  def self.create_slideshow(options = {})
+    options[:resource_type] ||= :video
+
+    call_api("create_slideshow", options) do
+      params = {
+        :timestamp               => Time.now.to_i,
+        :transformation          => Cloudinary::Utils.build_eager(options[:transformation]),
+        :manifest_transformation => Cloudinary::Utils.build_eager(options[:manifest_transformation]),
+        :manifest_json           => options[:manifest_json] && options[:manifest_json].to_json,
+        :tags                    => options[:tags] && Cloudinary::Utils.build_array(options[:tags]).join(","),
+        :overwrite               => Cloudinary::Utils.as_safe_bool(options[:overwrite])
+      }
+      SLIDESHOW_PARAMS.each { |k| params[k] = options[k] unless options[k].nil? }
+
+      params
+    end
+  end
+
+  # Generates sprites by merging multiple images into a single large image.
+  #
+  # @param [String|Hash] tag Treated as additional options when hash is passed, otherwise as a tag
+  # @param [Hash] options Additional options. Should be omitted when +tag_or_options+ is a Hash
+  #
+  # @return [Hash] Hash with meta information URLs of generated sprite resources
+  def self.generate_sprite(tag, options = {})
     version_store = options.delete(:version_store)
 
     result = call_api("sprite", options) do
-      {
-        :timestamp        => (options[:timestamp] || Time.now.to_i),
-        :tag              => tag,
-        :async            => options[:async],
-        :notification_url => options[:notification_url],
-        :transformation   => Cloudinary::Utils.generate_transformation_string(options.merge(:fetch_format => options[:format]))
-      }
+      Cloudinary::Utils.build_multi_and_sprite_params(tag, options)
     end
 
     if version_store == :file && result && result["version"]
@@ -229,16 +256,15 @@ class Cloudinary::Uploader
     return result
   end
 
-  def self.multi(tag, options={})
+  # Creates either a single animated image, video or a PDF.
+  #
+  # @param [String|Hash] tag Treated as additional options when hash is passed, otherwise as a tag
+  # @param [Hash] options Additional options. Should be omitted when +tag_or_options+ is a Hash
+  #
+  # @return [Hash] Hash with meta information URLs of the generated file
+  def self.multi(tag, options = {})
     call_api("multi", options) do
-      {
-        :timestamp        => (options[:timestamp] || Time.now.to_i),
-        :tag              => tag,
-        :format           => options[:format],
-        :async            => options[:async],
-        :notification_url => options[:notification_url],
-        :transformation   => Cloudinary::Utils.generate_transformation_string(options.clone)
-      }
+      Cloudinary::Utils.build_multi_and_sprite_params(tag, options)
     end
   end
 

data/lib/cloudinary/utils.rb

@@ -13,6 +13,7 @@ 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 = {
     "=" => 'eq',
@@ -334,7 +335,7 @@ class Cloudinary::Utils
     "if_" + normalize_expression(if_value) unless if_value.to_s.empty?
   end
 
-  EXP_REGEXP = Regexp.new('(\$_*[^_ ]+)|(?<!\$)('+PREDEFINED_VARS.keys.join("|")+')'+'|('+CONDITIONAL_OPERATORS.keys.reverse.map { |k| Regexp.escape(k) }.join('|')+')(?=[ _])')
+  EXP_REGEXP = Regexp.new('(\$_*[^_ ]+)|(?<![\$:])('+PREDEFINED_VARS.keys.join("|")+')'+'|('+CONDITIONAL_OPERATORS.keys.reverse.map { |k| Regexp.escape(k) }.join('|')+')(?=[ _])')
   EXP_REPLACEMENT = PREDEFINED_VARS.merge(CONDITIONAL_OPERATORS)
 
   def self.normalize_expression(expression)
@@ -430,6 +431,8 @@ class Cloudinary::Utils
   ]
 
   def self.text_style(layer)
+    return layer[:text_style] if layer[:text_style].present?
+
     font_family = layer[:font_family]
     font_size   = layer[:font_size]
     keywords    = []
@@ -719,6 +722,43 @@ class Cloudinary::Utils
     params
   end
 
+  # Helper method for generating download URLs
+  #
+  # @param [String] action @see Cloudinary::Utils.cloudinary_api_url
+  # @param [Hash] params Query parameters in generated URL
+  # @param [Hash] options Additional options
+  # @yield [query_parameters] Invokes the block with query parameters to override how to encode them
+  #
+  # @return [String]
+  def self.cloudinary_api_download_url(action, params, options = {})
+    cloudinary_params = sign_request(params.merge(mode: MODE_DOWNLOAD), options)
+
+    "#{Cloudinary::Utils.cloudinary_api_url(action, options)}?#{hash_query_params(cloudinary_params)}"
+  end
+  private_class_method :cloudinary_api_download_url
+
+  # Return a signed URL to the 'generate_sprite' endpoint with 'mode=download'.
+  #
+  # @param [String|Hash] tag Treated as additional options when hash is passed, otherwise as a tag
+  # @param [Hash] options Additional options. Should be omitted when +tag_or_options+ is a Hash
+  #
+  # @return [String] The signed URL to download sprite
+  def self.download_generated_sprite(tag, options = {})
+    params = build_multi_and_sprite_params(tag, options)
+    cloudinary_api_download_url("sprite", params, options)
+  end
+
+  # Return a signed URL to the 'multi' endpoint with 'mode=download'.
+  #
+  # @param [String|Hash] tag Treated as additional options when hash is passed, otherwise as a tag
+  # @param [Hash] options Additional options. Should be omitted when +tag_or_options+ is a Hash
+  #
+  # @return [String] The signed URL to download multi
+  def self.download_multi(tag, options = {})
+    params = build_multi_and_sprite_params(tag, options)
+    cloudinary_api_download_url("multi", params, options)
+  end
+
   def self.private_download_url(public_id, format, options = {})
     cloudinary_params = sign_request({
         :timestamp=>Time.now.to_i,
@@ -767,11 +807,10 @@ class Cloudinary::Utils
   # @option options [String] :keep_derived (false) keep the derived images used for generating the archive
   # @return [String] archive url
   def self.download_archive_url(options = {})
-    cloudinary_params = sign_request(Cloudinary::Utils.archive_params(options.merge(:mode => "download")), options)
-    return Cloudinary::Utils.cloudinary_api_url("generate_archive", options) + "?" + hash_query_params(cloudinary_params)
+    params = Cloudinary::Utils.archive_params(options)
+    cloudinary_api_download_url("generate_archive", params, options)
   end
 
-
   # Returns a URL that when invokes creates an zip archive and returns it.
   # @see download_archive_url
   def self.download_zip_url(options = {})
@@ -1191,6 +1230,41 @@ class Cloudinary::Utils
     REMOTE_URL_REGEX === url
   end
 
+  # Build params for multi, download_multi, generate_sprite, and download_generated_sprite methods
+  #
+  # @param [String|Hash] tag_or_options Treated as additional options when hash is passed, otherwise as a tag
+  # @param [Hash] options Additional options. Should be omitted when +tag_or_options+ is a Hash
+  #
+  # @return [Hash]
+  #
+  # @private
+  def self.build_multi_and_sprite_params(tag_or_options, options)
+    if tag_or_options.is_a?(Hash)
+      if options.blank?
+        options = tag_or_options
+        tag_or_options = nil
+      else
+        raise "First argument must be a tag when additional options are passed"
+      end
+    end
+    urls = options.delete(:urls)
+
+    if tag_or_options.blank? && urls.blank?
+      raise "Either tag or urls are required"
+    end
+
+    {
+      :tag => tag_or_options,
+      :urls => urls,
+      :transformation => Cloudinary::Utils.generate_transformation_string(options.merge(:fetch_format => options[:format])),
+      :notification_url => options[:notification_url],
+      :format => options[:format],
+      :async => options[:async],
+      :mode => options[:mode],
+      :timestamp => (options[:timestamp] || Time.now.to_i)
+    }
+  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 })
@@ -1224,10 +1298,53 @@ class Cloudinary::Utils
     end
   end
 
+  # Verifies the authenticity of an API response signature.
+  #
+  # @param [String] public_id he public id of the asset as returned in the API response
+  # @param [Fixnum] version The version of the asset as returned in the API response
+  # @param [String] signature Actual signature. Can be retrieved from the X-Cld-Signature header
+  # @param [Symbol|nil] signature_algorithm Algorithm to use for computing hash
+  # @param [Hash] options
+  # @option options [String] :api_secret API secret, if not passed taken from global config
+  #
+  # @return [Boolean]
+  def self.verify_api_response_signature(public_id, version, signature, signature_algorithm = nil, options = {})
+    api_secret = options[:api_secret] || Cloudinary.config.api_secret || raise("Must supply api_secret")
+
+    parameters_to_sign = {
+      :public_id => public_id,
+      :version => version
+    }
+
+    signature == api_sign_request(parameters_to_sign, api_secret, signature_algorithm)
+  end
+
+  # Verifies the authenticity of a notification signature.
+  #
+  # @param [String] body JSON of the request's body
+  # @param [Fixnum] timestamp Unix timestamp. Can be retrieved from the X-Cld-Timestamp header
+  # @param [String] signature Actual signature. Can be retrieved from the X-Cld-Signature header
+  # @param [Fixnum] valid_for The desired time in seconds for considering the request valid
+  # @param [Symbol|nil] signature_algorithm Algorithm to use for computing hash
+  # @param [Hash] options
+  # @option options [String] :api_secret API secret, if not passed taken from global config
+  #
+  # @return [Boolean]
+  def self.verify_notification_signature(body, timestamp, signature, valid_for = 7200, signature_algorithm = nil, options = {})
+    api_secret = options[:api_secret] || Cloudinary.config.api_secret || raise("Must supply api_secret")
+    raise("Body should be of String type") unless body.is_a?(String)
+    # verify that signature is valid for the given timestamp
+    return false if timestamp < (Time.now - valid_for).to_i
+
+    payload_hash = hash("#{body}#{timestamp}#{api_secret}", signature_algorithm, :hexdigest)
+
+    signature == payload_hash
+  end
+
   # Computes hash from input string using specified algorithm.
   #
   # @param [String] input                   String which to compute hash from
-  # @param [String|nil] signature_algorithm Algorithm to use for computing hash
+  # @param [Symbol|nil] signature_algorithm Algorithm to use for computing hash
   # @param [Symbol] hash_method             Hash method applied to a signature algorithm (:digest or :hexdigest)
   #
   # @return [String] Computed hash value

data/lib/cloudinary/version.rb

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

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

@@ -4302,12 +4302,20 @@ var slice = [].slice,
               switch (false) {
                 case !/w_auto:breakpoints/.test(dataSrc):
                   requiredWidth = maxWidth(containerWidth, tag);
-                  dataSrc = dataSrc.replace(/w_auto:breakpoints([_0-9]*)(:[0-9]+)?/, "w_auto:breakpoints$1:" + requiredWidth);
+                  if (requiredWidth) {
+                    dataSrc = dataSrc.replace(/w_auto:breakpoints([_0-9]*)(:[0-9]+)?/, "w_auto:breakpoints$1:" + requiredWidth);
+                  } else {
+                    setUrl = false;
+                  }
                   break;
                 case !(match = /w_auto(:(\d+))?/.exec(dataSrc)):
                   requiredWidth = applyBreakpoints.call(this, tag, containerWidth, match[2], options);
                   requiredWidth = maxWidth(requiredWidth, tag);
-                  dataSrc = dataSrc.replace(/w_auto[^,\/]*/g, "w_" + requiredWidth);
+                  if (requiredWidth) {
+                    dataSrc = dataSrc.replace(/w_auto[^,\/]*/g, "w_" + requiredWidth);
+                  } else {
+                    setUrl = false;
+                  }
               }
               Util.removeAttribute(tag, 'width');
               if (!options.responsive_preserve_height) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.20.0
+  version: 1.21.0
 platform: ruby
 authors:
 - Nadav Soferman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws_cf_signer