Merge pull request #249 from leeyeh/feat/save-options

implement AV.Object save options

Author: wangxiao

src/file.js

@@ -323,8 +323,8 @@ module.exports = function(AV) {
    * if (fileUploadControl.files.length > 0) {
    *   var file = fileUploadControl.files[0];
    *   var name = "photo.jpg";
-   *   var parseFile = new AV.File(name, file);
-   *   parseFile.save().then(function() {
+   *   var file = new AV.File(name, file);
+   *   file.save().then(function() {
    *     // The file has been saved to AV.
    *   }, function(error) {
    *     // The file either could not be read, or could not be saved to AV.

src/object.js

@@ -129,9 +129,12 @@ module.exports = function(AV) {
      * Set whether to enable fetchWhenSave option when updating object.
      * When set true, SDK would fetch the latest object after saving.
      * Default is false.
+     *
+     * @deprecated use AV.Object#save with options.fetchWhenSave instead
      * @param {boolean} enable  true to enable fetchWhenSave option.
      */
     fetchWhenSave: function(enable){
+      console.warn('AV.Object#fetchWhenSave is deprecated, use AV.Object#save with options.fetchWhenSave instead.');
       if (!_.isBoolean(enable)) {
         throw "Expect boolean value for fetchWhenSave";
       }
@@ -832,7 +835,9 @@ module.exports = function(AV) {
      *   }, function(error) {
      *     // The save failed.  Error is an instance of AV.Error.
      *   });</pre>
-     *
+     * @param {Object} options Optional Backbone-like options object to be passed in to set.
+     * @param {Boolean} options.fetchWhenSave fetch and update object after save succeeded
+     * @param {AV.Query} options.query Save object only when it matches the query
      * @return {AV.Promise} A promise that is fulfilled when the save
      *     completes.
      * @see AV.Error
@@ -918,6 +923,23 @@ module.exports = function(AV) {
           json._fetchWhenSave = true;
         }
 
+        if (options.fetchWhenSave) {
+          json._fetchWhenSave = true;
+        }
+        if (options.query) {
+          var queryJSON;
+          if (typeof options.query.toJSON === 'function') {
+            queryJSON = options.query.toJSON();
+            if (queryJSON) {
+              json._where = queryJSON.where;
+            }
+          }
+          if (!json._where) {
+            var error = new Error('options.query is not an AV.Query');
+            return AV.Promise.error(error)._thenRunCallbacks(options, model);
+          }
+        }
+
         var route = "classes";
         var className = model.className;
         if (model.className === "_User" && !model.id) {

src/utils.js

@@ -378,9 +378,16 @@ const init = (AV) => {
     if (objectId) {
       apiURL += "/" + objectId;
     }
-    if ((route ==='users' || route === 'classes') && dataObject && dataObject._fetchWhenSave){
-      delete dataObject._fetchWhenSave;
-      apiURL += '?new=true';
+    if ((route ==='users' || route === 'classes') && dataObject) {
+      apiURL += '?';
+      if (dataObject._fetchWhenSave) {
+        delete dataObject._fetchWhenSave;
+        apiURL += '&new=true';
+      }
+      if (dataObject._where) {
+        apiURL += ('&where=' + encodeURIComponent(JSON.stringify(dataObject._where)));
+        delete dataObject._where;
+      }
     }
 
     dataObject = _.clone(dataObject || {});

test/object.js

@@ -119,6 +119,28 @@ describe('Objects', function(){
         }
       });
     });
+    it('should not update prop when query not match',function(done){
+      gameScore.set('score', 10000);
+      gameScore.save(null, {
+        query: new AV.Query(GameScore).equalTo('score', -1)
+      }).then(function(result) {
+        done(new Error('should not success'));
+      }, function(error) {
+        expect(error.code).to.be.eql(305);
+        done();
+      });
+    });
+    it('should update prop when query match',function(done){
+      gameScore.set('score', 10000);
+      gameScore.save(null, {
+        query: new AV.Query(GameScore).notEqualTo('score', -1),
+        fetchWhenSave: true
+      }).then(function(result) {
+        done();
+      }, function(error) {
+        done(error);
+      });
+    });
   });
 
   describe("Deleting Objects",function(){
@@ -300,9 +322,10 @@ describe('Objects', function(){
           person2.set('age', 0);
           person2.increment('age',9);
           person2.save().then(function(person){
-            person.fetchWhenSave(true);
             person.increment('age', 10);
-            person.save().then(function(p){
+            person.save(null, {
+              fetchWhenSave: true
+            }).then(function(p){
               expect(p.get('age')).to.be(19);
               done();
             },function(err){
@@ -315,9 +338,10 @@ describe('Objects', function(){
 
     it("should fetch when save when creating new object.", function(done){
       var p= new Person();
-      p.fetchWhenSave(true);
       p.set('pname', 'dennis');
-      p.save().then(function(person) {
+      p.save(null, {
+        fetchWhenSave: true
+      }).then(function(person) {
         expect(person.get('company')).to.be('leancloud');
         done();
       }).catch(function(err) {