Bug fixes and tidy up of clean up

README.md

@@ -142,6 +142,7 @@ These might get done if we end up needing them/have time:
 
 ## Release History
 
+* 0.0.6 Bug fixes introduced in the last update and clean up was happening too soon. Moved it.
 * 0.0.5 Added the ability to passthrough specific information from the `.add()` options to the response object
 * 0.0.4 Authorization can now be set on each request (currently Bearer [...] only)
 * 0.0.3 More bug fixes: New contentId for every request

lib/batchelor.js

@@ -213,8 +213,8 @@ var request = require('request'),
 
           //  Get the response id if exists
           var returnedContentId = part.header['content-id'],
-            currentRequestCallback,
-            currentRequestExtendData;
+            currentRequestCallback = null,
+            currentRequestExtendData = null;
 
           if (!!returnedContentId) {
 
@@ -234,7 +234,9 @@ var request = require('request'),
 
           //  If this individual request has a callback, run it
           if (!!currentRequestCallback) {
+
             currentRequestCallback(part.data, currentRequestExtendData || null);
+
           } else {
             //  Anything that doesn't have a specific callback get's pushed into main body
             responseBody.parts.push(part.data);
@@ -247,15 +249,16 @@ var request = require('request'),
         //  Extend data sent through as is for parse in callback
         callback(responseBody, _requestExtensionData);
 
+        //  Clean up
+        _requests = [];
+        _requestExtensionData = [];
+        _requestSpecificCallbacks = [];
+        _multiparts = [];
+
       });
 
       //  Pipe our response to Dicer
       responseObj.pipe(d);
-    }).on('end', function () {
-
-      //  Clean up
-      _requests = _requestExtensionData = _requestSpecificCallbacks = _multiparts = [];
-
     });
   };