Mustang can now render templates from YAML!

joshthecoder · joshthecoder · commit 9e84cd098202 · 2010-03-16T14:39:00.000-05:00
diff --git a/mustang/Node.ooc b/mustang/Node.ooc
@@ -65,7 +65,7 @@ SectionNode: class extends TNode {
                 }
                 else {
                     itemContext = Context new()
-                    itemContext addValue("item", item)
+                    itemContext setValue("item", item)
                 }
 
                 Renderer new(this firstChild) render(itemContext, out)
diff --git a/mustang/Value.ooc b/mustang/Value.ooc
@@ -73,19 +73,19 @@ HashValue: class extends Value {
     }
 
     setString: func(name: String, value: String) {
-        addValue(name, StringValue new(value))
+        setValue(name, StringValue new(value))
     }
 
     setBool: func(name: String, value: Bool) {
-        addValue(name, BoolValue new(value))
+        setValue(name, BoolValue new(value))
     }
 
     setList: func(name: String, list: List<Value>) {
-        addValue(name, ListValue new(list))
+        setValue(name, ListValue new(list))
     }
 
     setHashMap: func(name: String, hash: HashMap<Value>) {
-        addValue(name, HashValue new(hash))
+        setValue(name, HashValue new(hash))
     }
 
     getValue: func(name: String) -> Value {
diff --git a/mustang/YAMLContext.ooc b/mustang/YAMLContext.ooc
@@ -0,0 +1,65 @@
+use yaml
+import yaml/[Parser, Document]
+
+import io/File
+import mustang/[Context, Value]
+
+
+YAMLContext: class extends Context {
+    loadFromString: static func(text: String) -> This {
+        parser := YAMLParser new()
+        parser setInputString(text)
+        This new(parser)
+    }
+
+    loadFromFile: static func(file: File) -> This {
+        parser := YAMLParser new()
+        parser setInputFile(file)
+        This new(parser)
+    }
+
+    loadFromFile: static func ~path(path: String) -> This {
+        This loadFromFile(File new(path))
+    }
+
+    init: func(parser: YAMLParser) {
+        document := parser parseDocument()
+        rootValue := nodeToValue(document getRootNode())
+        if(rootValue class != HashValue) {
+            Exception new("Root value must be a hash!") throw()
+        }
+
+        super(rootValue as HashValue)
+    }
+
+    nodeToValue: static func(node: DocumentNode) -> Value {
+        match node class {
+            case ScalarNode => StringValue new((node as ScalarNode) value)
+            case SequenceNode => sequenceToListValue(node as SequenceNode)
+            case MappingNode => mappingToHashValue(node as MappingNode)
+            case => Exception new("Unknown node type!") throw(); null
+        }
+    }
+
+    sequenceToListValue: static func(seq: SequenceNode) -> ListValue {
+        list := ListValue new()
+
+        for(node: DocumentNode in seq toList()) {
+            list appendValue(nodeToValue(node))
+        }
+
+        return list
+    }
+
+    mappingToHashValue: static func(map: MappingNode) -> HashValue {
+        hashes := map toHashMap()
+        values := HashValue new()
+
+        for(key: String in hashes getKeys()) {
+            value := hashes get(key)
+            values setValue(key, nodeToValue(value))
+        }
+
+        return values
+    }
+}
diff --git a/mustang/mustang.ooc b/mustang/mustang.ooc
@@ -1,19 +1,16 @@
 import io/File
 import structs/ArrayList
-import mustang/[TemplateParser, TemplateReader, Walker]
+import mustang/[Template, YAMLContext]
 
 main: func(args: ArrayList<String>) -> Int {
-    if(args size() < 2) {
-        "Usage: mustang <TEMPLATE>" println()
+    if(args size() < 3) {
+        "Usage: mustang <TEMPLATE> <YAML>" println()
         return 1
     }
 
-    template := TemplateReader getReaderFromFile(File new(args[1]))
-    parser := TemplateParser new(template, "{{", "}}")
-
-    root := parser parse()
-    printer := NodePrinter new(root)
-    printer print()
+    context := YAMLContext loadFromFile(args[2])
+    template := Template loadFromFile(args[1])
+    template render(context) println()
 
     return 0
 }

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ SectionNode: class extends TNode {`
`65`	`65`	`}`
`66`	`66`	`else {`
`67`	`67`	`itemContext = Context new()`
`68`		`- itemContext addValue("item", item)`
	`68`	`+ itemContext setValue("item", item)`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`Renderer new(this firstChild) render(itemContext, out)`
Original file line number	Diff line number	Diff line change
`@@ -73,19 +73,19 @@ HashValue: class extends Value {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`setString: func(name: String, value: String) {`
`76`		`- addValue(name, StringValue new(value))`
	`76`	`+ setValue(name, StringValue new(value))`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`setBool: func(name: String, value: Bool) {`
`80`		`- addValue(name, BoolValue new(value))`
	`80`	`+ setValue(name, BoolValue new(value))`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`setList: func(name: String, list: List<Value>) {`
`84`		`- addValue(name, ListValue new(list))`
	`84`	`+ setValue(name, ListValue new(list))`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`setHashMap: func(name: String, hash: HashMap<Value>) {`
`88`		`- addValue(name, HashValue new(hash))`
	`88`	`+ setValue(name, HashValue new(hash))`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`getValue: func(name: String) -> Value {`