Merge pull request #739 from Urigo/bugfix/splicing-arrays

bugfix (get-updates): changed the way array changes are saved to mongo.

Author: Urigo

lib/get-updates.js

@@ -24,7 +24,7 @@
     var getKeyPaths = function(obj) {
       var keys = _.keys(obj).map(function(k) {
         var v = obj[k];
-        if (!_.isObject(v) || _.isEmpty(v)) return k;
+        if (!_.isObject(v) || _.isEmpty(v) || _.isArray(v)) return k;
 
         return getKeyPaths(v).map(function(subKey) {
           return k + '.' + subKey;
@@ -34,15 +34,17 @@
       return _.flatten(keys);
     };
 
-    var getDeepValues = function(obj) {
-      var values = _.values(obj).map(function(v) {
-        if (!_.isObject(v) || _.isEmpty(v))
-          return v;
+    var getDeepValues = function(obj,arr) {
+      arr = arr || [];
+
+      _.values(obj).forEach(function(v) {
+        if (!_.isObject(v) || _.isEmpty(v) || _.isArray(v))
+          arr.push(v);
         else
-          return getDeepValues(v);
+          getDeepValues(v, arr);
       });
 
-      return flatten(values);
+      return arr;
     };
 
     var flatten = function(arr) {

modules/angular-meteor-object.js

@@ -56,8 +56,19 @@ angularMeteorObject.factory('AngularMeteorObject', [
           }
         }
 
-        // NOTE: do not use #upsert() method, since it does not exist in some collections
-        collection.update(this.$$id, mods, createFulfill({ action: 'updated' }));
+        var pullUpdate;
+        if (mods.$pull) {
+          pullUpdate = { $pull : mods.$pull };
+        }
+
+        if (!pullUpdate) {
+          // NOTE: do not use #upsert() method, since it does not exist in some collections
+          collection.update(this.$$id, mods, createFulfill({action: 'updated'}));
+        }
+        else {
+          collection.update(this.$$id, mods);
+          collection.update(this.$$id, pullUpdate, createFulfill({action: 'updated'}))
+        }
       }
       // insert
       else {
@@ -70,7 +81,7 @@ angularMeteorObject.factory('AngularMeteorObject', [
         collection.insert(mods, createFulfill({ action: 'inserted' }));
       }
 
-      return deferred.promise; 
+      return deferred.promise;
     };
 
     AngularMeteorObject.reset = function(keepClientProps) {
@@ -102,7 +113,7 @@ angularMeteorObject.factory('AngularMeteorObject', [
           delete self[prop];
           delete self._serverBackup[prop];
         });
-      } 
+      }
 
       else {
         _.keys(this.getRawObject()).forEach(function(prop) {
@@ -159,16 +170,28 @@ angularMeteorObject.factory('$meteorObject', [
       this.unregisterAutoBind = this._auto && $rootScope.$watch(function(){
         return self.getRawObject();
       }, function (item, oldItem) {
-        if (item === oldItem) return;
+        if (item === oldItem) {
+          self.$$collection.update({_id: item._id}, self.getRawObject());
+          return;
+        }
 
         var id = item._id;
         delete item._id;
         delete oldItem._id;
 
         var updates = getUpdates(oldItem, item);
         if (_.isEmpty(updates)) return;
+        var pullUpdate;
 
+        if (updates.$pull) {
+          pullUpdate = { $pull : updates.$pull };
+          delete updates.$pull;
+        }
         self.$$collection.update({_id: id}, updates);
+
+        if (pullUpdate) {
+          self.$$collection.update({ _id : id}, pullUpdate);
+        }
       }, true);
 
       this.unregisterAutoDestroy = $rootScope.$on('$destroy', function() {

tests/integration/angular-meteor-get-updates-spec.js

@@ -14,7 +14,7 @@ describe('getUpdates module', function() {
   describe('validations', function() {
     it('should throw an error if first argument is not an object', function() {
       var boundGetUpdates = _.partial(getUpdates);
-      expect(boundGetUpdates).toThrowError(/first argument.*object/); 
+      expect(boundGetUpdates).toThrowError(/first argument.*object/);
     });
 
     it('should throw an error if second argument is not an object', function() {
@@ -343,4 +343,4 @@ describe('getUpdates module', function() {
       expect(actualUpdates).toDeepEqual(expectedUpdates);
     });
   });
-});
+});

tests/integration/angular-meteor-object-spec.js

@@ -21,7 +21,7 @@ describe('$meteorObject service', function () {
 
   beforeEach(function () {
     id = 'test_1';
-    var data = { _id: id, a: 1, b: 2 };
+    var data = { _id: id, a: 1, b: 2, d: [1,2,3] };
 
     TestCollection = new Mongo.Collection(null);
     TestCollection.insert(data);
@@ -78,7 +78,8 @@ describe('$meteorObject service', function () {
         _id: id,
         a: 1,
         b: 2,
-        c: 3
+        c: 3,
+        d: [1,2,3]
       });
 
       Tracker.flush();
@@ -95,7 +96,8 @@ describe('$meteorObject service', function () {
         _id: id,
         a: 1,
         b: 2,
-        c: 3
+        c: 3,
+        d: [1,2,3]
       });
     });
 
@@ -133,7 +135,7 @@ describe('$meteorObject service', function () {
       meteorObject.clientProp = 'delete';
       meteorObject.reset(true);
 
-      expect(meteorObject.clientProp).toBeDefined('angular meteor object has client property'); 
+      expect(meteorObject.clientProp).toBeDefined('angular meteor object has client property');
     });
 
     it('should delete properties for an object that doesnt exist in the collection', function() {
@@ -182,5 +184,20 @@ describe('$meteorObject service', function () {
       expect(TestCollection.update.calls.mostRecent().args[0]).toEqual({ _id: id });
       expect(TestCollection.update.calls.mostRecent().args[1]).toEqual({ $unset: { 'c.d': true } });
     });
+
+    it('should save changes in a nested array', function() {
+      meteorObject.d.splice(1,1);
+
+      $rootScope.$apply();
+
+      var doc = TestCollection.findOne(id);
+
+      expect(doc).toDeepEqual({
+        _id : id,
+        a : 1,
+        b : 2,
+        d : [1, 3]
+      });
+    });
   });
 });