Added a test and fixed a bug on the localDB's changed message handling.

Author: Vincent Cantin

example-server/imports/api/friends.js

@@ -16,6 +16,24 @@ Meteor.methods({
   'friends.removeAll'() {
     Friends.remove({});
   },
+  'friends.addAttributes'(name, fields) {
+    Friends.update(
+      {
+        name: name
+      },
+      {
+        $set: fields
+      });
+  },
+  'friends.removeAttributes'(name, fields) {
+    Friends.update(
+      {
+        name: name
+      },
+      {
+        $unset: fields
+      });
+  },
   'friends.add'(a, b) {
     return a + b;
   }

unity-project/Assets/example/TestLocalDB.cs

@@ -79,13 +79,7 @@ public void Update() {
 		}
 
 		if (Input.GetKeyDown(KeyCode.F)) {
-			MethodCall methodCall = ddpConnection.Call("friends.create", JSONObject.CreateStringObject("Coco"));
-			methodCall.OnUpdated = (MethodCall obj) => {
-				Debug.Log("Updated, methodId=" + obj.id);
-			};
-			methodCall.OnResult = (MethodCall obj) => {
-				Debug.Log("Result = " + obj.result);
-			};
+			ddpConnection.Call("friends.create", JSONObject.CreateStringObject("Coco"));
 		}
 
 		if (Input.GetKeyDown(KeyCode.D)) {
@@ -94,6 +88,25 @@ public void Update() {
 			}
 		}
 
+		if (Input.GetKeyDown(KeyCode.O)) {
+			JSONObject parents = new JSONObject();
+			parents.AddField("mother", "wonder woman");
+			parents.AddField("father", "batman");
+			JSONObject attr = new JSONObject();
+			attr.AddField("age", 24);
+			attr.AddField("height", 180);
+			attr.AddField("parents", parents);
+			ddpConnection.Call("friends.addAttributes", JSONObject.StringObject("Coco"), attr);
+		}
+
+		if (Input.GetKeyDown(KeyCode.P)) {
+			JSONObject attr = new JSONObject();
+			attr.AddField("age", 1);
+			attr.AddField("height", 1);
+			attr.AddField("parents.mother", 1);
+			ddpConnection.Call("friends.removeAttributes", JSONObject.StringObject("Coco"), attr);
+		}
+
 	}
 
 }

unity-project/Assets/unity3d-ddp-client/local-db/JsonObjectCollection.cs

@@ -29,16 +29,23 @@ public void Add(string docId, JSONObject fields) {
 		documents.Add(docId, fields);
 	}
 
-	// TODO: This implementation is not tested, and is probably not complete.
 	public void Change(string docId, JSONObject fields, JSONObject cleared) {
 		if (OnChanged != null) {
 			OnChanged(docId, fields, cleared);
 		}
 
 		JSONObject document = documents[docId];
-		document.Merge(fields);
-		foreach (JSONObject field in cleared.list) {
-			document.RemoveField(field.str);
+
+		if (fields != null) {
+			foreach (string field in fields.keys) {
+				document.SetField(field, fields[field]);
+			}
+		}
+
+		if (cleared != null) {
+			foreach (JSONObject field in cleared.list) {
+				document.RemoveField(field.str);
+			}
 		}
 	}
 

unity-project/Assets/unity3d-ddp-client/local-db/TypedCollection.cs

@@ -36,7 +36,6 @@ public void Add(string docId, JSONObject fields) {
 		documents.Add(docId, document);
 	}
 
-	// TODO: This implementation is not tested, and is probably not complete.
 	public void Change(string docId, JSONObject fields, JSONObject cleared) {
 		JSONObject jsonDocument = DocumentToJSONObject(documents[docId]);
 
@@ -45,9 +44,16 @@ public void Change(string docId, JSONObject fields, JSONObject cleared) {
 			oldDocument = JSONObjectToDocument(jsonDocument.Copy());
 		}
 
-		jsonDocument.Merge(fields);
-		foreach (JSONObject field in cleared.list) {
-			jsonDocument.RemoveField(field.str);
+		if (fields != null) {
+			foreach (string field in fields.keys) {
+				jsonDocument.SetField(field, fields[field]);
+			}
+		}
+
+		if (cleared != null) {
+			foreach (JSONObject field in cleared.list) {
+				jsonDocument.RemoveField(field.str);
+			}
 		}
 
 		DocType newDocument = JSONObjectToDocument(jsonDocument);