Fixed bug in layout system, add more tests

Author: hoisie

.gitignore

@@ -0,0 +1,12 @@
+*.6
+*.8
+*.o
+*.so
+*.out
+*.go~
+*.cgo?.*
+_cgo_*
+_obj
+_test
+_testmain.go
+*.swp

mustache.go

@@ -375,8 +375,8 @@ func lookup(contextChain []interface{}, name string) reflect.Value {
     }()
 
 Outer:
-    for i := len(contextChain) - 1; i >= 0; i-- {
-        v := contextChain[i].(reflect.Value)
+    for _, ctx := range contextChain { //i := len(contextChain) - 1; i >= 0; i-- {
+        v := ctx.(reflect.Value)
         for v.IsValid() {
             typ := v.Type()
             if n := v.Type().NumMethod(); n > 0 {
@@ -473,13 +473,14 @@ func renderSection(section *sectionElement, contextChain []interface{}, buf io.W
         }
     }
 
+    chain2 := make([]interface{}, len(contextChain)+1)
+    copy(chain2[1:], contextChain)
     //by default we execute the section
     for _, ctx := range contexts {
-        contextChain = append(contextChain, ctx)
+        chain2[0] = ctx
         for _, elem := range section.elems {
-            renderElement(elem, contextChain, buf)
+            renderElement(elem, chain2, buf)
         }
-        contextChain = contextChain[0 : len(contextChain)-1]
     }
 }
 
@@ -493,8 +494,8 @@ func renderElement(element interface{}, contextChain []interface{}, buf io.Write
                 fmt.Printf("Panic while looking up %q: %s\n", elem.name, r)
             }
         }()
-
         val := lookup(contextChain, elem.name)
+
         if val.IsValid() {
             if elem.raw {
                 fmt.Fprint(buf, val.Interface())
@@ -529,7 +530,10 @@ func (tmpl *Template) Render(context ...interface{}) string {
 
 func (tmpl *Template) RenderInLayout(layout *Template, context ...interface{}) string {
     content := tmpl.Render(context...)
-    return layout.Render(map[string]string{"content":content})
+    allContext := make([]interface{}, len(context)+1)
+    copy(allContext[1:], context)
+    allContext[0] = map[string]string{"content": content}
+    return layout.Render(allContext...)
 }
 
 func ParseString(data string) (*Template, os.Error) {
@@ -571,7 +575,7 @@ func Render(data string, context ...interface{}) string {
 }
 
 func RenderInLayout(data string, layoutData string, context ...interface{}) string {
-    layoutTmpl,err  := ParseString(layoutData)
+    layoutTmpl, err := ParseString(layoutData)
     if err != nil {
         return err.String()
     }
@@ -591,7 +595,7 @@ func RenderFile(filename string, context ...interface{}) string {
 }
 
 func RenderFileInLayout(filename string, layoutFile string, context ...interface{}) string {
-    layoutTmpl,err  := ParseFile(layoutFile)
+    layoutTmpl, err := ParseFile(layoutFile)
     if err != nil {
         return err.String()
     }

mustache_test.go

@@ -70,8 +70,16 @@ func makeVector(n int) *vector.Vector {
     return v
 }
 
-var tests = []Test{
+type Category struct {
+    Tag         string
+    Description string
+}
+
+func (c Category) DisplayName() string {
+    return c.Tag + " - " + c.Description
+}
 
+var tests = []Test{
     {`hello world`, nil, "hello world"},
     {`hello {{name}}`, map[string]string{"name": "world"}, "hello world"},
     {`{{var}}`, map[string]string{"var": "5 > 2"}, "5 > 2"},
@@ -145,6 +153,9 @@ var tests = []Test{
     {`hello {{#section}}{{name}}{{/section}}`, map[string]interface{}{"name": "bob", "section": map[string]string{"name": "world"}}, "hello world"},
     {`hello {{#bool}}{{#section}}{{name}}{{/section}}{{/bool}}`, map[string]interface{}{"bool": true, "section": map[string]string{"name": "world"}}, "hello world"},
     {`{{#users}}{{canvas}}{{/users}}`, map[string]interface{}{"canvas": "hello", "users": []User{{"Mike", 1}}}, "hello"},
+    {`{{#categories}}{{DisplayName}}{{/categories}}`, map[string][]*Category{
+        "categories": {&Category{"a", "b"}},
+    }, "a - b"},
 }
 
 func TestBasic(t *testing.T) {
@@ -208,19 +219,20 @@ func TestMalformed(t *testing.T) {
 }
 
 type LayoutTest struct {
-    layout  string
+    layout   string
     tmpl     string
     context  interface{}
     expected string
 }
 
 var layoutTests = []LayoutTest{
     {`Header {{content}} Footer`, `Hello World`, nil, `Header Hello World Footer`},
-    {`Header {{content}} Footer`, `Hello {{s}}`, map[string]string{"s":"World"}, `Header Hello World Footer`},
-    {`Header {{content}} Footer`, `Hello {{content}}`, map[string]string{"content":"World"}, `Header Hello World Footer`},
+    {`Header {{content}} Footer`, `Hello {{s}}`, map[string]string{"s": "World"}, `Header Hello World Footer`},
+    {`Header {{content}} Footer`, `Hello {{content}}`, map[string]string{"content": "World"}, `Header Hello World Footer`},
+    {`Header {{extra}} {{content}} Footer`, `Hello {{content}}`, map[string]string{"content": "World", "extra": "extra"}, `Header extra Hello World Footer`},
+    {`Header {{content}} {{content}} Footer`, `Hello {{content}}`, map[string]string{"content": "World"}, `Header Hello World Hello World Footer`},
 }
 
-
 func TestLayout(t *testing.T) {
     for _, test := range layoutTests {
         output := RenderInLayout(test.tmpl, test.layout, test.context)