Minor cleanup.

mcantelon · Dec 31, 2010 · e9110cd · e9110cd
1 parent 1a65a61
commit e9110cd
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/lib/calais.js b/lib/calais.js
@@ -51,10 +51,6 @@ Calais.prototype = {
     return true
   },
 
-  _parseChunks: function(chunks) {
-    return chunks.join('');
-  },
-
   clean_result:function(result) {
     var clean_result = []
     for(var i in result) {
@@ -71,8 +67,6 @@ Calais.prototype = {
 
     if (this.validate_options()) {
 
-      var scope = this
-
       var params = {
         'Host':                    this.options.apiHost,
         'x-calais-licenseID':      this.api_key,
@@ -105,13 +99,18 @@ Calais.prototype = {
         })
         response.on('end', function() {
 
-          var urldata = scope._parseChunks(data)
+          // serialize the returned data
+          var calaisData = data.join('')
+
+          // take note of whether JSON output was requested
           var jsonOutput = (calais.options.outputFormat == 'application/json')
 
+          // parse to a Javascript object if outputting JSON
           var result = (jsonOutput)
-            ? JSON.parse(urldata)
-            : urldata
+            ? JSON.parse(calaisData)
+            : calaisData
 
+          // ignore cleanResult preference if not outputting JSON
           result = (jsonOutput && calais.options.cleanResult)
             ? calais.clean_result(result)
             : result