Merge branch 'Yoplitein-vibe724fix' into develop

Author: dymk

dub.json

@@ -9,7 +9,7 @@
 	],
 	"dependencies": {
 		"vibe-d": {
-			"version": "~master",
+			"version": ">=0.7.21",
 			"optional": true
 		}
 	},
@@ -35,7 +35,7 @@
 		{
 			"name": "unittest-vibed",
 			"dependencies": {
-				"vibe-d": "~master"
+				"vibe-d": ">=0.7.21"
 			},
 			"targetType": "executable",
 			"mainSourceFile": "src/app.d",

src/temple/package.d

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

src/temple/tests/capture.d

@@ -1,5 +1,7 @@
 module temple.tests.capture;
 
+version(TempleUnittest):
+
 import temple.tests.common;
 unittest
 {

src/temple/tests/common.d

@@ -1,6 +1,8 @@
 module temple.tests.common;
 
-version(unittest):
+
+version(TempleUnittest):
+
 public import std.stdio, std.file : readText;
 public import
 	temple,

src/temple/tests/filter.d

@@ -1,5 +1,7 @@
 module temple.tests.filter;
 
+version(TempleUnittest):
+
 import temple.tests.common;
 
 private struct SafeDemoFilter

src/temple/tests/todos.d

@@ -1,5 +1,7 @@
 module temple.tests.todos;
 
+version(TempleUnittest):
+
 /**
  * Use cases that can hopefully be made to work at some time in the future.
  * These might not work for a number of reasons, such as CTFE, Phobos, DMD, or

src/temple/tests/vibe.d

@@ -1,100 +1,84 @@
 module temple.tests.vibe;
 
-/**
- * Tests here depend on vibe.d's HTTPServer{Request,Response} being nonfinal
- * in order to mock methods on them. However, this would require a modification
- * to the vibe.d library, so by default they're disabled.
- */
-
-version(none):
+version(TempleUnittest):
 version(Have_vibe_d):
 
 private {
 	import temple.tests.common;
 	import vibe.http.server;
 	import vibe.core.stream;
+	import vibe.stream.memory;
 	import core.time;
 }
 
 /*
- * Stub of ConnectionStream to satisfy HTTPServerResponse
- */
-private final class NullConnStream : ConnectionStream {
-	/// InputStream
-	@property bool empty() { return true; }
-	@property ulong leastSize() { return 0; }
-	@property bool dataAvailableForRead() { return false; };
-	const(ubyte)[] peek() { return []; };
-	void read(ubyte[] dst) {};
-
-	/// OutputStream
-	void write(in ubyte[] bytes) {}
-	void flush() {}
-	void finalize() {}
-	void write(InputStream stream, ulong nbytes = 0) {};
-
-	// ConnectionStream
-	@property bool connected() const { return false; }
-	void close() {}
-	bool waitForData(Duration timeout = 0.seconds) { return false; }
-}
-
-/*
- * Stub of HTTPServerResponse to override bodyWriter
+ * Drops HTTP headers from the stream output and uses proper newlines
  */
-private final class DummyHTTPServerResponse : HTTPServerResponse {
-private:
-	AppenderOutputStream appender;
-
-public:
-	this() {
-		super(
-			new NullConnStream(),
-			new NullConnStream(),
-			null, null);
-		appender = new AppenderOutputStream();
-	}
+private string rendered(MemoryOutputStream output) {
+	import std.string: split, join;
 
-	override @property vibe.core.stream.OutputStream bodyWriter() {
-		return appender;
-	}
+	string data = cast(string)output.data;
+	string[] lines = data.split("\r\n");
+	lines = lines[4 .. $];
 
-	string rendered() {
-		return appender.data();
-	}
+	return lines.join("\n");
 }
 
 unittest {
-	auto resp = new DummyHTTPServerResponse();
+	auto output = new MemoryOutputStream();
+	auto resp = createTestHTTPServerResponse(output);
 	resp.renderTemple!`
 		Something here
 		<p>Something more here</p>
 		<%= "<p>Escape me!</p>" %>
 	`;
+	resp.bodyWriter.flush; //flushes resp's output stream wrapping the MemoryOutputStream
 
-	assert(isSameRender(resp.rendered, `
+	assert(isSameRender(output.rendered, `
 		Something here
 		<p>Something more here</p>
 		&lt;p&gt;Escape me!&lt;/p&gt;
 	`));
 }
 
 unittest {
-	auto resp = new DummyHTTPServerResponse();
+	auto output = new MemoryOutputStream();
+	auto resp = createTestHTTPServerResponse(output);
+	auto ctx = new TempleContext;
+	ctx.abc = "<unescaped>";
+	ctx.def = "<escaped>";
+	resp.renderTemple!`
+		<%= safe(var.abc) %>
+		<%= var.def %>
+	`(ctx);
+	resp.bodyWriter.flush; //flushes resp's output stream wrapping the MemoryOutputStream
+
+	assert(isSameRender(output.rendered, `
+		<unescaped>
+		&lt;escaped&gt;
+	`));
+}
+
+unittest {
+	auto output = new MemoryOutputStream();
+	auto resp = createTestHTTPServerResponse(output);
 	resp.renderTempleFile!"test12_vibe1.emd";
+	resp.bodyWriter.flush; //flushes resp's output stream wrapping the MemoryOutputStream
 
-	assert(isSameRender(resp.rendered, `
+	assert(isSameRender(output.rendered, `
 		Rendering with renderTempleFile in temple.vibe
 		<p>Don't escape</p>
 		&lt;p&gt;Do escape&lt;/p&gt;
 	`));
 }
 
 unittest {
-	auto resp = new DummyHTTPServerResponse();
+	auto output = new MemoryOutputStream();
+	auto resp = createTestHTTPServerResponse(output);
 	resp.renderTempleLayoutFile!("test13_vibelayout.emd", "test13_vibepartial.emd");
+	resp.bodyWriter.flush; //flushes resp's output stream wrapping the MemoryOutputStream
 
-	assert(isSameRender(resp.rendered, `
+	assert(isSameRender(output.rendered, `
 		&lt;div&gt;escaped header&lt;/div&gt;
 		<div>header div</div>
 		header

src/temple/vibe.d

@@ -9,6 +9,7 @@ private {
 	import vibe.http.server;
 	import vibe.textfilter.html;
 	import std.stdio;
+	import std.variant;
 }
 
 struct TempleHtmlFilter {
@@ -21,13 +22,21 @@ struct TempleHtmlFilter {
 		filterHTMLEscape(stream, unsafe);
 	}
 
+	static void temple_filter(ref TempleOutputStream stream, Variant variant) {
+		temple_filter(stream, variant.toString);
+	}
+
 	static string temple_filter(SafeString safe) {
 		return safe.payload;
 	}
 
 	static SafeString safe(string str) {
 		return SafeString(str);
 	}
+
+	static SafeString safe(Variant variant) {
+		return SafeString(variant.toString);
+	}
 }
 
 private enum SetupContext = q{
@@ -50,7 +59,7 @@ void renderTemple(string temple, Ctx = TempleContext)
 {
 	mixin(SetupContext);
 
-	auto t = Temple!(temple, TempleHtmlFilter);
+	auto t = compile_temple!(temple, TempleHtmlFilter);
 	t.render(res.bodyWriter, context);
 }