Merge branch 'master' into feature/search-by-context

# Conflicts:
#	lib/api.js
#	lib/api.js.map
#	lib/config.js
#	lib/preloaded_file.js
#	lib/upload_stream.js
#	lib/uploader.js
#	lib/uploader.js.map
#	lib/utils.js
#	lib/utils.js.map
#	lib/v2/api.js
#	lib/v2/index.js
#	lib/v2/uploader.js
#	test/api_spec.coffee

Author: Amir Tocker

.travis.yml

@@ -1,6 +1,7 @@
 language: node_js
 node_js:
-- '5.11'
+- '4'
+- '6'
 env:
   matrix:
     secure: JXtnVGwM09h0TwTD3pl4htaVn0fotnbfXNvFUXKnz/+OOETha5/GtaZSzrKTWUBbLAlC1VfE9FN5YovKOnfknquijBlgZi+lc3AX7r/chtvSGJiSqGtvQwtmOsNrF/eUIZ1rmoZSGbPgwSB7/3Mg8yyrx402d9dripiAYugAPJuOnhMUa2JlR2nQqBEJf90yeqIO9luKBeBUJCYUxSJeJhSAUgSRoPq8Z7OOtIePTShtN3cwFD/X2+OsTrQc99qqQQH1iC8DPQZgWjIjDwuzzDovy16gVanto+X2Mbb8pxsFu0LkPz0z25W/MBpU+Wyobmb8mcyvgo0Wjbcrf2u0OzOtpDF04TyjBQroLi/7gwlFGro1IIEkNVgF9Ju7LepFKrChS3fe9Wk7a/cey//PkC/A5I8hHr8Ii06Ew7oAnLsgDs6Ib6QN4kOWvVCoQ1rDVGiqaNH8WtET+l2EpBFXocxdPMTKVd4x/oQSUbripiDpsYKS+FLSiZ91sqDh2wF6jxdaTNOwB3/5RN+2HF3d1nFWtwiglXsTaP9ojJGFus518tT9oi5rkz6fUE7A8HleLX5ezziHOW8XQ4Ui/3dYyn52lVpN3ZVeZrh4PtVviYzf9tuVXvh8TwMPZHTOIIYVj3RYERflCJeb7CgPRd5fO/uwrD7IZFeZ1ScMBkCY+aU=

CHANGELOG.md

@@ -1,4 +1,35 @@
 
+1.5.0 / 2016-12-29
+==================
+
+New functionality
+-----------------
+
+  * `add_context` & `remove_all_context` API
+  * Add `data-max-chunk-size` to input created by `image_upload_tag`
+  * Add `moderation` and `phash` parameters to explicit API
+  
+    
+Other changes
+-------------
+
+  * Modify Travis configuration to test NodeJS v4 and v6 only.
+  * Modify `TEST_TAG`
+  * Use Sinon spy in `start_at` test
+  * Support context as hash argument in context API
+  * Delete streaming profiles after tests
+  * Fix signing URL tests, Fixes #89
+  * Add timeout to delete streaming profile test
+  * add tests for add_context & remove_all_context
+  * add add_context & remove_all_context methods
+  * fix test description
+  * add test to phash in an explicit call
+  * add test to moderation parameter in an explicit call
+  * Add test to accepts {effect: art:incognito}
+  * support phash in explicit call
+  * Fix missing moderation parameter in an explicit call
+  * Fix `nil` to `null`. Call `config()` with parameter name.
+
 1.4.6 / 2016-11-25
 ==================
 

lib/v2/uploader.js.map

@@ -2,7 +2,7 @@
   "author": "Cloudinary <[email protected]>",
   "name": "cloudinary",
   "description": "Cloudinary NPM for node.js integration",
-  "version": "1.4.6",
+  "version": "1.5.0",
   "homepage": "http://cloudinary.com",
   "license": "MIT",
   "repository": {
@@ -18,14 +18,17 @@
     "coffee-script": "^1.10.0",
     "dotenv": "1.x",
     "expect.js": "0.3.x",
+    "jsdom": "^9.5.0",
+    "jsdom-global": "^2.1.0",
     "mocha": "2.3.x",
     "sinon": "^1.17.2"
   },
   "scripts": {
     "pretest": "npm run compile",
     "prepublish": "npm run compile",
     "test": "node_modules/.bin/mocha -R spec --recursive test/",
-    "compile": "node_modules/.bin/coffee --map -o lib -c src"
+    "compile": "node_modules/.bin/coffee --map -o lib -c src",
+    "watch": "node_modules/.bin/coffee --watch --map -o lib -c src"
   },
   "optionalDependencies": {},
   "engines": {

package.json

@@ -12,10 +12,10 @@ api = module.exports
 
 call_api = (method, uri, params, callback, options) ->
   deferred = Q.defer()
-  cloudinary = options["upload_prefix"] ? config().upload_prefix ? "https://api.cloudinary.com"
-  cloud_name = options["cloud_name"] ? config().cloud_name ? throw("Must supply cloud_name")
-  api_key = options["api_key"] ? config().api_key ? throw("Must supply api_key")
-  api_secret = options["api_secret"] ? config().api_secret ? throw("Must supply api_secret")
+  cloudinary = options["upload_prefix"] ? config("upload_prefix") ? "https://api.cloudinary.com"
+  cloud_name = options["cloud_name"] ? config("cloud_name") ? throw("Must supply cloud_name")
+  api_key = options["api_key"] ? config("api_key") ? throw("Must supply api_key")
+  api_secret = options["api_secret"] ? config("api_secret") ? throw("Must supply api_secret")
   api_url = [cloudinary, "v1_1", cloud_name].concat(uri).join("/")
   query_params = querystring.stringify(params)
   if method == "get"
@@ -233,7 +233,7 @@ exports.upload_mappings = (callback, options = {})->
   params = api.only(options, "next_cursor", "max_results")
   call_api("get", "upload_mappings", params, callback, options)
 
-exports.upload_mapping = (name = nil, callback, options = {})->
+exports.upload_mapping = (name = null, callback, options = {})->
   call_api("get", 'upload_mappings', {folder: name}, callback, options)
 
 exports.delete_upload_mapping = (name, callback, options = {})->

src/api.coffee

@@ -196,6 +196,24 @@ call_tags_api = (tag, command, public_ids = [], callback, options = {}) ->
       params.tag = tag
     return [params]
 
+exports.add_context = (context, public_ids = [], callback, options = {}) ->
+  call_context_api(context, 'add', public_ids, callback, options)
+
+exports.remove_all_context = (public_ids = [], callback, options = {}) ->
+  call_context_api(null, 'remove_all', public_ids, callback, options)
+
+call_context_api = (context, command, public_ids = [], callback, options = {}) ->
+  call_api 'context', callback, options, ->
+    params = {
+      timestamp: utils.timestamp(),
+      public_ids: utils.build_array(public_ids),
+      command: command,
+      type: options.type
+    }
+    if context?
+      params.context = utils.encode_key_value(context)
+    return [params]
+
 call_api = (action, callback, options, get_params) ->
   deferred = Q.defer()
   options ?= {}
@@ -340,6 +358,7 @@ exports.image_upload_tag = (field, options = {}) ->
     "data-url": exports.upload_url(options),
     "data-form-data": exports.upload_tag_params(options),
     "data-cloudinary-field": field,
+    "data-max-chunk-size": options.chunk_size,
     "class": [html_options["class"], "cloudinary-fileupload"].join(" ")
   }, html_options)
   return '<input ' + utils.html_attrs(tag_options) + '/>'

src/uploader.coffee

@@ -417,7 +417,7 @@ exports.url = (public_id, options = {}) ->
   if sign_url
     to_sign = [transformation, source_to_sign].filter((part) -> part? && part != '').join('/')
     shasum = crypto.createHash('sha1')
-    shasum.update(utf8_encode(to_sign + api_secret))
+    shasum.update(utf8_encode(to_sign + api_secret), 'binary')
     signature = shasum.digest('base64').replace(/\//g, '_').replace(/\+/g, '-').substring(0, 8)
     signature = "s--#{signature}--"
 
@@ -597,7 +597,7 @@ exports.signed_preloaded_image = (result) ->
 exports.api_sign_request = (params_to_sign, api_secret) ->
   to_sign = _.sortBy("#{k}=#{utils.build_array(v).join(",")}" for k, v of params_to_sign when v?, _.identity).join("&")
   shasum = crypto.createHash('sha1')
-  shasum.update(utf8_encode(to_sign + api_secret))
+  shasum.update(utf8_encode(to_sign + api_secret), 'binary')
   shasum.digest('hex')
 
 exports.clear_blank = (hash) ->
@@ -626,7 +626,7 @@ exports.webhook_signature = (data, timestamp, options = {}) ->
   throw "Must supply timestamp"  unless timestamp
   api_secret = options.api_secret ? config().api_secret ? throw("Must supply api_secret")
   shasum = crypto.createHash('sha1')
-  shasum.update(data + timestamp + api_secret)
+  shasum.update(data + timestamp + api_secret, 'binary')
   shasum.digest('hex')
 
 exports.process_request_params = (params, options) ->
@@ -847,6 +847,8 @@ exports.build_explicit_api_params = (public_id, options = {})->
     face_coordinates: options.face_coordinates && utils.encode_double_array(options.face_coordinates)
     headers: build_custom_headers(options.headers)
     invalidate: utils.as_safe_bool(options.invalidate)
+    moderation: options.moderation
+    phash: utils.as_safe_bool(options.phash)
     public_id: public_id
     responsive_breakpoints: utils.generate_responsive_breakpoints_string(options.responsive_breakpoints)
     tags: options.tags && utils.build_array(options.tags).join(",")

src/utils.coffee

@@ -20,6 +20,8 @@ utils.v1_adapters exports, uploader,
   add_tag: 2,
   remove_tag: 2,
   remove_all_tags: 1,
+  add_context: 2,
+  remove_all_context: 1,
   replace_tag: 2,
   create_archive: 0,
   create_zip: 0