Merge pull request #24 from rkallos/feature/use-decorator-for-custom-event-fun

Use a decorator fun instead of replacing EventFun

Author: rkallos

src/wrek_vert.erl

@@ -118,7 +118,12 @@ handle_call({exec, Dir, Cmd, Env}, _From, State = #state{event_mgr = EvMgr}) ->
         end,
     handle_exec(Dir, Cmd, Env, EventFun, State);
 
-handle_call({exec, Dir, Cmd, Env, EventFun}, _From, State) ->
+handle_call({exec, Dir, Cmd, Env, EventFun0}, _From, State = #state{event_mgr = EvMgr}) ->
+    EventFun =
+        fun(Msg) ->
+            wrek_event:exec_output(EvMgr, id(State), Msg),
+            EventFun0(Msg)
+        end,
     handle_exec(Dir, Cmd, Env, EventFun, State);
 
 handle_call({get, Who0, Key, Default}, _From, State) ->

test/wrek_cb_event_handler.erl

@@ -0,0 +1,50 @@
+-module(wrek_cb_event_handler).
+-include("wrek_event.hrl").
+
+-export([code_change/3,
+         handle_call/2,
+         handle_event/2,
+         handle_info/2,
+         init/1,
+         terminate/2]).
+-behaviour(gen_event).
+
+
+-record(state, {
+    caller = undefined :: pid(),
+    count = 0 :: integer(),
+    evts = [] :: [wrek_event()],
+    fail_mode = total :: total | partial
+}).
+
+
+%% callbacks
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+handle_call(get, State) ->
+    {ok, State#state.count, State};
+
+handle_call(_, State) ->
+    {ok, ok, State}.
+
+
+handle_event(#wrek_event{type = exec, msg = {_, Data}}, Pid) ->
+    Pid ! {event_handler, Data},
+    {ok, Pid};
+
+handle_event(Evt, State) ->
+    {ok, State}.
+
+
+handle_info(_, State) ->
+    {ok, State}.
+
+
+init([CallbackPid]) ->
+    {ok, CallbackPid}.
+
+
+terminate(_, _State) ->
+    ok.

test/wrek_tests.erl

@@ -337,20 +337,33 @@ sandbox_test() ->
 custom_exec_callback_test() ->
     Self = self(),
     Callback = fun({_, Data}) ->
-        Self ! Data
+        Self ! {event_fun, Data}
     end,
 
+    {ok, EvMgr} = gen_event:start_link(),
+    gen_event:add_handler(EvMgr, wrek_cb_event_handler, [Self]),
+
     Dag = #{cb => #{module => wrek_echo_vert, args => [Callback, "good"], deps => []}},
 
-    wrek:start(Dag),
+    wrek:start(Dag, [{event_manager, EvMgr}]),
 
-    Msg = receive
-        M -> M
+    EventFunMsg = receive
+        {event_fun, Efm} -> Efm
+    after
+        500 -> bad
+    end,
+
+    EventHandlerMsg = receive
+        {event_handler, Ehm} -> Ehm
     after
         500 -> bad
     end,
 
-    ?assertEqual(Msg, <<"good">>).
+    gen_event:stop(EvMgr),
+
+    ?assertEqual(EventFunMsg, <<"good">>),
+    ?assertEqual(EventHandlerMsg, <<"good">>),
+    ?assertEqual(EventFunMsg, EventHandlerMsg).
 
 wrek_timeout_test() ->
     exec:start(),