Merge pull request #48 from gwicke/restore_date_parsing

Pchelolo · web-flow · commit 6adcc498ea40 · 2016-09-30T08:23:56.000-07:00
Restore improved date parsing from fd87fc3
diff --git a/lib/reqTemplate.js b/lib/reqTemplate.js
@@ -115,12 +115,13 @@ var globalMethods = {
         if (!isValidDate(date)) {
             var origDate = date;
 
-            if (typeof date === 'string' && !Number.isNaN(date)) {
+            if (typeof date === 'string' && /^\d+$/.test(date)) {
                 // It's a string, but may be it's just a stringified timestamp.
                 // Check if it actually is.
-                date = parseInt(date);
+                date = new Date(parseInt(date));
+            } else {
+                date = new Date(Date.parse(date));
             }
-            date = new Date(date);
 
             if (!isValidDate(date)) {
                 throw new Error('Invalid date: ' + origDate);
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swagger-router",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "An efficient swagger 2 based router with support for multiple APIs. For use in RESTBase.",
   "main": "index.js",
   "scripts": {
diff --git a/test/features/reqTemplate.js b/test/features/reqTemplate.js
@@ -567,6 +567,19 @@ describe('Request template', function() {
             }
         });
         var result = template.expand({
+            request: {
+                body: {
+                    date: '1990-02-20T19:31:13+00:00'
+                }
+            }
+        });
+        assert.deepEqual(result, {
+            body: {
+                date_iso: '1990-02-20T19:31:13.000Z',
+                date_rfc822: 'Tue, 20 Feb 1990 19:31:13 +0000'
+            }
+        });
+        result = template.expand({
             request: {
                 body: {
                     date: '1234'

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "swagger-router",`
`3`		`- "version": "0.5.0",`
	`3`	`+ "version": "0.5.1",`
`4`	`4`	`"description": "An efficient swagger 2 based router with support for multiple APIs. For use in RESTBase.",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`