Implement Repository#diff_from_buffer(s).

Author: bartkamphorst

ext/rugged/rugged_diff.c

@@ -657,37 +657,10 @@ static VALUE rb_git_diff_sorted_icase_p(VALUE self)
 	return git_diff_is_sorted_icase(diff) ? Qtrue : Qfalse;
 }
 
-/*
- *  call-seq: Diff.from_buffer(buffer) -> Rugged::Diff object
- *  
- *  Where +buffer+ is a +String+.
- *  Returns A Rugged::Diff object
- */
-static VALUE rb_git_diff_from_buffer(VALUE self, VALUE rb_buffer)
-{
-  git_diff *diff = NULL;
-  const char *buffer;
-  size_t len;
-  VALUE rb_diff;
-  int error;
-
-  Check_Type(rb_buffer, T_STRING);
-  buffer = RSTRING_PTR(rb_buffer);
-  len = RSTRING_LEN(rb_buffer);
-
-  error = git_diff_from_buffer(&diff, buffer, len);
-  rugged_exception_check(error);
-
-  rb_diff = Data_Wrap_Struct(rb_cRuggedDiff, NULL, git_diff_free, diff);
-  return rb_diff;
-}
-
 void Init_rugged_diff(void)
 {
 	rb_cRuggedDiff = rb_define_class_under(rb_mRugged, "Diff", rb_cObject);
 
-	rb_define_singleton_method(rb_cRuggedDiff, "from_buffer", rb_git_diff_from_buffer, 1);
-
 	rb_define_method(rb_cRuggedDiff, "patch", rb_git_diff_patch, -1);
 	rb_define_method(rb_cRuggedDiff, "write_patch", rb_git_diff_write_patch, -1);
 

ext/rugged/rugged_repo.c

@@ -2710,6 +2710,29 @@ static VALUE rb_git_repo_cherrypick_commit(int argc, VALUE *argv, VALUE self)
 	return rugged_index_new(rb_cRuggedIndex, self, index);
 }
 
+/*
+ *  call-seq: repo.diff_from_buffer(buffer) -> Rugged::Diff object
+ *  
+ *  Where +buffer+ is a +String+.
+ *  Returns A Rugged::Diff object
+ */
+static VALUE rb_git_diff_from_buffer(VALUE self, VALUE rb_buffer)
+{
+  git_diff *diff = NULL;
+  const char *buffer;
+  size_t len;
+  int error;
+
+  Check_Type(rb_buffer, T_STRING);
+  buffer = RSTRING_PTR(rb_buffer);
+  len = RSTRING_LEN(rb_buffer);
+
+  error = git_diff_from_buffer(&diff, buffer, len);
+  rugged_exception_check(error);
+
+  return rugged_diff_new(rb_cRuggedDiff, self, diff);
+}
+
 void Init_rugged_repo(void)
 {
 	id_call = rb_intern("call");
@@ -2768,6 +2791,8 @@ void Init_rugged_repo(void)
 	rb_define_method(rb_cRuggedRepo, "apply", rb_git_repo_apply, -1);
 
 	rb_define_method(rb_cRuggedRepo, "revert_commit", rb_git_repo_revert_commit, -1);
+	
+	rb_define_method(rb_cRuggedRepo, "diff_from_buffer", rb_git_diff_from_buffer, 1);
 
 	rb_define_method(rb_cRuggedRepo, "path_ignored?", rb_git_repo_is_path_ignored, 1);
 

test/diff_test.rb

@@ -66,14 +66,14 @@ def test_from_strings_with_custom_paths
 
 class RepoDiffTest < Rugged::TestCase
   def test_new_from_buffer
+    repo    = FixtureRepo.from_libgit2("attr")
     patch1  = Rugged::Patch.from_strings("deleted\n", "added\n", old_path: "old", new_path: "new").to_s
-    diff1   = Rugged::Diff.from_buffer(patch1)
+    diff1   = repo.diff_from_buffer(patch1)
     assert_equal diff1.patch, patch1
 
-    repo    = FixtureRepo.from_libgit2("attr")
     diff2   = repo.diff("605812a", "370fe9ec22", :context_lines => 1, :interhunk_lines => 1)
     patch2  = diff2.patch
-    diff3   = Rugged::Diff.from_buffer(patch2)
+    diff3   = repo.diff_from_buffer(patch2)
     assert_equal diff3.patch, patch2
   end