Merge branch 'release/v1.2.0'

sebelga · Apr 29, 2017 · 7a0bb87 · 7a0bb87
2 parents 2889961 + a82cdca
commit 7a0bb87
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -1,5 +1,7 @@
 'use strict';
 
+/* eslint-disable prefer-template */
+
 const is = require('is');
 const Schema = require('./schema');
 const Model = require('./model');
@@ -61,7 +63,7 @@ class Gstore {
         // an existing model name. in this case don't read from cache.
         if (this.models[name] && options.cache !== false) {
             if (schema && schema.instanceOfSchema && schema !== this.models[name].schema) {
-                throw new Error(`Trying to override ${name} Model Schema`);
+                throw new Error('Trying to override ' + name + ' Model Schema');
             }
             return this.models[name];
         }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gstore-node",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "gstore-node is a Google Datastore Entity Models tools",
   "main": "index.js",
   "scripts": {
@@ -34,14 +34,18 @@
       "name": "Micah Allen",
       "url": "https://github.com/micaww"
     },
+    {
+      "name": "Ricardo Machado",
+      "url": "https://github.com/mAiNiNfEcTiOn"
+    },
     {
       "name": "jfbenckhuijsen",
       "url": "https://github.com/jfbenckhuijsen"
     }
   ],
   "license": "ISC",
   "dependencies": {
-    "@google-cloud/datastore": "0.7.1",
+    "@google-cloud/datastore": "1.0.0",
     "arrify": "^1.0.1",
     "extend": "^3.0.0",
     "is": "^3.2.1",