Fixed blob issues

tbranyen · tbranyen · commit 290338b104e2 · 2011-04-12T14:47:24.000-04:00
diff --git a/example/raw-blob.js b/example/raw-blob.js
@@ -18,7 +18,7 @@ repo.open( path.resolve( '../.git' ), function() {
 
       console.log( entry.name() + ':' );
       console.log( blob.rawSize() );
-      console.log( blob.rawContent().toString() );
+      console.log( blob.rawContent() );
     }
   });
 });
diff --git a/src/blob.cc b/src/blob.cc
@@ -76,11 +76,11 @@ Handle<Value> GitBlob::Lookup(const Arguments& args) {
   HandleScope scope;
 
   if(args.Length() == 0 || !args[0]->IsObject()) {
-    return ThrowException(Exception::Error(String::New("Repo is required and must be a Object.")));
+    return ThrowException(Exception::Error(String::New("Repo is required and must be an Object.")));
   }
 
   if(args.Length() == 1 || !args[1]->IsObject()) {
-    return ThrowException(Exception::Error(String::New("Oid is required and must be a Object.")));
+    return ThrowException(Exception::Error(String::New("Oid is required and must be an Object.")));
   }
 
   if(args.Length() == 2 || !args[2]->IsFunction()) {
@@ -139,10 +139,15 @@ int GitBlob::EIO_AfterLookup(eio_req* req) {
 Handle<Value> GitBlob::RawContent(const Arguments& args) {
   GitBlob* blob = ObjectWrap::Unwrap<GitBlob>(args.This());
 
+  if(args.Length() == 0 || !args[0]->IsObject()) {
+    return ThrowException(Exception::Error(String::New("Buffer is required and must be an Object.")));
+  }
+
   int rawSize = blob->RawSize();
-  const char* buffer = (const char *)const_cast<void *>(blob->RawContent());
+  const char* contents = (const char *)const_cast<void *>(blob->RawContent());
 
-  return Buffer::New(const_cast<char *>(buffer), rawSize)->handle_;
+  Buffer* buffer = Buffer::New(const_cast<char *>(contents), rawSize);
+  return buffer->handle_;
 }
 
 Handle<Value> GitBlob::RawSize(const Arguments& args) {
diff --git a/test/raw-blob.js b/test/raw-blob.js
@@ -1,5 +1,6 @@
-var git = require( '../' ).raw,
-    rimraf = require( '../vendor/rimraf' );
+var git = require( '../' ).raw
+  , path = require( 'path' )
+  , rimraf = require( '../vendor/rimraf' );
 
 var testRepo = new git.Repo();
 
@@ -86,18 +87,18 @@ exports.rawContent = function( test ) {
   testRepo.open( path.resolve( '../.git' ), function() {
     testOid.mkstr( '59b20b8d5c6ff8d09518454d4dd8b7b30f095ab5' );
 
-    commit.lookup( repo, oid, function( err ) {
-      var tree = new git.Tree( repo ),
+    testCommit.lookup( testRepo, testOid, function( err ) {
+      var tree = new git.Tree( testRepo ),
           entry = new git.TreeEntry(),
-          blob = new git.Blob( repo );
+          blob = new git.Blob( testRepo );
 
-      if( !commit.tree( tree ) && tree.entryCount() > 1 ) {
+      if( !testCommit.tree( tree ) && tree.entryCount() > 1 ) {
         tree.entryByIndex( entry, 1 );
-        entry.toObject( repo, blob );
+        entry.toObject( testRepo, blob );
 
-        console.log( entry.name() + ':' );
-        console.log( blob.rawSize() );
-        console.dir( blob.rawContent() );
+        //console.log( entry.name() + ':' );
+        //console.log( blob.rawSize() );
+        //console.dir( blob.rawContent() );
       }
     });
   });

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ repo.open( path.resolve( '../.git' ), function() {`
`18`	`18`
`19`	`19`	`console.log( entry.name() + ':' );`
`20`	`20`	`console.log( blob.rawSize() );`
`21`		`- console.log( blob.rawContent().toString() );`
	`21`	`+ console.log( blob.rawContent() );`
`22`	`22`	`}`
`23`	`23`	`});`
`24`	`24`	`});`