cloudinary 1.13.2 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab5096280e7accb34f68e18a4979931fa98f0c03bfae01913b388679e499f332
-  data.tar.gz: 6d6afe81d600578d1741d5f4fb0b3a04c98bde8d9320cea260a4b371e8cd3a02
+  metadata.gz: e36bd9efd91c46b00fc0f52a3448ee076990a85b88a470e2cc8e7ccc610ed368
+  data.tar.gz: dbf3cb94bc5cae2b502b2ca1bea558c93c11e0f77d91fe0577e019452c2acc93
 SHA512:
-  metadata.gz: 577d651df8534d2a1e294b6b86040507fff83d3af3176c91d436c528145459c110786ae49793a3aa589ae8d9d6107606a2854e5b494ba2207f74174390cb39e7
-  data.tar.gz: 9e8857df349c08949ad9e3327e2d4acad3f7bd4c4f36a667a9e5940f47555df92522ddd9e5cbe55387674994364b1087913bc5e7674f530eacd35a592470ef42
+  metadata.gz: ba800e50f02feb8cd582a4ca42f6bdfe0fd77c6e36c9dd7e0c3314c9d944bafc451329c79276b02b417f04357aad5ff0ad71e32d3b433f36f2732bfbba70fa84
+  data.tar.gz: de478592b7552f4aa1b6459effe907b692d22b334b63eb1dc02e7a3ca5e0e5779c7fe82306d3211935df1964f085fdba0e3e6f159716a0055dc45e370be8f6c4

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,42 @@
+---
+name: Bug report
+about: Bug report for Cloudinary Ruby SDK
+title: ''
+labels: ''
+assignees: const-cloudinary
+
+---
+
+## Bug report for Cloudinary Ruby SDK
+Before proceeding, please update to latest version and test if the issue persists
+
+## Describe the bug in a sentence or two.
+…
+
+## 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)
+
+## Steps to reproduce
+… if applicable
+
+## Error screenshots or Stack Trace (if applicable)
+…
+
+## Operating System
+[ ] Linux
+[ ] Windows
+[ ] OSX
+[ ] 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
+
+## Repository
+If possible, please provide a link to a reproducible repository that showcases the problem

data/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,21 @@
+---
+name: Feature request
+about: Feature request for Cloudinary Ruby SDK
+title: ''
+labels: ''
+assignees: const-cloudinary
+
+---
+
+## Feature request for Cloudinary Ruby SDK
+…(If your feature is for other SDKs, please request them there)
+
+
+## Explain your use case
+… (A high level explanation of why you need this feature)
+
+## Describe the problem you’re trying to solve
+… (A more technical view of what you’d like to accomplish, and how this feature will help you achieve it)
+
+## Do you have a proposed solution?
+… (yes, no? Please elaborate if needed)

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,75 @@
 
+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
+===================
+
+New functionality and features
+------------------------------
+
+  * Add support for `accessibility_analysis` parameter
+  
+Other Changes
+-------------
+  * Fix `download` function in `Cloudinary::CarrierWave`
+  * Fix handling of empty value in `if` parameter
+  * Fix consumption of configuration from environment variables
+
+1.14.0 / 2020-05-06
+===================
+
+New functionality and features
+------------------------------
+
+  * Add support of global folder in ActiveStorage
+  * Add duration to conditions in video
+
+Other Changes
+-------------
+
+  * Fix `URI.unescape is obsolete` warning
+  * Fix lingering Rails 6 autoload warnings
+  * Fix Ruby 1.9 CI build
+  * Allow setting uploader timeout to `nil`
+  * Update link to CarrierWave integration
+  * Update issue templates
+
 1.13.2 / 2020-01-19
 ===================
 

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

@@ -24,11 +24,26 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "actionpack"
   s.add_development_dependency "nokogiri"
-  s.add_development_dependency "rake"
+
+  if RUBY_VERSION >= "2.2.0"
+    s.add_development_dependency "rake", ">= 13.0.1"
+  else
+    s.add_development_dependency "rake", "<= 12.2.1"
+  end
+
   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"
   s.add_development_dependency "rspec-rails"
+
   s.add_development_dependency "rubyzip", "<=1.2.0" # support testing Ruby 1.9
-  s.add_development_dependency "simplecov"
+
+  if RUBY_VERSION <= "2.4.0"
+    s.add_development_dependency "simplecov", "<= 0.17.1" # support testing Ruby 1.9
+  else
+    s.add_development_dependency "simplecov", "> 0.18.0"
+  end
 end

data/lib/active_storage/service/cloudinary_service.rb

@@ -12,6 +12,15 @@ unless ActiveStorage::Blob.method_defined? :original_key
   end
 end
 
+module CloudinaryHelper
+  alias cloudinary_url_internal_original cloudinary_url_internal
+
+  def cloudinary_url_internal(source, options = {})
+    source = ActiveStorage::Blob.service.public_id(source) if defined? ActiveStorage::Blob.service.public_id
+    cloudinary_url_internal_original(source, options)
+  end
+end
+
 module ActiveStorage
   class Service::CloudinaryService < Service
     module Headers
@@ -31,7 +40,7 @@ module ActiveStorage
           options = @options.merge(options)
           Cloudinary::Uploader.upload(
             io,
-            public_id: public_id(key),
+            public_id: public_id_internal(key),
             resource_type: resource_type(io, key),
             context: {active_storage_key: key, checksum: checksum},
             extra_headers: extra_headers,
@@ -61,7 +70,7 @@ module ActiveStorage
     def url_for_direct_upload(key, **options)
       instrument :url, key: key do |payload|
         options = {:resource_type => resource_type(nil, key)}.merge(@options.merge(options.symbolize_keys))
-        options[:public_id] = public_id(key)
+        options[:public_id] = public_id_internal(key)
         options[:context] = {active_storage_key: key}
         options.delete(:file)
         payload[:url] = api_uri("upload", options)
@@ -137,13 +146,19 @@ module ActiveStorage
 
     end
 
+    def public_id(key)
+      return key unless @options[:folder]
+
+      File.join(@options.fetch(:folder), public_id_internal(key))
+    end
+
     private
 
     def api_uri(action, options)
       base_url = Cloudinary::Utils.cloudinary_api_url(action, options)
       upload_params = Cloudinary::Uploader.build_upload_params(options)
 
-      upload_params.reject! {|k, v| Cloudinary::Utils.safe_blank?(v)}
+      upload_params.reject! { |k, v| Cloudinary::Utils.safe_blank?(v) }
       unless options[:unsigned]
         upload_params = Cloudinary::Utils.sign_request(upload_params, options)
       end
@@ -173,7 +188,7 @@ module ActiveStorage
       @formats[content_type]
     end
 
-    def public_id(key)
+    def public_id_internal(key)
       # TODO: Allow custom manipulation of key to obscure how we store in Cloudinary
       key
     end

data/lib/cloudinary.rb

@@ -64,19 +64,7 @@ module Cloudinary
     first_time = @@config.nil?
     @@config   ||= OpenStruct.new((YAML.load(ERB.new(IO.read(config_dir.join("cloudinary.yml"))).result)[config_env] rescue {}))
 
-    # Heroku support
-    if first_time && ENV["CLOUDINARY_CLOUD_NAME"]
-      set_config(
-        "cloud_name"          => ENV["CLOUDINARY_CLOUD_NAME"],
-        "api_key"             => ENV["CLOUDINARY_API_KEY"],
-        "api_secret"          => ENV["CLOUDINARY_API_SECRET"],
-        "secure_distribution" => ENV["CLOUDINARY_SECURE_DISTRIBUTION"],
-        "private_cdn"         => ENV["CLOUDINARY_PRIVATE_CDN"].to_s == 'true',
-        "secure"              => ENV["CLOUDINARY_SECURE"].to_s == 'true'
-      )
-    elsif first_time && ENV["CLOUDINARY_URL"]
-      config_from_url(ENV["CLOUDINARY_URL"])
-    end
+    config_from_env if first_time
 
     set_config(new_config) if new_config
     yield(@@config) if block_given?
@@ -105,7 +93,7 @@ module Cloudinary
       if isNestedKey? key
         putNestedKey key, value
       else
-        set_config(key => URI.decode(value))
+        set_config(key => Utils.smart_unescape(value))
       end
     end
   end
@@ -140,18 +128,34 @@ module Cloudinary
   end
 
   private
-  
+
+  def self.config_from_env
+    # Heroku support
+    if ENV["CLOUDINARY_CLOUD_NAME"]
+      config_keys = ENV.keys.select! { |key| key.start_with? "CLOUDINARY_" }
+      config_keys -= ["CLOUDINARY_URL"] # ignore it when explicit options are passed
+      config_keys.each do |full_key|
+        conf_key = full_key["CLOUDINARY_".length..-1].downcase # convert "CLOUDINARY_CONFIG_NAME" to "config_name"
+        conf_val = ENV[full_key]
+        conf_val = conf_val == 'true' if %w[true false].include?(conf_val) # cast relevant boolean values
+        set_config(conf_key => conf_val)
+      end
+    elsif ENV["CLOUDINARY_URL"]
+      config_from_url(ENV["CLOUDINARY_URL"])
+    end
+  end
+
   def self.config_env
     return ENV["CLOUDINARY_ENV"] if ENV["CLOUDINARY_ENV"]
     return Rails.env if defined? Rails::env
     nil
   end
-  
+
   def self.config_dir
-    return Pathname.new(ENV["CLOUDINARY_CONFIG_DIR"]) if ENV["CLOUDINARY_CONFIG_DIR"] 
+    return Pathname.new(ENV["CLOUDINARY_CONFIG_DIR"]) if ENV["CLOUDINARY_CONFIG_DIR"]
     self.app_root.join("config")
   end
-  
+
   def self.set_config(new_config)
     new_config.each{|k,v| @@config.send(:"#{k}=", v) if !v.nil?}
   end

data/lib/cloudinary/api.rb

@@ -78,7 +78,7 @@ class Cloudinary::Api
     resource_type = options[:resource_type] || "image"
     type          = options[:type] || "upload"
     uri           = "resources/#{resource_type}/#{type}/#{public_id}"
-    call_api(:get, uri, 
+    call_api(:get, uri,
              only(options,
                   :cinemagraph_analysis,
                   :colors,
@@ -90,7 +90,8 @@ class Cloudinary::Api
                   :pages,
                   :phash,
                   :quality_analysis,
-                  :derived_next_cursor
+                  :derived_next_cursor,
+                  :accessibility_analysis
              ), options)
   end
 

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

@@ -1,10 +1,11 @@
 module Cloudinary::CarrierWave
   def download!(uri, *args)
-    return super if !self.cloudinary_should_handle_remote?
+    return super unless self.cloudinary_should_handle_remote?
     if respond_to?(:process_uri)
       uri = process_uri(uri)
     else # Backward compatibility with old CarrierWave
-      uri = URI.parse(URI.escape(URI.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/cloudinary_controller.rb

@@ -1,13 +1,11 @@
 module Cloudinary::CloudinaryController
   protected
-  
+
   def valid_cloudinary_response?
     received_signature = request.query_parameters[:signature]
     calculated_signature = Cloudinary::Utils.api_sign_request(
       request.query_parameters.select{|key, value| [:public_id, :version].include?(key.to_sym)},
       Cloudinary.config.api_secret)
     return received_signature == calculated_signature
-  end  
+  end
 end
-
-ActionController::Base.send :include, Cloudinary::CloudinaryController

data/lib/cloudinary/railtie.rb

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

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,6 +65,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]),
+      :accessibility_analysis    => Cloudinary::Utils.as_safe_bool(options[:accessibility_analysis])
     }
     params
   end
@@ -77,6 +79,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
@@ -248,7 +253,7 @@ class Cloudinary::Uploader
     end
   end
 
-  # options may include 'exclusive' (boolean) which causes clearing this tag from all other resources 
+  # options may include 'exclusive' (boolean) which causes clearing this tag from all other resources
   def self.add_tag(tag, public_ids = [], options = {})
     exclusive = options.delete(:exclusive)
     command   = exclusive ? "set_exclusive" : "add"
@@ -317,7 +322,7 @@ class Cloudinary::Uploader
       params[:signature] = Cloudinary::Utils.api_sign_request(params.reject { |k, v| non_signable.include?(k) }, api_secret)
       params[:api_key]   = api_key
     end
-    timeout = options[:timeout] || Cloudinary.config.timeout || 60
+    timeout = options.fetch(:timeout) { Cloudinary.config.to_h.fetch(:timeout, 60) }
 
     result = nil
 

data/lib/cloudinary/utils.rb

@@ -42,6 +42,8 @@ class Cloudinary::Utils
     "page_x"               => "px",
     "page_y"               => "py",
     "tags"                 => "tags",
+    "initial_duration"     => "idu",
+    "duration"             => "du",
     "width"                => "w"
   }
 
@@ -137,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)}
@@ -300,15 +305,11 @@ class Cloudinary::Utils
   # Translates the condition if provided.
   # @return [string] "if_" + ifValue
   # @private
-  def self.process_if(ifValue)
-    if ifValue
-      ifValue = normalize_expression(ifValue)
-
-      ifValue = "if_" + ifValue
-    end
+  def self.process_if(if_value)
+    "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)
@@ -499,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
@@ -543,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)
@@ -563,7 +565,7 @@ class Cloudinary::Utils
       source = smart_escape(source)
       source_to_sign = source
     else
-      source = smart_escape(URI.decode(source))
+      source = smart_escape(smart_unescape(source))
       source_to_sign = source
       unless url_suffix.blank?
         raise(CloudinaryException, "url_suffix should not include . or /") if url_suffix.match(%r([\./]))
@@ -767,13 +769,18 @@ class Cloudinary::Utils
     "#{public_id}#{ext}"
   end
 
-  # Based on CGI::unescape. In addition does not escape / :
+  # Based on CGI::escape. In addition does not escape / :
   def self.smart_escape(string, unsafe = /([^a-zA-Z0-9_.\-\/:]+)/)
     string.gsub(unsafe) do |m|
       '%' + m.unpack('H2' * m.bytesize).join('%').upcase
     end
   end
 
+  # Based on CGI::unescape. In addition keeps '+' character as is
+  def self.smart_unescape(string)
+    CGI.unescape(string.sub('+', '%2B'))
+  end
+
   def self.random_public_id
     sr = defined?(ActiveSupport::SecureRandom) ? ActiveSupport::SecureRandom : SecureRandom
     sr.base64(20).downcase.gsub(/[^a-z0-9]/, "").sub(/^[0-9]+/, '')[0,20]
@@ -1129,4 +1136,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.13.2"
+  VERSION = "1.17.0"
 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

@@ -164,7 +164,7 @@ var slice = [].slice,
   * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.
   * @example
   *
-  * function Foo(){};  
+  * function Foo(){};
   * isFunction(Foo);
   * // => true
   *
@@ -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
@@ -3070,7 +3074,7 @@ var slice = [].slice,
      * @protected
      * @param {string} key - attribute name
      * @param {*|boolean} value - the value of the attribute. If the value is boolean `true`, return the key only.
-     * @returns {string} the attribute  
+     * @returns {string} the attribute
      *
      */
 

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.13.2
+  version: 1.17.0
 platform: ruby
 authors:
 - Nadav Soferman
 - Itai Lahan
 - Tal Lev-Ami
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-19 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws_cf_signer
@@ -74,14 +74,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -156,16 +170,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.0
 description: Client library for easily using the Cloudinary service
 email:
 - nadav.soferman@cloudinary.com
@@ -175,6 +189,9 @@ executables: []
 extensions: []
 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"
@@ -218,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
@@ -236,7 +256,7 @@ homepage: http://cloudinary.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -251,8 +271,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Client library for easily using the Cloudinary service
 test_files: []