From ee5c2ae25df7d5395cd853edb14a893c77096814 Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Tue, 27 Mar 2012 16:52:59 -0700 Subject: [PATCH 1/3] remove R14BXX from travis testing --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5cc6271..25a09e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,4 @@ language: erlang script: rebar compile && rebar skip_deps=true eunit otp_release: - - R15B - - R14B04 - - R14B03 - - R14B02 \ No newline at end of file + - R15B \ No newline at end of file From 4f0bfb03179fbc9c0b78bf4ba90355e1b5919965 Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Tue, 27 Mar 2012 16:58:44 -0700 Subject: [PATCH 2/3] point test status to master, not develop --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index e9de71a..ee9ca06 100644 --- a/README.markdown +++ b/README.markdown @@ -8,7 +8,7 @@ jsx is released under the terms of the [MIT][MIT] license jsx uses [rebar][rebar] for it's build chain and [meck][meck] for it's test suite -[![Build Status](https://secure.travis-ci.org/talentdeficit/jsx.png?branch=develop)](http://travis-ci.org/talentdeficit/jsx) +[![Build Status](https://secure.travis-ci.org/talentdeficit/jsx.png?branch=master)](http://travis-ci.org/talentdeficit/jsx) ## index ## From 09d8b50f78ed0f364bc417df496cfed6d06ea60e Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Thu, 29 Mar 2012 22:14:00 -0700 Subject: [PATCH 3/3] fix format/x and to_json/x bug involving string escapes --- src/jsx_to_json.erl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/jsx_to_json.erl b/src/jsx_to_json.erl index 739dcd7..2f0d7e9 100644 --- a/src/jsx_to_json.erl +++ b/src/jsx_to_json.erl @@ -39,13 +39,13 @@ -spec to_json(Source::any(), Opts::opts()) -> binary(). 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(). 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{}). @@ -196,7 +196,7 @@ basic_format_test_() -> }, {"naked string", ?_assertEqual(format(<<"\"hi\"">>, []), <<"\"hi\"">>)}, {"naked string with control character", ?_assertEqual( - format(<<"\"hi\\n\"">>, [json_escape]), <<"\"hi\\n\"">> + format(<<"\"hi\\n\"">>, []), <<"\"hi\\n\"">> )}, {"naked literal", ?_assertEqual(format(<<"true">>, []), <<"true">>)}, {"simple object", ?_assertEqual( @@ -245,7 +245,7 @@ basic_to_json_test_() -> }, {"naked string", ?_assertEqual(to_json(<<"hi">>, []), <<"\"hi\"">>)}, {"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">>)}, {"simple object", ?_assertEqual(