config: string get/set

c_src/config.c

@@ -95,7 +95,6 @@ geef_config_get_bool(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
 	return enif_make_tuple2(env, atoms.ok, ret);
 }
 
-
 ERL_NIF_TERM
 geef_config_set_int(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
 {
@@ -120,3 +119,56 @@ geef_config_set_int(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
 
 	return atoms.ok;
 }
+
+ERL_NIF_TERM
+geef_config_get_string(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
+{
+	geef_config *cfg;
+	ErlNifBinary bin, result;
+	int error;
+	const char *val;
+	ERL_NIF_TERM ret;
+
+	ret = extract(&cfg, &bin, env, argv);
+	if (ret != atoms.ok)
+		return ret;
+
+	error = git_config_get_string(&val, cfg->config, (char *) bin.data);
+	enif_release_binary(&bin);
+
+	if (error < 0)
+		return geef_error(env);
+
+	if (geef_string_to_bin(&result, val) < 0)
+		return geef_error(env);
+
+	return enif_make_tuple2(env, atoms.ok, enif_make_binary(env, &result));
+}
+
+ERL_NIF_TERM
+geef_config_set_string(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
+{
+	geef_config *cfg;
+	ErlNifBinary bin, val;
+	int error;
+	ERL_NIF_TERM ret;
+
+	ret = extract(&cfg, &bin, env, argv);
+	if (ret != atoms.ok)
+		return ret;
+
+	if (!enif_inspect_iolist_as_binary(env, argv[2], &val))
+		return enif_make_badarg(env);
+
+	if (!geef_terminate_binary(&val))
+		return geef_oom(env);
+
+	error = git_config_set_string(cfg->config, (char *) bin.data, (char *) val.data);
+	enif_release_binary(&bin);
+	enif_release_binary(&val);
+
+	if (error < 0)
+		return geef_error(env);
+
+	return atoms.ok;
+}

c_src/config.h

@@ -8,6 +8,8 @@ void geef_config_free(ErlNifEnv *env, void *cd);
 ERL_NIF_TERM geef_config_set_bool(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
 ERL_NIF_TERM geef_config_get_bool(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
 ERL_NIF_TERM geef_config_open(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM geef_config_set_string(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM geef_config_get_string(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
 
 extern ErlNifResourceType *geef_config_type;
 

c_src/geef.c

@@ -218,6 +218,8 @@ static ErlNifFunc geef_funcs[] =
 	{"revparse_single", 2, geef_revparse_single},
 	{"config_set_bool", 3, geef_config_set_bool},
 	{"config_get_bool", 2, geef_config_get_bool},
+	{"config_set_string", 3, geef_config_set_string},
+	{"config_get_string", 2, geef_config_get_string},
 	{"config_open",     1, geef_config_open},
 };
 

src/geef_config.erl

@@ -15,7 +15,7 @@
 -export([open/1]).
 -export([set/3]).
 -export([get_bool/2]).
-
+-export([get_string/2]).
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
 	 terminate/2, code_change/3]).
@@ -50,11 +50,16 @@ open(Path) ->
 
 %% @doc Set a value in the configuration
 set(Pid, Name, Val) when is_boolean(Val) ->
-    gen_server:call(Pid, {set_bool, Name, Val}).
+    gen_server:call(Pid, {set_bool, Name, Val});
+set(Pid, Name, Val) when is_list(Val) or is_binary(Val) ->
+    gen_server:call(Pid, {set_string, Name, Val}).
 
 get_bool(Pid, Name) ->
     gen_server:call(Pid, {get_bool, Name}).
 
+get_string(Pid, Name) ->
+    gen_server:call(Pid, {get_string, Name}).
+
 %%%===================================================================
 %%% gen_server callbacks
 %%%===================================================================
@@ -83,6 +88,14 @@ handle_call({set_bool, Name, Val}, _From, State = #state{handle=Handle}) ->
 
 handle_call({get_bool, Name}, _From, State = #state{handle=Handle}) ->
     Reply = geef_nif:config_get_bool(Handle, Name),
+    {reply, Reply, State};
+
+handle_call({set_string, Name, Val}, _From, State = #state{handle=Handle}) ->
+    Reply = geef_nif:config_set_string(Handle, Name, Val),
+    {reply, Reply, State};
+
+handle_call({get_string, Name}, _From, State = #state{handle=Handle}) ->
+    Reply = geef_nif:config_get_string(Handle, Name),
     {reply, Reply, State}.
 
 %%--------------------------------------------------------------------

src/geef_nif.erl

@@ -213,6 +213,14 @@ config_set_bool(_Handle, _Name, _Val) ->
 config_get_bool(_Handle, _Name) ->
     ?NIF_FN.
 
+-spec config_set_string(term(), iolist(), iolist()) -> ok | {error, term()}.
+config_set_string(_Handle, _Name, _Val) ->
+    ?NIF_FN.
+
+-spec config_get_string(term(), iolist()) -> {ok, binary()} | {error, term()}.
+config_get_string(_Handle, _Name) ->
+    ?NIF_FN.
+
 -spec config_open(iolist()) -> {ok, term()} | {error, term()}.
 config_open(_Path) ->
     ?NIF_FN.

test/config_test.erl

@@ -23,8 +23,8 @@ bool_test({Config, _}) ->
 string_test({Config, _}) ->
     Var = "user.name",
     Val = <<"Random J. Hacker">>,
-    ok = geef_config:set(Config, Var, Val),
-    [?_assertEqual({ok, Val}, geef_config:get(Config, Var))].
+    [?_assertEqual(ok, geef_config:set(Config, Var, Val)),
+     ?_assertEqual({ok, Val}, geef_config:get_string(Config, Var))].
 
 stop({_, Path}) ->
     ok = file:delete(Path).