core (grpc): properly nest structs

stephenplusplus · stephenplusplus · commit 8caa8adf09f3 · 2016-05-10T12:48:51.000-04:00
diff --git a/lib/common/grpc-service.js b/lib/common/grpc-service.js
@@ -329,7 +329,9 @@ GrpcService.convertValue_ = function(value) {
       blobValue: value
     };
   } else if (is.object(value)) {
-    convertedValue = GrpcService.objToStruct_(value);
+    convertedValue = {
+      structValue: GrpcService.objToStruct_(value)
+    };
   } else if (is.date(value)) {
     var seconds = value.getTime() / 1000;
     var secondsRounded = Math.floor(seconds);
@@ -351,74 +353,6 @@ GrpcService.convertValue_ = function(value) {
   return convertedValue;
 };
 
-/**
- * protobufjs via gRPC returns an object-ified array, like:
- *   {
- *     0: 0,
- *     1: 22
- *   }
- *
- * @todo Replace this function: https://github.com/grpc/grpc/issues/5006
- *
- * @private
- *
- * @param {*} value - Any value.
- * @return {boolean} - Is the object a buffer.
- */
-GrpcService.isBufferLike_ = function(value) {
-  if (!is.object(value) || is.empty(value)) {
-    return false;
-  }
-
-  delete value.length;
-  delete value.parent;
-
-  var lastNumber;
-
-  // Is every property name a number?
-  return Object.keys(value).every(function(key) {
-    var numericKey = parseInt(key, 10);
-
-    if (is.number(lastNumber) && numericKey - lastNumber !== 1) {
-      return false;
-    }
-
-    lastNumber = numericKey;
-
-    return !isNaN(numericKey) && String(numericKey).length === key.length;
-  });
-};
-
-/**
- * Convert an array-like object to an array.
- *
- * @todo Replace this function: https://github.com/grpc/grpc/issues/5006
- *
- * @private
- *
- * @param {object} obj - An array-like object.
- * @return {array} - The converted array.
- *
- * @example
- * GrpcService.objToArr_({
- *   0: 'a',
- *   1: 'b',
- *   2: 'c'
- * });
- * // ['a', 'b', 'c']
- */
-GrpcService.objToArr_ = function(obj) {
-  var arr = [];
-
-  for (var prop in obj) {
-    if (obj.hasOwnProperty(prop)) {
-      arr.push(obj[prop]);
-    }
-  }
-
-  return arr;
-};
-
 /**
  * Convert an object to a struct.
  *
diff --git a/system-test/logging.js b/system-test/logging.js
@@ -237,8 +237,18 @@ describe('Logging', function() {
     var log = logging.log('syslog');
 
     var logEntries = [
-      log.entry('log entry 1'), // string data
-      log.entry({ delegate: 'my_username' }) // object data
+      // string data
+      log.entry('log entry 1'),
+
+      // object data
+      log.entry({ delegate: 'my_username' }),
+
+      // nested object data
+      log.entry({
+        nested: {
+          delegate: 'my_username'
+        }
+      })
     ];
 
     var options = {
diff --git a/test/common/grpc-service.js b/test/common/grpc-service.js
@@ -710,7 +710,9 @@ describe('GrpcService', function() {
 
       var convertedValue = GrpcService.convertValue_(value);
 
-      assert.strictEqual(convertedValue, value);
+      assert.deepEqual(convertedValue, {
+        structValue: value
+      });
     });
 
     it('should convert dates', function() {
@@ -745,53 +747,6 @@ describe('GrpcService', function() {
     });
   });
 
-  describe('isBufferLike_', function() {
-    it('should return false if not an object', function() {
-      assert.strictEqual(GrpcService.isBufferLike_(0), false);
-      assert.strictEqual(GrpcService.isBufferLike_(true), false);
-      assert.strictEqual(GrpcService.isBufferLike_('not-buffer'), false);
-    });
-
-    it('should return false if empty', function() {
-      assert.strictEqual(GrpcService.isBufferLike_({}), false);
-    });
-
-    it('should filter out `length` and `parent` properties', function() {
-      var obj = {
-        1: 1,
-        2: 2,
-        3: 3,
-        length: 3,
-        parent: 'parent'
-      };
-
-      assert.strictEqual(GrpcService.isBufferLike_(obj), true);
-    });
-
-    it('require every property name to be a number', function() {
-      var isBufferLike = { 1: 1, 2: 2, 3: 3 };
-      var isNotBufferLike = { 1: 1, 2: 2, 3: 3, a: 'a' };
-      var isNotBufferLike2 = { 1: 1, 2: 2, 3: 3, '4a': '4a' };
-      var isNotBufferLike3 = { 1: 1, 2: 2, 3: 3, a4: 'a4' };
-      var isNotBufferLike4 = { 1: 1, 3: 3, 5: 5 };
-
-      assert.strictEqual(GrpcService.isBufferLike_(isBufferLike), true);
-      assert.strictEqual(GrpcService.isBufferLike_(isNotBufferLike), false);
-      assert.strictEqual(GrpcService.isBufferLike_(isNotBufferLike2), false);
-      assert.strictEqual(GrpcService.isBufferLike_(isNotBufferLike3), false);
-      assert.strictEqual(GrpcService.isBufferLike_(isNotBufferLike4), false);
-    });
-  });
-
-  describe('objToArr_', function() {
-    it('should convert an object into an array', function() {
-      assert.deepEqual(
-        GrpcService.objToArr_({ a: 'a', b: 'b', c: 'c' }),
-        ['a', 'b', 'c']
-      );
-    });
-  });
-
   describe('objToStruct_', function() {
     it('should convert values in an Object', function() {
       var inputValue = {};
