Add force_version transformation parameter

Author: strausr

.eslintignore

@@ -1,3 +1,4 @@
 lib-es5/*
 *.min.js
-node_modules
+node_modules
+test_cache/

lib-es5/utils/index.js

@@ -729,6 +729,10 @@ function url(public_id) {
   var transformation = utils.generate_transformation_string(options);
   var resource_type = utils.option_consume(options, "resource_type", "image");
   var version = utils.option_consume(options, "version");
+  var force_version = utils.option_consume(options, "force_version", config().force_version);
+  if (force_version == null) {
+    force_version = true;
+  }
   var format = utils.option_consume(options, "format");
   var cloud_name = utils.option_consume(options, "cloud_name", config().cloud_name);
   if (!cloud_name) {
@@ -783,14 +787,16 @@ function url(public_id) {
   public_id = _finalize_source2[0];
   source_to_sign = _finalize_source2[1];
 
-  if (source_to_sign.indexOf("/") > 0 && !source_to_sign.match(/^v[0-9]+/) && !source_to_sign.match(/^https?:\//)) {
-    if (version == null) {
-      version = 1;
-    }
+
+  if (version == null && force_version && source_to_sign.indexOf("/") >= 0 && !source_to_sign.match(/^v[0-9]+/) && !source_to_sign.match(/^https?:\//)) {
+    version = 1;
   }
   if (version != null) {
     version = `v${version}`;
+  } else {
+    version = null;
   }
+
   transformation = transformation.replace(/([^:])\/\//g, '$1/');
   if (sign_url && isEmpty(auth_token)) {
     var to_sign = [transformation, source_to_sign].filter(function (part) {

lib/utils/index.js

@@ -732,6 +732,10 @@ function url(public_id, options = {}) {
   let transformation = utils.generate_transformation_string(options);
   let resource_type = utils.option_consume(options, "resource_type", "image");
   let version = utils.option_consume(options, "version");
+  let force_version = utils.option_consume(options, "force_version", config().force_version);
+  if (force_version == null) {
+    force_version = true;
+  }
   let format = utils.option_consume(options, "format");
   let cloud_name = utils.option_consume(options, "cloud_name", config().cloud_name);
   if (!cloud_name) {
@@ -773,14 +777,16 @@ function url(public_id, options = {}) {
   }
   [resource_type, type] = finalize_resource_type(resource_type, type, url_suffix, use_root_path, shorten);
   [public_id, source_to_sign] = finalize_source(public_id, format, url_suffix);
-  if (source_to_sign.indexOf("/") > 0 && !source_to_sign.match(/^v[0-9]+/) && !source_to_sign.match(/^https?:\//)) {
-    if (version == null) {
-      version = 1;
-    }
+
+  if (version == null && force_version && source_to_sign.indexOf("/") >= 0 && !source_to_sign.match(/^v[0-9]+/) && !source_to_sign.match(/^https?:\//)) {
+    version = 1;
   }
   if (version != null) {
     version = `v${version}`;
+  } else {
+    version = null;
   }
+
   transformation = transformation.replace(/([^:])\/\//g, '$1/');
   if (sign_url && isEmpty(auth_token)) {
     let to_sign = [transformation, source_to_sign].filter(function (part) {

test/utils_spec.js

@@ -1257,6 +1257,28 @@ describe("utils", function () {
   it("should not add version if public_id contains version already", function () {
     test_cloudinary_url("v1234/test", {}, `http://res.cloudinary.com/${cloud_name}/image/upload/v1234/test`, {});
   });
+  it("should not set default version v1 to resources stored in folders if force_version is set to false", function () {
+    test_cloudinary_url("folder/test", {},
+      `http://res.cloudinary.com/${cloud_name}/image/upload/v1/folder/test`, {});
+    test_cloudinary_url("folder/test",
+      { force_version: false }, `http://res.cloudinary.com/${cloud_name}/image/upload/folder/test`, {});
+  });
+  it("explicitly set version is always passed", function () {
+    test_cloudinary_url("test",
+      { force_version: false, version: '1234' }, `http://res.cloudinary.com/${cloud_name}/image/upload/v1234/test`, {});
+    test_cloudinary_url("folder/test",
+      { force_version: false, version: '1234' }, `http://res.cloudinary.com/${cloud_name}/image/upload/v1234/folder/test`, {});
+  });
+  it("should use force_version from config", function () {
+    cloudinary.config({ force_version: false });
+    test_cloudinary_url("folder/test",
+      {}, `http://res.cloudinary.com/${cloud_name}/image/upload/folder/test`, {});
+  });
+  it("should override config with options", function () {
+    cloudinary.config({ force_version: false });
+    test_cloudinary_url("folder/test",
+      { force_version: true }, `http://res.cloudinary.com/${cloud_name}/image/upload/v1/folder/test`, {});
+  });
   it("should allow to shorted image/upload urls", function () {
     test_cloudinary_url("test", {
       shorten: true,