Merge pull request #5 from billinghamj/improved-regexes

Improved regexes

Author: cblanc

index.js

@@ -1,11 +1,11 @@
 "use strict";
 
-var validationRegex = /^[a-z0-9]{1,4}\s*?\d[a-z]{2}$/i,
+var validationRegex = /^[a-z][a-z\d]{1,3}\s*?\d[a-z]{2}$/i,
 		incodeRegex = /\d[a-z]{2}$/i,
-		validOutcodeRegex = /^[a-z0-9]{1,4}$/i,
+		validOutcodeRegex = /^[a-z][a-z\d]{1,3}$/i,
 		areaRegex = /^[a-z]{1,2}/i,
 		districtSplitRegex = /^([a-z]{1,2}\d)([a-z])$/i,
-		sectorRegex = /^[a-z0-9]{1,4}\s*?\d/i,
+		sectorRegex = /^[a-z][a-z\d]{1,3}\s*?\d/i,
 		unitRegex = /[a-z]{2}$/i;
 
 function isValidPostcode (postcode) {

tests/data/validation.json

@@ -28,6 +28,14 @@
 			"base" : "12FSSD",
 			"expected" : false
 		},
+		{
+			"base" : "1A1 1AA",
+			"expected" : false
+		},
+		{
+			"base" : "MA1 1AA",
+			"expected" : true
+		},
 		{
 			"base" : "BT35 8GE",
 			"expected" : true