Skip to content

Commit 2716130

Browse files
Amir Tockertocker
authored andcommitted
Fix breakpoints format parameter
1 parent 63cb44f commit 2716130

File tree

10 files changed

+56
-28
lines changed

10 files changed

+56
-28
lines changed

lib/api.js

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/api.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/uploader.js

Lines changed: 7 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/uploader.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/utils.js

Lines changed: 3 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/utils.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/v2/api.js

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/v2/api.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/utils.coffee

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -969,13 +969,9 @@ exports.generate_responsive_breakpoints_string = (breakpoints)->
969969

970970
for breakpoint_settings in breakpoints
971971
if breakpoint_settings?
972-
transformation = breakpoint_settings.transformation
973-
delete breakpoint_settings.transformation
974-
format = breakpoint_settings.format
975-
delete breakpoint_settings.format
976-
if transformation
977-
transformation = utils.generate_transformation_string(_.clone(transformation))
978-
breakpoint_settings.transformation = _.compact([transformation, format]).join("/")
972+
if breakpoint_settings.transformation
973+
breakpoint_settings.transformation = utils.generate_transformation_string(_.clone(breakpoint_settings.transformation))
974+
979975
JSON.stringify(breakpoints)
980976

981977
exports.build_streaming_profiles_param = (options={})->

test/uploader_spec.coffee

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -557,14 +557,30 @@ describe "uploader", ->
557557
context ":responsive_breakpoints", ->
558558
context ":create_derived with different transformation settings", ->
559559
it 'should return a responsive_breakpoints in the response', (done)->
560-
cloudinary.v2.uploader.upload IMAGE_FILE, responsive_breakpoints: [{transformation:{effect: "sepia"}, format:"jpg", bytes_step:20000, create_derived: true, min_width: 200, max_width: 1000, max_images: 20}, {format:"gif", create_derived:true, bytes_step:20000, min_width: 200, max_width: 1000, max_images: 20}], tags: UPLOAD_TAGS, (error, result)->
560+
cloudinary.v2.uploader.upload IMAGE_FILE, responsive_breakpoints: [{
561+
transformation: {effect: "sepia"},
562+
format: "jpg",
563+
bytes_step: 20000,
564+
create_derived: true,
565+
min_width: 200,
566+
max_width: 1000,
567+
max_images: 20
568+
}, {
569+
transformation: {angle: 10},
570+
format: "gif",
571+
create_derived: true,
572+
bytes_step: 20000,
573+
min_width: 200,
574+
max_width: 1000,
575+
max_images: 20
576+
}], tags: UPLOAD_TAGS, (error, result)->
561577
return done(new Error error.message) if error?
562578
expect(result).to.have.key('responsive_breakpoints')
563579
expect(result.responsive_breakpoints).to.have.length(2)
564-
expect(result.responsive_breakpoints[0]).to.have.key("transformation")
565-
expect(result.responsive_breakpoints[0].transformation).to.eql("e_sepia/jpg")
566-
expect(result.responsive_breakpoints[1]).to.have.key("transformation")
567-
expect(result.responsive_breakpoints[1].transformation).to.eql("gif")
580+
expect(_.at(result, "responsive_breakpoints[0].transformation")[0]).to.eql("e_sepia")
581+
expect(_.at(result, "responsive_breakpoints[0].breakpoints[0].url")[0]).to.match(/\.jpg$/)
582+
expect(_.at(result, "responsive_breakpoints[1].transformation")[0]).to.eql("a_10")
583+
expect(_.at(result, "responsive_breakpoints[1].breakpoints[0].url")[0]).to.match(/\.gif$/)
568584
done()
569585
true
570586

0 commit comments

Comments
 (0)