feat: map template

apps/dgiot/src/utils/dgiot_json.erl

@@ -22,8 +22,6 @@
     , encode/2
     , safe_encode/1
     , safe_encode/2
-    , test/0
-    , map/2
 ]).
 
 -compile({inline,
@@ -124,31 +122,3 @@ from_ejson(T) -> T.
 to_binary(B) when is_binary(B) -> B;
 to_binary(L) when is_list(L) ->
     iolist_to_binary(L).
-
-test() ->
-    {file, Here} = code:is_loaded(?MODULE),
-    Dir = filename:dirname(filename:dirname(Here)),
-    Root = dgiot_httpc:url_join([Dir, "/priv/"]),
-    TplPath = Root ++ "test.json",
-    case catch file:read_file(TplPath) of
-        {Err, _Reason} when Err == 'EXIT'; Err == error ->
-            <<"">>;
-        {ok, Template} ->
-            map(#{
-                <<"switch">> => 33331,
-                <<"title">> => <<"cto">>,
-                <<"label">> => 12343,
-                <<"lsxage">> => 40
-            }, Template)
-    end.
-
-
-map(Map, Template) ->
-    case erlydtl:compile({template, Template}, dgiot_render, [{out_dir, false}]) of
-        {ok, Render} ->
-            {ok, IoList} = Render:render(Map),
-%%            io:format("~p ~n",[decode(unicode:characters_to_binary(IoList))]),
-            unicode:characters_to_binary(IoList);
-        error ->
-            {error, compile_error}
-    end.

apps/dgiot/src/utils/dgiot_map.erl

@@ -11,6 +11,8 @@
 -export([with/2, get/2, merge/2, flatten/1, flatten/2]).
 -export([test_get/0, test_merge/0]).
 -export([unflatten/1, unflatten/2]).
+-export([test/0, map/2]).
+
 unflatten(Data) ->
     unflatten(Data, "_").
 
@@ -147,4 +149,32 @@ test_get() ->
 test_merge() ->
     A = #{1 => #{1 => 11}},
     B = #{1 => #{1 => 2, 2 => 3}, 2 => #{4 => 5}},
-    merge(A, B).
+    merge(A, B).
+
+test() ->
+    {file, Here} = code:is_loaded(?MODULE),
+    Dir = filename:dirname(filename:dirname(Here)),
+    Root = dgiot_httpc:url_join([Dir, "/priv/"]),
+    TplPath = Root ++ "test.json",
+    case catch file:read_file(TplPath) of
+        {Err, _Reason} when Err == 'EXIT'; Err == error ->
+            <<"">>;
+        {ok, Template} ->
+            map(#{
+                <<"switch">> => 33331,
+                <<"title">> => <<"cto">>,
+                <<"label">> => 12343,
+                <<"lsxage">> => 40
+            }, Template)
+    end.
+
+
+map(Map, Template) ->
+    case erlydtl:compile({template, Template}, dgiot_render, [{out_dir, false}]) of
+        {ok, Render} ->
+            {ok, IoList} = Render:render(Map),
+%%            io:format("~p ~n",[decode(unicode:characters_to_binary(IoList))]),
+            unicode:characters_to_binary(IoList);
+        error ->
+            {error, compile_error}
+    end.