Merge pull request #144 from cloudinary/feature/misc_and_params_completion

Feature/misc and params completion

Author: tocker

src/api.coffee

@@ -250,7 +250,7 @@ exports.create_upload_mapping = (name, callback, options = {})->
   call_api("post", 'upload_mappings', params, callback, options)
 
 publishResource = (byKey, value, callback, options={})->
-  params = api.only(options, "invalidate", "overwrite")
+  params = api.only(options, "type", "invalidate", "overwrite")
   params[byKey] = value
   resource_type = options.resource_type ? "image"
   uri = ["resources", resource_type, "publish_resources"]

src/utils.coffee

@@ -351,6 +351,7 @@ exports.generate_transformation_string = (options) ->
     e: normalize_expression(effect)
     fl: flags
     h: normalize_expression(height)
+    ki: normalize_expression(utils.option_consume(options, "keyframe_interval"))
     l: overlay
     o: normalize_expression(utils.option_consume(options, "opacity"))
     q: normalize_expression(utils.option_consume(options, "quality"))

test/api_spec.coffee

@@ -838,9 +838,9 @@ describe "api", ->
         return done(new Error error.message) if error?
         done()
       true
-    it "by public id", (done)->
+    it "should publish by public id", (done)->
       @timeout helper.TIMEOUT_LONG
-      cloudinary.v2.api.publish_by_ids [publishTestId], (error, result)->
+      cloudinary.v2.api.publish_by_ids [publishTestId], type: "authenticated", (error, result)->
         return done(new Error error.message) if error?
         published = result.published
         expect(published).not.to.be(null)
@@ -849,7 +849,7 @@ describe "api", ->
         expect(published[0].url).to.match(/\/upload\//)
         done()
       true
-    it "by prefix", (done)->
+    it "should publish by prefix", (done)->
       @timeout helper.TIMEOUT_LONG
       cloudinary.v2.api.publish_by_prefix publishTestId[0..-2], (error, result)->
         return done(new Error error.message) if error?
@@ -860,7 +860,7 @@ describe "api", ->
         expect(published[0].url).to.match(/\/upload\//)
         done()
       true
-    it "by tag", (done)->
+    it "should publish by tag", (done)->
       @timeout helper.TIMEOUT_LONG
       cloudinary.v2.api.publish_by_tag publishTestTag, (error, result)->
         return done(new Error error.message) if error?
@@ -871,6 +871,16 @@ describe "api", ->
         expect(published[0].url).to.match(/\/upload\//)
         done()
       true
+    it "should return empty when explicit given type doesn't match resource", (done)->
+      @timeout helper.TIMEOUT_LONG
+      cloudinary.v2.api.publish_by_ids [publishTestId], type: "private", (error, result)->
+        return done(new Error error.message) if error?
+        published = result.published
+        expect(published).not.to.be(null)
+        expect(published.length).to.be(0)
+        done()
+      true
+
   describe "access_mode", ->
     i = 0
     @timeout helper.TIMEOUT_LONG

test/video_spec.coffee

@@ -33,9 +33,10 @@ describe "video tag helper", ->
       html_width  : "200",
       video_codec : {codec: "h264"},
       audio_codec : "acc",
-      start_offset: 3
+      start_offset: 3,
+      keyframe_interval: "2.0"
     }
-    expected_url = VIDEO_UPLOAD_PATH + "ac_acc,so_3,vc_h264/movie"
+    expected_url = VIDEO_UPLOAD_PATH + "ac_acc,ki_2.0,so_3,vc_h264/movie"
     expect(cloudinary.video("movie", options)).to.eql(
       "<video height='100' poster='#{expected_url}.jpg' src='#{expected_url}.mp4' width='200'></video>")
 
@@ -51,15 +52,15 @@ describe "video tag helper", ->
     delete options['html_width']
     options['width'] = 250
     options['crop'] = 'scale'
-    expected_url = VIDEO_UPLOAD_PATH + "ac_acc,c_scale,so_3,vc_h264,w_250/movie"
+    expected_url = VIDEO_UPLOAD_PATH + "ac_acc,c_scale,ki_2.0,so_3,vc_h264,w_250/movie"
     expect(cloudinary.video("movie", options)).to.eql(
       "<video poster='#{expected_url}.jpg' width='250'>" +
       "<source src='#{expected_url}.webm' type='video/webm'>" +
       "<source src='#{expected_url}.mp4' type='video/mp4'>" +
       "<source src='#{expected_url}.ogv' type='video/ogg'>" +
       "</video>")
 
-    expected_url = VIDEO_UPLOAD_PATH + "ac_acc,c_fit,so_3,vc_h264,w_250/movie"
+    expected_url = VIDEO_UPLOAD_PATH + "ac_acc,c_fit,ki_2.0,so_3,vc_h264,w_250/movie"
     options['crop'] = 'fit'
     expect(cloudinary.video("movie", options)).to.eql(
       "<video poster='#{expected_url}.jpg'>" +