Commit graph

983 commits

Author SHA1 Message Date
alisdair sullivan
e1599574ff properly export config type 2014-02-10 06:39:15 +00:00
alisdair sullivan
1049d69f3e remove dead code
(thanks to dialyzer for the assist)
2014-02-10 04:06:13 +00:00
alisdair sullivan
a571665cb9 fix unused variable warning during compilation 2014-01-14 01:02:30 +00:00
alisdair sullivan
aa879c32ee add link to master branch in `README' 2014-01-13 16:46:10 -08:00
alisdair sullivan
618c017638 point users to `master' branch for 1.x 2014-01-13 16:44:16 -08:00
alisdair sullivan
ff3915abbc Merge branch 'vtwopointoh' into develop 2014-01-14 00:42:12 +00:00
alisdair sullivan
92f0a65dab important note about 2.0 preview 2014-01-14 00:39:06 +00:00
alisdair sullivan
52f5824de4 strip out public api for term/json building functions. not mature yet 2014-01-14 00:33:31 +00:00
alisdair sullivan
1050f560a7 update CHANGES 2014-01-13 07:59:59 +00:00
alisdair sullivan
c81e2108dd add `get_value/1' function for retrieving the current (final?) value
of the internal representations from `jsx_to_json' and `jsx_to_term'

add all internal representation functions to `jsx' module and export
them
2014-01-12 21:38:02 +00:00
alisdair sullivan
00469ba9c6 change `get_key/1' functions to return bare value or throw error
add `start_term' and `start_json' functions
2014-01-12 20:36:19 +00:00
alisdair sullivan
0c7517468c update CHANGES 2013-12-18 02:39:43 +00:00
alisdair sullivan
d011411c23 v1.4.5 2013-12-18 02:32:21 +00:00
alisdair sullivan
95b2d9b628 allow atoms in erlang terms to be converted to strings in json objects
and arrays. `true`, `false` and `null` excluded
2013-12-18 02:13:50 +00:00
alisdair sullivan
3bb65e9bab Merge branch 'develop' into vtwopointoh 2013-12-17 02:03:21 +00:00
alisdair sullivan
9e701a5f8b minor README edits 2013-12-16 22:32:18 +00:00
alisdair sullivan
123f8208d0 add atom to values allowed in to be encoded terms 2013-12-12 11:31:38 -08:00
alisdair sullivan
9a36b774ae include details of atoms as strings in CHANGES 2013-12-12 11:30:26 -08:00
alisdair sullivan
1daab2afc1 include details of atoms as strings in README 2013-12-12 11:29:38 -08:00
alisdair sullivan
8c826e7239 add max lapshin to contributors section of README 2013-12-12 11:23:01 -08:00
alisdair sullivan
bad524fc70 Merge pull request #44 from flussonic/develop
handle  jsx:encode([{key,value}])
2013-12-12 11:21:20 -08:00
alisdair sullivan
d7016c6cc5 add typespec changes and integer keys to CHANGES 2013-12-12 11:20:30 -08:00
alisdair sullivan
cc9d05bbb6 document integers as keys change to api in README 2013-12-12 11:18:24 -08:00
alisdair sullivan
3f218774f1 add eskuat to contributors section of README 2013-12-12 11:16:43 -08:00
alisdair sullivan
ee7e96cf98 Merge pull request #46 from eskuat/develop
allow integer object keys when converting term to json
2013-12-12 11:15:21 -08:00
eskuat
71646247f9 Use of list_to_binary/integer_to_list for compat with earlier Erlang versions 2013-12-08 02:36:01 +07:00
eskuat
123965166a Allow integer object keys when converting term to json
i.e. automatic conversion from integer to binary.
2013-12-08 00:18:29 +07:00
Max Lapshin
216b97df55 handle jsx:encode([{key,value}]) 2013-11-28 00:20:59 +04:00
alisdair sullivan
c7fcfbcb51 Merge pull request #45 from okeuday/develop
Fix dialyzer errors.
2013-11-26 11:21:04 -08:00
Michael Truog
e31e9c4daa Fix include file issue, when using eunit. 2013-11-25 09:30:04 -08:00
Michael Truog
30b136ce72 Fix dialyzer errors. 2013-11-22 19:22:01 -08:00
alisdair sullivan
5fcd4644bf make sure `jsx_encoder:encode/2' dispatches recursive calls correctly 2013-11-13 02:29:44 +00:00
alisdair sullivan
5db1d9cc05 cleanup README for v2.0 2013-11-03 23:39:52 +00:00
alisdair sullivan
04bd9dd827 interstitial README 2013-11-03 23:19:26 +00:00
alisdair sullivan
70aebfc6ad add get_key/1' to jsx_to_json' and `jsx_to_term' 2013-10-31 02:47:45 +00:00
alisdair sullivan
08673b144e update comments about internal rep to match reality 2013-10-30 00:57:50 +00:00
alisdair sullivan
eb7527e9a3 whitespace 2013-10-30 00:52:44 +00:00
alisdair sullivan
3f7f0f1f9c introduce Config' object to internal rep in jsx_to_json' to match
`jsx_to_term'
2013-10-30 00:52:24 +00:00
alisdair sullivan
5753baefaf convert jsx_to_json over to new internal interface 2013-10-30 00:34:45 +00:00
alisdair sullivan
f58ac5566e add whitespace formatting to rep manipulation functions 2013-10-30 00:21:17 +00:00
alisdair sullivan
4d7c1c5c18 Merge remote-tracking branch 'origin/develop' into develop 2013-10-29 19:49:46 +00:00
alisdair sullivan
6b189d35d3 update to 1.4.4 2013-10-29 19:47:55 +00:00
alisdair sullivan
53e44d1a89 update CHANGES for 1.4.4 2013-10-29 19:47:30 +00:00
alisdair sullivan
3fe01062e7 Merge branch 'multibytebugfix' into develop 2013-10-29 19:45:12 +00:00
alisdair sullivan
d06b64e4bd replace incorrect boolean shortcircuits in multibyte escaping 2013-10-29 19:44:28 +00:00
alisdair sullivan
7b9170b32d add `Config' arg to rep manipulation 2013-10-29 19:15:16 +00:00
alisdair sullivan
7296f790b2 convert all space/newlines in json formatter to emit binaries 2013-10-27 01:28:49 +00:00
alisdair sullivan
5409668cf4 abstracted internal state of `jsx_to_json'. uses same interface as
`jsx_to_term'
2013-10-26 14:45:36 +00:00
alisdair sullivan
625f912e7b generate test state from init/1' in jsx_to_term' and `jsx_to_json'
instead of doing it by hand
2013-10-25 01:39:59 +00:00
alisdair sullivan
62914f422a abstracted internal state of the `jsx_to_term' handler 2013-10-24 05:01:20 +00:00