datastore: allow storing empty objects (#1454)

stephenplusplus · callmehiphop · commit c741869223d2 · 2016-07-27T17:15:02.000-04:00
diff --git a/lib/datastore/entity.js b/lib/datastore/entity.js
@@ -283,10 +283,12 @@ function encodeValue(value) {
     return valueProto;
   }
 
-  if (is.object(value) && !is.empty(value)) {
-    for (var prop in value) {
-      if (value.hasOwnProperty(prop)) {
-        value[prop] = entity.encodeValue(value[prop]);
+  if (is.object(value)) {
+    if (!is.empty(value)) {
+      for (var prop in value) {
+        if (value.hasOwnProperty(prop)) {
+          value[prop] = entity.encodeValue(value[prop]);
+        }
       }
     }
 
diff --git a/test/datastore/entity.js b/test/datastore/entity.js
@@ -430,9 +430,21 @@ describe('entity', function() {
       assert.deepEqual(entity.encodeValue(value), expectedValueProto);
     });
 
+    it('should encode an empty object', function() {
+      var value = {};
+
+      var expectedValueProto = {
+        entityValue: {
+          properties: {}
+        }
+      };
+
+      assert.deepEqual(entity.encodeValue(value), expectedValueProto);
+    });
+
     it('should throw if an invalid value was provided', function() {
       assert.throws(function() {
-        entity.encodeValue({});
+        entity.encodeValue();
       }, /Unsupported field value/);
     });
   });

Original file line number	Diff line number	Diff line change
`@@ -283,10 +283,12 @@ function encodeValue(value) {`
`283`	`283`	`return valueProto;`
`284`	`284`	`}`
`285`	`285`
`286`		`- if (is.object(value) && !is.empty(value)) {`
`287`		`- for (var prop in value) {`
`288`		`- if (value.hasOwnProperty(prop)) {`
`289`		`- value[prop] = entity.encodeValue(value[prop]);`
	`286`	`+ if (is.object(value)) {`
	`287`	`+ if (!is.empty(value)) {`
	`288`	`+ for (var prop in value) {`
	`289`	`+ if (value.hasOwnProperty(prop)) {`
	`290`	`+ value[prop] = entity.encodeValue(value[prop]);`
	`291`	`+ }`
`290`	`292`	`}`
`291`	`293`	`}`
`292`	`294`