Added res.type (browser). Closes #54

ladjs · Jan 25, 2012 · 437277a · 437277a
1 parent 0412097
commit 437277a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/lib/node/index.js b/lib/node/index.js
@@ -156,7 +156,7 @@ function Response(req, res, options) {
  *   - `.contentType` the content type without params
  *
  * A response of "Content-Type: text/plain; charset=utf-8"
- * will provide you with a `.contentType` of "text/plain".
+ * will provide you with a `.type` of "text/plain".
  *
  * @param {Object} header
  * @api private

diff --git a/lib/superagent.js b/lib/superagent.js
@@ -203,6 +203,18 @@ var superagent = function(exports){
     return fields;
   }
 
+  /**
+   * Return the mime type for the given `str`.
+   *
+   * @param {String} str
+   * @return {String}
+   * @api private
+   */
+
+  function type(str){
+    return str.split(/ *; */).shift();
+  };
+
   /**
    * Initialize a new `Response` with the given `xhr`.
    *
@@ -265,13 +277,16 @@ var superagent = function(exports){
    *   - `.contentType` the content type without params
    *
    * A response of "Content-Type: text/plain; charset=utf-8"
-   * will provide you with a `.contentType` of "text/plain".
+   * will provide you with a `.type` of "text/plain".
    *
    * @param {Object} header
    * @api private
    */
 
   Response.prototype.setHeaderProperties = function(header){
+    var ct = this.header['content-type'] || '';
+    this.type = type(ct);
+
     // TODO: moar!
     var params = (this.header['content-type'] || '').split(/ *; */);
     this.contentType = params.shift();

diff --git a/test/test.request.js b/test/test.request.js
@@ -272,11 +272,11 @@ test('POST multiple .send() calls', function(next){
   });
 });
 
-test('GET .contentType', function(next){
+test('GET .type', function(next){
   request
   .get('/pets')
   .end(function(res){
-    assert('application/json' == res.contentType);
+    assert('application/json' == res.type);
     next();
   });
 });