umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

Merge pull request #85 from tvv/develop

Browse source 
accept datetime with msec
This commit is contained in:
alisdair sullivan 2015-08-08 17:43:00 -07:00
commit 77fe4be65c
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/jsx_parser.erl
View file

@ -119,6 +119,16 @@ when is_integer(Year), is_integer(Month), is_integer(Day), is_integer(Hour), is_
Stack,
Config
);
value([{{Year, Month, Day}, {Hour, Min, Sec}}|Tokens], Handler, Stack, Config)
when is_integer(Year), is_integer(Month), is_integer(Day), is_integer(Hour), is_integer(Min), is_float(Sec) ->
value([{string, unicode:characters_to_binary(io_lib:format(
"~4.10.0B-~2.10.0B-~2.10.0BT~2.10.0B:~2.10.0B:~9.6.0fZ",
[Year, Month, Day, Hour, Min, Sec]
))}|Tokens],
Handler,
Stack,
Config
);
value([{_, Value}|Tokens], Handler, Stack, Config) ->
value([Value] ++ Tokens, Handler, Stack, Config);
value([String|Tokens], Handler, Stack, Config) when is_atom(String) ->
@ -1147,6 +1157,10 @@ datetime_test_() ->
{"datetime", ?_assertEqual(
[start_array, {string, <<"2014-08-13T23:12:34Z">>}, end_array, end_json],
parse([start_array, {{2014,08,13},{23,12,34}}, end_array, end_json], [])
)},
{"datetime", ?_assertEqual(
[start_array, {string, <<"2014-08-13T23:12:34.363369Z">>}, end_array, end_json],
parse([start_array, {{2014,08,13},{23,12,34.363369}}, end_array, end_json], [])
)}
].