Merge pull request #2763 from vibe-d/fix_rest_enums

Fix handling of enum parameters for REST interface clients

Author: l-kramer

tests/rest/source/app.d

@@ -483,6 +483,12 @@ interface Example8API
 		double d;
 	}
 
+	enum E {
+		foo = 0,
+		bar = 1,
+		baz = 0
+	}
+
 	FooType constFoo (const FooType param);
 	FooType constRefFoo (const ref FooType param);
 	FooType inFoo (in FooType param);
@@ -491,6 +497,7 @@ interface Example8API
 	int[] constRefArr (const ref int[] param);
 	int[] inArr (in int[] param);
 	int[] immutableArr (immutable int[] param);
+	E getEnum(E value);
 }
 
 class Example8 : Example8API
@@ -536,6 +543,14 @@ class Example8 : Example8API
 	{
 		return param;
 	}
+
+	E getEnum(E value)
+	{
+		final switch (value) {
+			case E.foo: return E.bar;
+			case E.bar: return E.foo;
+		}
+	}
 }
 
 unittest
@@ -552,6 +567,7 @@ unittest
 	assert (routes[5].method == HTTPMethod.POST && routes[5].pattern == "/example8_api/const_ref_arr");
 	assert (routes[6].method == HTTPMethod.POST && routes[6].pattern == "/example8_api/in_arr");
 	assert (routes[7].method == HTTPMethod.POST && routes[7].pattern == "/example8_api/immutable_arr");
+	assert (routes[8].method == HTTPMethod.GET && routes[7].pattern == "/example8_api/enum");
 }
 
 void runTests(string url)
@@ -714,6 +730,9 @@ void runTests(string url)
 		assert(arr.equal(api.constRefArr(arr)));
 		assert(arr.equal(api.immutableArr(cast(immutable(int[])) arr)));
 		assert(arr.equal(api.inArr(arr)));
+		assert(api.getEnum(Example8API.E.foo) == Example8API.E.bar);
+		assert(api.getEnum(Example8API.E.bar) == Example8API.E.foo);
+		assert(api.getEnum(Example8API.E.baz) == Example8API.E.bar);
 	}
 }
 

web/vibe/web/rest.d

@@ -1868,8 +1868,7 @@ private auto executeClientMethod(I, size_t ridx, ARGS...)
 			query.filterURLEncode(ARGS[i].toString());
 		else
 		// Note: CTFE triggers compiler bug here (think we are returning Json, not string).
-				query.filterURLEncode(toRestString(
-				serializeWithPolicy!(JsonSerializer, SerPolicyType)(ARGS[i])));
+				query.filterURLEncode(toRestString!SerPolicyType(ARGS[i]));
 	}
 
 	foreach (i, PT; PTT) {
@@ -1914,7 +1913,7 @@ private auto executeClientMethod(I, size_t ridx, ARGS...)
 				foreach (j, PT; PTT) {
 					static if (sroute.parameters[j].name[0] == '_' || sroute.parameters[j].name == "id") {
 						case sroute.parameters[j].name:
-							url ~= urlEncode(toRestString(serializeToJson(ARGS[j])));
+							url ~= urlEncode(toRestString(ARGS[j]));
 							goto sbrk;
 					}
 				}
@@ -2103,14 +2102,22 @@ private {
 	import vibe.data.json;
 	import std.conv : to;
 
-	string toRestString(Json value)
+	string toRestString(alias SerPolicyType = DefaultPolicy, T)(T value)
 	@safe {
-		switch (value.type) {
-			default: return value.toString();
-			case Json.Type.bool_: return value.get!bool ? "true" : "false";
-			case Json.Type.int_: return to!string(value.get!long);
-			case Json.Type.float_: return to!string(value.get!double);
-			case Json.Type.string: return value.get!string;
+		import std.array : Appender, appender;
+		import std.uuid : UUID;
+		static if (isInstanceOf!(Nullable, T)) return T(fromRestString!(typeof(T.init.get()))(value));
+		else static if (is(T == bool)) return value ? "true" : "false";
+		else static if (is(T : int)) return to!string(value);
+		else static if (is(T : double)) return to!string(value); // FIXME: formattedWrite(dst, "%.16g", json.get!double);
+		else static if (is(string : T)) return value;
+		else static if (__traits(compiles, value.toISOExtString)) return value.toISOExtString;
+		else static if (__traits(compiles, value.toString)) return value.toString;
+		else static if (is(T == UUID)) return value.toString();
+		else {
+			auto ret = appender!string;
+			serializeWithPolicy!(JsonStringSerializer!(Appender!string), SerPolicyType, T)(value, ret);
+			return ret.data;
 		}
 	}