Fix encoding and charset, update version

coderoshi · coderoshi · commit 095f199741b0 · 2013-05-16T13:53:34.000-07:00
diff --git a/lib/fsm.js b/lib/fsm.js
@@ -139,6 +139,10 @@ FSM.prototype.respond = function(req, res, code, headers) {
       break;
     case 304:
       delete res.headers['Content-Type'];
+    default:
+      if(res.respBody()) {
+        res.res.write(res.respBody());
+      }
   }
   res.res.statusCode = code;
   if (this.resource.finishRequest != null) {
@@ -185,8 +189,14 @@ FSM.prototype.doChooseCharset = function(charsets, charset, defaultEnc) {
     return s.toLowerCase();
   });
   acceptedCharsets = charset.split(/\s*,\s*/);
-  accepted = acceptedCharsets.map(function(mt) {
-    return [1.0, mt];
+  accepted = acceptedCharsets.map(function(cs) {
+    cs = cs.split(';');
+    var ct = cs[0];
+    var q =  cs[1];
+    if(q) q = q.split('=')[1]
+    if(q) q = parseFloat(q);
+    q = q || 1.0;
+    return [q, ct.toLowerCase()];
   });
   if (_.contains(acceptedCharsets, defaultEnc)) {
     default_priority = 1.0;
@@ -205,24 +215,29 @@ FSM.prototype.doChooseCharset = function(charsets, charset, defaultEnc) {
     priority = value[0];
     acceptable = value[1];
     if (priority === 0.0) {
-      choices = _.without(choices, acceptable.toLowerCase());
+      choices = _.without(choices, acceptable);
       return false;
     } else {
-      return _.contains(choices, acceptable.toLowerCase());
+      return _.contains(choices, acceptable);
     }
   });
-  if (chosen && _.last(chosen)) {
-    return _.last(chosen);
-  } else if (any_ok && _.first(choices)) {
-    return _.first(choices);
+  if (chosen && chosen[1]) {
+    return chosen[1];
+  } else if (any_ok && choices[0]) {
+    return choices[0];
   } else if (default_ok && _.contains(choices, defaultEnc) && defaultEnc) {
     return defaultEnc;
   }
 };
 
 FSM.prototype.chooseEncoding = function(req, res, encoding) {
-  var accepted = encoding.split(/,\s*/);
   var provided = this.resource.encodingsProvidedSync(req, res);
+  accepted_encoding = this.doChooseEncoding(provided, encoding);
+  return this.metadata['accept-encoding'] = accepted_encoding;
+};
+
+FSM.prototype.doChooseEncoding = function(provided, encoding) {
+  var accepted = encoding.split(/,\s*/);
   var match = _.isEmpty(provided);
   var accepted_encoding = null;
   if (match) accepted_encoding = accepted[0];
@@ -232,7 +247,11 @@ FSM.prototype.chooseEncoding = function(req, res, encoding) {
     match = (accept === "*") || (provided[accept] != null);
     if (match) accepted_encoding = accept;
   }
-  return this.metadata['accept-encoding'] = accepted_encoding;
+  // TODO: this is likely wrong
+  if(!accepted_encoding || accepted_encoding === '*') {
+    accepted_encoding = "identity";
+  }
+  return accepted_encoding;
 };
 
 FSM.prototype.variances = function(req, res) {
@@ -785,10 +804,15 @@ FSM.prototype.v3o18 = function(req, res) {
           contentTypes = self.resource.contentTypesProvidedSync(req, res);
           contentType = self.metadata['Content-Type'];
           matchingCt = contentTypes[contentType];
-          self.resource[matchingCt].apply(self.resource, [
+          matchingRes = self.resource[matchingCt]
+          if(!matchingRes) {
+            throw("Expected function "+matchingCt+" for given content-type: "+contentType);
+          }
+          matchingRes.apply(self.resource, [
             req, res, function(result) {
               if (typeof result === 'number') {
                 self.respond(req, res, result);
+              // TODO: seems useful to do } else if (typeof result === 'boolean') {
               } else {
                 res.body = result;
                 self.encodeBody(req, res);
diff --git a/lib/resource.js b/lib/resource.js
@@ -146,8 +146,8 @@ Resource.prototype.movedTemporarily = function(req, res, next) {
   return next(false);
 };
 
-Resource.prototype.finishRequest = function(req, res, next) {
-  return next(true);
+Resource.prototype.finishRequest = function(req, res) {
+  return true;
 };
 
 Resource.prototype.lastModified = function(req, res, next) {
diff --git a/lib/webmachine.js b/lib/webmachine.js
@@ -15,13 +15,18 @@ Webmachine = (function() {
     this.resources = [];
   }
 
+  Webmachine.prototype.trace = function(tracing) {
+    this.tracing = tracing;
+  };
+
   Webmachine.prototype.add = function(resource) {
     resource.routeRe = util.pathRegexp(resource.route, (resource.routeReKeys = []), false, false);
     return this.resources.push(resource);
   };
 
   Webmachine.prototype.start = function(port, ipaddr) {
     var _this = this;
+    var tracing = this.tracing;
     this.server = http.createServer(function(req, res) {
       var fsm, match, pathInfo, rd, resource, rs, urlForm;
       urlForm = url.parse(req.url, true);
@@ -30,8 +35,15 @@ Webmachine = (function() {
         rd = new ReqData(req, urlForm, pathInfo);
         rs = new ResData(res);
         resource = new Resource(resource);
-        fsm = new Fsm(resource);
-        return fsm.run(rd, rs);
+        if(tracing) {
+          rs.trace = [];
+          fsm = new Fsm(resource, rs.trace);
+        } else {
+          fsm = new Fsm(resource);
+        }
+        fsm.run(rd, rs);
+        if(tracing) { console.dir(rs.trace); }
+        return true;
       } else {
         res.writeHead(404, {
           'Content-Type': 'text/plain'
diff --git a/npm-debug.log b/npm-debug.log
@@ -0,0 +1,29 @@
+0 info it worked if it ends with ok
+1 verbose cli [ 'node', '/usr/local/bin/npm', 'test', 'test/charset-test.js' ]
+2 info using npm@1.1.39
+3 info using node@v0.8.1
+4 verbose node symlink /usr/local/bin/node
+5 verbose config file /Users/ericredmond/.npmrc
+6 verbose config file /usr/local/etc/npmrc
+7 verbose config file /usr/local/lib/node_modules/npm/npmrc
+8 verbose read json /Users/ericredmond/Code/webmachine-nodejs/node_modules/test/charset-test.js/package.json
+9 error Error: ENOENT, open '/Users/ericredmond/Code/webmachine-nodejs/node_modules/test/charset-test.js/package.json'
+9 error  { [Error: ENOENT, open '/Users/ericredmond/Code/webmachine-nodejs/node_modules/test/charset-test.js/package.json']
+9 error   errno: 34,
+9 error   code: 'ENOENT',
+9 error   path: '/Users/ericredmond/Code/webmachine-nodejs/node_modules/test/charset-test.js/package.json' }
+10 error You may report this log at:
+10 error     <http://github.com/isaacs/npm/issues>
+10 error or email it to:
+10 error     <npm-@googlegroups.com>
+11 error System Darwin 12.3.0
+12 error command "node" "/usr/local/bin/npm" "test" "test/charset-test.js"
+13 error cwd /Users/ericredmond/Code/webmachine-nodejs
+14 error node -v v0.8.1
+15 error npm -v 1.1.39
+16 error path /Users/ericredmond/Code/webmachine-nodejs/node_modules/test/charset-test.js/package.json
+17 error code ENOENT
+18 error message ENOENT, open '/Users/ericredmond/Code/webmachine-nodejs/node_modules/test/charset-test.js/package.json'
+19 error errno 34
+20 error 34 errno
+21 verbose exit [ 34, true ]
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "author": "Eric Redmond <eric.redmond@gmail.com>",
   "name": "webmachine",
   "description": "Webmachine Application Server",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "preferGlobal": "true",
   "repository": {
     "type": "git",
@@ -12,7 +12,7 @@
   "license" : "MIT/X11",
   "main": "./lib/webmachine.js",
   "engines": {
-    "node": "~>0.6.0"
+    "node": "=>0.8.0"
   },
   "dependencies": {
     "optimist"        : "~>0.2.0",
diff --git a/test/charset-test.js b/test/charset-test.js
@@ -0,0 +1,29 @@
+var _         = require('underscore'),
+    vows      = require('vows'),
+    assert    = require('assert'),
+    Resource  = require('../lib/resource'),
+    Fsm       = require('../lib/fsm');
+
+
+
+vows.describe('FSM Charset').addBatch({
+  'given a charset': {
+    topic: function () {
+      root = {
+        route: '/'
+      };
+      var resource = new Resource(root);
+      var fsm = new Fsm(resource);
+      var potentials = ["utf-8"];
+      var acceptcharset = 'ISO-8859-1,utf-8;q=0.7,*;q=0.3';
+      var defaultEnc = "utf-8";
+      var charset = fsm.doChooseCharset(potentials, acceptcharset, defaultEnc);
+      this.callback(true, charset);
+    },
+    'default to utf8': function (passed, charset) {
+      assert.equal(charset, 'utf-8');
+    }
+  }
+  // define a ISO-8859-1 function, choose that
+  // check that * works against a lower q match
+}).export(module);
diff --git a/test/encoding-test.js b/test/encoding-test.js
@@ -0,0 +1,77 @@
+var _         = require('underscore'),
+    vows      = require('vows'),
+    assert    = require('assert'),
+    Resource  = require('../lib/resource'),
+    Fsm       = require('../lib/fsm');
+
+vows.describe('FSM Encoding').addBatch({
+  'given all encodings': {
+    topic: function () {
+      root = {
+        route: '/'
+      };
+      var resource = new Resource(root);
+      var fsm = new Fsm(resource);
+      var identityFunc = function(x){ return x; };
+      var provided = {"deflate":identityFunc,"identity":identityFunc};
+      var acceptencoding = '*';
+      var encoding = fsm.doChooseEncoding(provided, acceptencoding);
+      this.callback(true, encoding);
+    },
+    'default to identity': function (passed, charset) {
+      assert.equal(charset, 'identity');
+    }
+  },
+  'given identity encoding': {
+    topic: function () {
+      root = {
+        route: '/'
+      };
+      var resource = new Resource(root);
+      var fsm = new Fsm(resource);
+      var identityFunc = function(x){ return x; };
+      var provided = {"deflate":identityFunc,"identity":identityFunc};
+      var acceptencoding = 'identity';
+      var encoding = fsm.doChooseEncoding(provided, acceptencoding);
+      this.callback(true, encoding);
+    },
+    'choose identity': function (passed, charset) {
+      assert.equal(charset, 'identity');
+    }
+  },
+  'given deflate encoding': {
+    topic: function () {
+      root = {
+        route: '/'
+      };
+      var resource = new Resource(root);
+      var fsm = new Fsm(resource);
+      var identityFunc = function(x){ return x; };
+      var provided = {"deflate":identityFunc,"identity":identityFunc};
+      var acceptencoding = 'deflate';
+      var encoding = fsm.doChooseEncoding(provided, acceptencoding);
+      this.callback(true, encoding);
+    },
+    'choose deflate': function (passed, charset) {
+      assert.equal(charset, 'deflate');
+    }
+  },
+  'given no valid encoding': {
+    topic: function () {
+      root = {
+        route: '/'
+      };
+      var resource = new Resource(root);
+      var fsm = new Fsm(resource);
+      var identityFunc = function(x){ return x; };
+      var provided = {"identity":identityFunc};
+      var acceptencoding = 'derp';
+      var encoding = fsm.doChooseEncoding(provided, acceptencoding);
+      this.callback(true, encoding);
+    },
+    'choose identity': function (passed, charset) {
+      assert.equal(charset, 'identity');
+    }
+  }
+  // check that * works against a lower q match
+}).export(module);
