Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support different radius for each corner (containing images and overlays) #260

Merged
merged 2 commits into from
Oct 10, 2019
Merged

Support different radius for each corner (containing images and overlays) #260

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78d3fcf
Support different radius for each corner (containing images and overl…
YomesInc Apr 22, 2019
295d628
resolve conflicts
strausr Oct 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion lib-es5/utils/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,30 @@ function process_layer(layer) {
return result;
}

/**
* Parse radius options
* @private
* @param {Array<string|number>|string|number} radius The radius to parse
* @return {string} radius transformation string
*/
function process_radius(radius) {
if (!radius) {
return radius;
}
if (!isArray(radius)) {
radius = [radius];
}
if (radius.length === 0 || radius.length > 4) {
throw new Error("Radius array should contain between 1 and 4 values");
}
if (radius.findIndex(function (x) {
return x === null;
}) >= 0) {
throw new Error("Corner: Cannot be null");
}
return radius.map(normalize_expression).join(':');
}

function base64EncodeURL(url) {
var ignore;
try {
Expand Down Expand Up @@ -545,6 +569,7 @@ exports.generate_transformation_string = function generate_transformation_string
options["end_offset"] = _split_range2[1];
}
var overlay = process_layer(utils.option_consume(options, "overlay"));
var radius = process_radius(utils.option_consume(options, "radius"));
var underlay = process_layer(utils.option_consume(options, "underlay"));
var ifValue = process_if(utils.option_consume(options, "if"));
var fps = utils.option_consume(options, 'fps');
Expand All @@ -567,7 +592,7 @@ exports.generate_transformation_string = function generate_transformation_string
l: overlay,
o: normalize_expression(utils.option_consume(options, "opacity")),
q: normalize_expression(utils.option_consume(options, "quality")),
r: normalize_expression(utils.option_consume(options, "radius")),
r: radius,
t: named_transformation,
u: underlay,
w: normalize_expression(width),
Expand Down
27 changes: 25 additions & 2 deletions lib/utils/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,28 @@ function process_layer(layer) {
return result;
}

/**
* Parse radius options
* @private
* @param {Array<string|number>|string|number} radius The radius to parse
* @return {string} radius transformation string
*/
function process_radius(radius) {
if (!radius) {
return radius;
}
if (!isArray(radius)) {
radius = [radius];
}
if (radius.length === 0 || radius.length > 4) {
throw new Error("Radius array should contain between 1 and 4 values");
}
if (radius.findIndex(x => x === null) >= 0) {
throw new Error("Corner: Cannot be null");
}
return radius.map(normalize_expression).join(':');
}

function base64EncodeURL(url) {
var ignore;
try {
Expand Down Expand Up @@ -552,10 +574,11 @@ exports.generate_transformation_string = function generate_transformation_string
[options["start_offset"], options["end_offset"]] = split_range(utils.option_consume(options, "offset"));
}
let overlay = process_layer(utils.option_consume(options, "overlay"));
let radius = process_radius(utils.option_consume(options, "radius"));
let underlay = process_layer(utils.option_consume(options, "underlay"));
let ifValue = process_if(utils.option_consume(options, "if"));
let fps = utils.option_consume(options, 'fps');
if(isArray(fps)){
if (isArray(fps)){
fps = fps.join('-');
}
let params = {
Expand All @@ -574,7 +597,7 @@ exports.generate_transformation_string = function generate_transformation_string
l: overlay,
o: normalize_expression(utils.option_consume(options, "opacity")),
q: normalize_expression(utils.option_consume(options, "quality")),
r: normalize_expression(utils.option_consume(options, "radius")),
r: radius,
t: named_transformation,
u: underlay,
w: normalize_expression(width),
Expand Down
37 changes: 37 additions & 0 deletions test/cloudinary_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,43 @@ describe("cloudinary", function() {
}), `${upload_path}/g_center,p_a,q_auto:good,r_3,x_1,y_2/test`);
});
});
describe(":radius", function() {
const upload_path = 'http://res.cloudinary.com/test123/image/upload';
it("should support a single value", function() {
expect(cloudinary.utils.url("test", {
radius: 10
})).to.eql(`${upload_path}/r_10/test`);
expect(cloudinary.utils.url("test", {
radius: '10'
})).to.eql(`${upload_path}/r_10/test`);
expect(cloudinary.utils.url("test", {
variables: [['$v', 10]],
radius: '$v',
})).to.eql(`${upload_path}/$v_10,r_$v/test`);
});
it("should support an array of values", function() {
expect(cloudinary.utils.url("test", {
radius: [10,20,30]
})).to.eql(`${upload_path}/r_10:20:30/test`);
expect(cloudinary.utils.url("test", {
variables: [['$v', 10]],
radius: [10,20,'$v'],
})).to.eql(`${upload_path}/$v_10,r_10:20:$v/test`);
expect(cloudinary.utils.url("test", {
variables: [['$v', 10]],
radius: [10,20,'$v',40],
})).to.eql(`${upload_path}/$v_10,r_10:20:$v:40/test`);
})
it("should support colon separated values", function() {
expect(cloudinary.utils.url("test", {
radius: "10:20"
})).to.eql(`${upload_path}/r_10:20/test`);
expect(cloudinary.utils.url("test", {
variables: [['$v', 10]],
radius: "10:20:$v:40"
})).to.eql(`${upload_path}/$v_10,r_10:20:$v:40/test`);
})
})
it("should support named transformation", function() {
var options, result;
options = {
Expand Down
20 changes: 20 additions & 0 deletions test/utils_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,25 @@ describe("utils", function () {
angle: 'auto'
}, `http://res.cloudinary.com/${cloud_name}/image/upload/a_auto,c_scale,h_100,w_100/test`, {});
});
it("should disallow radius arrays that contain 0 or more than 4 values", function () {
expect(function () {
return utils.url("test", {
radius: [10, 20, 30, 10, 20]
});
}).to.throwError(/Radius array should contain between 1 and 4 values/);
expect(function () {
return utils.url("test", {
radius: []
});
}).to.throwError(/Radius array should contain between 1 and 4 values/);
});
it("should disallow radius arrays containing null values", function () {
expect(function () {
return utils.url("test", {
radius: [null, 20, 30, 10]
});
}).to.throwError(/Corner: Cannot be null/);
});
it("should use x, y, radius, prefix, gravity and quality from options", function () {
test_cloudinary_url("test", {
x: 1,
Expand Down Expand Up @@ -1438,3 +1457,4 @@ describe("utils", function () {

})
});