Merge pull request #8 from vellotis/bug-invalid-generated-isikukood

Fix #7

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "isikukood",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "homepage": "http://www.whoop.ee/posts/2014/02/17/validation-and-generation-of-estonian-personal-id.html",
   "authors": [
     "dknight <[email protected]>"

isikukood.js

@@ -205,13 +205,8 @@
     if (params.birthDay) {
       d = params.birthDay;
     } else {
-      if (m === 2 && y % 4 !== 0 || y % 100 === 0 && y % 400 !== 0) {
-        d = Math.round(Math.random() * 29);
-      } else if (m === 2) {
-        d = Math.round(Math.random() * 28);
-      } else {
-        d = Math.round(Math.random() * 30);
-      }
+      var daysInMonth = new Date(y, m, 0).getDate();
+      d = Math.floor(Math.random() * daysInMonth) + 1;
     }
 
     // Set the gender

package.json

@@ -1,6 +1,6 @@
 {
   "name": "isikukood",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Estonian personal ID (isikukood) JavaScript module",
   "main": "isikukood.js",
   "directories": {

test/spec/IsikukoodSpec.js

@@ -34,6 +34,21 @@ describe('Generated Isikukood', function () {
 		expect(ik.getControlNumber()).toBeDefined();
 		expect(ik.getControlNumber()).toEqual(lastNumber);
 	});
+	it('should have correct day in range of 01 to 31 (#7)', function () {
+		for (var i = 0; i < 200; i++) {
+			expect(Isikukood.generate().substr(5, 2)).not.toBe('00');
+		}
+	});
+	describe('generated Isikukood (#7)', function () {
+		Array(200).fill(null).map(function (undef, i) {
+			return Isikukood.generate();
+		}).forEach(function (code) {
+			it( code + ' should be valid', function () {
+				var ik = new Isikukood(code);
+				expect(ik.validate()).toBe(true);
+			});
+		})
+	});
 });
 
 describe('Isikukood 35703150220', function () {
@@ -85,9 +100,6 @@ describe('Isikukood 49200186017', function () {
 	it('should not validate', function () {
 		expect(ik.validate()).toBe(false);
 	});
-	it('should return female as a gender', function () {
-		expect(ik.getGender()).toBe('female');
-	});
 });
 
 describe('Isikukood 60311213742 (#5)', function () {