umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

fix format/x and to_json/x bug involving string escapes

Browse source
This commit is contained in:
alisdair sullivan 2012-03-29 22:13:01 -07:00
parent 4581bca902
commit cd1a6deaaa
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/jsx_to_json.erl
View file

@ -39,13 +39,13 @@
-spec to_json(Source::any(), Opts::opts()) -> binary(). -spec to_json(Source::any(), Opts::opts()) -> binary().
to_json(Source, Opts) when is_list(Opts) -> to_json(Source, Opts) when is_list(Opts) ->
(jsx:encoder(?MODULE, Opts, jsx_utils:extract_opts(Opts)))(Source). (jsx:encoder(?MODULE, Opts, jsx_utils:extract_opts([json_escape] ++ Opts)))(Source).
-spec format(Source::binary(), Opts::opts()) -> binary(). -spec format(Source::binary(), Opts::opts()) -> binary().
format(Source, Opts) when is_binary(Source) andalso is_list(Opts) -> format(Source, Opts) when is_binary(Source) andalso is_list(Opts) ->
(jsx:decoder(?MODULE, Opts, jsx_utils:extract_opts(Opts)))(Source). (jsx:decoder(?MODULE, Opts, jsx_utils:extract_opts([json_escape] ++ Opts)))(Source).
parse_opts(Opts) -> parse_opts(Opts, #opts{}). parse_opts(Opts) -> parse_opts(Opts, #opts{}).
@ -196,7 +196,7 @@ basic_format_test_() ->
}, },
{"naked string", ?_assertEqual(format(<<"\"hi\"">>, []), <<"\"hi\"">>)}, {"naked string", ?_assertEqual(format(<<"\"hi\"">>, []), <<"\"hi\"">>)},
{"naked string with control character", ?_assertEqual( {"naked string with control character", ?_assertEqual(
format(<<"\"hi\\n\"">>, [json_escape]), <<"\"hi\\n\"">> format(<<"\"hi\\n\"">>, []), <<"\"hi\\n\"">>
)}, )},
{"naked literal", ?_assertEqual(format(<<"true">>, []), <<"true">>)}, {"naked literal", ?_assertEqual(format(<<"true">>, []), <<"true">>)},
{"simple object", ?_assertEqual( {"simple object", ?_assertEqual(
@ -245,7 +245,7 @@ basic_to_json_test_() ->
}, },
{"naked string", ?_assertEqual(to_json(<<"hi">>, []), <<"\"hi\"">>)}, {"naked string", ?_assertEqual(to_json(<<"hi">>, []), <<"\"hi\"">>)},
{"naked string with control character", ?_assertEqual( {"naked string with control character", ?_assertEqual(
to_json(<<"hi\n">>, [json_escape]), <<"\"hi\\n\"">> to_json(<<"hi\n">>, []), <<"\"hi\\n\"">>
)}, )},
{"naked literal", ?_assertEqual(to_json(true, []), <<"true">>)}, {"naked literal", ?_assertEqual(to_json(true, []), <<"true">>)},
{"simple object", ?_assertEqual( {"simple object", ?_assertEqual(