moved to n2z

src/elements/combo/element_calendar.erl

@@ -16,7 +16,7 @@ render_element(Record) ->
       Record#calendar.id;
     Postback ->
       ID = case Record#calendar.id of
-        [] -> nitro:temp_id();
+        [] -> n2z:temp_id();
         I -> I
       end,
       nitro:wire(#event{type=click, postback=Postback, target=ID,

src/elements/form/element_button.erl

@@ -16,7 +16,7 @@ render_element(Record) ->
     undefined -> Record#button.id;
     Postback ->
       ID = case Record#button.id of
-        [] -> nitro:temp_id();
+        [] -> n2z:temp_id();
         I -> I
       end,
       

src/elements/form/element_form.erl

@@ -12,7 +12,7 @@ render_element(Record) when Record#form.show_if == false ->
 
 render_element(Record) ->
   ID = case Record#form.id of
-    [] -> nitro:temp_id();
+    [] -> n2z:temp_id();
     I -> I
   end,
   case Record#form.postback of

src/elements/form/element_keygen.erl

@@ -15,7 +15,7 @@ render_element(Record) ->
     [] -> Record#keygen.id;
     Postback ->
       ID = case Record#keygen.id of
-        [] -> nitro:temp_id();
+        [] -> n2z:temp_id();
         I -> I
       end,
       nitro:wire(#event{type=click, postback=Postback, target=ID,

src/elements/form/element_select.erl

@@ -12,7 +12,7 @@ render_element(Record) when Record#select.show_if == false ->
 
 render_element(Record = #select{}) ->
   ID = case Record#select.id of
-    [] -> nitro:temp_id();
+    [] -> n2z:temp_id();
     I -> I
   end,
   

src/elements/input/element_checkbox.erl

@@ -12,7 +12,7 @@ render_element(Record) when Record#checkbox.show_if == false ->
 
 render_element(Record) -> 
   Id = case Record#checkbox.id of
-    [] -> nitro:temp_id();
+    [] -> n2z:temp_id();
     I -> I
   end,
   

src/elements/input/element_color.erl

@@ -15,7 +15,7 @@ render_element(Record) ->
     [] -> Record#color.id;
     Postback ->
       ID = case Record#color.id of
-        [] -> nitro:temp_id();
+        [] -> n2z:temp_id();
         I -> I
       end,
       nitro:wire(#event{type=click, postback=Postback, target=ID,

src/elements/input/element_date.erl

@@ -15,7 +15,7 @@ render_element(Record) ->
     [] -> Record#date.id;
     Postback ->
       ID = case Record#date.id of
-        [] -> nitro:temp_id();
+        [] -> n2z:temp_id();
         I -> I
       end,
       nitro:wire(#event{type=click, postback=Postback, target=ID,

src/elements/input/element_datetime.erl

@@ -15,7 +15,7 @@ render_element(Record) ->
     [] -> Record#datetime.id;
     Postback ->
       ID = case Record#datetime.id of
-        [] -> nitro:temp_id();
+        [] -> n2z:temp_id();
         I -> I
       end,
       nitro:wire(#event{type=click, postback=Postback, target=ID,

src/elements/input/element_datetime_local.erl

@@ -15,7 +15,7 @@ render_element(Record) ->
     [] -> Record#datetime_local.id;
     Postback ->
       ID = case Record#datetime_local.id of
-        [] -> nitro:temp_id();
+        [] -> n2z:temp_id();
         I -> I
       end,
       nitro:wire(#event{type=click, postback=Postback, target=ID,

src/elements/input/element_dropdown.erl

@@ -11,7 +11,7 @@ render_element(Record) when Record#dropdown.show_if == false ->
 
 render_element(Record = #dropdown{}) -> 
   ID = case Record#dropdown.id of
-    [] -> nitro:temp_id();
+    [] -> n2z:temp_id();
     I -> I
   end,
   case Record#dropdown.postback of

src/elements/input/element_email.erl

@@ -15,7 +15,7 @@ render_element(Record) ->
     [] -> Record#email.id;
     Postback ->
       ID = case Record#email.id of
-        [] -> nitro:temp_id();
+        [] -> n2z:temp_id();
         I -> I
       end,
       nitro:wire(#event{type=click, postback=Postback, target=ID,

src/elements/input/element_file.erl

@@ -15,7 +15,7 @@ render_element(Record) ->
     [] -> Record#file.id;
     Postback ->
       ID = case Record#file.id of
-        [] -> nitro:temp_id();
+        [] -> n2z:temp_id();
         I -> I
       end,
       nitro:wire(#event{type=click, postback=Postback, target=ID,

src/elements/input/element_input.erl

@@ -15,7 +15,7 @@ render_element(Record) ->
     undefined -> Record#input.id;
     Postback ->
       ID = case Record#input.id of
-        [] -> nitro:temp_id();
+        [] -> n2z:temp_id();
         I -> I
       end,
       nitro:wire(#event{type=click, postback=Postback, target=ID,

src/elements/input/element_input_button.erl

@@ -15,7 +15,7 @@ render_element(Record) ->
     [] -> Record#input_button.id;
     Postback ->
       ID = case Record#input_button.id of
-        [] -> nitro:temp_id();
+        [] -> n2z:temp_id();
         I -> I
       end,
       nitro:wire(#event{type=click, postback=Postback, target=ID,

src/elements/input/element_input_image.erl

@@ -15,7 +15,7 @@ render_element(Record) ->
     [] -> Record#input_image.id;
     Postback ->
       ID = case Record#input_image.id of
-        [] -> nitro:temp_id();
+        [] -> n2z:temp_id();
         I -> I
       end,
       nitro:wire(#event{type=click, postback=Postback, target=ID,

src/elements/input/element_input_time.erl

@@ -15,7 +15,7 @@ render_element(Record) ->
     [] -> Record#input_time.id;
     Postback ->
       ID = case Record#input_time.id of
-        [] -> nitro:temp_id();
+        [] -> n2z:temp_id();
         I -> I
       end,
       nitro:wire(#event{type=click, postback=Postback, target=ID,

src/elements/input/element_link.erl

@@ -15,7 +15,7 @@ render_element(Record) ->
     [] -> Record#link.id;
     Postback ->
       ID = case Record#link.id of
-        [] -> nitro:temp_id();
+        [] -> n2z:temp_id();
         I -> I
       end,
       nitro:wire(#event{ type=click,postback=Postback,target=ID,

src/elements/input/element_month.erl

@@ -15,7 +15,7 @@ render_element(Record) ->
     [] -> Record#month.id;
     Postback ->
       ID = case Record#month.id of
-        [] -> nitro:temp_id();
+        [] -> n2z:temp_id();
         I -> I
       end,
       nitro:wire(#event{type=click, postback=Postback, target=ID,

src/elements/input/element_number.erl

@@ -15,7 +15,7 @@ render_element(Record) ->
     [] -> Record#number.id;
     Postback ->
       ID = case Record#number.id of
-        [] -> nitro:temp_id();
+        [] -> n2z:temp_id();
         I -> I
       end,
       nitro:wire(#event{type=click, postback=Postback, target=ID,

src/elements/input/element_password.erl

@@ -15,7 +15,7 @@ render_element(Record) ->
     [] -> Record#password.id;
     Postback ->
       ID = case Record#password.id of
-        [] -> nitro:temp_id();
+        [] -> n2z:temp_id();
         I -> I
       end,
       nitro:wire(#event{type=click, postback=Postback, target=ID,

src/elements/input/element_radio.erl

@@ -12,7 +12,7 @@ render_element(Record) when Record#radio.show_if == false ->
 
 render_element(Record) ->
   ID = case Record#radio.id of
-    [] -> nitro:temp_id();
+    [] -> n2z:temp_id();
     RadioID -> RadioID
   end,
 

src/elements/input/element_range.erl

@@ -15,7 +15,7 @@ render_element(Record) ->
     [] -> Record#range.id;
     Postback ->
       ID = case Record#range.id of
-        [] -> nitro:temp_id();
+        [] -> n2z:temp_id();
         I -> I
       end,
       nitro:wire(#event{type=click, postback=Postback, target=ID,

src/elements/input/element_reset.erl

@@ -15,7 +15,7 @@ render_element(Record) ->
     [] -> Record#reset.id;
     Postback ->
       ID = case Record#reset.id of
-        [] -> nitro:temp_id();
+        [] -> n2z:temp_id();
         I -> I
       end,
       nitro:wire(#event{type=click, postback=Postback, target=ID,

src/elements/input/element_search.erl

@@ -15,7 +15,7 @@ render_element(Record) ->
     [] -> Record#search.id;
     Postback ->
       ID = case Record#search.id of
-        [] -> nitro:temp_id();
+        [] -> n2z:temp_id();
         I -> I
       end,
       nitro:wire(#event{type=click, postback=Postback, target=ID,

src/elements/input/element_submit.erl

@@ -12,7 +12,7 @@ render_element(Record) when Record#submit.show_if == false ->
 
 render_element(Record) ->
   ID = case Record#submit.id of
-    [] -> nitro:temp_id();
+    [] -> n2z:temp_id();
     I -> I
   end,
   case Record#submit.postback of

src/elements/input/element_tel.erl

@@ -15,7 +15,7 @@ render_element(Record) ->
     [] -> Record#tel.id;
     Postback ->
       ID = case Record#tel.id of
-        [] -> nitro:temp_id();
+        [] -> n2z:temp_id();
         I -> I
       end,
       nitro:wire(#event{type=click, postback=Postback, target=ID,

src/elements/input/element_url.erl

@@ -15,7 +15,7 @@ render_element(Record) ->
     [] -> Record#url.id;
     Postback ->
       ID = case Record#url.id of
-        [] -> nitro:temp_id();
+        [] -> n2z:temp_id();
         I -> I
       end,
       nitro:wire(#event{type=click, postback=Postback, target=ID,

src/elements/input/element_week.erl

@@ -15,7 +15,7 @@ render_element(Record) ->
     [] -> Record#week.id;
     Postback ->
       ID = case Record#week.id of
-        [] -> nitro:temp_id();
+        [] -> n2z:temp_id();
         I -> I
       end,
       nitro:wire(#event{type=click, postback=Postback, target=ID,

src/elements/interactive/element_upload.erl

@@ -11,7 +11,7 @@ render_element(Record) when Record#upload.show_if == false ->
 
 render_element(#upload{id=Id}) ->
   Uid = case Id of
-    [] -> nitro:temp_id();
+    [] -> n2z:temp_id();
     I -> I
   end,
   

src/elements/table/element_tr.erl

@@ -11,7 +11,7 @@ render_element(Record) when Record#tr.show_if == false ->
 
 render_element(Record = #tr{postback= Postback}) ->
   Id = case Record#tr.id of
-    [] -> nitro:temp_id();
+    [] -> n2z:temp_id();
     I -> I
   end,
   

src/nitro.erl

@@ -11,21 +11,6 @@ atom(List) when erlang:is_list(List) ->
   string:join([ nitro:to_list(L) || L <- List], "_");
 atom(Scalar) -> nitro:to_list(Scalar).
 
-q(Key) -> q(Key, []).
-
-q(Key, Def) ->
-  case erlang:get(Key) of
-    undefined -> Def;
-    Val -> Val
-  end.
-
-qc(Key) ->
-  CX = erlang:get(context),
-  qc(Key,CX#cx.req).
-
-qc(Key, Req) ->
-  proplists:get_value(nitro:to_binary(Key), cowboy_req:parse_qs(Req)).
-
 
 % Convert and Utils API
 
@@ -124,13 +109,6 @@ os_env(Key, Default) ->
   end.
 
 
--ifndef(PICKLER).
--define(PICKLER, (application:get_env(n2z, pickler, nitro_conv))).
--endif.
-
-pickle(Data) -> ?PICKLER:pickle(Data).
-depickle(SerializedData) -> ?PICKLER:depickle(SerializedData).
-
 prolongate() ->
   case application:get_env(n2z, session) of
     {ok, M} -> M:prolongate();
@@ -147,11 +125,6 @@ render(X) -> wf_render:render(X).
 
 wire(Actions) -> action_wire:wire(Actions).
 
-unique_integer() -> erlang:unique_integer().
-
-temp_id() ->
-  "auto" ++ integer_to_list(unique_integer() rem 1000000).
-
 
 % Fast HEX
 
@@ -428,21 +401,3 @@ num(S) -> case rev(S) of
     [$T|T] -> erlang:list_to_integer(rev(T)) * 1000 * 1000 * 1000 * 1000
   end.
 
-cookie_expire(SecondsToLive) ->
-  Seconds = calendar:datetime_to_gregorian_seconds(calendar:local_time()),
-  DateTime = calendar:gregorian_seconds_to_datetime(Seconds + SecondsToLive),
-  cow_date:rfc2109(DateTime).
-
-cookie(Id, Value) -> cookie(Id, Value, 2147483647). % expire never
-cookie(Id, Value, Expire) ->
-  Format = "document.cookie='~s=~s; path=/; expires=~s';",
-  nitro:wire(nitro:f(Format, [nitro:to_list(Id), nitro:to_list(Value), cookie_expire(Expire)])).
-
-cookies() ->
-  cowboy_req:parse_cookies((erlang:get(context))#cx.req).
-cookie(Key) ->
-  case lists:keyfind(Key, 1, cowboy_req:parse_cookies((erlang:get(context))#cx.req)) of
-    false -> undefined;
-    {_, Value} -> Value
-  end.
-

src/nitro_n2z.erl

@@ -14,7 +14,7 @@ info({text, <<"N2Z,", Auth/binary>>}, Req, State) ->
 
 info(#init{token=Auth}, Req, State) ->
   {'Token', Token} = nitro:authenticate([], Auth),
-  Sid = case nitro:depickle(Token) of
+  Sid = case n2z:depickle(Token) of
     {{S, _}, _} -> S;
     X -> X
   end,
@@ -60,7 +60,7 @@ render_actions(Actions) ->
 % n2z events
 
 html_events(#pickle{source=Source, pickled=Pickled, args=Linked}, State=#cx{token = Token}) ->
-  Ev  = nitro:depickle(Pickled),
+  Ev  = n2z:depickle(Pickled),
   L   = nitro:prolongate(),
   Res = case Ev of
     #ev{} when L =:= false ->

src/render/wf_event.erl

@@ -27,7 +27,7 @@ target(Id) ->
 
 
 new(bin, Data) ->
-  <<"ws.send(enc(tuple(atom('bin'), bin('", (nitro:pickle(Data))/binary, "'))));">>.
+  <<"ws.send(enc(tuple(atom('bin'), bin('", (n2z:pickle(Data))/binary, "'))));">>.
 
 new(P, E, D, N, Data, Source) -> new(P, E, D, N, Data, Source, <<>>).
 
@@ -43,7 +43,7 @@ new(Postback, Element, Delegate, Name, Data, Source, Validation) ->
     "])){", nitro:to_binary(Validation),
     " ws.send(enc(tuple(atom('",
     nitro:to_binary(application:get_env(n2z, event, pickle)),
-    "'),bin('", Element, "'),bin('", nitro:pickle(Event), "'),", Data, ")));"
+    "'),bin('", Element, "'),bin('", n2z:pickle(Event), "'),", Data, ")));"
     "}else console.log('Validation Error'); }"
   ]).