umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

Merge branch 'develop'

Browse source
This commit is contained in:
alisdair sullivan 2015-08-20 09:22:33 -07:00
commit 2d8a7d07da
5 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.md
View file

@ -1,3 +1,7 @@
v2.7.1
* support for milliseconds in datetimes
v2.7.0
* `return_tail` option

4
README.md
View file

@ -1,4 +1,4 @@
# jsx (v2.7.0) #
# jsx (v2.7.1) #
an erlang application for consuming, producing and manipulating [json][json].
@ -715,7 +715,7 @@ following events must be handled:
## acknowledgements ##
jsx wouldn't be what it is without the contributions of [Paul J. Davis](https://github.com/davisp), [Lloyd Hilaiel](https://github.com/lloyd), [John Engelhart](https://github.com/johnezang), [Bob Ippolito](https://github.com/etrepum), [Brujo Benavides](https://github.com/elbrujohalcon), [Alex Kropivny](https://github.com/amtal), [Steve Strong](https://github.com/srstrong), [Michael Truog](https://github.com/okeuday), [Devin Torres](https://github.com/devinus), [fogfish](https://github.com/fogfish), [emptytea](https://github.com/emptytea), [John Daily](https://github.com/macintux), [Ola Bäckström](https://github.com/olabackstrom), [Joseph Crowe](https://github.com/JosephCrowe), [Patrick Gombert](https://github.com/patrickgombert), [Eshengazin S. Kuat](https://github.com/eskuat), [Max Lapshin](https://github.com/maxlapshin), [Bikram Chatterjee](https://github.com/c-bik), [Michael Uvarov](https://github.com/arcusfelis) and [Led](https://github.com/Ledest)
jsx wouldn't be what it is without the contributions of [Paul J. Davis](https://github.com/davisp), [Lloyd Hilaiel](https://github.com/lloyd), [John Engelhart](https://github.com/johnezang), [Bob Ippolito](https://github.com/etrepum), [Brujo Benavides](https://github.com/elbrujohalcon), [Alex Kropivny](https://github.com/amtal), [Steve Strong](https://github.com/srstrong), [Michael Truog](https://github.com/okeuday), [Devin Torres](https://github.com/devinus), [fogfish](https://github.com/fogfish), [emptytea](https://github.com/emptytea), [John Daily](https://github.com/macintux), [Ola Bäckström](https://github.com/olabackstrom), [Joseph Crowe](https://github.com/JosephCrowe), [Patrick Gombert](https://github.com/patrickgombert), [Eshengazin S. Kuat](https://github.com/eskuat), [Max Lapshin](https://github.com/maxlapshin), [Bikram Chatterjee](https://github.com/c-bik), [Michael Uvarov](https://github.com/arcusfelis), [Led](https://github.com/Ledest) and [tvv](https://github.com/tvv)
[json]: http://json.org
[yajl]: http://lloyd.github.com/yajl

3
mix.exs
View file

@ -4,7 +4,7 @@ use Mix.Project
def project do
[
app: :jsx,
version: "2.7.0",
version: "2.7.1",
description: "an erlang application for consuming, producing and manipulating json. inspired by yajl",
deps: deps(Mix.env),
package: package,
@ -25,6 +25,7 @@ use Mix.Project
"LICENSE",
"mix.exs",
"rebar.config",
"rebar.config.script",
"README.md",
"src"
],

2
src/jsx.app.src
View file

@ -1,7 +1,7 @@
{application, jsx,
[
{description, "a streaming, evented json parsing toolkit"},
{vsn, "2.7.0"},
{vsn, "2.7.1"},
{modules, [
jsx,
jsx_encoder,

14
src/jsx_parser.erl
View file

@ -119,6 +119,16 @@ when is_integer(Year), is_integer(Month), is_integer(Day), is_integer(Hour), is_
Stack,
Config
);
value([{{Year, Month, Day}, {Hour, Min, Sec}}|Tokens], Handler, Stack, Config)
when is_integer(Year), is_integer(Month), is_integer(Day), is_integer(Hour), is_integer(Min), is_float(Sec) ->
value([{string, unicode:characters_to_binary(io_lib:format(
"~4.10.0B-~2.10.0B-~2.10.0BT~2.10.0B:~2.10.0B:~9.6.0fZ",
[Year, Month, Day, Hour, Min, Sec]
))}|Tokens],
Handler,
Stack,
Config
);
value([{_, Value}|Tokens], Handler, Stack, Config) ->
value([Value] ++ Tokens, Handler, Stack, Config);
value([String|Tokens], Handler, Stack, Config) when is_atom(String) ->
@ -1147,6 +1157,10 @@ datetime_test_() ->
{"datetime", ?_assertEqual(
[start_array, {string, <<"2014-08-13T23:12:34Z">>}, end_array, end_json],
parse([start_array, {{2014,08,13},{23,12,34}}, end_array, end_json], [])
)},
{"datetime", ?_assertEqual(
[start_array, {string, <<"2014-08-13T23:12:34.363369Z">>}, end_array, end_json],
parse([start_array, {{2014,08,13},{23,12,34.363369}}, end_array, end_json], [])
)}
].