Merge pull request #13 from zotonic/atom-lists

Encode lists of atoms as a list of strings
zotonic · Sep 6, 2024 · 636263b · 636263b
2 parents 6e45194 + f1fb78c
commit 636263b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
 
     strategy:
       matrix:
-        otp_version: [24,25,26,27]
+        otp_version: [25,26,27]
         os: [ubuntu-latest]
 
     container:

diff --git a/src/jsxrecord.erl b/src/jsxrecord.erl
@@ -117,7 +117,13 @@ encode_list([{K, _} | _] = Proplist, Opts) when ?IS_PROPLIST_KEY(K) ->
     Map = proplists:to_map(Proplist),
     euneus_encoder:encode_map(Map, Opts);
 encode_list(List, Opts) ->
-    euneus_encoder:encode_list(List, Opts).
+    case lists:all(fun is_atom/1, List) of
+        true ->
+            List1 = [ atom_to_binary(A, utf8) || A <- List ],
+            euneus_encoder:encode_list(List1, Opts);
+        false ->
+            euneus_encoder:encode_list(List, Opts)
+    end.
 
 encode_tuple({struct, MochiJSON}, Opts) ->
     Map = mochijson_to_map(MochiJSON),

diff --git a/test/jsxrecord_SUITE.erl b/test/jsxrecord_SUITE.erl
@@ -38,6 +38,7 @@ all() ->
         dates,
         times,
         proplist,
+        atom_list,
         record_proplist,
         mixed_list,
         unknown_term
@@ -98,6 +99,10 @@ proplist(_Config) ->
     <<"{\"a\":1}">> = encode([ {a, 1} ]),
     ok.
 
+atom_list(_Config) ->
+    <<"[\"a\",\"b\"]">> = encode([ a, b ]),
+    ok.
+
 record_proplist(_Config) ->
     Tr = #trans{ tr = [ {en, <<"hello">>} ]},
     Json = encode(Tr),