cloudinary 1.16.1 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eeda4318322d6304cf37a68c621387dc7d4382cd45d6665eddea154ce30adac3
-  data.tar.gz: ef675318a0c25a7e729d91ad014a8b36bad2756cafb73c20f69693b230747537
+  metadata.gz: e36bd9efd91c46b00fc0f52a3448ee076990a85b88a470e2cc8e7ccc610ed368
+  data.tar.gz: dbf3cb94bc5cae2b502b2ca1bea558c93c11e0f77d91fe0577e019452c2acc93
 SHA512:
-  metadata.gz: c1ad5eee4b1b5eca7467e134cba0fc9516c0fe5af018637c1c0dbabc0a707a30e1cb115892de48f2acd2f8d339159842599edb7e0a1be15ea4ef391cbe569b78
-  data.tar.gz: 19235e8274a35ed46c302a57056c45ff885b1a59a8ad852b057bce384729b108105b9b6d53638adefc2b317cccbc3fae48f4dbae962937e3e682da962f817b86
+  metadata.gz: ba800e50f02feb8cd582a4ca42f6bdfe0fd77c6e36c9dd7e0c3314c9d944bafc451329c79276b02b417f04357aad5ff0ad71e32d3b433f36f2732bfbba70fa84
+  data.tar.gz: de478592b7552f4aa1b6459effe907b692d22b334b63eb1dc02e7a3ca5e0e5779c7fe82306d3211935df1964f085fdba0e3e6f159716a0055dc45e370be8f6c4

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,21 @@
 
+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
 ===================
 

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/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/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],

data/lib/cloudinary/utils.rb

@@ -141,6 +141,9 @@ class Cloudinary::Utils
 
   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)}
   end
@@ -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)
@@ -1132,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.16.1"
+  VERSION = "1.17.0"
 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

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.16.1
+  version: 1.17.0
 platform: ruby
 authors:
 - Nadav Soferman
 - Itai Lahan
 - Tal Lev-Ami
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2020-08-21 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"
@@ -222,6 +237,8 @@ files:
 - lib/cloudinary/video_helper.rb
 - 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
@@ -239,7 +256,7 @@ homepage: http://cloudinary.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -254,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: []