nimbu-js-sdk 1.6.4 → 1.7.1

package/dist/nimbu.js

@@ -1432,7 +1432,7 @@ var _events = __webpack_require__(52);
 
 var _events2 = _interopRequireDefault(_events);
 
-var _future = __webpack_require__(8);
+var _future = __webpack_require__(7);
 
 var _future2 = _interopRequireDefault(_future);
 
@@ -1901,13 +1901,9 @@ _underscore2.default.extend(_NKObject.prototype, _events2.default, {
     } else {
       (attrs = {})[key] = val;
     }
-    options = _underscore2.default.extend({
-      validate: true
-    }, options);
-    // Make save({ success: function() {} }) work.
     if (!options && attrs) {
       extra_keys = _underscore2.default.reject(attrs, function (value, key) {
-        return _underscore2.default.include(["success", "error", "wait"], key);
+        return _underscore2.default.include(["success", "error", "wait", "useACL", "forceChannel", "locale"], key);
       });
       if (extra_keys.length === 0) {
         all_functions = true;
@@ -1925,6 +1921,9 @@ _underscore2.default.extend(_NKObject.prototype, _events2.default, {
       }
     }
     options = _underscore2.default.clone(options) || {};
+    options = _underscore2.default.extend({
+      validate: true
+    }, options);
     if (options.wait) {
       current = _underscore2.default.clone(this.attributes);
     }
@@ -1963,7 +1962,8 @@ _underscore2.default.extend(_NKObject.prototype, _events2.default, {
         method: method,
         data: json,
         useACL: options.useACL,
-        forceChannel: options.forceChannel
+        forceChannel: options.forceChannel,
+        locale: options.locale
       });
       request = request.then(function (resp, status, xhr) {
         var serverAttrs;
@@ -3034,17 +3034,6 @@ var _traverse = exports._traverse = function _traverse(object, func, seen) {
 /* 7 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isObject = __webpack_require__(14);
-module.exports = function (it) {
-  if (!isObject(it)) throw TypeError(it + ' is not an object!');
-  return it;
-};
-
-
-/***/ }),
-/* 8 */
-/***/ (function(module, exports, __webpack_require__) {
-
 "use strict";
 /* WEBPACK VAR INJECTION */(function(Promise) {
 
@@ -3111,6 +3100,13 @@ _underscore2.default.extend(Future, {
     future.resolve.apply(future, arguments);
     return future;
   },
+  // add alias similar to native Promise
+  resolve: function resolve() {
+    var future;
+    future = new Future();
+    future.resolve.apply(future, arguments);
+    return future;
+  },
   /*
   Returns a new future that is rejected with a given error.
   @return {Nimbu.Future} the new future.
@@ -3121,10 +3117,18 @@ _underscore2.default.extend(Future, {
     future.reject.apply(future, arguments);
     return future;
   },
+  // add alias similar to native Promise
+  reject: function reject() {
+    var future;
+    future = new Future();
+    future.reject.apply(future, arguments);
+    return future;
+  },
   /*
   Returns a new future that is fulfilled when all of the input futures
   are resolved. If any future in the list fails, then the returned future
-  will fail with the last error. If they all succeed, then the returned
+  will fail with an array of all the rejected values (null for the futures
+  that didn't fail). If they all succeed, then the returned
   future will succeed, with the result being an array with the results of
   all the input futures.
   @param {Array} futures a list of futures to wait for.
@@ -3306,6 +3310,9 @@ _underscore2.default.extend(Future.prototype, {
   always: function always(callback) {
     return this.then(callback, callback);
   },
+  finally: function _finally(callback) {
+    return this.then(callback, callback);
+  },
   /*
   Add handlers to be called when the Future object is resolved
   */
@@ -3318,6 +3325,10 @@ _underscore2.default.extend(Future.prototype, {
   fail: function fail(callback) {
     return this.then(null, callback);
   },
+  // alias fail to catch to mimick native Promises
+  catch: function _catch(callback) {
+    return this.then(null, callback);
+  },
   /*
    * Run the given callbacks after this future is fulfilled.
    * @param optionsOrCallback {} A Backbone-style options callback, or a
@@ -3400,6 +3411,17 @@ _underscore2.default.extend(Future.prototype, {
 _registry2.default.Future = Future;
 /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(38)))
 
+/***/ }),
+/* 8 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var isObject = __webpack_require__(14);
+module.exports = function (it) {
+  if (!isObject(it)) throw TypeError(it + ' is not an object!');
+  return it;
+};
+
+
 /***/ }),
 /* 9 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -3745,7 +3767,7 @@ var _errors = __webpack_require__(9);
 
 var _errors2 = _interopRequireDefault(_errors);
 
-var _future = __webpack_require__(8);
+var _future = __webpack_require__(7);
 
 var _future2 = _interopRequireDefault(_future);
 
@@ -3770,7 +3792,7 @@ useChaos = false;
 chaosThreshold = 0.95;
 
 exports.default = _request = function _request(options) {
-  var className, classRoute, currentCustomer, data, dataObject, forceChannel, headers, id, method, path, queryString, route, sessionToken, url, useACL;
+  var className, classRoute, currentCustomer, data, dataObject, forceChannel, headers, id, locale, method, path, queryString, route, sessionToken, url, useACL;
   route = options.route;
   className = options.className;
   id = options.id;
@@ -3781,6 +3803,7 @@ exports.default = _request = function _request(options) {
   queryString = options.query;
   path = options.path;
   forceChannel = options.forceChannel;
+  locale = options.locale;
   if (!_global.accessToken) {
     throw "You must specify your accessToken using Nimbu.initialize().";
   }
@@ -3794,10 +3817,19 @@ exports.default = _request = function _request(options) {
       sessionToken = currentCustomer.session_token;
     }
   }
-  if (useACL && queryString != null) {
-    queryString = queryString + "&use_acl=1";
-  } else if (useACL) {
-    queryString = "use_acl=1";
+  if (useACL) {
+    if (queryString != null) {
+      queryString = queryString + "&use_acl=1";
+    } else {
+      queryString = "use_acl=1";
+    }
+  }
+  if (locale != null) {
+    if (queryString != null) {
+      queryString = queryString + "&content_locale=" + locale;
+    } else {
+      queryString = "content_locale=" + locale;
+    }
   }
   if (!path) {
     if (route !== "batch" && route !== "objects" && route !== "events" && route !== "files" && route !== "functions" && route !== "login" && route !== "push" && route !== "customers" && route !== "jobs") {
@@ -4790,7 +4822,7 @@ module.exports = function (it) {
 /* 19 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var anObject = __webpack_require__(7);
+var anObject = __webpack_require__(8);
 var IE8_DOM_DEFINE = __webpack_require__(60);
 var toPrimitive = __webpack_require__(61);
 var dP = Object.defineProperty;
@@ -4864,7 +4896,7 @@ module.exports = function (it) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = "1.6.4";
+exports.default = "1.7.1";
 
 /***/ }),
 /* 24 */
@@ -6549,7 +6581,7 @@ var _object = __webpack_require__(4);
 
 var _object2 = _interopRequireDefault(_object);
 
-var _future = __webpack_require__(8);
+var _future = __webpack_require__(7);
 
 var _future2 = _interopRequireDefault(_future);
 
@@ -6590,7 +6622,7 @@ var Customer, sharedSecret;
 
 sharedSecret = null;
 
-exports.default = Customer = _object2.default.extend("customers", {
+exports.default = Customer = _object2.default.extend("customer", {
   /*
   @lends Nimbu.Customer.prototype
   */
@@ -8281,7 +8313,7 @@ var _object = __webpack_require__(4);
 
 var _object2 = _interopRequireDefault(_object);
 
-var _future = __webpack_require__(8);
+var _future = __webpack_require__(7);
 
 var _future2 = _interopRequireDefault(_future);
 
@@ -8395,7 +8427,7 @@ var _events = __webpack_require__(52);
 
 var _events2 = _interopRequireDefault(_events);
 
-var _future = __webpack_require__(8);
+var _future = __webpack_require__(7);
 
 var _future2 = _interopRequireDefault(_future);
 
@@ -8647,7 +8679,7 @@ module.exports = function (Constructor, NAME, next) {
 /***/ (function(module, exports, __webpack_require__) {
 
 // 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties])
-var anObject = __webpack_require__(7);
+var anObject = __webpack_require__(8);
 var dPs = __webpack_require__(67);
 var enumBugKeys = __webpack_require__(45);
 var IE_PROTO = __webpack_require__(33)('IE_PROTO');
@@ -8694,7 +8726,7 @@ module.exports = Object.create || function create(O, Properties) {
 /***/ (function(module, exports, __webpack_require__) {
 
 var dP = __webpack_require__(19);
-var anObject = __webpack_require__(7);
+var anObject = __webpack_require__(8);
 var getKeys = __webpack_require__(43);
 
 module.exports = __webpack_require__(15) ? Object.defineProperties : function defineProperties(O, Properties) {
@@ -9253,7 +9285,7 @@ module.exports = function (it, Constructor, name, forbiddenField) {
 var ctx = __webpack_require__(21);
 var call = __webpack_require__(81);
 var isArrayIter = __webpack_require__(82);
-var anObject = __webpack_require__(7);
+var anObject = __webpack_require__(8);
 var toLength = __webpack_require__(44);
 var getIterFn = __webpack_require__(83);
 var BREAK = {};
@@ -9282,7 +9314,7 @@ exports.RETURN = RETURN;
 /***/ (function(module, exports, __webpack_require__) {
 
 // call something on iterator step with safe closing on error
-var anObject = __webpack_require__(7);
+var anObject = __webpack_require__(8);
 module.exports = function (iterator, fn, value, entries) {
   try {
     return entries ? fn(anObject(value)[0], value[1]) : fn(value);
@@ -9328,7 +9360,7 @@ module.exports = __webpack_require__(11).getIteratorMethod = function (it) {
 /***/ (function(module, exports, __webpack_require__) {
 
 // 7.3.20 SpeciesConstructor(O, defaultConstructor)
-var anObject = __webpack_require__(7);
+var anObject = __webpack_require__(8);
 var aFunction = __webpack_require__(22);
 var SPECIES = __webpack_require__(2)('species');
 module.exports = function (O, D) {
@@ -9462,7 +9494,7 @@ module.exports = navigator && navigator.userAgent || '';
 /* 89 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var anObject = __webpack_require__(7);
+var anObject = __webpack_require__(8);
 var isObject = __webpack_require__(14);
 var newPromiseCapability = __webpack_require__(48);
 
@@ -10548,7 +10580,7 @@ var _errors = __webpack_require__(9);
 
 var _errors2 = _interopRequireDefault(_errors);
 
-var _future = __webpack_require__(8);
+var _future = __webpack_require__(7);
 
 var _future2 = _interopRequireDefault(_future);
 
@@ -11777,6 +11809,10 @@ var _requests = __webpack_require__(10);
 
 var _requests2 = _interopRequireDefault(_requests);
 
+var _future = __webpack_require__(7);
+
+var _future2 = _interopRequireDefault(_future);
+
 var _global = __webpack_require__(6);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -11809,7 +11845,12 @@ _underscore2.default.extend(Cloud, {
       data: (0, _global._encode)(data, null, true)
     });
     return request.then(function (resp) {
-      return (0, _global._decode)(null, resp).result;
+      data = (0, _global._decode)(null, resp);
+      if (data && data.code === 141) {
+        return _future2.default.error(data);
+      } else {
+        return data.result;
+      }
     })._thenRunCallbacks(options);
   }
 });
@@ -11843,7 +11884,7 @@ var _errors = __webpack_require__(9);
 
 var _errors2 = _interopRequireDefault(_errors);
 
-var _future = __webpack_require__(8);
+var _future = __webpack_require__(7);
 
 var _future2 = _interopRequireDefault(_future);