cleanup

example/priv/conf.yaml

@@ -2,7 +2,7 @@ example:
   srv_conf:
     iface:
       ip: 127.0.0.1
-      port: 83
+      port: 82
     hostname: example server
     header: hello world
     conn_type: http

src/nakaz.erl

@@ -13,9 +13,6 @@
 
 -export([start/2, stop/1]).
 
-%% Types
-
-
 %% API
 
 start() ->

src/nakaz_core.erl

@@ -5,13 +5,9 @@
 
 -include_lib("z_validate/include/z_validate.hrl").
 
-%% FIXME(Sergei): remove!
--compile(export_all).
-
-
 %% API
 -export([start_link/1]).
--export([ensure/4, use/3, reload/0]).
+-export([ensure/4, use/3, reload/0, reload/1]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
@@ -268,14 +264,6 @@ zz_verify_ok(Val) ->
         Other           -> ?Z_THROW({unknown_value, Other})
     end.
 
--spec zz_verify_ok({ok, A} | {error, any()}, any()) -> A when A :: any().
-zz_verify_ok(Val, Err) ->
-    case Val of
-        {ok, ValOk}     -> ValOk;
-        {error, Reason} -> ?Z_THROW(Reason);
-        _               -> ?Z_THROW(Err)
-    end.
-
 -spec zz_defined(A | undefined, any()) -> A when A :: any().
 zz_defined(Val, Err) ->
     case Val of

src/nakaz_errors.erl

@@ -12,7 +12,6 @@ render(Error) ->
 
 -spec r(any()) -> {string(), [any()]}.
 r({cant_execute_magic_fun, Mod}) ->
-    %% FIXME(Dmitry): rename parsetransform to nakaz_pt
     {"Can't execute 'magic function' that must be generated "
      "by nakaz_pt in module ~s", [Mod]};
 r(empty) ->
@@ -31,9 +30,9 @@ r({missing, {field, Name, Section}}) ->
     {"Missing field ~p in section ~p", [Name, Section]};
 r({invalid, {Name, Type, Value, {Line, _Column}}}) ->
     {"Invalid type at line ~p: value ~p for field ~p doesn't match ~s",
-     [Line, Value, Name, pp_type(Type)]};
+     [Line+1, Value, Name, pp_type(Type)]};
 r({unsupported, Line, Mod}) ->
-    {"Unsupported type expression at ~p.erl:~p", [Mod, Line]};
+    {"Unsupported type expression at ~p.erl:~p", [Mod, Line+1]};
 r(UnknownError) ->
     io:format("~p~n", [UnknownError]),
     ok = lager:warning("no clause for rendering error ~p", [UnknownError]),