Merge pull request #33 from sebelga/release/v0.9.1

Release/v0.9.1

README.md

@@ -1581,7 +1581,7 @@ query.run({ format: gstore.Queries.formats.ENTITY })
 	  	gstore.save(entities).then(() => {
 	  		...
 	  	});
-	  })
+	  });
 
 ```
 

lib/model.js

@@ -937,9 +937,7 @@ class Model extends Entity {
                         if (is.object(propertyValue) && Object.keys(propertyValue).length === 2
                                 && {}.hasOwnProperty.call(propertyValue, 'longitude')
                                 && {}.hasOwnProperty.call(propertyValue, 'latitude')) {
-                            const validLng = validateLngLat(propertyValue.longitude);
-                            const validLat = validateLngLat(propertyValue.latitude);
-                            typeValid = validLng && validLat;
+                            typeValid = validateLngLat(propertyValue);
                         } else {
                             typeValid = propertyValue.constructor.name === 'GeoPoint';
                         }
@@ -1025,9 +1023,13 @@ class Model extends Entity {
                 (typeof v === 'string' && v.trim().length === 0);
         }
 
-        function validateLngLat(value) {
-            const regEx = /^-?([1-8]?[1-9]|[1-9]0)\.{1}\d{1,6}/;
-            return regEx.test(value);
+        function validateLngLat(data) {
+            const validLatitude = (isInt(data.latitude) || isFloat(data.latitude))
+                                    && data.latitude >= -90 && data.latitude <= 90;
+            const validLongitude = (isInt(data.longitude) || isFloat(data.longitude))
+                                    && data.longitude >= -180 && data.longitude <= 180;
+
+            return validLatitude && validLongitude;
         }
     }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gstore-node",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "gstore-node is a Google Datastore Entity Models tools",
   "main": "index.js",
   "scripts": {

test/model-test.js

@@ -1749,8 +1749,8 @@ describe('Model', () => {
             // valid geo object
             const model3 = new ModelInstance({
                 location: {
-                    latitude: 40.6894,
-                    longitude: -74.0447,
+                    latitude: 40.68942342541,
+                    longitude: -74.044743654572,
                 },
             });
             const valid3 = model3.validate();
@@ -1765,12 +1765,16 @@ describe('Model', () => {
             const model6 = new ModelInstance({ location: { longitude: 40.6895 } });
             const valid6 = model6.validate();
 
+            const model7 = new ModelInstance({ location: { longitude: '120.123', latitude: '40.12345678' } });
+            const valid7 = model7.validate();
+
             expect(valid.success).equal(false);
             expect(valid2.success).equal(true);
             expect(valid3.success).equal(true);
             expect(valid4.success).equal(false);
             expect(valid5.success).equal(false);
             expect(valid6.success).equal(false);
+            expect(valid7.success).equal(false);
         });
 
         it('--> array ok', () => {