pubsub: incorporate @google-cloud/common-grpc (#1950)

packages/pubsub/package.json

@@ -50,7 +50,8 @@
     "pubsub"
   ],
   "dependencies": {
-    "@google-cloud/common": "^0.11.0",
+    "@google-cloud/common": "^0.12.0",
+    "@google-cloud/common-grpc": "^0.1.1",
     "arrify": "^1.0.0",
     "extend": "^3.0.0",
     "google-gax": "^0.10.0",

packages/pubsub/src/iam.js

@@ -22,6 +22,7 @@
 
 var arrify = require('arrify');
 var common = require('@google-cloud/common');
+var commonGrpc = require('@google-cloud/common-grpc');
 var is = require('is');
 var util = require('util');
 
@@ -79,10 +80,10 @@ function IAM(pubsub, id) {
 
   this.id = id;
 
-  common.GrpcService.call(this, config, pubsub.options);
+  commonGrpc.Service.call(this, config, pubsub.options);
 }
 
-util.inherits(IAM, common.GrpcService);
+util.inherits(IAM, commonGrpc.Service);
 
 /**
  * Get the IAM policy

packages/pubsub/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 is = require('is');
 var util = require('util');
@@ -76,10 +77,10 @@ function PubSub(options) {
 
   this.options = options;
 
-  common.GrpcService.call(this, config, options);
+  commonGrpc.Service.call(this, config, options);
 }
 
-util.inherits(PubSub, common.GrpcService);
+util.inherits(PubSub, commonGrpc.Service);
 
 /**
  * Create a topic with the given name.

packages/pubsub/src/subscription.js

@@ -22,6 +22,7 @@
 
 var arrify = require('arrify');
 var common = require('@google-cloud/common');
+var commonGrpc = require('@google-cloud/common-grpc');
 var events = require('events');
 var is = require('is');
 var modelo = require('modelo');
@@ -270,7 +271,7 @@ function Subscription(pubsub, options) {
     config.methods.create = true;
   }
 
-  common.GrpcServiceObject.call(this, config);
+  commonGrpc.ServiceObject.call(this, config);
   events.EventEmitter.call(this);
 
   this.autoAck = is.boolean(options.autoAck) ? options.autoAck : false;
@@ -331,7 +332,7 @@ function Subscription(pubsub, options) {
   this.listenForEvents_();
 }
 
-modelo.inherits(Subscription, common.GrpcServiceObject, events.EventEmitter);
+modelo.inherits(Subscription, commonGrpc.ServiceObject, events.EventEmitter);
 
 /**
  * Simplify a message from an API response to have five properties: `id`,

packages/pubsub/src/topic.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 is = require('is');
 var util = require('util');
@@ -180,7 +181,7 @@ function Topic(pubsub, name) {
     }
   };
 
-  common.GrpcServiceObject.call(this, {
+  commonGrpc.ServiceObject.call(this, {
     parent: pubsub,
     id: this.name,
     createMethod: pubsub.createTopic.bind(pubsub),
@@ -224,7 +225,7 @@ function Topic(pubsub, name) {
   this.iam = new IAM(pubsub, this.name);
 }
 
-util.inherits(Topic, common.GrpcServiceObject);
+util.inherits(Topic, commonGrpc.ServiceObject);
 
 /**
  * Format a message object as the upstream API expects it.

packages/pubsub/test/iam.js

@@ -18,7 +18,7 @@
 
 var assert = require('assert');
 var extend = require('extend');
-var GrpcService = require('@google-cloud/common').GrpcService;
+var GrpcService = require('@google-cloud/common-grpc').Service;
 var nodeutil = require('util');
 var proxyquire = require('proxyquire');
 var util = require('@google-cloud/common').util;
@@ -52,8 +52,10 @@ describe('IAM', function() {
   before(function() {
     IAM = proxyquire('../src/iam.js', {
       '@google-cloud/common': {
-        GrpcService: FakeGrpcService,
         util: fakeUtil
+      },
+      '@google-cloud/common-grpc': {
+        Service: FakeGrpcService
       }
     });
   });

packages/pubsub/test/index.js

@@ -77,10 +77,12 @@ describe('PubSub', function() {
     delete process.env.PUBSUB_EMULATOR_HOST;
     PubSub = proxyquire('../', {
       '@google-cloud/common': {
-        GrpcService: FakeGrpcService,
         paginator: fakePaginator,
         util: fakeUtil
       },
+      '@google-cloud/common-grpc': {
+        Service: FakeGrpcService
+      },
       './subscription.js': Subscription,
       './topic.js': Topic
     });

packages/pubsub/test/subscription.js

@@ -18,7 +18,7 @@
 
 var assert = require('assert');
 var extend = require('extend');
-var GrpcServiceObject = require('@google-cloud/common').GrpcServiceObject;
+var GrpcServiceObject = require('@google-cloud/common-grpc').ServiceObject;
 var nodeutil = require('util');
 var proxyquire = require('proxyquire');
 var util = require('@google-cloud/common').util;
@@ -81,9 +81,11 @@ describe('Subscription', function() {
   before(function() {
     Subscription = proxyquire('../src/subscription.js', {
       '@google-cloud/common': {
-        GrpcServiceObject: FakeGrpcServiceObject,
         util: fakeUtil
       },
+      '@google-cloud/common-grpc': {
+        ServiceObject: FakeGrpcServiceObject
+      },
       './iam.js': FakeIAM
     });
 

packages/pubsub/test/topic.js

@@ -18,7 +18,7 @@
 
 var assert = require('assert');
 var extend = require('extend');
-var GrpcServiceObject = require('@google-cloud/common').GrpcServiceObject;
+var GrpcServiceObject = require('@google-cloud/common-grpc').ServiceObject;
 var nodeutil = require('util');
 var proxyquire = require('proxyquire');
 var util = require('@google-cloud/common').util;
@@ -60,11 +60,13 @@ describe('Topic', function() {
 
   before(function() {
     Topic = proxyquire('../src/topic.js', {
-      './iam.js': FakeIAM,
       '@google-cloud/common': {
-        GrpcServiceObject: FakeGrpcServiceObject,
         util: fakeUtil
-      }
+      },
+      '@google-cloud/common-grpc': {
+        ServiceObject: FakeGrpcServiceObject
+      },
+      './iam.js': FakeIAM
     });
   });