minor updates

upgrade to spirit 0.0.10
upgrade to spirit-router 0.0.6 for examples
export all functions from express-compat
minor code clean up

Makefile

@@ -7,8 +7,11 @@ bench: build
 	@NODE_ENV=production go run benchmarks/runner.go
 
 clean:
+	@if [ -a uploads/ ] ; \
+	then \
+		rm -r uploads/ ; \
+	fi;
 	@rm -r lib/
-	@rm -r examples/test
 
 build:
 	@echo "Building src..."

examples/body-parser.js

@@ -7,7 +7,7 @@
  *
  */
 const spirit = require("spirit")
-const {route} = require("spirit-router")
+const route = require("spirit-router")
 // normally this would be require("spirit-express")
 const express = require("../index")
 

examples/cookie-parser.js

@@ -10,7 +10,7 @@
  * but it's outputted, just to visually show it's populated
  */
 const spirit = require("spirit")
-const {route} = require("spirit-router")
+const route = require("spirit-router")
 // normally this would be require("spirit-express")
 const express = require("../index")
 

examples/express-session.js

@@ -3,7 +3,7 @@
  *
  */
 const {response, adapter} = require("spirit").node
-const {route} = require("spirit-router")
+const route = require("spirit-router")
 // normally this would be require("spirit-express")
 const express = require("../index")
 

examples/multer.js

@@ -4,7 +4,7 @@
  */
 const http = require("http")
 const {response, adapter} = require("spirit").node
-const {route} = require("spirit-router")
+const route = require("spirit-router")
 // normally this would be require("spirit-express")
 const express = require("../index")
 

examples/passport.js

@@ -3,7 +3,7 @@
  *
  */
 const spirit = require("spirit")
-const {route} = require("spirit-router")
+const route = require("spirit-router")
 // normally this would be require("spirit-express")
 const express = require("../index")
 

index.js

@@ -1,3 +1 @@
-var compat = require("./lib/express-compat")
-
-module.exports = compat
+module.exports = require("./lib/express-compat").compat

package.json

@@ -30,10 +30,10 @@
     "jasmine": "^2.4.1",
     "rewire": "^2.5.1",
     "superagent": "^2.0.0",
-    "spirit-router": ">=0.0.5"
+    "spirit-router": ">=0.0.6"
   },
   "dependencies": {
     "bluebird": "^3.4.1",
-    "spirit": ">=0.0.9"
+    "spirit": ">=0.0.10"
   }
 }

spec/express_compat-spec.js

@@ -1,4 +1,4 @@
-const compat = require("../lib/express-compat")
+const compat = require("../lib/express-compat").compat
 const ExpressRes = require("../lib/express-res")
 
 describe("express compat", () => {

src/express-compat.js

@@ -1,10 +1,6 @@
 const Promise = require("bluebird")
-//Promise.onPossiblyUnhandledRejection(function(e, promise) {
-//  throw "Uncaught error: " + e;
-//});
 const spirit = require("spirit")
 const ExpressRes = require("./express-res")
-//const express_req = require("./express-req")
 
 /**
  * Create a Express `res` like object to pass
@@ -16,7 +12,7 @@ const ExpressRes = require("./express-res")
  * @param {function} resolve - Promise resolve
  * @return {ExpressRes}
  */
-const init_resp = (request, resolve) => {
+const init_res = (request, resolve) => {
   if (!request._res) {
     request._res = new ExpressRes(resolve)
   } else {
@@ -29,7 +25,7 @@ const init_resp = (request, resolve) => {
  * transform `request` to be `request` and `req` combined together
  * attach Express req properties and methods
  *
- * If it's already done then do nothing
+ * If this has already happened, then it'll just return
  *
  * @param {request} $param - multiple types / type union
  * @return {request-map} A request map with everything in `req` part of `request`
@@ -48,7 +44,6 @@ const init_req = (request) => {
 
   if (request.url) r.originalUrl = request.url
 
-  //return express_req(r)
   return r
 }
 
@@ -62,7 +57,7 @@ const partial_response = (res, response) => {
   return response
 }
 
-const express_next = (resolve, reject, req, handler) => {
+const next = (resolve, reject, req, handler) => {
   return (err) => {
     if (err) {
       return reject(err)
@@ -71,7 +66,7 @@ const express_next = (resolve, reject, req, handler) => {
     // always keep url correct incase a Express middleware overwrites it
     if (req.originalUrl) req.url = req.originalUrl
 
-    resolve(spirit.utils.callp(handler, [req])
+    resolve(spirit.callp(handler, [req])
             .then((response) => {
               // some Express middleware modify the `res` obj
               // but do not call `res.end`
@@ -114,19 +109,25 @@ const express_next = (resolve, reject, req, handler) => {
   }
 }
 
-const express_compat = (exp_middleware) => {
+const compat = (exp_middleware) => {
   return (handler) => {
     return (request) => {
       return new Promise((resolve, reject) => {
         if (request && typeof request.req !== "function") {
           throw new Error("Unable to use Express middleware. Expected request to have the raw node.js http req available")
         }
         const req = init_req(request)
-        const res = init_resp(req, resolve)
-        exp_middleware(req, res, express_next(resolve, reject, req, handler))
+        const res = init_res(req, resolve)
+        exp_middleware(req, res, next(resolve, reject, req, handler))
       })
     }
   }
 }
 
-module.exports = express_compat
+module.exports = {
+  compat,
+  next,
+  init_req,
+  init_res,
+  partial_response
+}

src/express-res.js

@@ -1,4 +1,4 @@
-const {response} = require("spirit").node
+const response = require("spirit").node.response
 
 class ExpressRes {
   constructor(done) {