umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

Merge pull request #93 from hachreak/fix_timestamp_export

Browse source 
accept erlang:timestamp()
This commit is contained in:
alisdair sullivan 2016-01-16 09:43:45 -08:00
commit b8ba469754
1 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/jsx_parser.erl
View file

@ -109,6 +109,17 @@ value([Number|Tokens], Handler, Stack, Config) when is_float(Number) ->
maybe_done(Tokens, handle_event({float, Number}, Handler, Config), Stack, Config); maybe_done(Tokens, handle_event({float, Number}, Handler, Config), Stack, Config);
value([{raw, Raw}|Tokens], Handler, Stack, Config) when is_binary(Raw) -> value([{raw, Raw}|Tokens], Handler, Stack, Config) when is_binary(Raw) ->
value((jsx:decoder(?MODULE, [], []))(Raw) ++ Tokens, Handler, Stack, Config); value((jsx:decoder(?MODULE, [], []))(Raw) ++ Tokens, Handler, Stack, Config);
value([{_,_,_}=Timestamp|Tokens], Handler, Stack, Config) ->
{{Year, Month, Day}, {Hour, Min, Sec}} = calendar:now_to_datetime(
Timestamp),
value([{string, unicode:characters_to_binary(io_lib:format(
"~4.10.0B-~2.10.0B-~2.10.0BT~2.10.0B:~2.10.0B:~2.10.0BZ",
[Year, Month, Day, Hour, Min, Sec]
))}|Tokens],
Handler,
Stack,
Config
);
value([{{Year, Month, Day}, {Hour, Min, Sec}}|Tokens], Handler, 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_integer(Sec) -> when is_integer(Year), is_integer(Month), is_integer(Day), is_integer(Hour), is_integer(Min), is_integer(Sec) ->
value([{string, unicode:characters_to_binary(io_lib:format( value([{string, unicode:characters_to_binary(io_lib:format(
@ -1178,6 +1189,15 @@ datetime_test_() ->
]. ].
timestamp_test_() ->
[
{"timestamp", ?_assertEqual(
[start_array, {string, <<"2016-01-15T18:19:28Z">>}, end_array, end_json],
parse([start_array, {1452,881968,111772}, end_array, end_json], [])
)}
].
rogue_tuple_test_() -> rogue_tuple_test_() ->
[ [
{"kv in value position of object", ?_assertError( {"kv in value position of object", ?_assertError(