Merge pull request #9 from jeremydaly/v0.1.1

v0.1.1

Author: jeremydaly

Diff for: README.md

@@ -248,7 +248,7 @@ api.use(function(req,res,next) {
 
 The `next()` callback tells the system to continue executing. If this is not called then the system will hang and eventually timeout unless another request ending call such as `error` is called. You can define as many middleware functions as you want. They will execute serially and synchronously in the order in which they are defined.
 
-### Clean Up
+## Clean Up
 The API has a built-in clean up method called 'finally()' that will execute after all middleware and routes have been completed, but before execution is complete. This can be used to close database connections or to perform other clean up functions. A clean up function can be defined using the `finally` method and requires a function with two parameters for the REQUEST and the RESPONSE as its only argument. For example:
 
 ```javascript

Diff for: request.js

@@ -41,8 +41,8 @@ class REQUEST {
 			}
 		}
 
-		// Extract path from event
-		let path = app._event.path.trim().replace(/^\/(.*?)(\/)*$/,'$1').split('/')
+		// Extract path from event (strip querystring just in case)
+		let path = app._event.path.trim().split('?')[0].replace(/^\/(.*?)(\/)*$/,'$1').split('/')
 
 		// Remove base if it exists
 		if (app._base && app._base === path[0]) {

Diff for: test/routes.js

@@ -200,6 +200,29 @@ describe('Route Tests:', function() {
     }) // end it
 
 
+    it('Event path + querystring w/ trailing slash (this shouldn\'t happen with API Gateway)', function() {
+      let _event = Object.assign({},event,{ path: '/test/123/query/?test=321', queryStringParameters: { test: '321' } })
+
+      return new Promise((resolve,reject) => {
+        api.run(_event,{},function(err,res) { resolve(res) })
+      }).then((result) => {
+        //console.log(result);
+        expect(result).to.deep.equal({ headers: { 'Content-Type': 'application/json' }, statusCode: 200, body: '{"method":"get","status":"ok","param":"123","query":"321"}' })
+      })
+    }) // end it
+
+    it('Event path + querystring w/o trailing slash (this shouldn\'t happen with API Gateway)', function() {
+      let _event = Object.assign({},event,{ path: '/test/123/query?test=321', queryStringParameters: { test: '321' } })
+
+      return new Promise((resolve,reject) => {
+        api.run(_event,{},function(err,res) { resolve(res) })
+      }).then((result) => {
+        //console.log(result);
+        expect(result).to.deep.equal({ headers: { 'Content-Type': 'application/json' }, statusCode: 200, body: '{"method":"get","status":"ok","param":"123","query":"321"}' })
+      })
+    }) // end it
+
+
     it('Missing path: /not_found', function() {
       let _event = Object.assign({},event,{ path: '/not_found' })