logging: incorporate @google-cloud/common-grpc (#1949)

Author: stephenplusplus

handwritten/logging/package.json

@@ -52,7 +52,8 @@
     "stackdriver"
   ],
   "dependencies": {
-    "@google-cloud/common": "^0.11.0",
+    "@google-cloud/common": "^0.12.0",
+    "@google-cloud/common-grpc": "^0.1.1",
     "arrify": "^1.0.0",
     "async": "^2.1.4",
     "extend": "^3.0.0",

handwritten/logging/src/entry.js

@@ -20,7 +20,7 @@
 
 'use strict';
 
-var common = require('@google-cloud/common');
+var commonGrpc = require('@google-cloud/common-grpc');
 var extend = require('extend');
 var is = require('is');
 var isCircular = require('is-circular');
@@ -103,7 +103,7 @@ Entry.fromApiResponse_ = function(entry) {
   var data = entry[entry.payload];
 
   if (entry.payload === 'jsonPayload') {
-    data = common.GrpcService.structToObj_(data);
+    data = commonGrpc.Service.structToObj_(data);
   }
 
   var serializedEntry = new Entry(entry, data);
@@ -130,7 +130,7 @@ Entry.prototype.toJSON = function() {
   var entry = extend(true, {}, this.metadata);
 
   if (is.object(this.data)) {
-    entry.jsonPayload = common.GrpcService.objToStruct_(this.data, {
+    entry.jsonPayload = commonGrpc.Service.objToStruct_(this.data, {
       stringify: true
     });
   } else if (is.string(this.data)) {

handwritten/logging/src/index.js

@@ -22,6 +22,7 @@
 
 var arrify = require('arrify');
 var common = require('@google-cloud/common');
+var commonGrpc = require('@google-cloud/common-grpc');
 var extend = require('extend');
 var format = require('string-format-obj');
 var googleProtoFiles = require('google-proto-files');
@@ -80,10 +81,10 @@ function Logging(options) {
     packageJson: require('../package.json')
   };
 
-  common.GrpcService.call(this, config, options);
+  commonGrpc.Service.call(this, config, options);
 }
 
-util.inherits(Logging, common.GrpcService);
+util.inherits(Logging, commonGrpc.Service);
 
 // jscs:disable maximumLineLength
 /**

handwritten/logging/src/log.js

@@ -23,6 +23,7 @@
 var arrify = require('arrify');
 var async = require('async');
 var common = require('@google-cloud/common');
+var commonGrpc = require('@google-cloud/common-grpc');
 var extend = require('extend');
 var is = require('is');
 var util = require('util');
@@ -98,14 +99,14 @@ function Log(logging, name) {
     }
   };
 
-  common.GrpcServiceObject.call(this, {
+  commonGrpc.ServiceObject.call(this, {
     parent: logging,
     id: this.name,
     methods: methods
   });
 }
 
-util.inherits(Log, common.GrpcServiceObject);
+util.inherits(Log, commonGrpc.ServiceObject);
 
 /**
  * Return an array of log entries with the desired severity assigned.

handwritten/logging/src/sink.js

@@ -21,6 +21,7 @@
 'use strict';
 
 var common = require('@google-cloud/common');
+var commonGrpc = require('@google-cloud/common-grpc');
 var extend = require('extend');
 var util = require('util');
 
@@ -146,7 +147,7 @@ function Sink(logging, name) {
     }
   };
 
-  common.GrpcServiceObject.call(this, {
+  commonGrpc.ServiceObject.call(this, {
     parent: logging,
     baseUrl: '/sinks',
     id: name,
@@ -155,7 +156,7 @@ function Sink(logging, name) {
   });
 }
 
-util.inherits(Sink, common.GrpcServiceObject);
+util.inherits(Sink, commonGrpc.ServiceObject);
 
 /**
  * Set the sink's filter.

handwritten/logging/test/entry.js

@@ -20,6 +20,7 @@ var assert = require('assert');
 var extend = require('extend');
 var GrpcService = require('@google-cloud/common').GrpcService;
 var proxyquire = require('proxyquire');
+var util = require('@google-cloud/common').util;
 
 function FakeGrpcService() {}
 
@@ -32,8 +33,8 @@ describe('Entry', function() {
 
   before(function() {
     Entry = proxyquire('../src/entry.js', {
-      '@google-cloud/common': {
-        GrpcService: FakeGrpcService
+      '@google-cloud/common-grpc': {
+        Service: FakeGrpcService
       }
     });
   });
@@ -132,6 +133,10 @@ describe('Entry', function() {
   });
 
   describe('toJSON', function() {
+    beforeEach(function() {
+      FakeGrpcService.objToStruct_ = util.noop;
+    });
+
     it('should not modify the original instance', function() {
       var entryBefore = extend(true, {}, entry);
       entry.toJSON();

handwritten/logging/test/index.js

@@ -91,10 +91,12 @@ describe('Logging', function() {
   before(function() {
     Logging = proxyquire('../', {
       '@google-cloud/common': {
-        GrpcService: FakeGrpcService,
         paginator: fakePaginator,
         util: fakeUtil
       },
+      '@google-cloud/common-grpc': {
+        Service: FakeGrpcService
+      },
       './log.js': FakeLog,
       './entry.js': FakeEntry,
       './sink.js': FakeSink

handwritten/logging/test/log.js

@@ -70,12 +70,14 @@ describe('Log', function() {
 
   before(function() {
     Log = proxyquire('../src/log.js', {
-      './entry.js': Entry,
-      './metadata.js': FakeMetadata,
       '@google-cloud/common': {
-        GrpcServiceObject: FakeGrpcServiceObject,
         util: fakeUtil
-      }
+      },
+      '@google-cloud/common-grpc': {
+        ServiceObject: FakeGrpcServiceObject,
+      },
+      './entry.js': Entry,
+      './metadata.js': FakeMetadata
     });
     var assignSeverityToEntries_ = Log.assignSeverityToEntries_;
     Log.assignSeverityToEntries_ = function() {

handwritten/logging/test/sink.js

@@ -30,7 +30,6 @@ var fakeUtil = extend({}, util, {
   }
 });
 
-
 function FakeGrpcServiceObject() {
   this.calledWith_ = arguments;
 }
@@ -48,8 +47,10 @@ describe('Sink', function() {
   before(function() {
     Sink = proxyquire('../src/sink.js', {
       '@google-cloud/common': {
-        GrpcServiceObject: FakeGrpcServiceObject,
         util: fakeUtil
+      },
+      '@google-cloud/common-grpc': {
+        ServiceObject: FakeGrpcServiceObject,
       }
     });
   });