abandoning branch for now, work is in intermediate state
This commit is contained in:
alisdair sullivan
parent
bff9a38d39
commit
1617c878f5
46 changed files with 2040 additions and 97 deletions
90
src/jsx.erl
90
src/jsx.erl
|
|
@ -31,10 +31,6 @@
|
|||
-export([is_json/1, is_json/2]).
|
||||
-export([format/1, format/2]).
|
||||
|
||||
%% if testing is enabled, export load_tests/1 so all modules may use it
|
||||
-ifdef(test).
|
||||
-export([load_tests/1]).
|
||||
-endif.
|
||||
|
||||
%% types for function specifications
|
||||
-include("./include/jsx_types.hrl").
|
||||
|
|
@ -218,15 +214,22 @@ detect_encoding(Bin, Opts) ->
|
|||
end
|
||||
}.
|
||||
|
||||
|
||||
%% eunit tests
|
||||
-ifdef(test).
|
||||
|
||||
jsx_decoder_test_() ->
|
||||
lists:map(fun(Encoding) ->
|
||||
decoder_tests(load_tests("./test/cases"), Encoding, [])
|
||||
end,
|
||||
[utf8, utf16, {utf16, little}, utf32, {utf32, little}]
|
||||
).
|
||||
|
||||
|
||||
load_tests(Path) ->
|
||||
%% search the specified directory for any files with the .test ending
|
||||
TestSpecs = filelib:wildcard("*.test", Path),
|
||||
load_tests(TestSpecs, Path, []).
|
||||
|
||||
|
||||
load_tests([], _Dir, Acc) ->
|
||||
lists:reverse(Acc);
|
||||
load_tests([Test|Rest], Dir, Acc) ->
|
||||
|
|
@ -234,26 +237,69 @@ load_tests([Test|Rest], Dir, Acc) ->
|
|||
case file:consult(Dir ++ "/" ++ Test) of
|
||||
{ok, TestSpec} ->
|
||||
try
|
||||
load_tests(Rest, Dir, [parse_test(TestSpec, [])] ++ Acc)
|
||||
ParsedTest = parse_tests(TestSpec, Dir),
|
||||
load_tests(Rest, Dir, [ParsedTest] ++ Acc)
|
||||
catch _:_ ->
|
||||
load_tests(Rest, Dir, Acc)
|
||||
end
|
||||
; {error, _Reason} ->
|
||||
load_tests(Rest, Dir, Acc)
|
||||
end.
|
||||
|
||||
|
||||
%% if the json, eep0018 or jsx values are lists, assume they're a path to a file that should
|
||||
%% be read with file:read_file/1
|
||||
parse_test([{Key, Path}|Rest], Test) when is_list(Path) ->
|
||||
case lists:member(Key, [json, eep0018, jsx]) of
|
||||
true ->
|
||||
case file:read_file(Path) of
|
||||
{ok, Bin} -> parse_test(Rest, [{Key, Bin}] ++ Test)
|
||||
; {error, Reason} -> {error, Reason}
|
||||
end
|
||||
; false ->
|
||||
parse_test(Rest, [{Key, Path}] ++ Test)
|
||||
end.
|
||||
|
||||
|
||||
parse_tests(TestSpec, Dir) ->
|
||||
parse_tests(TestSpec, Dir, []).
|
||||
|
||||
-endif.
|
||||
parse_tests([{json, Path}|Rest], Dir, Acc) when is_list(Path) ->
|
||||
case file:read_file(Dir ++ "/" ++ Path) of
|
||||
{ok, Bin} -> parse_tests(Rest, Dir, [{json, Bin}] ++ Acc)
|
||||
; _ -> erlang:error(badarg)
|
||||
end;
|
||||
parse_tests([KV|Rest], Dir, Acc) ->
|
||||
parse_tests(Rest, Dir, [KV] ++ Acc);
|
||||
parse_tests([], _Dir, Acc) ->
|
||||
Acc.
|
||||
|
||||
|
||||
decoder_tests([Test|Rest], Encoding, Acc) ->
|
||||
Name = lists:flatten(proplists:get_value(name, Test) ++ "::" ++ io_lib:format("~p", [Encoding])),
|
||||
JSON = unicode:characters_to_binary(proplists:get_value(json, Test), unicode, Encoding),
|
||||
JSX = proplists:get_value(jsx, Test),
|
||||
Flags = proplists:get_value(jsx_flags, Test, []),
|
||||
decoder_tests(Rest,
|
||||
Encoding,
|
||||
[{"incremental " ++ Name, ?_assert(incremental_decode(JSON, Flags) =:= JSX)}]
|
||||
++ [{Name, ?_assert(decode(JSON, Flags) =:= JSX)}]
|
||||
++ Acc
|
||||
);
|
||||
decoder_tests([], _Encoding, Acc) ->
|
||||
io:format("~p~n", [Acc]),
|
||||
Acc.
|
||||
|
||||
|
||||
decode(JSON, Flags) ->
|
||||
P = jsx:parser(Flags),
|
||||
decode_loop(P(JSON), []).
|
||||
|
||||
decode_loop({event, end_json, _Next}, Acc) ->
|
||||
lists:reverse([end_json] ++ Acc);
|
||||
decode_loop({incomplete, More}, Acc) ->
|
||||
decode_loop(More(end_stream), Acc);
|
||||
decode_loop({event, E, Next}, Acc) ->
|
||||
decode_loop(Next(), [E] ++ Acc).
|
||||
|
||||
|
||||
incremental_decode(<<C:1/binary, Rest/binary>>, Flags) ->
|
||||
P = jsx:parser(Flags),
|
||||
incremental_decode_loop(P(C), Rest, []).
|
||||
|
||||
incremental_decode_loop({incomplete, Next}, <<>>, Acc) ->
|
||||
incremental_decode_loop(Next(end_stream), <<>>, Acc);
|
||||
incremental_decode_loop({incomplete, Next}, <<C:1/binary, Rest/binary>>, Acc) ->
|
||||
incremental_decode_loop(Next(C), Rest, Acc);
|
||||
incremental_decode_loop({event, end_json, _Next}, _Rest, Acc) ->
|
||||
lists:reverse([end_json] ++ Acc);
|
||||
incremental_decode_loop({event, Event, Next}, Rest, Acc) ->
|
||||
incremental_decode_loop(Next(), Rest, [Event] ++ Acc).
|
||||
|
||||
-endif.
|
||||
|
|
@ -404,13 +404,13 @@ key_repeats(_Key, []) -> false.
|
|||
%% eunit tests
|
||||
-ifdef(test).
|
||||
|
||||
jsx_escape_test_() ->
|
||||
escape_test_() ->
|
||||
[
|
||||
{"json string escaping", ?_assert(json_escape(<<"\"\\\b\f\n\r\t">>) =:= <<"\\\"\\\\\\b\\f\\n\\r\\t">>)},
|
||||
{"json string hex escape", ?_assert(json_escape(<<1, 2, 3, 11, 26, 30, 31>>) =:= <<"\\u0001\\u0002\\u0003\\u000b\\u001a\\u001e\\u001f">>)}
|
||||
].
|
||||
|
||||
jsx_nice_decimal_test_() ->
|
||||
nice_decimal_test_() ->
|
||||
[
|
||||
{"0.0", ?_assert(float_to_decimal(0.0) =:= "0.0")},
|
||||
{"1.0", ?_assert(float_to_decimal(1.0) =:= "1.0")},
|
||||
|
|
@ -428,7 +428,7 @@ jsx_nice_decimal_test_() ->
|
|||
{"max denormalized float", ?_assert(float_to_decimal((1 - math:pow(2, -52)) * math:pow(2, -1022)) =:= "2.225073858507201e-308")}
|
||||
].
|
||||
|
||||
jsx_key_repeats_test_() ->
|
||||
key_repeats_test_() ->
|
||||
[
|
||||
{"encoded key repeat", ?_assert(key_repeats([{key, <<"key">>}], [{key, <<>>}, {key, <<"notkey">>}, {key, <<"key">>}, {key, <<"trailing key">>}]) =:= true)},
|
||||
{"encoded key no repeat", ?_assert(key_repeats([{key, <<"key">>}], [{key, <<>>}, {key, <<"notkey">>}, {key, <<"trailing key">>}]) =:= false)},
|
||||
|
|
|
|||
140
src/jsx_test.erl
Normal file
140
src/jsx_test.erl
Normal file
|
|
@ -0,0 +1,140 @@
|
|||
%% The MIT License
|
||||
|
||||
%% Copyright (c) 2010 Alisdair Sullivan <alisdairsullivan@yahoo.ca>
|
||||
|
||||
%% Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
%% of this software and associated documentation files (the "Software"), to deal
|
||||
%% in the Software without restriction, including without limitation the rights
|
||||
%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
%% copies of the Software, and to permit persons to whom the Software is
|
||||
%% furnished to do so, subject to the following conditions:
|
||||
|
||||
%% The above copyright notice and this permission notice shall be included in
|
||||
%% all copies or substantial portions of the Software.
|
||||
|
||||
%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
%% THE SOFTWARE.
|
||||
|
||||
|
||||
-module(jsx_test).
|
||||
-author("alisdairsullivan@yahoo.ca").
|
||||
|
||||
-export([test/0]).
|
||||
|
||||
-ifdef(test).
|
||||
-include_lib("eunit/include/eunit.hrl").
|
||||
-endif.
|
||||
|
||||
|
||||
%% if not compiled with test support
|
||||
|
||||
-ifndef(test).
|
||||
|
||||
test() -> erlang:error(notest).
|
||||
|
||||
-else.
|
||||
|
||||
|
||||
|
||||
jsx_decoder_test_() ->
|
||||
jsx_decoder_gen(load_tests("./test/cases"), [utf8, utf16, {utf16, little}, utf32, {utf32, little}]).
|
||||
|
||||
jsx_decoder_gen([Test|Rest], []) ->
|
||||
jsx_decoder_gen(Rest, [utf8, utf16, {utf16, little}, utf32, {utf32, little}]);
|
||||
jsx_decoder_gen([], _) ->
|
||||
[];
|
||||
jsx_decoder_gen([Test|Rest] = Tests, [Encoding|Encodings]) ->
|
||||
Name = lists:flatten(proplists:get_value(name, Test) ++ " :: " ++ io_lib:format("~p", [Encoding])),
|
||||
JSON = unicode:characters_to_binary(proplists:get_value(json, Test), unicode, Encoding),
|
||||
JSX = proplists:get_value(jsx, Test),
|
||||
Flags = proplists:get_value(jsx_flags, Test, []),
|
||||
{generator,
|
||||
fun() ->
|
||||
[{Name, ?_assert(decode(JSON, Flags) =:= JSX)} | jsx_decoder_gen(Tests, Encodings)]
|
||||
end
|
||||
}.
|
||||
|
||||
|
||||
load_tests(Path) ->
|
||||
%% search the specified directory for any files with the .test ending
|
||||
TestSpecs = filelib:wildcard("*.test", Path),
|
||||
load_tests(TestSpecs, Path, []).
|
||||
|
||||
load_tests([], _Dir, Acc) ->
|
||||
lists:reverse(Acc);
|
||||
load_tests([Test|Rest], Dir, Acc) ->
|
||||
%% should alert about badly formed tests eventually, but for now just skip over them
|
||||
case file:consult(Dir ++ "/" ++ Test) of
|
||||
{ok, TestSpec} ->
|
||||
try
|
||||
ParsedTest = parse_tests(TestSpec, Dir),
|
||||
load_tests(Rest, Dir, [ParsedTest] ++ Acc)
|
||||
catch _:_ ->
|
||||
load_tests(Rest, Dir, Acc)
|
||||
end
|
||||
; {error, _Reason} ->
|
||||
load_tests(Rest, Dir, Acc)
|
||||
end.
|
||||
|
||||
|
||||
parse_tests(TestSpec, Dir) ->
|
||||
parse_tests(TestSpec, Dir, []).
|
||||
|
||||
parse_tests([{json, Path}|Rest], Dir, Acc) when is_list(Path) ->
|
||||
case file:read_file(Dir ++ "/" ++ Path) of
|
||||
{ok, Bin} -> parse_tests(Rest, Dir, [{json, Bin}] ++ Acc)
|
||||
; _ -> erlang:error(badarg)
|
||||
end;
|
||||
parse_tests([KV|Rest], Dir, Acc) ->
|
||||
parse_tests(Rest, Dir, [KV] ++ Acc);
|
||||
parse_tests([], _Dir, Acc) ->
|
||||
Acc.
|
||||
|
||||
|
||||
decoder_tests([Test|Rest], Encoding, Acc) ->
|
||||
Name = lists:flatten(proplists:get_value(name, Test) ++ "::" ++ io_lib:format("~p", [Encoding])),
|
||||
JSON = unicode:characters_to_binary(proplists:get_value(json, Test), unicode, Encoding),
|
||||
JSX = proplists:get_value(jsx, Test),
|
||||
Flags = proplists:get_value(jsx_flags, Test, []),
|
||||
decoder_tests(Rest,
|
||||
Encoding,
|
||||
[{"incremental " ++ Name, ?_assert(incremental_decode(JSON, Flags) =:= JSX)}]
|
||||
++ [{Name, ?_assert(decode(JSON, Flags) =:= JSX)}]
|
||||
++ Acc
|
||||
);
|
||||
decoder_tests([], _Encoding, Acc) ->
|
||||
io:format("~p~n", [Acc]),
|
||||
Acc.
|
||||
|
||||
|
||||
decode(JSON, Flags) ->
|
||||
P = jsx:parser(Flags),
|
||||
decode_loop(P(JSON), []).
|
||||
|
||||
decode_loop({event, end_json, _Next}, Acc) ->
|
||||
lists:reverse([end_json] ++ Acc);
|
||||
decode_loop({incomplete, More}, Acc) ->
|
||||
decode_loop(More(end_stream), Acc);
|
||||
decode_loop({event, E, Next}, Acc) ->
|
||||
decode_loop(Next(), [E] ++ Acc).
|
||||
|
||||
|
||||
incremental_decode(<<C:1/binary, Rest/binary>>, Flags) ->
|
||||
P = jsx:parser(Flags),
|
||||
incremental_decode_loop(P(C), Rest, []).
|
||||
|
||||
incremental_decode_loop({incomplete, Next}, <<>>, Acc) ->
|
||||
incremental_decode_loop(Next(end_stream), <<>>, Acc);
|
||||
incremental_decode_loop({incomplete, Next}, <<C:1/binary, Rest/binary>>, Acc) ->
|
||||
incremental_decode_loop(Next(C), Rest, Acc);
|
||||
incremental_decode_loop({event, end_json, _Next}, _Rest, Acc) ->
|
||||
lists:reverse([end_json] ++ Acc);
|
||||
incremental_decode_loop({event, Event, Next}, Rest, Acc) ->
|
||||
incremental_decode_loop(Next(), Rest, [Event] ++ Acc).
|
||||
|
||||
-endif.
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
-file("priv/jsx_decoder.erl", 1).
|
||||
-file("priv/jsx_decoder_template.erl", 1).
|
||||
|
||||
-module(jsx_utf16).
|
||||
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
-file("./include/jsx_decoder.hrl", 1).
|
||||
|
||||
-file("priv/jsx_decoder.erl", 38).
|
||||
-file("priv/jsx_decoder_template.erl", 35).
|
||||
|
||||
-file("./include/jsx_types.hrl", 1).
|
||||
|
||||
|
|
@ -111,7 +111,7 @@
|
|||
| indent
|
||||
| {output_encoding, supported_utf()}.
|
||||
|
||||
-file("priv/jsx_decoder.erl", 39).
|
||||
-file("priv/jsx_decoder_template.erl", 36).
|
||||
|
||||
-spec parse(JSON :: json(), Opts :: jsx_opts()) -> jsx_parser_result().
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-file("priv/jsx_decoder.erl", 1).
|
||||
-file("priv/jsx_decoder_template.erl", 1).
|
||||
|
||||
-module(jsx_utf16le).
|
||||
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
-file("./include/jsx_decoder.hrl", 1).
|
||||
|
||||
-file("priv/jsx_decoder.erl", 38).
|
||||
-file("priv/jsx_decoder_template.erl", 35).
|
||||
|
||||
-file("./include/jsx_types.hrl", 1).
|
||||
|
||||
|
|
@ -111,7 +111,7 @@
|
|||
| indent
|
||||
| {output_encoding, supported_utf()}.
|
||||
|
||||
-file("priv/jsx_decoder.erl", 39).
|
||||
-file("priv/jsx_decoder_template.erl", 36).
|
||||
|
||||
-spec parse(JSON :: json(), Opts :: jsx_opts()) -> jsx_parser_result().
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-file("priv/jsx_decoder.erl", 1).
|
||||
-file("priv/jsx_decoder_template.erl", 1).
|
||||
|
||||
-module(jsx_utf32).
|
||||
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
-file("./include/jsx_decoder.hrl", 1).
|
||||
|
||||
-file("priv/jsx_decoder.erl", 38).
|
||||
-file("priv/jsx_decoder_template.erl", 35).
|
||||
|
||||
-file("./include/jsx_types.hrl", 1).
|
||||
|
||||
|
|
@ -111,7 +111,7 @@
|
|||
| indent
|
||||
| {output_encoding, supported_utf()}.
|
||||
|
||||
-file("priv/jsx_decoder.erl", 39).
|
||||
-file("priv/jsx_decoder_template.erl", 36).
|
||||
|
||||
-spec parse(JSON :: json(), Opts :: jsx_opts()) -> jsx_parser_result().
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-file("priv/jsx_decoder.erl", 1).
|
||||
-file("priv/jsx_decoder_template.erl", 1).
|
||||
|
||||
-module(jsx_utf32le).
|
||||
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
-file("./include/jsx_decoder.hrl", 1).
|
||||
|
||||
-file("priv/jsx_decoder.erl", 38).
|
||||
-file("priv/jsx_decoder_template.erl", 35).
|
||||
|
||||
-file("./include/jsx_types.hrl", 1).
|
||||
|
||||
|
|
@ -111,7 +111,7 @@
|
|||
| indent
|
||||
| {output_encoding, supported_utf()}.
|
||||
|
||||
-file("priv/jsx_decoder.erl", 39).
|
||||
-file("priv/jsx_decoder_template.erl", 36).
|
||||
|
||||
-spec parse(JSON :: json(), Opts :: jsx_opts()) -> jsx_parser_result().
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-file("priv/jsx_decoder.erl", 1).
|
||||
-file("priv/jsx_decoder_template.erl", 1).
|
||||
|
||||
-module(jsx_utf8).
|
||||
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
-file("./include/jsx_decoder.hrl", 1).
|
||||
|
||||
-file("priv/jsx_decoder.erl", 38).
|
||||
-file("priv/jsx_decoder_template.erl", 35).
|
||||
|
||||
-file("./include/jsx_types.hrl", 1).
|
||||
|
||||
|
|
@ -111,7 +111,7 @@
|
|||
| indent
|
||||
| {output_encoding, supported_utf()}.
|
||||
|
||||
-file("priv/jsx_decoder.erl", 39).
|
||||
-file("priv/jsx_decoder_template.erl", 36).
|
||||
|
||||
-spec parse(JSON :: json(), Opts :: jsx_opts()) -> jsx_parser_result().
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue