Reuse existing macros for getting and setting the refdb.

Author: arthurschreiber

ext/rugged/rugged.h

@@ -97,6 +97,7 @@ VALUE rugged_signature_new(const git_signature *sig, const char *encoding_name);
 
 VALUE rugged_repo_new(VALUE klass, git_repository *repo);
 VALUE rugged_index_new(VALUE klass, VALUE owner, git_index *index);
+VALUE rugged_refdb_new(VALUE klass, VALUE owner, git_refdb *refdb);
 VALUE rugged_config_new(VALUE klass, VALUE owner, git_config *cfg);
 VALUE rugged_odb_new(VALUE klass, VALUE owner, git_odb *odb);
 VALUE rugged_object_new(VALUE owner, git_object *object);

ext/rugged/rugged_refdb.c

@@ -27,6 +27,13 @@
 extern VALUE rb_mRugged;
 VALUE rb_cRuggedRefdb;
 
+VALUE rugged_refdb_new(VALUE klass, VALUE owner, git_refdb *refdb)
+{
+	VALUE rb_refdb = Data_Wrap_Struct(klass, NULL, git_refdb_free, refdb);
+	rugged_set_owner(rb_refdb, owner);
+	return rb_refdb;
+}
+
 /*
  *  call-seq:
  *    Refdb.new(repository) -> refdb
@@ -44,7 +51,7 @@ static VALUE rb_git_refdb_new(VALUE klass, VALUE rb_repo) {
 
 	rugged_exception_check(git_refdb_new(&refdb, repo));
 
-	return Data_Wrap_Struct(klass, NULL, git_refdb_free, refdb);
+	return rugged_refdb_new(klass, Qnil, refdb);
 }
 
 /*
@@ -62,7 +69,7 @@ static VALUE rb_git_refdb_open(VALUE klass, VALUE rb_repo) {
 
 	rugged_exception_check(git_refdb_open(&refdb, repo));
 
-	return Data_Wrap_Struct(klass, NULL, git_refdb_free, refdb);
+	return rugged_refdb_new(klass, Qnil, refdb);
 }
 
 /*

ext/rugged/rugged_repo.c

@@ -40,6 +40,7 @@ extern VALUE rb_cRuggedTree;
 extern VALUE rb_cRuggedReference;
 extern VALUE rb_cRuggedBackend;
 extern VALUE rb_cRuggedOdb;
+extern VALUE rb_cRuggedRefdb;
 
 extern VALUE rb_cRuggedCredPlaintext;
 extern VALUE rb_cRuggedCredSshKey;
@@ -155,6 +156,7 @@ VALUE rugged_repo_new(VALUE klass, git_repository *repo)
 
 	rb_iv_set(rb_repo, "@config", Qnil);
 	rb_iv_set(rb_repo, "@index", Qnil);
+	rb_iv_set(rb_repo, "@refdb", Qnil);
 
 	return rb_repo;
 }
@@ -609,6 +611,24 @@ static VALUE rb_git_repo_get_odb(VALUE self)
 	RB_GIT_REPO_OWNED_GET(rb_cRuggedOdb, odb);
 }
 
+/*
+ *  call-seq:
+ *    repo.refdb = refdb
+ */
+static VALUE rb_git_repo_set_refdb(VALUE self, VALUE rb_data)
+{
+	RB_GIT_REPO_OWNED_SET(rb_cRuggedRefdb, refdb);
+}
+
+/*
+ *  call-seq:
+ *    repo.refdb -> refdb
+ */
+static VALUE rb_git_repo_get_refdb(VALUE self)
+{
+	RB_GIT_REPO_OWNED_GET(rb_cRuggedRefdb, refdb);
+}
+
 /*
  *  call-seq:
  *    repo.ident = ident
@@ -2483,19 +2503,6 @@ static VALUE rb_git_repo_cherrypick(int argc, VALUE *argv, VALUE self)
 	return Qnil;
 }
 
-static VALUE rb_git_repository_set_refdb(VALUE self, VALUE rb_refdb)
-{
-	git_repository *repo;
-	git_refdb *refdb;
-
-	Data_Get_Struct(self, git_repository, repo);
-	Data_Get_Struct(rb_refdb, git_refdb, refdb);
-
-	git_repository_set_refdb(repo, refdb);
-
-	return rb_refdb;
-}
-
 void Init_rugged_repo(void)
 {
 	id_call = rb_intern("call");
@@ -2531,9 +2538,10 @@ void Init_rugged_repo(void)
 	rb_define_method(rb_cRuggedRepo, "index=",  rb_git_repo_set_index,  1);
 	rb_define_method(rb_cRuggedRepo, "config",  rb_git_repo_get_config,  0);
 	rb_define_method(rb_cRuggedRepo, "config=",  rb_git_repo_set_config,  1);
-	rb_define_method(rb_cRuggedRepo, "odb",  rb_git_repo_get_odb,  0);
-	rb_define_method(rb_cRuggedRepo, "odb=",  rb_git_repo_set_odb,  1);
-	rb_define_method(rb_cRuggedRepo, "refdb=", rb_git_repository_set_refdb, 1);
+	rb_define_method(rb_cRuggedRepo, "odb",  rb_git_repo_get_odb, 0);
+	rb_define_method(rb_cRuggedRepo, "odb=",  rb_git_repo_set_odb, 1);
+	rb_define_method(rb_cRuggedRepo, "refdb", rb_git_repo_get_refdb, 0);
+	rb_define_method(rb_cRuggedRepo, "refdb=", rb_git_repo_set_refdb, 1);
 
 	rb_define_method(rb_cRuggedRepo, "ident", rb_git_repo_get_ident, 0);
 	rb_define_method(rb_cRuggedRepo, "ident=", rb_git_repo_set_ident, 1);