Merge pull request #20 from legobear154/master

Fixed up vibe.d support

Author: dymk

dub.json

@@ -7,6 +7,12 @@
 	[
 		"Dylan Knutson"
 	],
+	"dependencies": {
+		"vibe-d": {
+			"version": "~master",
+			"optional": true
+		}
+	},
 
 	"targetType": "library",
 	"ignoredFiles": ["source/app.d"],
@@ -22,7 +28,7 @@
 			"dependencies": {},
 			"targetType": "executable",
 			"mainSourceFile": "src/app.d",
-			"versions": ["TempleUnittest"],
+			"versions": ["TempleUnittest", "VibeCustomMain"],
 			"stringImportPaths": ["test"]
 		},
 

src/temple/output_stream.d

@@ -59,7 +59,6 @@ public:
 	}
 
 	// for vibe.d's html escape
-	package
 	void put(dchar d) {
 		import std.conv;
 		this.sink(d.to!string);

src/temple/package.d

@@ -210,11 +210,11 @@ public:
         private import vibe.core.stream : OutputStream;
         private import vibe.stream.wrapper : StreamOutputRange;
 
-        void render(vibe.core.stream.OutputStream os) {
+		void render(vibe.core.stream.OutputStream os, TempleContext tc = null) {
             static assert(isOutputRange!(vibe.core.stream.OutputStream, string));
 
             auto sor = StreamOutputRange(os);
-            this.render(sor);
+            this.render(sor, tc);
         }
     }
 

src/temple/vibe.d

@@ -60,8 +60,8 @@ void renderTempleFile(string file, Ctx = TempleContext)
 {
 	mixin(SetupContext);
 
-	alias render = compile_temple_file!(file, TempleHtmlFilter);
-	render(res.bodyWriter, context);
+	auto t = compile_temple_file!(file, TempleHtmlFilter);
+	t.render(res.bodyWriter, context);
 }
 
 void renderTempleLayoutFile(string layout_file, string partial_file, Ctx = TempleContext)
@@ -70,10 +70,10 @@ void renderTempleLayoutFile(string layout_file, string partial_file, Ctx = Templ
 {
 	mixin(SetupContext);
 
-	alias layout = TempleLayoutFile!(layout_file, TempleHtmlFilter);
-	alias partial = compile_temple_file!(partial_file, TempleHtmlFilter);
-
-	layout(res.bodyWriter, &partial, context);
+	auto layout = compile_temple_file!(layout_file, TempleHtmlFilter);
+	auto partial = compile_temple_file!(partial_file, TempleHtmlFilter);
+	auto composed = layout.layout(&partial);
+	composed.render(res.bodyWriter, context);
 }
 
 private void copyContextParams(ref TempleContext ctx, ref HTTPServerRequest req) {