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

Author: netanelgilad

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) {
@@ -114,12 +116,13 @@
         if (_.isDate(srcValue) && _.isDate(dstValue)) {
           if (srcValue.getTime() != dstValue.getTime()) diff[k] = dstValue;
         }
-
-        if (_.isObject(srcValue) && _.isObject(dstValue)) {
+        else if (_.isArray(srcValue) && _.isArray(dstValue) && !angular.equals(srcValue, dstValue)) {
+          diff[k] = dstValue;
+        }
+        else if (_.isObject(srcValue) && _.isObject(dstValue)) {
           var valueDiff = getDifference(srcValue, dstValue);
           utils.setFilled(diff, k, valueDiff);
         }
-
         else if (srcValue !== dstValue) {
           diff[k] = dstValue;
         }
@@ -141,12 +144,10 @@
 
       var set = createSet(paths);
       var unset = createUnset(paths);
-      var pull = createPull(unset);
 
       var updates = {};
       utils.setFilled(updates, '$set', set);
       utils.setFilled(updates, '$unset', unset);
-      utils.setFilled(updates, '$pull', pull);
 
       return updates;
     };
@@ -166,18 +167,6 @@
       }, {});
     };
 
-    var createPull = function(unset) {
-      var arrKeyPaths = _.keys(unset).map(function(k) {
-        var split = k.match(/(.*)\.\d+$/);
-        return split && split[1];
-      });
-
-      return _.compact(arrKeyPaths).reduce(function(pull, k) {
-        pull[k] = null;
-        return pull;
-      }, {});
-    };
-
     var getUndefinedKeys = function(obj) {
       return _.keys(obj).filter(function (k) {
         var v = obj[k];

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() {
@@ -45,8 +45,7 @@ describe('getUpdates module', function() {
       var expectedUpdates = {
         $set: {
           'b.e': 'e',
-          'd.2': 4,
-          'd.3': 3
+          'd' : [1,2,4,3]
         }
       };
 
@@ -80,30 +79,6 @@ describe('getUpdates module', function() {
       expect(actualUpdates).toDeepEqual(expectedUpdates);
     });
 
-    it('should define a "$pull" property when the destination object has an array value with missing elements', function() {
-      var src = {
-        arr: [1, 2, 3, 4, 5]
-      };
-
-      var dst = {
-        arr: [1, 2, 3]
-      };
-
-      var expectedUpdates = {
-        $unset: {
-          'arr.3': true,
-          'arr.4': true
-        },
-
-        $pull: {
-          'arr': null
-        }
-      };
-
-      var actualUpdates = getUpdates(src, dst);
-      expect(actualUpdates).toDeepEqual(expectedUpdates);
-    });
-
     it('should get updates when object-field is assigned a deep-object', function() {
       var src = {a: {}};
       var dst = {a: {L1: {L2: {L3: 'v'}}}};
@@ -183,9 +158,7 @@ describe('getUpdates module', function() {
 
       expect(updates).toDeepEqual({
         $set: {
-          'a.0': 1,
-          'a.1': 2,
-          'a.2': 3
+          'a': [1,2,3],
         }
       });
     });
@@ -233,9 +206,7 @@ describe('getUpdates module', function() {
 
       expect(updates).toDeepEqual({
         $set: {
-          'a.subfield.0': 1,
-          'a.subfield.1': 2,
-          'a.subfield.2': 3
+          'a.subfield': [1,2,3],
         }
       });
     });
@@ -343,4 +314,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]
+      });
+    });
   });
 });