221V 3 years ago
parent
commit
1f10555d37
2 changed files with 25 additions and 11 deletions
  1. 19 10
      src/nitro.erl
  2. 6 1
      src/nitro_static.erl

+ 19 - 10
src/nitro.erl

@@ -4,7 +4,16 @@
 -include_lib("nitro/include/nitro.hrl").
 -include_lib("nitro/include/nitro.hrl").
 -include_lib("nitro/include/event.hrl").
 -include_lib("nitro/include/event.hrl").
 
 
--compile([export_all, nowarn_export_all]). % todo export
+-export([atom/1, f/1, f/2, coalesce/1,
+  to_list/1, to_atom/1, to_binary/1, to_integer/1,
+  join/2, replace/3, indexof/2, indexof/3, append/3, os_env/1, os_env/2,
+  prolongate/0, authenticate/2,
+  render/1, wire/1, hex/1, unhex/1, js_escape/1, js_escape/2,
+  html_encode/1, html_encode/2, url_encode/1, url_decode/1,
+  update/2, insert_top/2, insert_top/3, insert_bottom/2, insert_bottom/3,
+  insert_before/2, insert_after/2, insert_adjacent/3, insert_adjacent/4,
+  clear/1, remove/1, setAttr/3, style/2, style/3, display/2, show/1, hide/1,
+  compact/1, meg/1, num/1 ]).
 
 
 
 
 atom(List) when erlang:is_list(List) ->
 atom(List) when erlang:is_list(List) ->
@@ -276,6 +285,7 @@ url_encode([C | Rest], Acc) ->
   <<Hi:4, Lo:4>> = <<C>>,
   <<Hi:4, Lo:4>> = <<C>>,
   url_encode(Rest, [digit(Lo), digit(Hi), ?PERCENT | Acc]).
   url_encode(Rest, [digit(Lo), digit(Hi), ?PERCENT | Acc]).
 
 
+
 url_decode(Binary) when erlang:is_binary(Binary) ->
 url_decode(Binary) when erlang:is_binary(Binary) ->
   url_decode(erlang:binary_to_list(Binary));
   url_decode(erlang:binary_to_list(Binary));
 url_decode(String) -> url_decode_h(lists:reverse(String)).
 url_decode(String) -> url_decode_h(lists:reverse(String)).
@@ -333,11 +343,11 @@ insert_adjacent(Command, Target, Elements, Q) ->
 render_html(Elements) ->
 render_html(Elements) ->
   Pid = erlang:self(),
   Pid = erlang:self(),
   Ref = erlang:make_ref(),
   Ref = erlang:make_ref(),
-  erlang:spawn(fun() ->  % todo : remove spawn
+  erlang:spawn(fun() ->
     R = nitro:render(Elements),
     R = nitro:render(Elements),
     Pid ! {R, Ref, erlang:get(actions)}
     Pid ! {R, Ref, erlang:get(actions)}
     end),
     end),
-  {Render, Ref, Actions} = receive {_, Ref, _} = A -> A end, 
+  {Render, Ref, Actions} = receive {_, Ref, _} = A -> A end,
   {Render, Ref, Actions}.
   {Render, Ref, Actions}.
 
 
 
 
@@ -390,14 +400,13 @@ compact(Tuple) when erlang:is_tuple(Tuple) ->
 compact(T) ->
 compact(T) ->
   nitro:js_escape(nitro:to_list(T)).
   nitro:js_escape(nitro:to_list(T)).
 
 
-meg(X) -> erlang:integer_to_list(X div 1000000) ++ "M".
 
 
-rev(X) -> lists:reverse(X).
+meg(X) -> erlang:integer_to_list(X div 1000000) ++ "M".
 
 
-num(S) -> case rev(S) of
-    [$K|K] -> erlang:list_to_integer(rev(K)) * 1000;
-    [$M|M] -> erlang:list_to_integer(rev(M)) * 1000 * 1000;
-    [$G|G] -> erlang:list_to_integer(rev(G)) * 1000 * 1000 * 1000;
-    [$T|T] -> erlang:list_to_integer(rev(T)) * 1000 * 1000 * 1000 * 1000
+num(S) -> case lists:reverse(S) of
+    [$K|K] -> erlang:list_to_integer(lists:reverse(K)) * 1000;
+    [$M|M] -> erlang:list_to_integer(lists:reverse(M)) * 1000 * 1000;
+    [$G|G] -> erlang:list_to_integer(lists:reverse(G)) * 1000 * 1000 * 1000;
+    [$T|T] -> erlang:list_to_integer(lists:reverse(T)) * 1000 * 1000 * 1000 * 1000
   end.
   end.
 
 

+ 6 - 1
src/nitro_static.erl

@@ -4,7 +4,12 @@
 
 
 -include_lib("kernel/include/file.hrl").
 -include_lib("kernel/include/file.hrl").
 
 
--compile([export_all, nowarn_export_all]). % todo export
+-export([init/3, rest_init/2,
+  malformed_request/2, forbidden/2,
+  content_types_provided/2, resource_exists/2,
+  generate_etag/2, generate_default_etag/2,
+  last_modified/2, get_file/2,
+  fixpath/1, fix/1 ]).
 
 
 
 
 init(_, _, _) -> {upgrade, protocol, cowboy_rest}.
 init(_, _, _) -> {upgrade, protocol, cowboy_rest}.