vulcan 0.3.0 → 0.4.0

data/server/node_modules/restler/README.md

@@ -1,10 +1,12 @@
-Restler 0.2.0
+Restler 0.2.4
 ===========
 
 (C) Dan Webb (dan@danwebb.net/@danwrong) 2011, Licensed under the MIT-LICENSE
 
 An HTTP client library for node.js (0.3 and up).  Hides most of the complexity of creating and using http.Client. Very early days yet.
 
+See [Version History](https://github.com/danwrong/restler/wiki/Version-History) for changes
+
 
 Features
 --------
@@ -19,8 +21,9 @@ Features
 * Transparently handle SSL (just specify https in the URL)
 * Deals with basic auth for you, just provide username and password options
 * Simple service wrapper that allows you to easily put together REST API libraries
-    
-    
+* Transparently handle content-encoded responses (gzip, deflate)
+
+
 API
 ---
 
@@ -68,9 +71,12 @@ All of these attempt to turn the response into a JavaScript object. In order to
 
 * _method_ Request method, can be get, post, put, del
 * _query_ Query string variables as a javascript object, will override the querystring in the URL
-* _data_ The data to be added to the body of the request.  Can be a string or any object
+* _data_ The data to be added to the body of the request.  Can be a string or any object. 
+Note that if you want your request body to be JSON with the Content-Type `application/json`, you need to 
+JSON.stringify your object first. Otherwise, it will be sent as `application/x-www-form-urlencoded` and encoded accordingly.
 * _parser_ A function that will be called on the returned data.  try parsers.auto, parsers.json etc
 * _encoding_ The encoding of the request body.  defaults to utf8
+* _decoding_ The encoding of the response body. For a list of supported values see [Buffers](http://nodejs.org/docs/latest/api/buffers.html#buffers). Additionally accepts `"buffer"` - returns response as `Buffer`. Defaults to `utf8`.
 * _headers_ a hash of HTTP headers to be sent
 * _username_ Basic auth username
 * _password_ Basic auth password
@@ -82,7 +88,7 @@ All of these attempt to turn the response into a JavaScript object. In order to
 Example usage
 -------------
 
-    var sys = require('sys'),
+    var sys = require('util'),
         rest = require('./restler');
 
     rest.get('http://google.com').on('complete', function(data) {
@@ -112,7 +118,7 @@ Example usage
       password: 'wouldntyouliketoknow',
       data: {
         'sound[message]': 'hello from restler!',
-        'sound[file]': rest.file('doug-e-fresh_the-show.mp3', 'audio/mpeg')
+        'sound[file]': rest.file('doug-e-fresh_the-show.mp3', null, null, null, 'audio/mpeg')
       }
     }).on('complete', function(data) {
       sys.puts(data.audio_url);
@@ -135,6 +141,13 @@ Example usage
       sys.p(data);
     });
 
+    // the JSON post
+    rest.post('http://example.com/action', {
+      data: JSON.stringify({ id: 334 }),
+    }).on('complete', function(data, response) {
+      // you can get at the raw response like this...
+    });
+
     
 Running the tests
 -----------------
@@ -144,4 +157,4 @@ Running the tests
 TODO
 ----
 * Deal with no utf-8 response bodies
-* What do you need? Let me know or fork.
+* What do you need? Let me know or fork.

data/server/node_modules/restler/bin/restler

@@ -2,7 +2,7 @@
 
 require.paths.push(process.cwd());
 
-var sys  = require('sys'),
+var sys  = require('util'),
     rest = require('../lib/restler'),
     repl = require('repl');
   

data/server/node_modules/restler/lib/multipartform.js

@@ -1,5 +1,5 @@
 var fs = require('fs');
-var sys = require("sys")
+var sys = require('util')
 exports.defaultBoundary = '48940923NODERESLTER3890457293';
 
 
@@ -109,7 +109,7 @@ Part.prototype = {
   	  fs.open(this.value.path, "r", 0666, function (err, fd) { 
     	  if (err) throw err; 
     	  
-  		  position = 0;
+  		  var position = 0;
   		  
   	    (function reader () {
   	      fs.read(fd, 1024 * 4, position, "binary", function (er, chunk) {
@@ -142,12 +142,13 @@ function MultiPartRequest(data, boundary) {
 
 MultiPartRequest.prototype = {
   _partNames: function() {
-	  partNames = []
-      for (var name in this.data) {
-  		partNames.push(name)
+    var partNames = [];
+    for (var name in this.data) {
+      partNames.push(name)
   	}
   	return partNames;
   },
+  
   write: function(stream, callback) {
     var partCount = 0, self = this;
     
@@ -157,8 +158,8 @@ MultiPartRequest.prototype = {
   	
   	// Let each part write itself out to the stream
   	(function writePart() {
-  	  partName = this.partNames[partCount];
-  	  part = new Part(partName, self.data[partName], self.boundary);
+  	  var partName = self.partNames[partCount];
+  	  var part = new Part(partName, self.data[partName], self.boundary);
   	  part.write(stream, function (err) {
   		  if (err) {
     			callback(err);
@@ -199,4 +200,4 @@ var exportMethods = {
 
 Object.keys(exportMethods).forEach(function(exportMethod) {
   exports[exportMethod] = exportMethods[exportMethod]
-})
+})

data/server/node_modules/restler/lib/restler.js

@@ -1,9 +1,10 @@
-var sys       = require('sys'),
+var sys       = require('util'),
     http      = require('http'),
     https     = require('https'),
     url       = require('url'),
     qs        = require('querystring'),
-    multipart = require('./multipartform');
+    multipart = require('./multipartform'),
+    zlib      = require('zlib');
     
 function mixin(target, source) {
   Object.keys(source).forEach(function(key) {
@@ -20,7 +21,7 @@ function Request(uri, options) {
     'Accept': '*/*',
     'User-Agent': 'Restler for node.js',
     'Host': this.url.host
-  }
+  };
   
   mixin(this.headers, options.headers || {});
   
@@ -46,6 +47,11 @@ function Request(uri, options) {
       this.headers['Content-Type'] = 'application/x-www-form-urlencoded';
       this.headers['Content-Length'] = this.options.data.length;
     }
+    if(typeof this.options.data == 'string') {
+      var buffer = new Buffer(this.options.data, this.options.encoding || 'utf8');
+      this.options.data = buffer;
+      this.headers['Content-Length'] = buffer.length;
+    }
   }
   
   var proto = (this.url.protocol == 'https:') ? https : http;
@@ -62,9 +68,10 @@ function Request(uri, options) {
 }
 
 Request.prototype = new process.EventEmitter();
+
 mixin(Request.prototype, {
   _isRedirect: function(response) {
-    return ([301, 302].indexOf(response.statusCode) >= 0);
+    return ([301, 302, 303].indexOf(response.statusCode) >= 0);
   },
   _fullPath: function() {
     var path = this.url.pathname || '/';
@@ -101,25 +108,46 @@ mixin(Request.prototype, {
     } else {
       var body = '';
       
-      // TODO Handle different encodings
-      response.setEncoding('utf8');
+      response.setEncoding('binary');
       
       response.on('data', function(chunk) {
         body += chunk;
       });
       
       response.on('end', function() {
-         if (self.options.parser) {
-           self.options.parser.call(response, body, function(parsedData) {
-
-             self._fireEvents(parsedData, response);
-           });
-         } else {
-           self._fireEvents(body, response);
-         }
+        self._decode(new Buffer(body, 'binary'), response, function(err, body) {
+          if (err) {
+            self._respond('error', '', 'Failed to decode response body');
+            return;
+          }
+          self._encode(body, response, function(body) {
+            self._fireEvents(body, response);
+          });
+        });
       });
     }
   },
+  _decode: function(body, response, callback) {
+    var encoder = response.headers['content-encoding'];
+    if (encoder in decoders) {
+      decoders[encoder].call(response, body, callback);
+    } else {
+      callback(null, body);
+    }
+  },
+  _encode: function(body, response, callback) {
+    var self = this;
+    if (self.options.decoding == 'buffer') {
+      callback(body);
+    } else {
+      body = body.toString(self.options.decoding);
+      if (self.options.parser) {
+        self.options.parser.call(response, body, callback);
+      } else {
+        callback(body);
+      }
+    }
+  },
   _respond: function(type, data, response) {
     if (this.options.originalRequest) {
       this.options.originalRequest.emit(type, data, response);
@@ -135,11 +163,11 @@ mixin(Request.prototype, {
     this._respond(response.statusCode.toString(), body, response);
     this._respond('complete', body, response);
   },
-  _makeRequest: function() { 
+  _makeRequest: function() {
     var self = this;
        
     this.request.on('response', function(response) {
-		  self._responseHandler(response);
+  	  self._responseHandler(response);
   	}).on('error', function(err) {
   	  self._respond('error', null, err);
   	});
@@ -155,7 +183,7 @@ mixin(Request.prototype, {
       if (this.options.data) {
         this.request.write(this.options.data.toString(), this.options.encoding || 'utf8');
       }
-		  this.request.end();
+      this.request.end();
     }
     
     return this;
@@ -170,7 +198,9 @@ function shortcutOptions(options, method) {
 }
     
 function request(url, options) {  
-  	return (new Request(url, options)).run();
+  var request = new Request(url, options);
+  request.on('error', function() {}); 
+ 	return request.run();
 }
 
 function get(url, options) {
@@ -207,7 +237,7 @@ var parsers = {
   json: function(data, callback) {
     callback(data && JSON.parse(data));
   }
-}
+};
 
 parsers.auto.matchers = {
   'application/json': parsers.json
@@ -233,15 +263,27 @@ try {
       parser.on('end', function(result) {
           callback(result);
       });
-      
-      parser.parseString(data);
+      try {
+          parser.parseString(data);
+      } catch (e) {
+          callback({error:'Oops, something went wrong.'});
+      }
     } else {
       callback();
     }
   };
   
   parsers.auto.matchers['application/xml'] = parsers.xml;
-} catch(e) {}
+} catch(e) { }
+
+var decoders = {
+  gzip: function(buf, callback) {
+    zlib.gunzip(buf, callback);
+  },
+  deflate: function(buf, callback) {
+    zlib.inflate(buf, callback);
+  }
+};
 
 
 function Service(defaults) {

data/server/node_modules/restler/package.json

@@ -1,10 +1,10 @@
 {
     "name": "restler",
-    "version": "0.2.1",
+    "version": "0.2.4",
     "description": "An HTTP client library for node.js",
     "contributors": [{ "name": "Dan Webb", "email": "dan@danwebb.net" }],
     "homepage": "https://github.com/danwrong/restler",
     "directories" : { "lib" : "./lib" },
     "main" : "./lib/restler",
     "engines": { "node": ">= 0.3.7" }
-}
+}

data/server/node_modules/restler/test/restler.js

@@ -1,6 +1,6 @@
 var helper = require('./test_helper'),
     rest   = require('../lib/restler'),
-    sys    = require('sys');
+    sys    = require('util');
     
 helper.testCase("Basic Tests", helper.echoServer, {
   testRequestShouldTakePath: function(host, test) {
@@ -145,4 +145,24 @@ helper.testCase('Redirect Tests', helper.redirectServer, {
       test.equal('Hell Yeah!', data, "returned " + sys.inspect(data));
     });
   }
-});
+});
+
+helper.testCase('Content-Length Tests', helper.contentLengthServer, {
+  testRequestHeaderIncludesContentLengthWithJSONData: function(host, test){
+    var jsonString = JSON.stringify({ greeting: 'hello world' });
+    rest.post(host, {
+      data: jsonString
+    }).on('complete', function(data){
+      test.equal(26, data, 'should set content-length');
+    });
+  },
+  testJSONMultibyteContentLength: function (host, test){
+    var multibyteData = JSON.stringify({ greeting: 'こんにちは世界' });
+    rest.post(host, {
+      data: multibyteData
+    }).on('complete', function(data) {
+      test.notEqual(22, data, 'should unicode string length');
+      test.equal(36, data, 'should byte-size content-length');
+    });
+  }
+});

data/server/node_modules/restler/test/test_helper.js

@@ -1,5 +1,5 @@
 var http  = require("http"),
-    sys   = require('sys'),
+    sys   = require('util'),
     test  = require('assert');
 
 exports.echoServer = function() {
@@ -84,6 +84,25 @@ exports.redirectServer = function() {
   return ["http://localhost:" + port, server];
 }
 
+exports.contentLengthServer = function (){
+  var port = exports.port++;
+
+  var server = http.createServer(function(request, response){
+    response.writeHead(200, { 'Content-Type': 'text/plain' });
+    if('content-length' in request.headers){
+      response.write(request.headers['content-length']);
+    } else {
+      response.write('content-length isnot set');
+    }
+
+    response.end();
+    server.close();
+  });
+
+  server.listen(port, 'localhost');
+  return ['http://localhost:' + port, server];
+};
+
 exports.port = 7000;
 
 exports.testCase = function(caseName, serverFunc, tests) {

data/server/package.json

@@ -10,7 +10,6 @@
     "restler"
   ],
   "engines": {
-    "node": ">=0.4.7 <0.6.0",
-    "npm":  ">=1.0.0"
+    "node": "0.6.x"
   }
 }

data/server/web.js

@@ -1,10 +1,8 @@
-require.paths.unshift(__dirname + '/lib');
-
 var cradle  = require('cradle');
 var express = require('express');
 var fs      = require('fs');
 var spawner = require('spawner').create();
-var sys     = require('sys');
+var util    = require('util');
 var uuid    = require('node-uuid');
 
 var app = express.createServer(
@@ -14,6 +12,14 @@ var app = express.createServer(
   require('connect-form')({ keepExtensions: true })
 );
 
+function log_action(uuid, message) {
+  console.log(uuid + ': ' + message);
+}
+
+function log_error(uuid, message) {
+  log_action(uuid, 'ERROR: ' + message);
+}
+
 // connect to couchdb
 var couchdb_url = require('url').parse(process.env.CLOUDANT_URL);
 var couchdb_options = couchdb_url.auth ?
@@ -27,6 +33,7 @@ app.post('/make', function(request, response, next) {
 
   // require a form
   if (! request.form) {
+    console.log('invalid form');
     response.write('invalid form');
     response.send(500);
   } else {
@@ -48,10 +55,12 @@ app.post('/make', function(request, response, next) {
         var prefix  = fields.prefix;
 
         // create a couchdb documents for this build
+        log_action(id, 'saving to couchdb');
         db.save(id, { command:command, prefix:prefix }, function(err, doc) {
-          if (err) { return next(err); }
+          if (err) { log_error(id, util.inspect(err)); return next(err); }
 
           // save the input tarball as an attachment
+          log_action(id, 'saving attachment - [id:' + doc.id + ', rev:' + doc.rev + ']')
           db.saveAttachment(
             doc.id,
             doc.rev,
@@ -59,16 +68,26 @@ app.post('/make', function(request, response, next) {
             'application/octet-stream',
             fs.createReadStream(files.code.path),
             function(err, data) {
-              if (err) { return next(err); }
+              if (err) {
+                // work around temporary problem with cloudant and document
+                // conflicts
+                if (err.error != 'conflict') {
+                  log_error(id, err.reason);
+                  return next(err.reason);
+                }
+              }
 
               // spawn bin/make with this build id
+              log_action(id, 'spawning build');
               var ls = spawner.spawn('bin/make ' + id, function(err) {
+                log_error(id, 'could not spawn: ' + err);
                 response.write('could not spawn: ' + err);
                 response.send(500);
               });
 
               ls.on('error', function(error) {
-                response.write('error: ' + err);
+                log_error(id, 'spawn error: ' + util.inspect(error));
+                response.write('error: ' + util.inspect(error));
                 response.send(500);
               });
 
@@ -86,7 +105,7 @@ app.post('/make', function(request, response, next) {
           response.header('X-Make-Id', id);
         });
       }
-      
+
     });
   }
 });
@@ -97,6 +116,10 @@ app.get('/output/:id', function(request, response, next) {
   // from couchdb
   var stream = db.getAttachment(request.params.id, 'output');
 
+  stream.on('error', function(err) {
+    console.log('download error: ' + err);
+  });
+
   stream.on('data', function(chunk) {
     response.write(chunk, 'binary');
   });