Skip to content
This repository has been archived by the owner on Apr 25, 2019. It is now read-only.

Commit

Permalink
added @asString attribute (needed for 2 fields in GCMNotification)
Browse files Browse the repository at this point in the history
  • Loading branch information
sigod committed Aug 24, 2015
1 parent 21e3b25 commit dfea4ea
Showing 1 changed file with 19 additions and 4 deletions.
23 changes: 19 additions & 4 deletions source/gcm.d
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,14 @@ struct GCMNotification
string body_loc_key;

/// Indicates the string value to replace format specifiers in body string for localization.
@asString
string[] body_loc_args;

/// Indicates the key to the title string for localization.
string title_loc_key;

/// Indicates the string value to replace format specifiers in title string for localization.
@asString
string[] title_loc_args;
}

Expand Down Expand Up @@ -205,6 +207,9 @@ class GCM
}
}

///
enum asString;

private:

alias Alias(alias a) = a;
Expand Down Expand Up @@ -234,7 +239,6 @@ template isISOExtStringSerializable(T)
}

//TODO: support classes
//TODO: `asString` fields
JSONValue convert(T)(T value)
{
import std.traits : isSomeFunction, isTypeTuple;
Expand All @@ -259,17 +263,28 @@ JSONValue convert(T)(T value)
continue;
}

JSONValue json = void;

static if (__traits(compiles, { auto v = JSONValue(__traits(getMember, value, field_name)); })) {
ret[stripName!field_name] = JSONValue(__traits(getMember, value, field_name));
json = JSONValue(__traits(getMember, value, field_name));
}
else static if (isISOExtStringSerializable!FieldN) {
ret[stripName!field_name] = __traits(getMember, value, field_name).toISOExtString();
json = __traits(getMember, value, field_name).toISOExtString();
}
else static if (is(FieldN == struct)) {
ret[stripName!field_name] = convert(__traits(getMember, value, field_name));
json = convert(__traits(getMember, value, field_name));
}
else
static assert(false, FieldN.stringof ~ " not supported");

//TODO: use hasUDA from 2.068
static if (__traits(getAttributes, __traits(getMember, value, field_name)).length > 0
&& __traits(isSame, __traits(getAttributes, __traits(getMember, value, field_name))[0], asString))
{
json = JSONValue(json.toString());
}

ret[stripName!field_name] = json;
}
}

Expand Down

0 comments on commit dfea4ea

Please sign in to comment.