Make request a little smarter with headers and datatypes

lib/request.js

@@ -22,21 +22,6 @@ var http = require('http')
   , log = require('./log')
   , core = require('./core');
 
-var formatters = {
-  xml: function (data) {
-    return data;
-  }
-, html: function (data) {
-    return data;
-  }
-, txt: function (data) {
-    return data;
-  }
-, json: function (data) {
-    return JSON.parse(data);
-  }
-}
-
 /**
   @name request
   @namespace request
@@ -59,6 +44,7 @@ var request = function (opts, callback) {
     , requester = parsed.protocol == 'http:' ? http : https
     , method = (options.method && options.method.toUpperCase()) || 'GET'
     , headers = core.mixin({}, options.headers || {})
+    , data = options.data
     , contentLength
     , port
     , clientOpts;
@@ -71,18 +57,53 @@ var request = function (opts, callback) {
   }
 
   path = parsed.pathname;
-  if (parsed.search) {
-    path += parsed.search;
-  }
 
   if (method == 'POST' || method == 'PUT') {
-    if (options.data) {
-      contentLength = Buffer.byteLength(options.data);
+    // Handle the payload and content-length
+    if (data) {
+      // JSON data
+      if (options.dataType == 'json') {
+        if (typeof data == 'object') {
+          data = JSON.stringify(data);
+        }
+        headers['Content-Type'] = headers['Content-Type'] ||
+            headers['content-type'] || 'application/json';
+      }
+      // Form data
+      else {
+        if (typeof data == 'object') {
+          data = uri.paramify(data);
+        }
+        // FIXME: What is the prefix for form-urlencoded?
+        headers['Content-Type'] = headers['Content-Type'] ||
+            headers['content-type'] || 'form-urlencoded';
+      }
+      contentLength = Buffer.byteLength(data);
     }
     else {
       contentLength = 0
     }
     headers['Content-Length'] = contentLength;
+
+    if (parsed.search) {
+      path += parsed.search;
+    }
+  }
+  else {
+    if (data) {
+      // Data is an object, parse into querystring
+      if (typeof data == 'object') {
+        data = uri.paramify(data);
+      }
+      // Create querystring or append to existing
+      if (parsed.search) {
+        path += parsed.search; // search includes question mark
+        path += '&' + data;
+      }
+      else {
+        path += '?' + data;
+      }
+    }
   }
 
   clientOpts = {
@@ -96,28 +117,34 @@ var request = function (opts, callback) {
   client = requester.request(clientOpts);
 
   client.addListener('response', function (resp) {
-    var data = ''
-      , dataType;
+    var data = '';
+
     resp.addListener('data', function (chunk) {
       data += chunk.toString();
     });
+
     resp.addListener('end', function () {
       var stat = resp.statusCode
+        , contentType
         , err;
       // Successful response
       if ((stat > 199 && stat < 300) || stat == 304) {
-        dataType = options.dataType || uri.getFileExtension(parsed.pathname);
-        if (formatters[dataType]) {
-          try {
-            if (data) {
-              data = formatters[dataType](data);
+        if (data) {
+          contentType = response.headers['Content-Type'];
+          if (contentType == 'application/json' || contentType == 'text/json' ||
+            uri.getFileExtension(parsed.pathname) == 'json') {
+            try {
+                data = JSON.parse(data);
+            }
+            catch (e) {
+              return callback(e, null);
             }
           }
-          catch (e) {
-            callback(e, null);
-          }
+          callback(null, data);
+        }
+        else {
+          callback(null, null);
         }
-        callback(null, data);
       }
       // Something failed
       else {
@@ -133,8 +160,8 @@ var request = function (opts, callback) {
     callback(e, null);
   });
 
-  if ((method == 'POST' || method == 'PUT') && options.data) {
-    client.write(options.data);
+  if ((method == 'POST' || method == 'PUT') && data) {
+    client.write(data);
   }
 
   client.end();