Module API: provide wrapped results object in callback

macbre · Jan 22, 2014 · 8cbaa49 · 8cbaa49
1 parent 51edcb4
commit 8cbaa49
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -13,7 +13,7 @@ function phantomas(url, options, callback) {
 		events = new emitter(),
 		path = '',
 		proc,
-		results = '';
+		data = '';
 
 	// options can be omitted
 	if (typeof options === 'function') {
@@ -80,27 +80,32 @@ function phantomas(url, options, callback) {
 
 	// gather data from stdout
 	proc.stdout.on('data', function(buf) {
-		results += buf;
+		data += buf;
 	});
 
 	// process results
 	proc.on('close', function(code) {
 		var debug = require('debug')('phantomas:results'),
-			json = false;
+			json = false,
+			results = false;
 
 		debug('Process returned code #%d', code);
-		debug('JSON: %s', results);
+		debug('JSON: %s', data);
 
 		// (try to) parse to JSON
 		try {
-			json = JSON.parse(results);
+			json = JSON.parse(data);
 		}
 		catch(ex) {
-			debug('Error when parsing JSON (%s): <%s>', ex, results);
+			debug('Error when parsing JSON (%s): <%s>', ex, data);
 		}
 
 		if (json !== false) {
-			events.emit('results', json);
+			events.emit('data', json);
+
+			// wrap JSON data into results object
+			results = new (require('../core/results'))(json);
+			events.emit('results', results);
 		}
 
 		if (code > 0) {
@@ -110,7 +115,7 @@ function phantomas(url, options, callback) {
 		}
 
 		if (typeof callback === 'function') {
-			callback(code === 0 ? null : code, json);
+			callback(code === 0 ? null : code, json, results);
 		}
 	});