Allow iodata() for object keys

README.md

@@ -46,8 +46,14 @@ Data Format
     [true, 1.0]                -> [true, 1.0]    -> [true, 1.0]
     {[]}                       -> {}             -> {[]}
     {[{foo, bar}]}             -> {"foo": "bar"} -> {[{<<"foo">>, <<"bar">>}]}
+    {[{"foo", bar}]}           -> {"foo": "bar"} -> {[{<<"foo">>, <<"bar">>}]}
+    {[{"foo", "bar"}]}         -> {"foo": [98,97,114]} -> {[{<<"foo">>, "bar"}]}
     {[{<<"foo">>, <<"bar">>}]} -> {"foo": "bar"} -> {[{<<"foo">>, <<"bar">>}]}
 
+Its important to note that while keys in objects can be an iolist(),
+values will always be treated as arrays of integeres regardless of
+whether Erlang displays them as a string.
+
 Improvements over EEP0018
 -------------------------
 

c_src/encoder.c

@@ -232,10 +232,7 @@ enc_string(Encoder* e, ERL_NIF_TERM val)
     int uval;
     int i;
 
-    if(enif_is_binary(e->env, val)) {
-        if(!enif_inspect_binary(e->env, val, &bin)) {
-            return 0;
-        }
+    if(enif_inspect_iolist_as_binary(e->env, val, &bin)) {
         data = bin.data;
         size = bin.size;
     } else if(enif_is_atom(e->env, val)) {

test/006-maps.t

@@ -8,6 +8,7 @@ main([]) ->
 
     etap:plan(15),
     util:test_good(good()),
+    test_encode(),
     util:test_errors(errors()),
     etap:end_tests().
 
@@ -22,6 +23,20 @@ good() ->
             <<"{\"foo\":\"bar\",\"baz\":123}">>}
     ].
 
+
+test_encode() ->
+    % Its ok to use iolist() for keys
+    Cases = [
+        {<<"{\"foo\":true}">>, {[{"foo",true}]}},
+        {<<"{\"foo\":true}">>, {[{["f","o",<<"o">>],true}]}},
+        {<<"{\"foo\":[98,97,114]}">>, {[{"foo","bar"}]}}
+    ],
+    lists:foreach(fun({J, E}) ->
+        Msg = lists:flatten(io_lib:format("Encoded ~p", [E])),
+        etap:is(jiffy:encode(E), J, Msg)
+    end, Cases).
+
+
 errors() ->
     [
         <<"{">>,