unwrap ?CTX and ?REQ

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 
 
-##### next version
+##### 6.6.2-erl19
 * unwrap:  
 ```
   nitro:jse/1 -> nitro:js_escape/1  
@@ -14,6 +14,7 @@
   nitro:state/1 -> erlang:get(Key)  
   nitro:state/2 -> erlang:put(Key, Value)  
   nitro:config/3 -> application:get_env/3  
+  ?CTX -> erlang:get(context)  
 ```
 * mv nitro_conv > nitro module  
 * mv redirect to n2o (n4u)  

include/n2o.hrl

@@ -48,8 +48,9 @@
              vsn       = [] :: [] | binary()} ).
 
 
--define(CTX(ClientId), n2o:cache(ClientId) ).
--define(REQ(ClientId), (n2o:cache(ClientId))#cx.req ).
+%% todo mv work with cache to n2o (n4u)
+%%-define(CTX(ClientId), n2o:cache(ClientId) ).
+%%-define(REQ(ClientId), (n2o:cache(ClientId))#cx.req ).
 
 
 %% Nitrogen Protocol

include/nitro.hrl

@@ -1,10 +1,6 @@
 -ifndef(NITRO_HRL).
 -define(NITRO_HRL, true).
 
--ifndef(CTX).
--define(CTX, (get(context))).
--endif.
-
 -define(DEFAULT_BASE, {?ELEMENT_BASE([])} ).
 -define(DEFAULT_BASE_TAG(Tag), {?ELEMENT_BASE([], Tag, [])} ).
 -define(ELEMENT_BASE(Module), ?ELEMENT_BASE(Module, [], []) ).

src/nitro.erl

@@ -25,10 +25,17 @@ atom(Scalar) -> ?MODULE:to_list(Scalar).
 
 
 q(Key) -> q(Key, []). %% todo unwrap
-q(Key, Def) -> case get(Key) of undefined -> Def; Val -> Val end.
+q(Key, Def) ->
+  case erlang:get(Key) of
+    undefined -> Def;
+    Val -> Val
+  end.
 
-qc(Key) -> CX = get(context), qc(Key,CX#cx.req).
-qc(Key, Req) -> proplists:get_value(?MODULE:to_binary(Key),cowboy_req:parse_qs(Req)).
+qc(Key) ->
+  CX = erlang:get(context),
+  qc(Key, CX#cx.req).
+qc(Key, Req) ->
+  proplists:get_value(?MODULE:to_binary(Key), cowboy_req:parse_qs(Req)).
 
 
 %% Convert and Utils API

src/render/wf_event.erl

@@ -42,7 +42,7 @@ new(P, E, D, N, Data, Source) -> new(P, E, D, N, Data, Source, <<>>).
 new([], _, _, _, _, _, _) -> <<>>;
 new(undefined, _, _, _, _, _, _) -> <<>>; %% todo check maybe rm?
 new(Postback, Element, Delegate, Name, Data, Source, Validation) ->
-  Module = nitro:coalesce([Delegate, ?CTX#cx.module]),
+  Module = nitro:coalesce([Delegate, (erlang:get(context))#cx.module]),
   Join = fun([])    -> [];
             ([E])   -> [$'|E] ++ [$'];
             ([H|T]) -> [[$'|H] ++ [$']] ++ [ [$,,$'|E] ++ [$'] || E <- T ]