cloudinary 1.15.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c4d1942e462293cb9a3cf7d73878104de63cc041ad6c9a82ae985e9ce1c6dd7
-  data.tar.gz: fd09572e0b1be22051a711fb7aacfc1f3f46856531b5c0a3caf50fea49eabae5
+  metadata.gz: c9179fe1c8105281b33780687c2bed49db41a35fca2d33ff15bd7fd4635d119f
+  data.tar.gz: 7b3bd01f71f1012bc7f315f707450ebb65537064e004fad615d713f489c4316c
 SHA512:
-  metadata.gz: 66eea468a7816511382761d6ab667c39b4f90da2c765871d99a69d34091949a3fc8d4d2245cd3b53f18560a99eea59fdd2cdd0173d8e41e6ab8e040236d52dc4
-  data.tar.gz: 65c5d8536b106b88f6bf8de3a540df6ffed3f6fed39141d6dfbf47a5ae6b11f3ec37699722e5b20e8fe35c86f452f29ec0ba9b9f5edc776ce81efebbf8cd14f8
+  metadata.gz: 347fc122e9a31aa241afa194c09cdc3c0d19e63c5a206cc7751f4939de7c273769d648c7fd33af2cc4e7505fba0a5be9d555f1c3db1e2b41d45cfb58082e1cc3
+  data.tar.gz: 4f04b59256afe8f23c27625d94d761e9802e2ccd91d3c3dc992eb263e3430a7a053467c203d416d379815e317924f042c9310ac0f2b4ca185630307268aa66ca

data/.github/pull_request_template.md

@@ -0,0 +1,24 @@
+### Brief Summary of Changes
+<!--
+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
+
+#### Are tests included?
+[ ] Yes
+[ ] No
+
+#### 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
+-->

data/.travis.yml

@@ -12,4 +12,8 @@ matrix:
       rvm: ruby-2.5.3
       before_install:
         - gem install bundler
+
+before_script: >
+  export CLOUDINARY_URL=$(bash tools/get_test_cloud.sh);
+  echo cloud_name: "$(echo $CLOUDINARY_URL | cut -d'@' -f2)"
 script: bundle exec rspec

data/CHANGELOG.md

@@ -1,4 +1,61 @@
 
+1.18.0 / 2020-09-27
+===================
+
+New functionality and features
+------------------------------
+  * Add `download_folder` helper
+  * Add support for `sources` in `video` tag
+  * Add structured metadata to Admin and Upload API
+  
+Other Changes
+-------------
+  * Fix download of a raw file in ActiveStorage
+  * Update embedded `jquery.cloudinary.js` to fix ES5 compatibility issue
+  
+1.17.1 / 2020-08-25
+===================
+
+  * Fix options handling issue in SassC
+
+1.17.0 / 2020-08-21
+===================
+
+New functionality and features
+------------------------------
+
+  * Add support for `eval` upload parameter
+  * Add support for 32-char signature length
+  
+Other Changes
+-------------
+
+  * Fix escaping of query string characters in CarrierWave integration
+  * Fix detection integration test
+  * Integrate with sub-account test service
+  * Add pull request template
+
+1.16.1 / 2020-07-06
+===================
+
+  * Detect data URLs with suffix in mime type
+  * Fix `Invalid regular expression` error in Safari
+
+1.16.0 / 2020-06-29
+===================
+
+New functionality and features
+------------------------------
+
+  * Add support for uploading `StringIO`
+
+Other Changes
+-------------
+
+  * Set default cache storage to `file` in `CarrierWave`
+  * Fix `normalize_expression` to ignore predefined variables
+  * Fix sample projects
+
 1.15.0 / 2020-06-11
 ===================
 

data/Rakefile

@@ -1,55 +1,13 @@
 require 'bundler'
 require 'fileutils'
-require 'tmpdir'
-require 'rest_client'
-require 'json'
-require 'rubygems/package'
-
 require 'rspec/core/rake_task'
+
 RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
 
 Bundler::GemHelper.install_tasks
 
-namespace :cloudinary do
-  desc "Fetch the latest JavaScript library files and create the JavaScript index files"
-  task :fetch_assets do
-    index_files      = %w[jquery.ui.widget.js jquery.iframe-transport.js jquery.fileupload.js jquery.cloudinary.js]
-    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"))
-
-    FileUtils.rm_rf 'vendor/assets'
-    html_folder = 'vendor/assets/html'
-    FileUtils.mkdir_p html_folder
-    js_folder = 'vendor/assets/javascripts/cloudinary'
-    FileUtils.mkdir_p js_folder
-
-    puts "Fetching cloudinary_js version #{release["tag_name"]}\n\n"
-    sio  = StringIO.new(RestClient.get(release["tarball_url"]).body)
-    file =Zlib::GzipReader.new(sio)
-    tar  = Gem::Package::TarReader.new(file)
-    tar.each_entry do |entry|
-      name = File.basename(entry.full_name)
-      if files.include? name
-        js_full_name = File.join(js_folder, name)
-        puts "Adding #{js_full_name}"
-        File.write js_full_name, entry.read
-      elsif name == 'cloudinary_cors.html'
-        html_full_name = File.join(html_folder, name)
-        puts "Adding #{html_full_name}"
-        File.write html_full_name, entry.read
-      end
-    end
-    puts "Creating 'index.js' and 'processing.js' files"
-    File.open("vendor/assets/javascripts/cloudinary/index.js", "w") do |f|
-      index_files.each { |name| f.puts "//= require ./#{name}" }
-    end
-    File.open("vendor/assets/javascripts/cloudinary/processing.js", "w") do |f|
-      processing_files.each { |name| f.puts "//= require ./#{name}" }
-    end
-  end
+path = File.expand_path(__dir__)
+Dir.glob("#{path}/lib/tasks/**/*.rake").each { |f| import f }
 
-end
 task :build => "cloudinary:fetch_assets"

data/cloudinary.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "rspec", '>=3.5'
+  s.add_development_dependency "rspec-retry"
   s.add_development_dependency "rails", "~>5.2" if RUBY_VERSION >= "2.2.2"
 
   s.add_development_dependency "railties", "<= 4.2.7" if RUBY_VERSION <= "1.9.3"

data/lib/active_storage/service/cloudinary_service.rb

@@ -1,5 +1,6 @@
 require 'active_storage/blob_key'
 require 'cloudinary/helper'
+require 'net/http'
 
 unless ActiveStorage::Blob.method_defined? :original_key
   class ActiveStorage::Blob
@@ -57,7 +58,7 @@ module ActiveStorage
         url = Cloudinary::Utils.cloudinary_url(
           public_id(key),
           resource_type: resource_type(nil, key),
-          format: ext_for_file(filename, content_type),
+          format: ext_for_file(key, filename, content_type),
           **@options.merge(options.symbolize_keys)
         )
 
@@ -107,8 +108,7 @@ module ActiveStorage
     end
 
     def download(key, &block)
-      url = Cloudinary::Utils.unsigned_download_url(public_id(key), resource_type: resource_type(nil, key))
-      uri = URI(url)
+      uri = URI(url(key))
       if block_given?
         instrument :streaming_download, key: key do
           Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
@@ -169,12 +169,18 @@ module ActiveStorage
     #
     # It does the best effort when original filename does not include extension, but we know the mime-type.
     #
+    # @param [ActiveStorage::BlobKey]   key          The blob key with attributes.
     # @param [ActiveStorage::Filename]  filename     The original filename.
     # @param [string]                   content_type The content type of the file.
     #
     # @return [string] The extension of the filename.
-    def ext_for_file(filename, content_type)
+    def ext_for_file(key, filename, content_type)
+      if filename.blank?
+        options = key.respond_to?(:attributes) ? key.attributes : {}
+        filename = ActiveStorage::Filename.new(options[:filename]) if options.has_key?(:filename)
+      end
       ext = filename.respond_to?(:extension_without_delimiter) ? filename.extension_without_delimiter : nil
+
       return ext unless ext.blank?
 
       # Raw files are not convertible, no extension guessing for them

data/lib/cloudinary/api.rb

@@ -348,6 +348,144 @@ class Cloudinary::Api
     call_json_api('GET', json_url, {}, 60, {})
   end
 
+  # Returns a list of all metadata field definitions.
+  #
+  # @see https://cloudinary.com/documentation/admin_api#get_metadata_fields Get metadata fields API reference
+  #
+  # @param [Hash] options Additional options
+  # @return [Cloudinary::Api::Response]
+  # @raise [Cloudinary::Api::Error]
+  def self.list_metadata_fields(options = {})
+    call_metadata_api(:get, [], {}, options)
+  end
+
+  # Gets a metadata field by external id.
+  #
+  # @see https://cloudinary.com/documentation/admin_api#get_a_metadata_field_by_external_id Get metadata field by external ID API reference
+  #
+  # @param [String] field_external_id The ID of the metadata field to retrieve
+  # @param [Hash]   options           Additional options
+  # @return [Cloudinary::Api::Response]
+  # @raise [Cloudinary::Api::Error]
+  def self.metadata_field_by_field_id(field_external_id, options = {})
+    uri = [field_external_id]
+
+    call_metadata_api(:get, uri, {}, options)
+  end
+
+  # Creates a new metadata field definition.
+  #
+  # @see https://cloudinary.com/documentation/admin_api#create_a_metadata_field Create metadata field API reference
+  #
+  # @param [Hash] field   The field to add
+  # @param [Hash] options Additional options
+  # @return [Cloudinary::Api::Response]
+  # @raise [Cloudinary::Api::Error]
+  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)
+  end
+
+  # Updates a metadata field by external id.
+  #
+  # Updates a metadata field definition (partially, no need to pass the entire object) passed as JSON data.
+  # See https://cloudinary.com/documentation/admin_api#generic_structure_of_a_metadata_field for the generic structure
+  # of a metadata field.
+  #
+  # @see https://cloudinary.com/documentation/admin_api#update_a_metadata_field_by_external_id Update metadata field API reference
+  #
+  # @param [String] field_external_id The id of the metadata field to update
+  # @param [Hash]   field             The field definition
+  # @param [Hash]   options           Additional options
+  # @return [Cloudinary::Api::Response]
+  # @raise [Cloudinary::Api::Error]
+  def self.update_metadata_field(field_external_id, field, options = {})
+    uri = [field_external_id]
+    params = only(field, :label, :mandatory, :default_value, :validation)
+
+    call_metadata_api(:put, uri, params, options)
+  end
+
+  # Deletes a metadata field definition.
+  #
+  # The field should no longer be considered a valid candidate for all other endpoints.
+  #
+  # @see https://cloudinary.com/documentation/admin_api#delete_a_metadata_field_by_external_id Delete metadata field API reference
+  #
+  # @param [String] field_external_id The external id of the field to delete
+  # @param [Hash]   options           Additional options
+  # @return [Cloudinary::Api::Response] A hash with a "message" key. "ok" value indicates a successful deletion
+  # @raise [Cloudinary::Api::Error]
+  def self.delete_metadata_field(field_external_id, options = {})
+    uri = [field_external_id]
+
+    call_metadata_api(:delete, uri, {}, options)
+  end
+
+  # Deletes entries in a metadata field datasource.
+  #
+  # Deletes (blocks) the datasource entries for a specified metadata field definition. Sets the state of the
+  # entries to inactive. This is a soft delete, the entries still exist under the hood and can be activated
+  # again with the restore datasource entries method.
+  #
+  # @see https://cloudinary.com/documentation/admin_api#delete_entries_in_a_metadata_field_datasource Delete entries in a metadata field datasource API reference
+  #
+  # @param [String] field_external_id    The id of the field to update
+  # @param [Array]  entries_external_id  The ids of all the entries to delete from the datasource
+  # @param [Hash]   options              Additional options
+  # @return [Cloudinary::Api::Response] The remaining datasource entries
+  # @raise [Cloudinary::Api::Error]
+  def self.delete_datasource_entries(field_external_id, entries_external_id, options = {})
+    uri = [field_external_id, "datasource"]
+    params = {:external_ids => entries_external_id }
+
+    call_metadata_api(:delete, uri, params, options)
+  end
+
+  # Updates a metadata field datasource.
+  #
+  # Updates the datasource of a supported field type (currently only enum and set), passed as JSON data. The
+  # update is partial: datasource entries with an existing external_id will be updated and entries with new
+  # external_id’s (or without external_id’s) will be appended.
+  #
+  # @see https://cloudinary.com/documentation/admin_api#update_a_metadata_field_datasource Update a metadata field datasource API reference
+  #
+  # @param [String] field_external_id   The external id of the field to update
+  # @param [Array]  entries_external_id
+  # @param [Hash]   options             Additional options
+  # @return [Cloudinary::Api::Response]
+  # @raise [Cloudinary::Api::Error]
+  def self.update_metadata_field_datasource(field_external_id, entries_external_id, options = {})
+    uri = [field_external_id, "datasource"]
+
+    params = entries_external_id.each_with_object({:values => [] }) do |item, hash|
+      item = only(item, :external_id, :value)
+      hash[:values ] << item if item.present?
+    end
+
+    call_metadata_api(:put, uri, params, options)
+  end
+
+  # Restores entries in a metadata field datasource.
+  #
+  # Restores (unblocks) any previously deleted datasource entries for a specified metadata field definition.
+  # Sets the state of the entries to active.
+  #
+  # @see https://cloudinary.com/documentation/admin_api#restore_entries_in_a_metadata_field_datasource Restore entries in a metadata field datasource API reference
+  #
+  # @param [String] field_external_id    The ID of the metadata field
+  # @param [Array]  entries_external_ids An array of IDs of datasource entries to restore (unblock)
+  # @param [Hash]   options              Additional options
+  # @return [Cloudinary::Api::Response]
+  # @raise [Cloudinary::Api::Error]
+  def self.restore_metadata_field_datasource(field_external_id, entries_external_ids, options = {})
+    uri = [field_external_id, "datasource_restore"]
+    params = {:external_ids => entries_external_ids }
+
+    call_metadata_api(:post, uri, params, options)
+  end
+
   protected
 
   def self.call_api(method, uri, params, options)
@@ -396,6 +534,22 @@ class Cloudinary::Api
     raise GeneralError.new("Error parsing server response (#{response.code}) - #{response.body}. Got - #{e}")
   end
 
+  # Protected function that assists with performing an API call to the metadata_fields part of the Admin API.
+  #
+  # @protected
+  # @param [Symbol] method  The HTTP method. Valid methods: get, post, put, delete
+  # @param [Array]  uri     REST endpoint of the API (without 'metadata_fields')
+  # @param [Hash]   params  Query/body parameters passed to the method
+  # @param [Hash]   options Additional options. Can be an override of the configuration, headers, etc.
+  # @return [Cloudinary::Api::Response]
+  # @raise [Cloudinary::Api::Error]
+  def self.call_metadata_api(method, uri, params, options)
+    options[:content_type] = :json
+    uri = ["metadata_fields", uri].reject(&:empty?).join("/")
+
+    call_api(method, uri, params, options)
+  end
+
   def self.only(hash, *keys)
     result = {}
     keys.each do |key|

data/lib/cloudinary/carrier_wave.rb

@@ -9,6 +9,7 @@ module Cloudinary::CarrierWave
 
   def self.included(base)
     base.storage Cloudinary::CarrierWave::Storage
+    base.cache_storage = :file if base.cache_storage.blank?
     base.extend ClassMethods
     base.class_attribute :metadata
     base.class_attribute :storage_type, instance_reader: false

data/lib/cloudinary/carrier_wave/remote.rb

@@ -4,7 +4,8 @@ module Cloudinary::CarrierWave
     if respond_to?(:process_uri)
       uri = process_uri(uri)
     else # Backward compatibility with old CarrierWave
-      uri = URI.parse(Cloudinary::Utils.smart_escape(Cloudinary::Utils.smart_unescape(uri)))
+      remote_url_unsafe_chars = /([^a-zA-Z0-9_.\-\/:?&=]+)/ # In addition allow query string characters: "?","&" and "="
+      uri = URI.parse(Cloudinary::Utils.smart_escape(Cloudinary::Utils.smart_unescape(uri), remote_url_unsafe_chars))
     end
     return if uri.to_s.blank?
     self.original_filename = @cache_id = @filename = File.basename(uri.path).gsub(/[^a-zA-Z0-9\.\-\+_]/, '')

data/lib/cloudinary/carrier_wave/storage.rb

@@ -1,7 +1,8 @@
 class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
 
   def store!(file)
-    return if !uploader.enable_processing
+    return unless uploader.enable_processing
+
     if uploader.is_main_uploader?
       case file
       when Cloudinary::CarrierWave::PreloadedCloudinaryFile

data/lib/cloudinary/helper.rb

@@ -438,7 +438,7 @@ begin
     # @return [::SassC::Script::Value::String]
     def cloudinary_url(public_id, sass_options = {})
       options = {}
-      sass_options.to_h.each { |k, v| options[k.value] = v.value }
+      sass_options.to_h.each { |k, v| options[k.value.to_sym] = v.value }
       url = Cloudinary::Utils.cloudinary_url(public_id.value, {:type => :asset}.merge(options))
       ::SassC::Script::Value::String.new("url(#{url})")
     end

data/lib/cloudinary/railtie.rb

@@ -1,6 +1,6 @@
 class Cloudinary::Railtie < Rails::Railtie
   rake_tasks do
-    Dir[File.join(File.dirname(__FILE__),'../tasks/*.rake')].each { |f| load f }
+    Dir[File.join(File.dirname(__FILE__),'../tasks/**/*.rake')].each { |f| load f }
   end
   config.after_initialize do |app|
     ActionView::Base.send :include, CloudinaryHelper

data/lib/cloudinary/uploader.rb

@@ -37,6 +37,7 @@ class Cloudinary::Uploader
       :eager_async               => Cloudinary::Utils.as_safe_bool(options[:eager_async]),
       :eager_notification_url    => options[:eager_notification_url],
       :exif                      => Cloudinary::Utils.as_safe_bool(options[:exif]),
+      :eval                      => options[:eval],
       :face_coordinates          => Cloudinary::Utils.encode_double_array(options[:face_coordinates]),
       :faces                     => Cloudinary::Utils.as_safe_bool(options[:faces]),
       :folder                    => options[:folder],
@@ -64,7 +65,8 @@ 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]),
-      :accessibility_analysis    => Cloudinary::Utils.as_safe_bool(options[:accessibility_analysis])
+      :accessibility_analysis    => Cloudinary::Utils.as_safe_bool(options[:accessibility_analysis]),
+      :metadata                  => Cloudinary::Utils.encode_context(options[:metadata])
     }
     params
   end
@@ -78,6 +80,9 @@ class Cloudinary::Uploader
       params = build_upload_params(options)
       if file.is_a?(Pathname)
         params[:file] = File.open(file, "rb")
+      elsif file.is_a?(StringIO)
+        file.rewind
+        params[:file] = Cloudinary::Blob.new(file.read, options)
       elsif file.respond_to?(:read) || Cloudinary::Utils.is_remote?(file)
         params[:file] = file
       else
@@ -268,6 +273,29 @@ class Cloudinary::Uploader
     return self.call_tags_api(nil, "remove_all", public_ids, options)
   end
 
+  # Populates metadata fields with the given values. Existing values will be overwritten.
+  #
+  # Any metadata-value pairs given are merged with any existing metadata-value pairs
+  # (an empty value for an existing metadata field clears the value).
+  #
+  # @param [Hash] metadata    A list of custom metadata fields (by external_id) and the values to assign to each of them.
+  # @param [Array] public_ids An array of Public IDs of assets uploaded to Cloudinary.
+  # @param [Hash] options
+  # @option options [String] :resource_type The type of file. Default: image. Valid values: image, raw, video.
+  # @option options [String] :type          The storage type. Default: upload. Valid values: upload, private, authenticated
+  # @return mixed a list of public IDs that were updated
+  # @raise [Cloudinary::Api:Error]
+  def self.update_metadata(metadata, public_ids, options = {})
+    self.call_api("metadata", options) do
+      {
+        timestamp: (options[:timestamp] || Time.now.to_i),
+        type: options[:type],
+        public_ids: Cloudinary::Utils.build_array(public_ids),
+        metadata: Cloudinary::Utils.encode_context(metadata)
+      }
+    end
+  end
+
   private
 
   def self.call_tags_api(tag, command, public_ids = [], options = {})

data/lib/cloudinary/utils.rb

@@ -139,7 +139,10 @@ class Cloudinary::Utils
       zoom
   ].map(&:to_sym)
 
-  REMOTE_URL_REGEX = %r(^ftp:|^https?:|^s3:|^gs:|^data:([\w-]+\/[\w-]+)?(;[\w-]+=[\w-]+)*;base64,([a-zA-Z0-9\/+\n=]+)$)
+  REMOTE_URL_REGEX = %r(^ftp:|^https?:|^s3:|^gs:|^data:([\w-]+\/[\w-]+(\+[\w-]+)?)?(;[\w-]+=[\w-]+)*;base64,([a-zA-Z0-9\/+\n=]+)$)
+
+  LONG_URL_SIGNATURE_LENGTH = 32
+  SHORT_URL_SIGNATURE_LENGTH = 8
 
   def self.extract_config_params(options)
       options.select{|k,v| URL_KEYS.include?(k)}
@@ -306,7 +309,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)
@@ -497,6 +500,7 @@ class Cloudinary::Utils
     url_suffix = options.delete(:url_suffix)
     use_root_path = config_option_consume(options, :use_root_path)
     auth_token = config_option_consume(options, :auth_token)
+    long_url_signature = config_option_consume(options, :long_url_signature)
     unless auth_token == false
       auth_token = Cloudinary::AuthToken.merge_auth_token(Cloudinary.config.auth_token, auth_token)
     end
@@ -541,7 +545,7 @@ class Cloudinary::Utils
       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 = fully_unescape(to_sign)
-      signature = 's--' + Base64.urlsafe_encode64(Digest::SHA1.digest(to_sign + secret))[0,8] + '--'
+      signature = compute_signature(to_sign, secret, long_url_signature)
     end
 
     prefix = unsigned_download_url_prefix(source, cloud_name, private_cdn, cdn_subdomain, secure_cdn_subdomain, cname, secure, secure_distribution)
@@ -732,6 +736,18 @@ class Cloudinary::Utils
     download_archive_url(options.merge(:target_format => "zip"))
   end
 
+  # Creates and returns a URL that when invoked creates an archive of a folder.
+  #
+  # @param [Object] folder_path Full path (from the root) of the folder to download.
+  # @param [Hash] options       Additional options.
+  #
+  # @return [String]
+  def self.download_folder(folder_path, options = {})
+    resource_type = options[:resource_type] || "all"
+
+    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
@@ -1132,4 +1148,24 @@ class Cloudinary::Utils
   def self.is_remote?(url)
     REMOTE_URL_REGEX === url
   end
+
+  # Computes a short or long signature based on a message and secret
+  # @param [String]  message The string to sign
+  # @param [String]  secret A secret that will be added to the message when signing
+  # @param [Boolean] long_signature Whether to create a short or long signature
+  # @return [String] Properly formatted signature
+  def self.compute_signature(message, secret, long_url_signature)
+    combined_message_secret = message + secret
+
+    algo, signature_length =
+      if long_url_signature
+        [Digest::SHA256, LONG_URL_SIGNATURE_LENGTH]
+      else
+        [Digest::SHA1, SHORT_URL_SIGNATURE_LENGTH]
+      end
+
+    "s--#{Base64.urlsafe_encode64(algo.digest(combined_message_secret))[0, signature_length]}--"
+  end
+
+  private_class_method :compute_signature
 end

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.15.0"
+  VERSION = "1.18.0"
 end

data/lib/cloudinary/video_helper.rb

@@ -3,12 +3,33 @@ module CloudinaryHelper
   DEFAULT_POSTER_OPTIONS = { :format => 'jpg', :resource_type => 'video' }
   DEFAULT_SOURCE_TYPES   = %w(webm mp4 ogv)
   DEFAULT_VIDEO_OPTIONS  = { :resource_type => 'video' }
+  DEFAULT_SOURCES        = [
+    {
+      :type            => "mp4",
+      :codecs          => "hev1",
+      :transformations => { :video_codec => "h265" }
+    },
+    {
+      :type            => "webm",
+      :codecs          => "vp9",
+      :transformations => { :video_codec => "vp9" }
+    },
+    {
+      :type            => "mp4",
+      :transformations => { :video_codec => "auto" }
+    },
+    {
+      :type            => "webm",
+      :transformations => { :video_codec => "auto" }
+    }
+  ]
 
   # Creates an HTML video tag for the provided +source+
   #
   # ==== Options
   # * <tt>:source_types</tt> - Specify which source type the tag should include. defaults to webm, mp4 and ogv.
   # * <tt>:source_transformation</tt> - specific transformations to use for a specific source type.
+  # * <tt>:sources</tt> - list of sources (overrides :source_types when present)
   # * <tt>:poster</tt> - override default thumbnail:
   #   * url: provide an ad hoc url
   #   * options: with specific poster transformations and/or Cloudinary +:public_id+
@@ -20,6 +41,17 @@ module CloudinaryHelper
   #   cl_video_tag("mymovie.webm", :source_types => [:webm, :mp4], :poster => {:effect => 'sepia'}) do
   #     content_tag( :span, "Cannot present video!")
   #   end
+  #   cl_video_tag("mymovie", :sources => [
+  #     {
+  #       :type => "mp4",
+  #       :codecs => "hev1",
+  #       :transformations => { :video_codec => "h265" }
+  #     },
+  #     {
+  #       :type => "webm",
+  #       :transformations => { :video_codec => "auto" }
+  #     }
+  #   ])
   def cl_video_tag(source, options = {}, &block)
     source = strip_known_ext(source)
     video_attributes = [:autoplay,:controls,:loop,:muted,:poster, :preload]
@@ -48,30 +80,12 @@ module CloudinaryHelper
       video_options[:poster] = cl_video_thumbnail_path(source, options)
     end
 
-    source_transformation = options.delete(:source_transformation) || {}
-    source_types = Array(options.delete(:source_types))
-    fallback     = (capture(&block) if block_given?) || options.delete(:fallback_content)
+    fallback = (capture(&block) if block_given?) || options.delete(:fallback_content)
 
-    if source_types.size > 1
-      cloudinary_tag(source, options) do |_source, tag_options|
-        content_tag('video', tag_options.merge(video_options)) do
-          source_tags = source_types.map do |type|
-            transformation = source_transformation[type.to_sym] || {}
-            cloudinary_tag("#{source}.#{type}", options.merge(transformation)) do |url, _tag_options|
-              mime_type = "video/#{(type == 'ogv' ? 'ogg' : type)}"
-              tag("source", :src => url, :type => mime_type)
-            end
-          end
-          source_tags.push(fallback.html_safe) unless fallback.blank?
-          safe_join(source_tags)
-        end
-      end
+    if options[:sources]
+      video_tag_from_sources(source, options, video_options, fallback)
     else
-      transformation      = source_transformation[source_types.first.to_sym] || {}
-      video_options[:src] = cl_video_path("#{source}.#{source_types.first.to_sym}", transformation.merge(options))
-      cloudinary_tag(source, options) do |_source, tag_options|
-        content_tag('video', fallback, tag_options.merge(video_options))
-      end
+      video_tag_from_source_types(source, options, video_options, fallback)
     end
   end
 
@@ -96,6 +110,66 @@ module CloudinaryHelper
     name.sub(/\.(#{DEFAULT_SOURCE_TYPES.join("|")})$/, '')
   end
 
+  private
+
+  def video_tag_from_source_types(source_name, options, video_options, fallback)
+    source_transformation = options.delete(:source_transformation) || {}
+    source_types = Array(options.delete(:source_types))
+
+    if source_types.size > 1
+      sources = source_types.map do |type|
+        {
+          :type => type,
+          :transformations => source_transformation[type.to_sym] || {}
+        }
+      end
+
+      generate_tag_from_sources(:source_name => source_name,
+                                :sources => sources,
+                                :options => options,
+                                :video_options => video_options,
+                                :fallback => fallback)
+    else
+      transformation      = source_transformation[source_types.first.to_sym] || {}
+      video_options[:src] = cl_video_path("#{source_name}.#{source_types.first.to_sym}", transformation.merge(options))
+      cloudinary_tag(source_name, options) do |_source, tag_options|
+        content_tag('video', fallback, tag_options.merge(video_options))
+      end
+    end
+  end
+
+  def video_tag_from_sources(source_name, options, video_options, fallback)
+    sources = options.delete(:sources)
+
+    generate_tag_from_sources(:source_name => source_name,
+                              :sources => sources,
+                              :options => options,
+                              :video_options => video_options,
+                              :fallback => fallback)
+  end
+
+  def generate_tag_from_sources(params)
+    source_name, sources, options, video_options, fallback = params.values_at(:source_name, :sources, :options, :video_options, :fallback)
+
+    cloudinary_tag(source_name, options) do |_source, tag_options|
+      content_tag('video', tag_options.merge(video_options)) do
+        source_tags = sources.map do |source|
+          type = source[:type]
+          transformation = source[:transformations] || {}
+          cloudinary_tag("#{source_name}.#{type}", 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]
+              mime_type = "#{mime_type}; codecs=#{codecs}"
+            end
+            tag("source", :src => url, :type => mime_type)
+          end
+        end
+        source_tags.push(fallback.html_safe) unless fallback.blank?
+        safe_join(source_tags)
+      end
+    end
+  end
 end
 
 

data/lib/tasks/cloudinary/fetch_assets.rake

@@ -0,0 +1,48 @@
+require 'tmpdir'
+require 'rest_client'
+require 'json'
+require 'rubygems/package'
+
+unless Rake::Task.task_defined?('cloudinary:fetch_assets') # prevent double-loading/execution
+  namespace :cloudinary do
+    desc "Fetch the latest JavaScript library files and create the JavaScript index files"
+    task :fetch_assets do
+      index_files = %w[jquery.ui.widget.js jquery.iframe-transport.js jquery.fileupload.js jquery.cloudinary.js]
+      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"))
+
+      FileUtils.rm_rf 'vendor/assets'
+      html_folder = 'vendor/assets/html'
+      FileUtils.mkdir_p html_folder
+      js_folder = 'vendor/assets/javascripts/cloudinary'
+      FileUtils.mkdir_p js_folder
+
+      puts "Fetching cloudinary_js version #{release["tag_name"]}\n\n"
+      sio = StringIO.new(RestClient.get(release["tarball_url"]).body)
+      file = Zlib::GzipReader.new(sio)
+      tar = Gem::Package::TarReader.new(file)
+      tar.each_entry do |entry|
+        name = File.basename(entry.full_name)
+        if files.include? name
+          js_full_name = File.join(js_folder, name)
+          puts "Adding #{js_full_name}"
+          File.write js_full_name, entry.read
+        elsif name == 'cloudinary_cors.html'
+          html_full_name = File.join(html_folder, name)
+          puts "Adding #{html_full_name}"
+          File.write html_full_name, entry.read
+        end
+      end
+      puts "Creating 'index.js' and 'processing.js' files"
+      File.open("vendor/assets/javascripts/cloudinary/index.js", "w") do |f|
+        index_files.each { |name| f.puts "//= require ./#{name}" }
+      end
+      File.open("vendor/assets/javascripts/cloudinary/processing.js", "w") do |f|
+        processing_files.each { |name| f.puts "//= require ./#{name}" }
+      end
+    end
+
+  end
+end

data/tools/allocate_test_cloud.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+API_ENDPOINT="https://sub-account-testing.cloudinary.com/create_sub_account"
+
+SDK_NAME="${1}"
+
+CLOUD_DETAILS=$(curl -sS -d "{\"prefix\" : \"${SDK_NAME}\"}" "${API_ENDPOINT}")
+
+echo "${CLOUD_DETAILS}" | ruby -e "require 'json'; c=JSON.parse(ARGF.read)['payload']; puts 'cloudinary://' + c['cloudApiKey'] + ':'+ c['cloudApiSecret'] + '@' + c['cloudName']"

data/tools/get_test_cloud.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+RUBY_VER=$(ruby -v | head -n 1 | cut -d ' ' -f 2);
+SDK_VER=$(grep -oiP '(?<=VERSION = ")([a-zA-Z0-9\-.]+)(?=")' lib/cloudinary/version.rb)
+
+
+bash "${DIR}"/allocate_test_cloud.sh "Ruby ${RUBY_VER} SDK ${SDK_VER}"

data/tools/update_version

@@ -12,6 +12,8 @@ QUOTE=
 
 NEW_VERSION=
 
+UPDATE_ONLY=false
+
 function echo_err
 {
     echo "$@" 1>&2;
@@ -23,6 +25,7 @@ function usage
       echo "      -v | --version <version> set a new version"
       echo "      -c | --current show current version"
       echo "      -d | --dry-run print the commands without executing them"
+      echo "      -u | --update-only only update the version"
       echo "      -h | --help print this information and exit"
       echo
       echo "For example: $0 -v 1.2.3"
@@ -30,7 +33,7 @@ function usage
 
 function process_arguments
 {
-    while [ "$1" != "" ]; do
+    while [[ "$1" != "" ]]; do
         case $1 in
             -v | --version )
                 shift
@@ -53,6 +56,11 @@ function process_arguments
                 echo "Dry Run"
                 echo ""
                 ;;
+            -u | --update-only )
+                UPDATE_ONLY=true
+                echo "Only update version"
+                echo ""
+                ;;
             -h | --help )
                 usage; return 0
                 ;;
@@ -72,7 +80,7 @@ function pushd
 # Intentionally make popd silent
 function popd
 {
-    command popd "$@" > /dev/null
+    command popd > /dev/null
 }
 
 # Check if one version is less than or equal than other
@@ -82,7 +90,7 @@ function popd
 # ver_lte 1.2.4 1.2.3 && echo "yes" || echo "no" # no
 function ver_lte
 {
-    [ "$1" = "`echo -e "$1\n$2" | sort -V | head -n1`" ]
+    [[ "$1" = "`echo -e "$1\n$2" | sort -V | head -n1`" ]]
 }
 
 # Extract the last entry or entry for a given version
@@ -108,6 +116,10 @@ function verify_dependencies
         return 1
     fi
 
+    if [[ "${UPDATE_ONLY}" = true ]]; then
+      return 0;
+    fi
+
     if [[ -z "$(type -t git-changelog)" ]]
     then
         echo_err "git-extras packages is not installed."
@@ -127,25 +139,26 @@ function safe_replace
 
     grep -q "${old}" "${file}" || { echo_err "${old} was not found in ${file}"; return 1; }
 
-    ${CMD_PREFIX} sed -E -i '.bak' "${QUOTE}s/${old}/${new}/${QUOTE}" "${file}"
+    ${CMD_PREFIX} sed -i.bak -e "${QUOTE}s/${old}/${new}/${QUOTE}" -- "${file}"  && rm -- "${file}.bak"
 }
 
 function current_version
 {
-    grep -oiP '(?<=VERSION = ")([0-9.]+[^ ]*)(?=")' lib/cloudinary/version.rb
+    grep -oiP '(?<=VERSION = ")([a-zA-Z0-9\-.]+)(?=")' lib/cloudinary/version.rb
 }
 
 function update_version
 {
-    if [ -z "${NEW_VERSION}" ]; then
+    if [[ -z "${NEW_VERSION}" ]]; then
         usage; return 1
     fi
 
     # Enter git root
     pushd $(git rev-parse --show-toplevel)
+
     local current_version=$(current_version)
 
-    if [ -z "${current_version}" ]; then
+    if [[ -z "${current_version}" ]]; then
         echo_err "Failed getting current version, please check directory structure and/or contact developer"
         return 1
     fi
@@ -166,12 +179,17 @@ function update_version
                   lib/cloudinary/version.rb\
                   || return 1
 
-    ${CMD_PREFIX} git changelog -t ${NEW_VERSION} || true
+    if [[ "${UPDATE_ONLY}" = true ]]; then
+      popd;
+      return 0;
+    fi
+
+    ${CMD_PREFIX} git changelog -t "${NEW_VERSION}" || true
 
     echo ""
     echo "# After editing CHANGELOG.md, optionally review changes and issue these commands:"
     echo git add lib/cloudinary/version.rb CHANGELOG.md
-    echo git commit -m \"Version ${NEW_VERSION}\"
+    echo git commit -m "\"Version ${NEW_VERSION}\""
     echo sed -e "'1,/^${NEW_VERSION//./\\.}/d'" \
              -e "'/^=/d'" \
              -e "'/^$/d'" \
@@ -180,7 +198,7 @@ function update_version
          \| git tag -a "'${NEW_VERSION}'" --file=-
 
     # Don't run those commands on dry run
-    [ -n "${CMD_PREFIX}" ] && { popd; return 0; }
+    [[ -n "${CMD_PREFIX}" ]] && { popd; return 0; }
 
     echo ""
     read -p "Run the above commands automatically? (y/N): " confirm && [[ ${confirm} == [yY] || ${confirm} == [yY][eE][sS] ]] || { popd; return 0; }
@@ -197,6 +215,6 @@ function update_version
     popd
 }
 
+process_arguments "$@"
 verify_dependencies
-process_arguments $*
 update_version

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

@@ -1403,7 +1403,8 @@ var slice = [].slice,
       "*": "mul",
       "/": "div",
       "+": "add",
-      "-": "sub"
+      "-": "sub",
+      "^": "pow",
     };
 
 
@@ -1472,30 +1473,33 @@ var slice = [].slice,
       return new this(expressionStr);
     };
 
-
     /**
      * Normalize a string expression
      * @function Cloudinary#normalize
      * @param {string} expression a expression, e.g. "w gt 100", "width_gt_100", "width > 100"
      * @return {string} the normalized form of the value expression, e.g. "w_gt_100"
      */
-
     Expression.normalize = function(expression) {
-      var operators, pattern, replaceRE;
+      var operators, operatorsPattern, operatorsReplaceRE, predefinedVarsPattern, predefinedVarsReplaceRE;
       if (expression == null) {
         return expression;
       }
       expression = String(expression);
-      operators = "\\|\\||>=|<=|&&|!=|>|=|<|/|-|\\+|\\*";
-      pattern = "((" + operators + ")(?=[ _])|" + Object.keys(Expression.PREDEFINED_VARS).join("|") + ")";
-      replaceRE = new RegExp(pattern, "g");
-      expression = expression.replace(replaceRE, function(match) {
-        return Expression.OPERATORS[match] || Expression.PREDEFINED_VARS[match];
-      });
+      operators = "\\|\\||>=|<=|&&|!=|>|=|<|/|-|\\+|\\*|\\^";
+
+      // operators
+      operatorsPattern = "((" + operators + ")(?=[ _]))";
+      operatorsReplaceRE = new RegExp(operatorsPattern, "g");
+      expression = expression.replace(operatorsReplaceRE, match => Expression.OPERATORS[match]);
+
+      // predefined variables
+      predefinedVarsPattern = "(" + Object.keys(Expression.PREDEFINED_VARS).join("|") + ")";
+      predefinedVarsReplaceRE = new RegExp(predefinedVarsPattern, "g");
+      expression = expression.replace(predefinedVarsReplaceRE, (match, p1, offset) => (expression[offset - 1] === '$' ? match : Expression.PREDEFINED_VARS[match]));
+
       return expression.replace(/[ _]+/g, '_');
     };
 
-
     /**
      * Serialize the expression
      * @return {string} the expression as a string

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.18.0
 platform: ruby
 authors:
 - Nadav Soferman
 - Itai Lahan
 - Tal Lev-Ami
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2020-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws_cf_signer
@@ -110,6 +110,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: rspec-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -177,6 +191,7 @@ extra_rdoc_files: []
 files:
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/pull_request_template.md"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -220,7 +235,10 @@ files:
 - lib/cloudinary/utils.rb
 - lib/cloudinary/version.rb
 - lib/cloudinary/video_helper.rb
-- lib/tasks/cloudinary.rake
+- lib/tasks/cloudinary/fetch_assets.rake
+- lib/tasks/cloudinary/sync_static.rake
+- tools/allocate_test_cloud.sh
+- tools/get_test_cloud.sh
 - tools/update_version
 - vendor/assets/html/cloudinary_cors.html
 - vendor/assets/javascripts/cloudinary/canvas-to-blob.min.js
@@ -238,7 +256,7 @@ homepage: http://cloudinary.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -254,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Client library for easily using the Cloudinary service
 test_files: []