umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

is_json/2 and format/2 now both accept either a json text (binary) or a function that acts as a jsx iterator. specs updated to reflect

Browse source
This commit is contained in:
alisdair sullivan 2011-07-04 19:25:09 -07:00
parent e088c6fd26
commit 0052480652
3 changed files with 38 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/jsx_verify.erl
View file

@ -31,19 +31,17 @@
-include("jsx_common.hrl").
-ifdef(TEST).
-include_lib("eunit/include/eunit.hrl").
-endif.
-spec is_json(JSON::binary(), Opts::verify_opts()) -> true | false.
is_json(JSON, Opts) ->
P = jsx:decoder(extract_parser_opts(Opts)),
case proplists:get_value(strict, Opts, false) of
true -> collect_strict(P(JSON), [[]])
; false -> collect(P(JSON), [[]])
-spec is_json(JSON::binary(), Opts::verify_opts()) -> true | false
; (F::jsx_iterator(), Opts::verify_opts()) -> true | false.
is_json(JSON, OptsList) when is_binary(JSON) ->
P = jsx:decoder(extract_parser_opts(OptsList)),
is_json(fun() -> P(JSON) end, OptsList);
is_json(F, OptsList) when is_function(F) ->
case proplists:get_value(strict, OptsList, false) of
true -> collect_strict(F(), [[]])
; false -> collect(F(), [[]])
end.
@ -107,6 +105,7 @@ collect(_, _) ->
%% eunit tests
-ifdef(TEST).
-include_lib("eunit/include/eunit.hrl").
true_test_() ->
[