umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

Merge pull request #46 from eskuat/develop

Browse source 
allow integer object keys when converting term to json
This commit is contained in:
alisdair sullivan 2013-12-12 11:15:21 -08:00
commit ee7e96cf98
1 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/jsx_encoder.erl
View file

@ -79,14 +79,14 @@ value(Term, Handler, Config) -> ?error(value, Term, Handler, Config).
list_or_object([Term|Rest], {Handler, State}, Config) -> list_or_object([Term|Rest], {Handler, State}, Config) ->
case pre_encode(Term, Config) of case pre_encode(Term, Config) of
{K, V} when is_atom(K); is_binary(K) -> {K, V} when is_atom(K); is_binary(K); is_integer(K) ->
object([{K, V}|Rest], {Handler, Handler:handle_event(start_object, State)}, Config) object([{K, V}|Rest], {Handler, Handler:handle_event(start_object, State)}, Config)
; T -> ; T ->
list([T|Rest], {Handler, Handler:handle_event(start_array, State)}, Config) list([T|Rest], {Handler, Handler:handle_event(start_array, State)}, Config)
end. end.
object([{Key, Value}, Next|Rest], {Handler, State}, Config) when is_atom(Key); is_binary(Key) -> object([{Key, Value}, Next|Rest], {Handler, State}, Config) when is_atom(Key); is_binary(Key); is_integer(Key) ->
V = pre_encode(Value, Config), V = pre_encode(Value, Config),
object( object(
[pre_encode(Next, Config)|Rest], [pre_encode(Next, Config)|Rest],
@ -100,7 +100,7 @@ object([{Key, Value}, Next|Rest], {Handler, State}, Config) when is_atom(Key); i
}, },
Config Config
); );
object([{Key, Value}], {Handler, State}, Config) when is_atom(Key); is_binary(Key) -> object([{Key, Value}], {Handler, State}, Config) when is_atom(Key); is_binary(Key); is_integer(Key) ->
object( object(
[], [],
{ {
@ -128,6 +128,7 @@ pre_encode(Value, Config) -> (Config#config.pre_encode)(Value).
fix_key(Key) when is_atom(Key) -> fix_key(atom_to_binary(Key, utf8)); fix_key(Key) when is_atom(Key) -> fix_key(atom_to_binary(Key, utf8));
fix_key(Key) when is_integer(Key) -> fix_key(list_to_binary(integer_to_list(Key)));
fix_key(Key) when is_binary(Key) -> Key. fix_key(Key) when is_binary(Key) -> Key.
@ -304,4 +305,22 @@ custom_error_handler_test_() ->
)} )}
]. ].
integer_key_test_() ->
Term = [{123, [{456, 789}]}],
[
{"basic integer keys", ?_assertEqual(
[
start_object,
{key, <<"123">>},
start_object,
{key, <<"456">>},
{integer, 789},
end_object,
end_object,
end_json
],
encode(Term, [])
)}
].
-endif. -endif.