base64 to conv module. remove n2o references from nitro_n2o. check n2o config in nitro module.

src/nitro.erl

@@ -57,12 +57,17 @@ to_binary(L) when is_list(L) ->  iolist_to_binary(L);
 to_binary(X) when is_tuple(X) ->  term_to_binary(X).
 
 -ifndef(PICKLER).
--define(PICKLER, (application:get_env(n2o,pickler,nitro_pickle))).
+-define(PICKLER, (application:get_env(n2o,pickler,nitro_conv))).
 -endif.
 
 pickle(Data) -> ?PICKLER:pickle(Data).
 depickle(SerializedData) -> ?PICKLER:depickle(SerializedData).
-depickle(SerializedData, TTLSeconds) -> ?PICKLER:depickle(SerializedData, TTLSeconds).
+
+prolongate() -> case application:get_env(n2o,session) of {ok, M} -> M:prolongate(); undefined -> false end.
+authenticate(I, Auth) -> case application:get_env(n2o,session) of 
+    {ok, M} -> M:authenticate(I, Auth);
+    undefined -> {'Token', <<>>}
+end.
 
 render(X) -> wf_render:render(X).
 wire(Actions) -> action_wire:wire(Actions).

src/nitro_conv.erl

@@ -9,7 +9,7 @@
 -define(IS_STRING(Term), (is_list(Term) andalso Term /= [] andalso is_integer(hd(Term)))).
 
 -ifndef(N2O_JSON).
--define(N2O_JSON, (application:get_env(neo,json,jsone))).
+-define(N2O_JSON, (application:get_env(n2o,json,jsone))).
 -endif.
 
 
@@ -198,3 +198,8 @@ config(App, Key, Default) -> application:get_env(App,Key,Default).
 os_env(Key) -> os_env(Key, "").
 os_env(Key, Default) -> case os:getenv(Key) of false -> Default; V -> V end.
 
+% base64 encode/decode
+pickle(Data) -> base64:encode(term_to_binary({Data, os:timestamp()}, [compressed])).
+depickle(PickledData) ->
+    try {Data, _PickleTime} = binary_to_term(base64:decode(nitro:to_binary(PickledData))), Data
+    catch _:_ -> undefined end.

src/nitro_n2o.erl

@@ -9,8 +9,8 @@ info({text,<<"N2O,",Auth/binary>>}, Req, State) ->
     info(#init{token=Auth},Req,State);
 
 info(#init{token=Auth}, Req, State) ->
-    {'Token', Token} = n2o_session:authenticate([], Auth),
-    Sid = case n2o:depickle(Token) of {{S,_},_} -> S; X -> X end,
+    {'Token', Token} = nitro:authenticate([], Auth),
+    Sid = case nitro:depickle(Token) of {{S,_},_} -> S; X -> X end,
     New = State#cx{session = Sid, token = Auth},
     put(context,New),
     {reply,{bert,case io(init, State) of
@@ -51,11 +51,11 @@ render_actions(Actions) ->
 % n2o events
 
 html_events(#pickle{source=Source,pickled=Pickled,args=Linked}, State=#cx{token = Token}) ->
-    Ev  = nitro_pickle:depickle(Pickled),
-    L   = n2o_session:prolongate(),
+    Ev  = nitro:depickle(Pickled),
+    L   = nitro:prolongate(),
     Res = case Ev of
           #ev{} when L =:= false -> render_ev(Ev,Source,Linked,State), <<>>;
-          #ev{} -> render_ev(Ev,Source,Linked,State), n2o_session:authenticate([], Token);
+          #ev{} -> render_ev(Ev,Source,Linked,State), nitro:authenticate([], Token);
           _CustomEnvelop -> %?LOG_ERROR("EV expected: ~p~n",[CustomEnvelop]),
                            {error,"EV expected"} end,
     io(Res).

src/nitro_pickle.erl

@@ -1,7 +0,0 @@
--module(nitro_pickle).
--compile(export_all).
-
-pickle(Data) -> base64:encode(term_to_binary({Data, os:timestamp()}, [compressed])).
-depickle(PickledData) ->
-    try {Data, _PickleTime} = binary_to_term(base64:decode(nitro:to_binary(PickledData))), Data
-    catch _:_ -> undefined end.