Get partials working.

joshthecoder · joshthecoder · commit 3674cb394e57 · 2010-03-17T18:17:15.000-05:00
diff --git a/mustang/Node.ooc b/mustang/Node.ooc
@@ -1,6 +1,6 @@
 import io/Writer
 import structs/[List, HashMap]
-import mustang/[Context, Value, Renderer]
+import mustang/[Context, Value, Renderer, Template]
 
 /**
     Base template node interface.
@@ -84,3 +84,15 @@ SectionNode: class extends TNode {
 
     debug: func -> String { "Section: name=%s" format(variableName) }
 }
+
+PartialNode: class extends TNode {
+    partialTemplate: Template
+
+    init: func(=partialTemplate) {}
+
+    render: func(context: Context, out: Writer) {
+        partialTemplate render(context, out)
+    }
+
+    debug: func -> String { "Partial" }
+}
diff --git a/mustang/TagParser.ooc b/mustang/TagParser.ooc
@@ -1,5 +1,5 @@
 import structs/List
-import mustang/Node
+import mustang/[Node, Template]
 
 /**
     Used by TemplateParser for parsing tags.
@@ -59,7 +59,7 @@ SectionParser: class extends TagParser {
     isBlock: func -> Bool { true }
 
     parse: func(tag: String) -> TNode {
-        variableName := tag substring(1). trim()
+        variableName := tag substring(1) trim()
         SectionNode new(variableName)
     }
 }
@@ -73,8 +73,11 @@ PartialParser: class extends TagParser {
     matches: func(tag: String) -> Bool { tag first() == '>' }
 
     parse: func(tag: String) -> TNode {
-        "Parsed parital tag!" println()
-        null
+        //TODO: better template path lookups
+        templateName := tag substring(1) trim()
+        template := Template loadFromFile("%s.mustache" format(templateName))
+
+        PartialNode new(template)
     }
 }
 
diff --git a/mustang/TemplateReader.ooc b/mustang/TemplateReader.ooc
@@ -12,6 +12,10 @@ TemplateReader: class {
         return new(buffer)
     }
 
+    getReaderFromPath: static func(path: String) -> This {
+        getReaderFromFile(File new(path))
+    }
+
     init: func(=content) {
         index = 0
     }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import structs/List`
`2`		`-import mustang/Node`
	`2`	`+import mustang/[Node, Template]`
`3`	`3`
`4`	`4`	`/**`
`5`	`5`	`Used by TemplateParser for parsing tags.`
`@@ -59,7 +59,7 @@ SectionParser: class extends TagParser {`
`59`	`59`	`isBlock: func -> Bool { true }`
`60`	`60`
`61`	`61`	`parse: func(tag: String) -> TNode {`
`62`		`- variableName := tag substring(1). trim()`
	`62`	`+ variableName := tag substring(1) trim()`
`63`	`63`	`SectionNode new(variableName)`
`64`	`64`	`}`
`65`	`65`	`}`
`@@ -73,8 +73,11 @@ PartialParser: class extends TagParser {`
`73`	`73`	`matches: func(tag: String) -> Bool { tag first() == '>' }`
`74`	`74`
`75`	`75`	`parse: func(tag: String) -> TNode {`
`76`		`- "Parsed parital tag!" println()`
`77`		`- null`
	`76`	`+ //TODO: better template path lookups`
	`77`	`+ templateName := tag substring(1) trim()`
	`78`	`+ template := Template loadFromFile("%s.mustache" format(templateName))`
	`79`	`+`
	`80`	`+ PartialNode new(template)`
`78`	`81`	`}`
`79`	`82`	`}`
`80`	`83`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,10 @@ TemplateReader: class {`
`12`	`12`	`return new(buffer)`
`13`	`13`	`}`
`14`	`14`
	`15`	`+ getReaderFromPath: static func(path: String) -> This {`
	`16`	`+ getReaderFromFile(File new(path))`
	`17`	`+ }`
	`18`	`+`
`15`	`19`	`init: func(=content) {`
`16`	`20`	`index = 0`
`17`	`21`	`}`