Merge branch 'master' of github.com:Urigo/angular-meteor

Author: Urigo

.docs/angular-meteor/client/views/api/api.AngularMeteorCollection.html

@@ -10,7 +10,7 @@
 
 # AngularMeteorCollection
 
-An object that binds a [Meteor Collection](http://docs.meteor.com/#/full/collections) to an AngularJS scope variable. This is the object that return by calling the [$meteor.collection service](http://angular-meteor.com/api/meteorCollection). It represents the documents that exist in the Meteor local collection
+An object that binds a [Meteor Collection](http://docs.meteor.com/#/full/collections) to an AngularJS scope variable. This is the object that is returned when [$meteor.collection service](http://angular-meteor.com/api/meteorCollection) is called. It represents the documents that exist in the Meteor local collection.
 
 ----
 

.docs/angular-meteor/client/views/api/api.meteorCollection.html

@@ -17,7 +17,7 @@
 Service binding include 3 parts:
 
 * watching the changes in **Angular $scope** and updating the **Meteor Collection**. (called "autobind")
-* watching hte changes in the **Meteor Collection** and updating the **Angular $scope** variables (called "observe")
+* watching the changes in the **Meteor Collection** and updating the **Angular $scope** variables (called "observe")
 
 The autobinding is optional, and can be set to false, so changes in the Angular $scope variables will have to be explicitly saved to the collection to be updated to the Meteor Collection.
 

.docs/angular-meteor/client/views/steps/tutorial.step_09.html

@@ -68,7 +68,7 @@ <h1>Step 9 - Privacy and publish-subscribe functions</h1>
 
 * We have `Meteor.publish` - a function to define what to publish from the server to the client
 * The first parameter is the name of the subscription. the client will subscribe to that name
-* The second parameter is a function the defines what will be returned in the subscription
+* The second parameter is a function that defines what will be returned in the subscription
 
 That function will determine what data will be returned and the permissions needed.
 

modules/angular-meteor-object.js

@@ -39,7 +39,7 @@ angularMeteorObject.factory('AngularMeteorObject', ['$q', '$meteorSubscribe', fu
     return deferred.promise;
   };
 
-  AngularMeteorObject.reset = function reset() {
+  AngularMeteorObject.reset = function reset(keepClientProps) {
     var self = this,
       collection = self.$$collection,
       options = self.$$options,
@@ -48,17 +48,32 @@ angularMeteorObject.factory('AngularMeteorObject', ['$q', '$meteorSubscribe', fu
     if (collection){
       var serverValue = collection.findOne(id, options);
       var prop;
+      var props;
       if (serverValue) {
         angular.extend(Object.getPrototypeOf(self), Object.getPrototypeOf(serverValue));
         for (prop in serverValue) {
           if (serverValue.hasOwnProperty(prop)) {
             self[prop] = serverValue[prop];
+            self._serverBackup[prop] = serverValue[prop];
           }
         }
+
+        if (keepClientProps) {
+          props = _.intersection(_.keys(self), _.keys(self._serverBackup));
+        } else {
+          props = _.keys(self);
+        }
+        var serverProps = _.keys(serverValue);
+        var removedKeys = _.difference(props, serverProps, self.$$internalProps);
+        _.each(removedKeys, function (prop) {
+          delete self[prop];
+          delete self._serverBackup[prop]
+        });
       } else {
         for (prop in _.omit(self, self.$$internalProps)) {
           delete self[prop];
         }
+        self._serverBackup = {};
       }
     }
   };
@@ -83,15 +98,17 @@ angularMeteorObject.factory('AngularMeteorObject', ['$q', '$meteorSubscribe', fu
 // A list of internals properties to not watch for, nor pass to the Document on update and etc.
   AngularMeteorObject.$$internalProps = [
     'save', 'reset', '$$collection', '$$options', '$$id', '$$hashkey', '$$internalProps', 'subscribe', 'stop', 'autorunComputation', 'unregisterAutoBind', 'unregisterAutoDestroy', 'getRawObject',
-    'collection', '_eventEmitter'
+    'collection', '_eventEmitter', '_serverBackup'
   ];
 
   var createAngularMeteorObject = function(collection, id, options){
     // Make data not be an object so we can extend it to preserve
     // Collection Helpers and the like
     var data = new function SubObject() {};
-    angular.extend(data, collection.findOne(id, options));
+    var doc = collection.findOne(id, options)
+    angular.extend(data, doc);
 
+    data._serverBackup = doc || {};
     data.$$collection = collection;
     data.$$options = options;
     data.$$id = id;
@@ -121,7 +138,7 @@ angularMeteorObject.factory('$meteorObject', ['$rootScope', '$meteorUtils', 'Ang
       var data = new AngularMeteorObject(collection, id, options);
 
       data.autorunComputation = $meteorUtils.autorun($rootScope, function() {
-        data.reset();
+        data.reset(true);
       });
 
       if (auto) { // Deep watches the model and performs autobind.

package.js

@@ -72,6 +72,7 @@ Package.onTest(function(api) {
     'tests/integration/angular-meteor-session-spec.js',
     'tests/integration/angular-meteor-diff-array-spec.js',
     'tests/integration/angular-meteor-collection-spec.js',
+    'tests/integration/angular-meteor-object-spec.js',
     'tests/integration/angular-meteor-reactive-scope-spec.js',
     'tests/integration/angular-meteor-utils-spec.js',
     'tests/integration/test_collections.js'

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

@@ -0,0 +1,71 @@
+describe('$meteorObject service', function () {
+  var $meteorObject,
+      TestCollection
+      id,
+      meteorObject;
+
+  beforeEach(angular.mock.module('angular-meteor'));
+
+  beforeEach(angular.mock.inject(function (_$meteorObject_) {
+    $meteorObject = _$meteorObject_;
+  }));
+
+  beforeEach(function () {
+    id = 'test_1'
+    var data = { _id: id, a: 1, b: 2 };
+
+    TestCollection = new Mongo.Collection(null);
+    TestCollection.insert(data);
+
+    meteorObject = $meteorObject(TestCollection, id, false);
+  });
+
+  it('should delete the property when unset in the collection', function () {
+    TestCollection.update(id, { $unset: { a: 1 } });
+
+    Tracker.flush();
+
+    var doc = TestCollection.findOne(id);
+    expect(doc.a).not.toBeDefined('document have unset property'); // make sure it was unset in mongo
+
+    expect(meteorObject.a).not.toBeDefined('angular meteor object have unset property');
+  });
+
+
+  it('should keep the client only property after autorun updates', function () {
+    meteorObject.clientProp = 'keep';
+
+    TestCollection.update(id, { $unset: { a: 1 } });
+
+    Tracker.flush();
+
+    var doc = TestCollection.findOne(id);
+    expect(doc.clientProp).not.toBeDefined('document have client property');  // make sure it didn't set to mongo
+
+    expect(meteorObject.a).not.toBeDefined('angular meteor object have unset property');
+    expect(meteorObject.clientProp).toBeDefined('angular meteor object doesnt have client property');
+  });
+
+  it('should delete server and client side properties when object removed from the collection', function () {
+    meteorObject.clientProp = 'keep'
+    TestCollection.remove(id);
+
+    Tracker.flush();
+
+    expect(meteorObject.a).not.toBeDefined();
+    expect(meteorObject.b).not.toBeDefined();
+    expect(meteorObject._id).not.toBeDefined();
+    expect(meteorObject.clientProp).not.toBeDefined();
+  });
+
+  describe('#reset()', function () {
+
+    it('should remove the client property', function () {
+      meteorObject.clientProp = 'delete';
+
+      meteorObject.reset();
+
+      expect(meteorObject.clientProp).not.toBeDefined('angular meteor object doesnt have client property');
+    });
+  });
+});