GH-292 support template name in nested partials, need a stack to store the current name

lib/dust.js

@@ -136,7 +136,8 @@ Context.wrap = function(context, name) {
     return context;
   }
   var global= {};
-  global.__template_name__ = name;
+  global.__templates__ = [];
+  global.__templates__.push(name);
   return new Context(new Stack(context), global);
 };
 
@@ -490,6 +491,7 @@ Chunk.prototype.block = function(elem, context, bodies) {
 
 Chunk.prototype.partial = function(elem, context, params) {
   var partialContext;
+  context.global.__templates__.push(elem);
   if (params){
     //put the params context second to match what section does. {.} matches the current context without parameters
     // start with an empty context
@@ -506,12 +508,17 @@ Chunk.prototype.partial = function(elem, context, params) {
   } else {
     partialContext = context;
   }
-  if (typeof elem === "function") {
-    return this.capture(elem, partialContext, function(name, chunk) {
-      dust.load(name, chunk, partialContext).end();
-    });
-  }
-  return dust.load(elem, this, partialContext);
+  var partialChunk;
+   if (typeof elem === "function") {
+     partialChunk = this.capture(elem, partialContext, function(name, chunk) {
+       dust.load(name, chunk, partialContext).end();
+     });
+   }
+   else {
+     partialChunk = dust.load(elem, this, partialContext);
+   }
+   context.global.__templates__.pop();
+   return partialChunk;
 };
 
 Chunk.prototype.helper = function(name, context, bodies, params) {

src/dust.pegjs

@@ -97,9 +97,9 @@ identifier "identifier"
   / k:key      { var arr = ["key", k]; arr.text = k; return arr; }
 
 number "number"
-  = n:(frac / integer) { return ['literal', n]; }
+  = n:(float / integer) { return ['literal', n]; }
 
-frac "frac"
+float "float"
   = l:integer "." r:integer+ { return parseFloat(l + "." + r.join('')); }
 
 integer "integer"

test/jasmine-test/spec/coreTests.js

@@ -30,17 +30,31 @@ var coreTests = [
         expected: "Hello World!",
         message: "should test basic text rendering"
       },
-            {
+      {
         name:     "global_template",
         source:   '{#helper foo="bar" boo="boo"} {/helper}',
-        context:  { "helper": function(chunk, context, bodies, params) { return chunk.write(context.global.__template_name__); } },
+        context:  { "helper": function(chunk, context, bodies, params) 
+                     {
+                      var len = Object.keys(context.global.__templates__).length;
+                      // top of the current stack
+                      currentTemplateName = context.global.__templates__[len - 1];
+                      return chunk.write(currentTemplateName);
+                     }
+                  },
         expected: "global_template",
         message: "should render the template name"
-      },
-      {
-        name:     "apps/test/foo.tl&v=0.1",
-        source:   '{#helper foo="bar" boo="boo" template="tl/apps/test"} {/helper}',
-        context:  { "helper": function(chunk, context, bodies, params) { return chunk.write(context.global.__template_name__); } },
+       },
+       {
+         name:     "apps/test/foo.tl&v=0.1",
+         source:   '{#helper foo="bar" boo="boo" template="tl/apps/test"} {/helper}',
+         context:  { "helper": function(chunk, context, bodies, params)
+                    {
+                      var len = Object.keys(context.global.__templates__).length;
+                      // top of the current stack
+                      currentTemplateName = context.global.__templates__[len - 1];
+                      return chunk.write(currentTemplateName);
+                    } 
+                   },
         expected: "apps/test/foo.tl&v=0.1",
         message: "should render the template name with paths"
       },