Enable nested dict decoding

.gitignore

@@ -1,2 +1,6 @@
+/doc
+/_test
+/.eunit
+/docs
 ebin
 *.dump

src/bert.app.src

@@ -0,0 +1,7 @@
+{application, bert,
+ [
+  {description, "BERT Serialization Library"},
+  {vsn, "1.1.0"},
+  {modules, [bert]},
+  {applications, [kernel, stdlib]}
+ ]}.

src/bert.erl

@@ -7,10 +7,6 @@
 
 -export([encode/1, decode/1]).
 
--ifdef(TEST).
--include("test/bert_test.erl").
--endif.
-
 %%---------------------------------------------------------------------------
 %% Public API
 
@@ -34,7 +30,7 @@ encode_term(Term) ->
     [] -> {bert, nil};
     true -> {bert, true};
     false -> {bert, false};
-    Dict when is_record(Term, dict, 8) ->
+    Dict when is_tuple(Term) andalso element(1, Term) =:= dict ->
       {bert, dict, dict:to_list(Dict)};
     List when is_list(Term) ->
       lists:map((fun encode_term/1), List);
@@ -56,7 +52,8 @@ decode_term(Term) ->
     {bert, true} -> true;
     {bert, false} -> false;
     {bert, dict, Dict} ->
-      dict:from_list(Dict);
+      L = lists:map(fun decode_term/1, Dict),
+      dict:from_list(L);
     {bert, Other} ->
       {bert, Other};
     List when is_list(Term) ->
@@ -66,4 +63,4 @@ decode_term(Term) ->
       TList2 = lists:map((fun decode_term/1), TList),
       list_to_tuple(TList2);
     _Else -> Term
-  end.
+  end.

test/bert_tests.erl

@@ -0,0 +1,46 @@
+-module(bert_tests).
+-include_lib("eunit/include/eunit.hrl").
+-import(bert, [encode/1, decode/1]).
+
+%% encode
+
+encode_list_nesting_test() ->
+  Bert = term_to_binary([foo, {bert, true}]),
+  Bert = encode([foo, true]).
+
+encode_tuple_nesting_test() ->
+  Bert = term_to_binary({foo, {bert, true}}),
+  Bert = encode({foo, true}).
+
+encode_dict_test() ->
+  Bert = term_to_binary({ bert, dict,
+                          dict:to_list(dict:store(foo, true, dict:new())) }),
+  Bert = encode(dict:store(foo, true, dict:new())).
+
+%% decode
+
+decode_list_nesting_test() ->
+  Bert = term_to_binary([foo, {bert, true}]),
+  Term = [foo, true],
+  Term = decode(Bert).
+
+decode_tuple_nesting_test() ->
+  Bert = term_to_binary({foo, {bert, true}}),
+  Term = {foo, true},
+  Term = decode(Bert).
+
+decode_dict_test() ->
+  Bert = term_to_binary({ bert, dict,
+                          dict:to_list(dict:store(foo, true, dict:new())) }),
+  Term = dict:store(foo, true, dict:new()),
+  Term = decode(Bert).
+
+decode_dict_nesting_test() ->
+  Bert = term_to_binary({ bert, dict,
+                          dict:to_list(dict:store(a,
+                                                  { bert, dict,
+                                                    dict:to_list(dict:store(b, "b", dict:new()))
+                                                  },
+                                                  dict:new())) }),
+  Term = dict:store(a, dict:store(b, "b", dict:new()), dict:new()),
+  Term = decode(Bert).