Check for content-type, updated buffer handling, and better query string parse

.travis.yml

@@ -1,3 +1,3 @@
 language: node_js
 node_js:
-  - 0.6
+  - "0.10"

README.md

@@ -1,4 +1,4 @@
-# apiserver [![build status](https://secure.travis-ci.org/kilianc/node-apiserver.png?branch=master)](http://travis-ci.org/kilianc/node-apiserver)
+# apiserver [![build status](https://secure.travis-ci.org/skliffmueller/node-apiserver.png?branch=master)](http://travis-ci.org/skliffmueller/node-apiserver)
 
 A ready to go, modular, multi transport, streaming friendly, JSON(P) API Server.
 

lib/apiserver.js

@@ -3,7 +3,6 @@ var http = require('http'),
     qs = require('qs'),
     util = require('util'),
     events = require('events'),
-    bufferedRequest = require('buffered-request'),
     middleware = require('./middleware'),
     Router = require('apiserver-router'),
     Chain = require('fnchain')
@@ -101,7 +100,6 @@ function onRequest(request, response) {
   request.parsedUrl = parse(request.url, true)
   request.pathname = request.path = request.parsedUrl.pathname.replace(/\/\/+/g, '/')
   request.querystring = request.qs = qs.parse(request.parsedUrl.search.replace(/^\?/, ''))
-  request.makeBuffered()
   request.pause()
   request.timeout = setInterval(function () {
     response.writeHead(408)

lib/middleware/multipart-parser.js

@@ -2,7 +2,7 @@ var formidable = require('formidable')
 
 module.exports = function () {
   return function (request, response, next) {
-    if (!request.method.match(/(PUT|POST|OPTIONS)/)) {
+    if (!request.method.match(/(PUT|POST|OPTIONS)/) || request.headers['content-type'] == undefined) {
       return next()
     }
     if (request.headers['content-type'].match(/multipart\/form-data/)) {

lib/middleware/payload-parser.js

@@ -1,9 +1,9 @@
-var querystring = require('querystring'),
+var qs = require('qs'),
     BufferJoiner = require('bufferjoiner')
 
 module.exports = function () {
   return function (request, response, next) {
-    if (!request.method.match(/(PUT|POST|OPTIONS)/)) {
+    if (!request.method.match(/(PUT|POST|OPTIONS)/) || request.headers['content-type'] == undefined) {
       return next()
     }
     request.rawBody = new BufferJoiner()
@@ -13,7 +13,7 @@ module.exports = function () {
     request.once('end', function () {
       request.rawBody = request.rawBody.join()
       if (request.headers['content-type'].match(/application\/x-www-form-urlencoded/)) {
-        request.body = querystring.parse(request.rawBody.toString('utf8'))
+        request.body = qs.parse(request.rawBody.toString('utf8'))
       } else if (request.headers['content-type'].match(/application\/json/)) {
         try {
           request.body = JSON.parse(request.rawBody.toString('utf8'))
@@ -25,4 +25,4 @@ module.exports = function () {
     })
     next()
   }
-}
+}

package.json

@@ -9,22 +9,22 @@
     "json",
     "jsonp"
   ],
-  "version": "0.2.2",
+  "version": "0.3.0",
   "repository": {
     "type": "git",
-    "url": "http://github.com/kilianc/node-apiserver.git"
+    "url": "http://github.com/skliffmueller/node-apiserver.git"
   },
   "main": "./",
   "scripts": {
     "test": "make test"
   },
   "engines": {
-    "node": ">= v0.6.x"
+    "node": ">= v0.9.x"
   },
   "dependencies": {
     "json-transport": "0.1.x",
     "apiserver-router": "0.2.x",
-    "buffered-request": "0.1.x",
+    "qs": "0.6.x",
     "fnchain": "0.1.1",
     "bufferjoiner": "0.1.x",
     "formidable": "1.0.x",
@@ -36,4 +36,4 @@
     "should": "0.6.1",
     "request": "2.9.x"
   }
-}
+}