rugged 0.22.0b2 → 0.22.0b3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1fcbe10398bb6a72a8b366a061a86dc86a22d86
-  data.tar.gz: 6d0ab2ee6aa49b3d0d6e7f9c2f5c7ee18f01e820
+  metadata.gz: 41fe2ca17d9e55ea205e190f8d0c23ff9d6a388f
+  data.tar.gz: 8a2e8c0501f8383b6c8ce747d212b7aa0d9a07fa
 SHA512:
-  metadata.gz: 47f0d46dbfb6a493678c7c0fffc12d25ffadabc3b8210920a2f509556e2504b48de4223db27488e70a78da1d2bbf6d440dfe15b3992ff7a2ded9bdebf5219d3b
-  data.tar.gz: 2c83e8937a0bda990da855f793901299269ea2cf174c2e7f7501795c7f3a7377b37b60fe555a453963206d93c4c035fe24c9ee02afcd084d101e484426b35030
+  metadata.gz: ca4649799366b724b65b4c257148c366f7e02545fa1834ff2eaf7742c33c4901e498d80a5ee5be1bd7b658051d3f626b2395d0ced84777cc488d1995cc1f1c51
+  data.tar.gz: ce5ac5b5439329dd959225a6225884136b7a78a5b501502c52dee7a9cc59b9e89d5343fdb7ada26a922cd96cf4052046ba5e4576005c49e6b633638db3d3c6df

data/ext/rugged/rugged_blob.c

@@ -32,7 +32,6 @@ extern VALUE rb_cRuggedRepo;
 static ID id_read;
 
 VALUE rb_cRuggedBlob;
-VALUE rb_cRuggedBlobLoader;
 VALUE rb_cRuggedBlobSig;
 
 /*
@@ -480,75 +479,46 @@ static VALUE rb_git_blob_diff(int argc, VALUE *argv, VALUE self)
 	return rugged_patch_new(self, patch);
 }
 
-/*
- *  call-seq:
- *    Rugged::Blob::Loader.new(repository, max_size) -> Blob::Loader instance
- *
- *	Create a Blob Loader instance that allows you to bring several blobs
- *	from the object database with no extra memory cost by reusing the same
- *	underlying storage.
- *
- *	repository - the repo where the blobs will be loaded from
- *	max_size - the maximum size for the underlying storage; blobs larger than
- *	that size will be truncated
- *
- *	Example:
- *
- *		loader = loader = Rugged::Blob::Loader.new(@repo, 4 * 1024)
- *		#=> Blob::Loader instance
- *
- *		loader.load("d70d245ed97ed2aa596dd1af6536e4bfdb047b69")
- *		#=> [contents, real_size]
- */
-static VALUE rb_git_blob_loader_new(VALUE self, VALUE rb_repo, VALUE rb_max_bytes)
+static VALUE rb_git_blob_to_buffer(int argc, VALUE *argv, VALUE self)
 {
-	long max_bytes;
-
-	rugged_check_repo(rb_repo);
-	Check_Type(rb_max_bytes, T_FIXNUM);
-
-	/* extra byte for NULL-termination */
-	max_bytes = (long)FIX2INT(rb_max_bytes) + 1;
-
-	rb_iv_set(self, "@repository", rb_repo);
-	rb_iv_set(self, "buffer", rb_str_buf_new(max_bytes));
-	return Qnil;
-}
-
-static VALUE rb_git_blob_loader_load(VALUE self, VALUE rb_sha1)
-{
-	VALUE rb_ret, rb_repo, rb_buffer;
+	VALUE rb_repo, rb_sha1, rb_max_bytes;
+	VALUE rb_ret;
 
 	git_repository *repo = NULL;
 	git_blob *blob = NULL;
 
-	size_t size, capacity;
+	size_t size;
 	const char *content;
 
-	rb_repo = rb_iv_get(self, "@repository");
-	rb_buffer = rb_iv_get(self, "buffer");
+	rb_scan_args(argc, argv, "21", &rb_repo, &rb_sha1, &rb_max_bytes);
 
-	Check_Type(rb_buffer, T_STRING);
 	rugged_check_repo(rb_repo);
 	Data_Get_Struct(rb_repo, git_repository, repo);
 
 	blob = (git_blob *)rugged_object_get(repo, rb_sha1, GIT_OBJ_BLOB);
 
 	content = git_blob_rawcontent(blob);
-	size = (long)git_blob_rawsize(blob);
-	capacity = rb_str_capacity(rb_buffer);
+	size = git_blob_rawsize(blob);
 
-	if (size > capacity - 1)
-		size = capacity - 1;
+	if (!NIL_P(rb_max_bytes)) {
+		int maxbytes;
 
-	memcpy(RSTRING_PTR(rb_buffer), content, size);
-	rb_str_set_len(rb_buffer, size);
+		Check_Type(rb_max_bytes, T_FIXNUM);
+		maxbytes = FIX2INT(rb_max_bytes);
+
+		if (maxbytes >= 0 && (size_t)maxbytes < size)
+			size = (size_t)maxbytes;
+	}
 
 	rb_ret = rb_ary_new();
-	rb_ary_push(rb_ret, rb_buffer);
+
+	rb_ary_push(rb_ret, rb_str_new(content, size));
 	rb_ary_push(rb_ret, INT2FIX(git_blob_rawsize(blob)));
 
 	git_object_free((git_object*)blob);
+
+	/* TODO: LOC */
+
 	return rb_ret;
 }
 
@@ -621,11 +591,9 @@ void Init_rugged_blob(void)
 	rb_define_singleton_method(rb_cRuggedBlob, "from_disk", rb_git_blob_from_disk, 2);
 	rb_define_singleton_method(rb_cRuggedBlob, "from_io", rb_git_blob_from_io, -1);
 
+	rb_define_singleton_method(rb_cRuggedBlob, "to_buffer", rb_git_blob_to_buffer, -1);
+
 	rb_cRuggedBlobSig = rb_define_class_under(rb_cRuggedBlob, "HashSignature", rb_cObject);
 	rb_define_singleton_method(rb_cRuggedBlobSig, "new", rb_git_blob_sig_new, -1);
 	rb_define_singleton_method(rb_cRuggedBlobSig, "compare", rb_git_blob_sig_compare, 2);
-
-	rb_cRuggedBlobLoader = rb_define_class_under(rb_cRuggedBlob, "Loader", rb_cObject);
-	rb_define_method(rb_cRuggedBlobLoader, "initialize", rb_git_blob_loader_new, 2);
-	rb_define_method(rb_cRuggedBlobLoader, "load", rb_git_blob_loader_load, 1);
 }

data/lib/rugged/version.rb

@@ -1,3 +1,3 @@
 module Rugged
-  Version = VERSION = '0.22.0b2'
+  Version = VERSION = '0.22.0b3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rugged
 version: !ruby/object:Gem::Version
-  version: 0.22.0b2
+  version: 0.22.0b3
 platform: ruby
 authors:
 - Scott Chacon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-23 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler