cloudinary 1.16.0 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38bfe3ef22f15b588b0cc8d80a433eb76d31b899eed350a8722547eeeee86643
-  data.tar.gz: f00c4f2e455a3ef278a5169df4fd40f982e65f774ccd444095053663dc531c15
+  metadata.gz: eeda4318322d6304cf37a68c621387dc7d4382cd45d6665eddea154ce30adac3
+  data.tar.gz: ef675318a0c25a7e729d91ad014a8b36bad2756cafb73c20f69693b230747537
 SHA512:
-  metadata.gz: 560784ae8664c5d3425599cb40cd72f69010223a22ae8d62dbb0c16033ce25dc28ae5810f39adb859436209d767dbfbe097974f7f8018add701eb072556e5bb3
-  data.tar.gz: 551b473e18bb1774a724da52201c8a8d463cb7dcaaa3926de8f980b150fb18e69c03d50d39fa6e9d11d2d8f29d1413759953d714166252c6390e08ad5811c668
+  metadata.gz: c1ad5eee4b1b5eca7467e134cba0fc9516c0fe5af018637c1c0dbabc0a707a30e1cb115892de48f2acd2f8d339159842599edb7e0a1be15ea4ef391cbe569b78
+  data.tar.gz: 19235e8274a35ed46c302a57056c45ff885b1a59a8ad852b057bce384729b108105b9b6d53638adefc2b317cccbc3fae48f4dbae962937e3e682da962f817b86

data/CHANGELOG.md

@@ -1,4 +1,10 @@
 
+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
 ===================
 

data/lib/cloudinary/utils.rb

@@ -139,7 +139,7 @@ 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=]+)$)
 
   def self.extract_config_params(options)
       options.select{|k,v| URL_KEYS.include?(k)}

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.16.0"
+  VERSION = "1.16.1"
 end

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

@@ -1473,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
+      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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.16.1
 platform: ruby
 authors:
 - Nadav Soferman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-29 00:00:00.000000000 Z
+date: 2020-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws_cf_signer