vibe.web.web: Allow Json as a auto-injected parameter type

vibe-d · Nov 30, 2017 · 2a42a31 · 2a42a31
1 parent e424042
commit 2a42a31
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 7 deletions.
diff --git a/tests/vibe.web.web/source/app.d b/tests/vibe.web.web/source/app.d
@@ -2,6 +2,7 @@ module app;
 
 import vibe.core.core;
 import vibe.core.log;
+import vibe.data.json;
 import vibe.http.client;
 import vibe.http.router;
 import vibe.http.server;
@@ -10,20 +11,37 @@ import std.format : format;
 
 // TODO: test the various parameter and return type combinations, as well as all attributes
 
+class Service {
+	@noRoute void getFoo(HTTPServerResponse res) { res.writeBody("oops"); }
+	void getBar(HTTPServerResponse res) { res.writeBody("ok"); }
+	// you can work with Json objects directly
+	auto postJson(Json json) { return json; }
+}
+
 shared static this()
 {
 	auto settings = new HTTPServerSettings;
 	settings.bindAddresses = ["127.0.0.1"];
 	settings.port = 9132;
-
 	auto router = new URLRouter;
 	router.registerWebInterface(new Service);
 
 	listenHTTP(settings, router);
 
 	runTask({
 		scope (exit) exitEventLoop();
-
+		void postJson(V)(string url, V[string] payload, HTTPStatus expected, scope void delegate(scope HTTPClientResponse res) expectedHandler) {
+			requestHTTP("http://127.0.0.1:9132"~url,
+				(scope req) {
+					req.method = HTTPMethod.POST;
+					req.writeJsonBody(payload);
+				},
+				(scope res) {
+					assert(res.statusCode == expected, format("Unexpected status code for %s: %s", url, res.statusCode));
+					expectedHandler(res);
+				}
+			);
+		}
 		void test(string url, HTTPStatus expected) {
 			requestHTTP("http://127.0.0.1:9132"~url,
 				(scope req) {
@@ -36,11 +54,12 @@ shared static this()
 		}
 		test("/foo", HTTPStatus.notFound);
 		test("/bar", HTTPStatus.ok);
+
+		postJson("/json", ["foo": "bar"], HTTPStatus.ok, (scope res) {
+			auto j = res.readJson;
+			assert(j["foo"].get!string == "bar");
+		});
+
 		logInfo("All web tests succeeded.");
 	});
 }
-
-class Service {
-	@noRoute void getFoo(HTTPServerResponse res) { res.writeBody("oops"); }
-	void getBar(HTTPServerResponse res) { res.writeBody("ok"); }
-}
diff --git a/web/vibe/web/web.d b/web/vibe/web/web.d
@@ -911,6 +911,10 @@ private void handleRequest(string M, alias overload, C, ERROR...)(HTTPServerRequ
 			else static if (is(PT == InputStream)) params[i] = req.bodyReader;
 			else static if (is(PT == HTTPServerRequest) || is(PT == HTTPRequest)) params[i] = req;
 			else static if (is(PT == HTTPServerResponse) || is(PT == HTTPResponse)) params[i] = res;
+			else static if (is(PT == Json)) {
+				enforceBadRequest(req.json.type != Json.Type.undefined, "Invalid Json passed.");
+				params[i] = req.json;
+			}
 			else static if (is(PT == WebSocket)) {} // handled below
 			else static if (param_names[i].startsWith("_")) {
 				if (auto pv = param_names[i][1 .. $] in req.params) {