fixed tests, noise reduction (debug)

Author: regular

index.js

@@ -27,6 +27,7 @@ module.exports = function(needle, replace, options) {
     var fifo = null;
 
     function queueReplacement(stream) {
+        debug('queueing replacement %s %s', typeof replace, replace);
         stream.queue(replace);
         occurances++;
         if (maxOccurances && occurances >= maxOccurances) {
@@ -66,7 +67,7 @@ module.exports = function(needle, replace, options) {
         // Is the rest of the chunk identical to 
         // the rest of the needle?
         var nl = compare(needle, chunk, pin, pic);
-        debug('compare', needle, chunk, pin, pic, 'nl', nl);
+        //debug('compare', needle, chunk, pin, pic, 'nl', nl);
         // is the whole needle contained in the chunk?
         if (nl === 0) {
             // YES! This is the chunk containing the needle's tail.
@@ -96,7 +97,9 @@ module.exports = function(needle, replace, options) {
     }
 
     function write(chunk) {
+        debug('client writes %s of len %d', typeof chunk, chunk.length);
         if (forwarding) {
+            debug('forwarding %s', typeof chunk);
             this.queue(chunk);
             return;
         }
@@ -112,8 +115,10 @@ module.exports = function(needle, replace, options) {
             for(;;) {
                 if (forwarding) {
                     if (pic===0) {
-                        this.queue(chunk);
+                            debug('forwarding %s', typeof chunk);
+                            this.queue(chunk);
                     } else {
+                        debug('forwarding %s', typeof chunk);
                         this.queue(chunk.slice(pic));
                     }
                     pic = 0;

lib/fifo.js

@@ -59,7 +59,6 @@ function fifo(passDownstream) {
         var len = ch.length;
         var skip = seq[0][0];
         var fwd = seq[0][1];
-        debug(skip, fwd); 
         var skipBytes = Math.min(len, skip);
         if (skipBytes === len) {
             chunks.shift();
@@ -70,20 +69,19 @@ function fifo(passDownstream) {
         }
         skip -= skipBytes;
         len -= skipBytes;
-        debug('len', len);
         var fwdBytes = Math.min(len, fwd);
         if (fwdBytes) {
             if (fwdBytes === len) {
-                debug('forwarding', ch);
+                debug('forwarding %s %o', typeof ch, ch);
                 passDownstream(ch);
                 chunks.shift();
             } else {
-                debug('forwarding slice', ch.slice(0, fwdBytes));
+                debug('forwarding slice %s %o', typeof ch, ch.slice(0, fwdBytes));
                 passDownstream(ch.slice(0, fwdBytes));
                 chunks[0] = ch = ch.slice(fwdBytes);
             }
         }
-        debug('forwarded', fwdBytes, 'bytes');
+        debug('forwarded %d bytes', fwdBytes);
         fwd -= fwdBytes;
         if (skip === 0 && fwd === 0) {
             seq.shift();
@@ -132,7 +130,7 @@ function fifo(passDownstream) {
                 sum -= s[0] + s[1];
             });
             f(sum);
-        }
+        };
     } 
 
     // return bytes for which  we don't know

package.json

@@ -1,7 +1,7 @@
 {
   "name": "binary-stream-replace",
   "version": "1.0.0",
-  "description": "efficiently replace a sequence of bytes in a stream with a different sequence of bytes, either n times or all occurances.",
+  "description": "efficiently replace a sequence of bytes in a stream with a different sequence of bytes, either first n occurances or all occurances.",
   "main": "index.js",
   "scripts": {
     "test": "tap-prettify test"
@@ -12,12 +12,11 @@
     "browserify",
     "replace"
   ],
-  "author": "Jan Bölsche",
+  "author": "Jan Bölsche <[email protected]>",
   "license": "ISC",
   "devDependencies": {
     "tape": "^3.2.0",
     "tap-prettify": "0.0.2",
-    "from": "^0.1.3",
     "concat-stream": "^1.4.7"
   },
   "dependencies": {

test/long.js

@@ -8,7 +8,6 @@ function compare(t, encoding, file1, file2, n, r, o) {
     var src = fs.createReadStream(path.join(__dirname, 'fixtures', file1), {encoding:encoding});
     var rs = Rs(n, r, o);
     var cs = Cs(function(data) {
-        console.log(typeof data);
         var d2 = fs.readFileSync(path.join(__dirname, 'fixtures', file2), encoding);
         t.deepEqual(data, d2);
     });
@@ -30,12 +29,12 @@ test('should change first 6 occurances of "of" to "0ffer"', function(t) {
     compare(t, 'utf-8', 'lorem.txt', '6x0ffer.txt', 'of', '0ffer', {maxOccurances: 6});
 });
 
-test('hould not alter a binary stream', function(t) {
+test('should not alter a binary stream', function(t) {
     t.plan(1);
-    compare(t, 'binary', 'random.bin', 'random.bin', new Buffer([0xff,0xff,0xff,0xff]), new Buffer([0x00]));
+    compare(t, null, 'random.bin', 'random.bin', new Buffer([0xff,0xff,0xff,0xff]), new Buffer([0x00]));
 });
 
 test('should replace all occurances of 0xff with 0x00 in a binary file', function(t) {
     t.plan(1);
-    compare(t, 'binary', 'random.bin', 'ffto00.bin', new Buffer([0xff]), new Buffer([0x00]));
+    compare(t, null, 'random.bin', 'ffto00.bin', new Buffer([0xff]), new Buffer([0x00]));
 });