From c28bd854f64cc163a9ba11b17146e9cbea56c85b Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Tue, 27 Mar 2012 16:51:23 -0700 Subject: [PATCH 1/4] travis ci status pointer to develop branch --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index f7aae27..f39ffd0 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=master)](http://travis-ci.org/talentdeficit/jsx) +[![Build Status](https://secure.travis-ci.org/talentdeficit/jsx.png?branch=develop)](http://travis-ci.org/talentdeficit/jsx) ## index ## From 47951fbd86f21f9e5e76fa92e569dfd73e0fe823 Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Tue, 27 Mar 2012 16:53:18 -0700 Subject: [PATCH 2/4] 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 addb1e172dc58d87d0b7b258086b588a4c8c2d16 Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Tue, 27 Mar 2012 16:56:12 -0700 Subject: [PATCH 3/4] fix for failing tests on R14BXX --- .travis.yml | 5 ++++- src/jsx_decoder.erl | 2 +- src/jsx_encoder.erl | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 25a09e8..5cc6271 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,7 @@ language: erlang script: rebar compile && rebar skip_deps=true eunit otp_release: - - R15B \ No newline at end of file + - R15B + - R14B04 + - R14B03 + - R14B02 \ No newline at end of file diff --git a/src/jsx_decoder.erl b/src/jsx_decoder.erl index 7d4faa8..d814582 100644 --- a/src/jsx_decoder.erl +++ b/src/jsx_decoder.erl @@ -1265,7 +1265,7 @@ surrogates() -> lists:seq(16#d800, 16#dfff). control_characters() -> lists:seq(1, 31). -good() -> [32, 33] ++ lists:seq(16#23, 16#5b) ++ lists:seq(16#5d, 16#d7ff) ++ lists:seq(16#e000, 16#ffff). +good() -> [32, 33] ++ lists:seq(16#23, 16#5b) ++ lists:seq(16#5d, 16#d7ff) ++ lists:seq(16#e000, 16#fffd). good_extended() -> lists:seq(16#100000, 16#10ffff). diff --git a/src/jsx_encoder.erl b/src/jsx_encoder.erl index 1dbd13f..6f52c7a 100644 --- a/src/jsx_encoder.erl +++ b/src/jsx_encoder.erl @@ -292,7 +292,7 @@ check([H|T], Opts, Acc) -> surrogates() -> lists:seq(16#d800, 16#dfff). -good() -> lists:seq(1, 16#d7ff) ++ lists:seq(16#e000, 16#ffff). +good() -> lists:seq(1, 16#d7ff) ++ lists:seq(16#e000, 16#fffd). good_extended() -> lists:seq(16#100000, 16#10ffff). From d964d4b12f75e91d57dab31d8d34e1c79be4ff19 Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Tue, 27 Mar 2012 16:58:06 -0700 Subject: [PATCH 4/4] bump version to v1.1.1 --- README.markdown | 2 +- src/jsx.app.src | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.markdown b/README.markdown index f39ffd0..e9de71a 100644 --- a/README.markdown +++ b/README.markdown @@ -1,4 +1,4 @@ -# jsx (v1.1) # +# jsx (v1.1.1) # a sane [json][json] implementation for erlang, inspired by [yajl][yajl] diff --git a/src/jsx.app.src b/src/jsx.app.src index 4568dc9..846abd4 100644 --- a/src/jsx.app.src +++ b/src/jsx.app.src @@ -1,7 +1,7 @@ {application, jsx, [ {description, "a streaming, evented json parsing toolkit"}, - {vsn, "1.1"}, + {vsn, "1.1.1"}, {modules, [ jsx, jsx_encoder,