discovered var was, in fact, functioning aside from that edge case

Author: weswigham

README.md

@@ -49,10 +49,9 @@ Logic
 Just write javascript. Really; write _any_ javascript inline with your markup and it just works (tm). 
 
 Known exceptions to 'just working':
-`var` statements do bad things (like write tags), since they try to bind to the context. As a workaround (until I start 
-using the new Proxy API - _and_ `node` supports the new Proxy API), store all scratch variables on $scope (if you're 
-using an explicit context, you can pass a different identifier as the first argument to the context-generator, 
-if $scope is too long/misleading for you).
+`var` statements don't function immediately within an explicitly defined context. 
+Make an IIFE within the explicit with (like in the first test) to get around the problem, 
+or use implied contexts. Or don't use locals.
 
 Scope
 -------
@@ -109,7 +108,7 @@ module.exports = function() {
     });
 };
 ```
-Since `http` (and `sink`, and `JSON`) will be overridden by the implicit context. You have two options: 
+Since `http` (and `JSON`) will be overridden by the implicit context. You have two options: 
 - Export the desired functions into the `$scope`
 - Utilize _explicit contexts_ for complicated files
 
@@ -173,36 +172,36 @@ Scope object passed in the options object:
 `not.js` File:
 ```js
 module.exports = function() {
-  $scope.promise = new $scope.Promise(function(resolve, reject) {
-    $scope.http.get('www.github.com', function(cli) {
-      $scope.sink = '';
+  var promise = new $scope.Promise(function(resolve, reject) {
+    $scope.http.get('http://www.github.com', function(cli) {
+      var sink = '';
       cli.on('data', function(data) {
-          $scope.sink += data;
+          sink += data;
       });
       cli.on('end', function() {
           $(sink, true);
           resolve(); //The return value of implied functions isn't actually used
       });
       cli.on('error', function(e) {
-        $scope.error = $scope.JSON.parse(e);
+        var error = $scope.JSON.parse(e);
         html
           head
-            meta({title: $scope.error})
+            meta({title: error})
           $head
           body
-            $($scope.error);
+            $(error);
           $body
         $html
         resolve();
       });
     });
   });
 
-  return $scope.promise //Implied functions that return promises have their .proxy attribute
-                        //set to the proxy generated for them - call .collect() on the proxy
-                        //to get the result string when the promise resolves
-                        //eg. promise.then(function() { return promise.proxy.collect(); })
-                        //    .then(function(rendered) {doStuff(rendered);});
+  return promise; //Implied functions that return promises have their .proxy attribute
+                  //set to the proxy generated for them - call .collect() on the proxy
+                  //to get the result string when the promise resolves
+                  //eg. promise.then(function() { return promise.proxy.collect(); })
+                  //    .then(function(rendered) {doStuff(rendered);});
 };
 ```
 
@@ -219,5 +218,4 @@ TODO
 ====
 Doctype shorthand?
 Shorthand for inlining a script (something shorter than `script({type: 'text/javascript'}); $($scope.func.toString(), true); script`)
-Figure out how to fix 'var' within the dsl sensibly. Likely involves some metatrickery with the correct flow of calls through the proxy object chain (just overriding `get` hasn't worked, in my experience). It's complicated by variable hoisting.
 Benchmarks?

test/examples.js

@@ -77,35 +77,34 @@ describe('the third functional example in the readme', function() {
   it('should run and produce correct html', function(done) {
     this.timeout(5000);
 
-    var implicitExample = function() {
-      $scope.promise = new $scope.Promise(function(resolve, reject) {
-        $scope.http.get('http://www.github.com', function(cli) {
-          $scope.sink = '';
-          cli.on('data', function(data) {
-              $scope.sink += data;
-          });
-          cli.on('end', function() {
-              $($scope.sink, true);
-              $scope.log('Wrote result.')
-              resolve(); //The return value of implied functions isn't actually used
-          });
-          cli.on('error', function(e) {
-            $scope.error = $scope.JSON.parse(e);
-            html
-              head
-                meta({title: $scope.error})
-              $head
-              body
-                $($scope.error);
-              $body
-            $html
-            resolve();
-          });
+  var implicitExample = function() {
+    var promise = new $scope.Promise(function(resolve, reject) {
+      $scope.http.get('http://www.github.com', function(cli) {
+        var sink = '';
+        cli.on('data', function(data) {
+            sink += data;
+        });
+        cli.on('end', function() {
+            $(sink, true);
+            resolve(); //The return value of implied functions isn't actually used
+        });
+        cli.on('error', function(e) {
+          var error = $scope.JSON.parse(e);
+          html
+            head
+              meta({title: error})
+            $head
+            body
+              $(error);
+            $body
+          $html
+          resolve();
         });
       });
+    });
 
-      return $scope.promise;
-    };
+    return promise;
+  };
 
     var result = notjs.renderFunc(implicitExample, {
       Promise: require('promise'),

test/html.js

@@ -14,10 +14,11 @@ describe('the not.js html dsl', function() {
         items: ['Foo', 'Bar', 'Baz', 'Bat']
       }
     };
+    
     //Call the context with the name you want the scope accessible by and the scope object itself
     //"$scope" is the default and may be omitted
     with (context('$scope', scope)) {
-    
+      (function() { //Make a closure so we can use locals
       //Any valid identifier is a used as a tag (with some exceptions, see below)
       html
         head
@@ -47,9 +48,9 @@ describe('the not.js html dsl', function() {
           $p
 
           //Include plain js logic inline with your template!
-          for ($scope.i=0; $scope.i<4; $scope.i++) {
+          for (var i=0; i<4; i++) {
             p
-              $('I\'m number '+$scope.i+'!');
+              $('I\'m number '+i+'!');
             $p
           }
 
@@ -59,6 +60,7 @@ describe('the not.js html dsl', function() {
           $($scope.impliedContext($scope.sublayout), true)
         $body
       $html
+      })();
     }
     context.collect().should.be.equal(
 '<html><head><meta title=\"not.js wat?\" /></head><body style=\"width: 100%;\"><p><h1 style=\"text-align: right;\">Title '+
@@ -95,7 +97,7 @@ describe('the not.js html dsl', function() {
     var path = require('path').resolve('test', 'implied.not.js');
     notjs.renderPath(path, {scope: scope}, function(err, res) {
       if (err) throw err;
-      res.should.be.equal('<h1>Title!</h1><ul class=\"un-list\"><li>Item: Foo</li><li>Item: Bar</li><li>Item: Baz</li><li>Item: Bat</li></ul>');
+      res.should.be.equal('<h1>Title!</h1><ul class="un-list"><li>Item: Foo</li><li>Item: Bar</li><li>Item: Baz</li><li>Item: Bat</li></ul>');
       done();
     });
   });
@@ -114,9 +116,13 @@ describe('the not.js html dsl', function() {
   it('lets you alias the scope in implied arguments by taking an argument', function() {
     var block = function(s) {
       h1; $('text: '); $(s.text); $h1;
+      
+      var example = 'thing';
+      example += ' and more';
+      h2; $(example); $h2;
     };
 
     var result = notjs.renderFunc(block, {text: 'some text'});
-    result.should.be.equal('<h1>text: some text</h1>');
+    result.should.be.equal('<h1>text: some text</h1><h2>thing and more</h2>');
   });
 });