Merge pull request #3 from tonymet/feature/smaller-dependencies

use @gcloud/datastore instead to reduce dependencies
fabito · Apr 12, 2018 · 98236c2 · 98236c2
2 parents 2e0ea9e + da7e13b
commit 98236c2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,4 +26,6 @@ build/Release
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
 node_modules
 
-.tmp/
+.tmp/
+credentials.json
+.env
diff --git a/package.json b/package.json
@@ -20,9 +20,9 @@
   },
   "bugs": {
     "url": "https://github.com/fabito/botkit-storage-datastore/issues"
-  },  
+  },
   "dependencies": {
-    "google-cloud": "^0.53.0"
+    "@google-cloud/datastore": "^1.4.0"
   },
   "devDependencies": {
     "coveralls": "^2.11.9",

diff --git a/src/index.js b/src/index.js
@@ -1,4 +1,4 @@
-var gcloud = require('google-cloud');
+var Datastore = require('@google-cloud/datastore');
 
 /**
  * The Botkit google cloud datastore driver
@@ -11,7 +11,7 @@ module.exports = function(config) {
         throw new Error('projectId is required.');
     }
 
-    var datastore = gcloud.datastore(config),
+    var datastore = Datastore(config),
         namespace = config.namespace,
         teamKind = config.teamKind || 'BotkitTeam',
         channelKind = config.channelKind || 'BotkitChannel',

diff --git a/tests/index.js b/tests/index.js
@@ -5,7 +5,7 @@ var should = require('should'),
 require('should-sinon');
 
 describe('Datastore', function() {
-    var gcloudMock,
+    var GCloudDatastore,
         datastoreMock,
         Storage;
 
@@ -21,12 +21,10 @@ describe('Datastore', function() {
             runQuery: sinon.stub()
         };
 
-        gcloudMock = {
-            datastore: sinon.stub().returns(datastoreMock)
-        };
+        GCloudDatastore = sinon.stub().returns(datastoreMock);
 
         Storage = proxyquire('../src/index', {
-            'google-cloud': gcloudMock
+            '@google-cloud/datastore': GCloudDatastore
         });
 
     });
@@ -44,7 +42,7 @@ describe('Datastore', function() {
         it('should initialize datastore with projectId', function() {
             var config = {projectId: 'crystalbluepersuation'};
             Storage(config);
-            gcloudMock.datastore.should.be.calledWith(config);
+            GCloudDatastore.should.be.calledWith(config);
         });
     });
 

diff --git a/tests/it.js b/tests/it.js
@@ -3,7 +3,7 @@
 var DatastoreStorage = require('../src');
 
 var storage = new DatastoreStorage({
-	projectId: 'myproject',
+	projectId: process.env.projectId || 'myproject',
 	namespace: '---botkit---'
 	//,apiEndpoint: 'http://localhost:8888'
 });