.into() FINALLY works

Author: James Halliday

index.js

@@ -78,10 +78,16 @@ exports.stream = function (em, eventName) {
         };
 
         self.into = function (key, cb) {
-            if (!vars.get(key)) {
-                vars.set(key, {});
-            }
-            saw.nest(cb, vars.get(key));
+            if (!vars.get(key)) vars.set(key, {});
+            var parent = vars;
+            vars = Vars(parent.get(key));
+            
+            saw.nest(function () {
+                cb.apply(this, arguments);
+                this.tap(function () {
+                    vars = parent;
+                });
+            }, vars.store);
         };
 
         self.flush = function () {

test/binary.js

@@ -701,7 +701,7 @@ exports.nested = function () {
     }, 50);
 };
 
-exports.into = function () {
+exports.intoBuffer = function () {
     var to = setTimeout(function () {
         assert.fail('never finished');
     }, 500);
@@ -737,3 +737,46 @@ exports.into = function () {
         })
     ;
 }
+
+exports.intoStream = function () {
+    var to = setTimeout(function () {
+        assert.fail('never finished');
+    }, 500);
+    
+    var digits = [ 1, 2, 3, 4, 5, 6 ];
+    var stream = new EventEmitter;
+    var iv = setInterval(function () {
+        var d = digits.shift();
+        if (d) stream.emit('data', new Buffer([ d ]))
+        else clearInterval(iv)
+    }, 20);
+    
+    Binary.stream(stream)
+        .into('moo', function () {
+            this
+                .word8('x')
+                .word8('y')
+                .word8('z')
+            ;
+        })
+        .tap(function (vars) {
+            assert.eql(vars, { moo : { x : 1, y : 2, z : 3 } });
+        })
+        .word8('w')
+        .tap(function (vars) {
+            assert.eql(vars, {
+                moo : { x : 1, y : 2, z : 3 },
+                w : 4,
+            });
+        })
+        .word8('x')
+        .tap(function (vars) {
+            assert.eql(vars, {
+                moo : { x : 1, y : 2, z : 3 },
+                w : 4,
+                x : 5,
+            });
+            clearTimeout(to);
+        })
+    ;
+}