improved date-time format validation (issue #37)

minor change to license format.

Author: oferei

lib/formats.js

@@ -35,7 +35,7 @@ function validateFormatPhone(obj) {
 var formats = {
 	'date-time': { // ISO 8601 (YYYY-MM-DDThh:mm:ssZ in UTC time)
 		types: ['string'],
-		regex: /^\d{4}-\d{2}-\d{2}T[0-2]\d:[0-5]\d:[0-5]\d([.,]\d+)?Z$/
+		regex: /^(\d{4}(?!\d{2}\b))((-?)((0[1-9]|1[0-2])(\3([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6])))([T\s]((([01]\d|2[0-3])((:?)[0-5]\d)?|24\:?00)([\.,]\d+(?!:))?)?(\17[0-5]\d([\.,]\d+)?)?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?))?$/
 	},
 	'date': { // YYYY-MM-DD
 		types: ['string'],

package.json

@@ -1,7 +1,7 @@
 {
   "name": "json-gate",
   "description": "A friendly, fast JSON schema validator",
-  "version": "0.8.22",
+  "version": "0.8.23",
   "author": {
     "name": "Ofer Reichman",
     "email": "[email protected]"
@@ -52,10 +52,5 @@
   "engines": {
     "node": "*"
   },
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "https://raw.github.com/oferei/json-gate/master/LICENSE"
-    }
-  ]
+  "license": "MIT"
 }

test/object-format-test.js

@@ -18,6 +18,14 @@ var objDateTimeFractionComma = {
 	dateTime: '2012-11-06T09:13:24,142857Z'
 };
 
+var objDateTimeWithAheadOffset = {
+	dateTime: '2016-10-18T11:11:11.616+05'
+};
+
+var objDateTimeWithBehindOffset = {
+	dateTime: '2016-10-18T11:11:11.616-05'
+};
+
 var objInvalidDateTime = {
 	dateTime: '2012-11-06'
 };
@@ -311,6 +319,8 @@ vows.describe('Object Format').addBatch({
 	'when a date-time is passed for a date-time': objectShouldBeValid(objDateTime, schemaDateTime),
 	'when a date-time with a dot fraction is passed for a date-time': objectShouldBeValid(objDateTimeFractionDot, schemaDateTime),
 	'when a date-time with a comma fraction is passed for a date-time': objectShouldBeValid(objDateTimeFractionComma, schemaDateTime),
+	'when a date-time with a ahead offset is passed for a date-time': objectShouldBeValid(objDateTimeWithAheadOffset, schemaDateTime),
+	'when a date-time with a behind offset is passed for a date-time': objectShouldBeValid(objDateTimeWithBehindOffset, schemaDateTime),
 	'when a date-time is passed for a date-time': objectShouldBeValid(objDateTime, schemaDateTime),
 	'when trying to pass a date for a date-time': objectShouldBeInvalid(objInvalidDateTime, schemaDateTime, { errMsg: 'JSON object property \'dateTime\' does not conform to the \'date-time\' format' }),
 	'when a date is passed for a date': objectShouldBeValid(objDate, schemaDate),