Merge branch 'release/v0.5.1'

README.md

@@ -25,7 +25,6 @@ This library is in in active development, please report any issue you might find
 - [Installation](#installation)
   - [Getting started](#getting-started)
     - [Aliases](#aliases)
-    - [runInTransaction alias](#runintransaction-alias)
 - [Schema](#schema)
   - [Creation](#creation)
   - [Properties types](#properties-types)
@@ -113,8 +112,6 @@ After a successfull connection, gstore has 2 aliases set up
 - `gstore.ds` The gcloud datastore instance
 - `gstore.runInTransaction`. Alias of the same gcloud method
 
-#### runInTransaction alias
-
 ## Schema
 ### Creation
 ```
@@ -189,7 +186,8 @@ This setting can be overridden by passing a *readAll* setting set to **true** in
 - **inline** settings of list(), query() and findAround()
 
 #### write
-If you want to protect certain properties to be written by a user, you can set their *write* option to **false**. You can then call [sanitize()](#modelSanitize) on a Model passing the user data and those properties will be removed. Example: `var data = BlogPostModel.sanitize(req.body);`
+If you want to protect certain properties to be written by a user, you can set their *write* option to **false**. You can then call [sanitize()](#modelSanitize) on a Model passing the user data and those properties will be removed.  
+Example: `var data = BlogPostModel.sanitize(req.body);`
 
 
 ```

lib/entity.js

@@ -127,7 +127,7 @@
         let path;
         if (id) {
             if (is.string(id)) {
-                id = /^\d+$/.test(id) ? parseInt(id, 10) : id;
+                id = isFinite(id) ? parseInt(id, 10) : id;
             } else if (!is.number(id)) {
                 throw new Error('id must be a string or a number');
             }

lib/model.js

@@ -50,7 +50,7 @@
             let multiple = is.array(id);
 
             cb          = args.pop();
-            id          = is.array(id) || isNaN(parseInt(id)) ? id : parseInt(id);
+            id          = parseId(id);
             ancestors   = args.length > 1 ? args[1] : undefined;
             namespace   = args.length > 2 ? args[2] : undefined;
             transaction = args.length > 3 ? args[3] : undefined;
@@ -102,7 +102,7 @@
             let args = arrayArguments(arguments);
 
             cb          = args.pop();
-            id          = isNaN(parseInt(id)) ? id : parseInt(id);
+            id          = parseId(id);
             ancestors   = args.length > 2 ? args[2] : undefined;
             namespace   = args.length > 3 ? args[3] : undefined;
             transaction = args.length > 4 ? args[4] : undefined;
@@ -279,7 +279,7 @@
             let multiple = is.array(id);
 
             cb          = args.pop();
-            id          = is.array(id) || isNaN(parseInt(id)) ? id : parseInt(id);
+            id          = parseId(id);
             ancestors   = args.length > 1 ? args[1]: undefined;
             namespace   = args.length > 2 ? args[2]: undefined;
             transaction = args.length > 3 ? args[3]: undefined;
@@ -567,7 +567,7 @@
                 let path = [_this.entityKind];
 
                 if (typeof id !== 'undefined' && id !== null) {
-                    id = isNaN(parseInt(id, 10)) ? id : parseInt(id, 10);
+                    id = parseId(id);
                     path.push(id);
                 }
 
@@ -884,6 +884,10 @@
         return a;
     }
 
+    function parseId(id) {
+        return isFinite(id) ? parseInt(id, 10) : id;
+    }
+
     function initQuery(self, namespace, transaction) {
         if (transaction && transaction.constructor.name !== 'Transaction') {
             throw Error('Transaction needs to be a gcloud Transaction');

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gstore-node",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "gstore-node is a Google Datastore Entity Models tools",
   "main": "index.js",
   "scripts": {
@@ -12,8 +12,7 @@
     "node": ">=4.0"
   },
   "keywords": [
-    "Google Datastore",
-    "Node JS"
+    "google datastore", "gcloud node", "google app engine", "node.js"
   ],
   "repository": {
     "type": "git",

test/model-test.js

@@ -334,6 +334,12 @@ describe('Model', function() {
             expect(ds.get.getCall(0).args[0].id).equal(123);
         });
 
+        it('not converting string with mix of number and non number', () => {
+            ModelInstance.get('123:456', () => {});
+
+            expect(ds.get.getCall(0).args[0].name).equal('123:456');
+        });
+
         it('passing an ancestor path array', () => {
             let ancestors = ['Parent', 'keyname'];
 
@@ -442,6 +448,12 @@ describe('Model', function() {
             expect(transaction.get.getCall(0).args[0].path[1]).equal(123);
         });
 
+        it('not converting string id with mix of number and alpha chars', () => {
+            ModelInstance.update('123:456', () => {});
+
+            expect(transaction.get.getCall(0).args[0].name).equal('123:456');
+        });
+
         it('should rollback if error while getting entity', function(done) {
             transaction.get.restore();
 
@@ -625,6 +637,13 @@ describe('Model', function() {
             });
         });
 
+        it('not converting string id with mix of number and alpha chars', (done) => {
+            ModelInstance.delete('123:456', () => {
+                expect(ds.delete.getCall(0).args[0].name).equal('123:456');
+                done();
+            });
+        });
+
         it('should allow array of ids', (done) => {
             ModelInstance.delete([22, 69], (err, response) => {
                 expect(is.array(ds.delete.getCall(0).args[0])).be.true;