@@ -16,6 +16,7 @@
                 'src/tree_entry.cc',
                 'src/diff_list.cc',
                 'src/threads.cc',
+                'src/wrapper.cc',
                 'src/functions/string.cc',
                 'src/functions/utilities.cc'
             ],
 
@@ -8,8 +8,10 @@ var idefs = JSON.parse(fs.readFileSync('v0.18.0.json')),
 
 for (var i in idefs) {
   var idef = idefs[i];
-  if (idef.jsClassName != "Oid") continue;
-
-  fs.writeFileSync(path.resolve("./include/" + idef.filename), headerTemplate(idef));
-  fs.writeFileSync(path.resolve("./src/" + path.basename(idef.filename, '.h') + '.cc'), classTemplate(idef));
+  if (["Oid", "Blob"].indexOf(idef.jsClassName) > -1) {
+    fs.writeFileSync(
+      path.resolve("./include/" + idef.filename), headerTemplate(idef));
+    fs.writeFileSync(
+      path.resolve("./src/" + path.basename(idef.filename, '.h') + '.cc'), classTemplate(idef));
+  }
 }
@@ -1,112 +1,75 @@
 /**
- * Copyright (c) 2011, Tim Branyen @tbranyen <tim@tabdeveloper.com>
- * @author Michael Robinson @codeofinterest <mike@pagesofinterest.net>
- *
- * Dual licensed under the MIT and GPL licenses.
- */
+ * This code is auto-generated; unless you know what you're doing, do not modify!
+ **/
 
-#ifndef BLOB_H
-#define BLOB_H
+#ifndef GITBLOB_H
+#define GITBLOB_H
 
 #include <v8.h>
 #include <node.h>
-#include <string.h>
+#include <string>
 
 #include "git2.h"
 
-#include "repo.h"
-#include "oid.h"
-
-using namespace v8;
 using namespace node;
+using namespace v8;
 
-/**
- *   Wrapper for libgit2 git_blob.
- */
 class GitBlob : public ObjectWrap {
   public:
 
     static Persistent<Function> constructor_template;
+    static void Initialize (Handle<v8::Object> target);
 
-    static void Initialize(Handle<Object> target);
-
-    git_blob* GetValue();
-    void SetValue(git_blob* blob);
+    git_blob *GetValue();
 
-  protected:
-    GitBlob() {};
-    ~GitBlob() {};
+  private:
+    GitBlob(git_blob *raw);
+    ~GitBlob();
 
     static Handle<Value> New(const Arguments& args);
-    static Handle<Value> Free(const Arguments& args);
 
     static Handle<Value> Lookup(const Arguments& args);
     static void LookupWork(uv_work_t* req);
     static void LookupAfterWork(uv_work_t* req);
 
-    static Handle<Value> RawContent(const Arguments& args);
-    static void RawContentWork(uv_work_t* req);
-    static void RawContentAfterWork(uv_work_t* req);
-
+    struct LookupBaton {
+      uv_work_t request;
+      const git_error* error;
+      git_blob *out;
+      git_repository * repo;
+      const git_oid * id;
+      Persistent<Function> callback;
+    };
+    static Handle<Value> Oid(const Arguments& args);
+    static Handle<Value> Content(const Arguments& args);
+    static Handle<Value> Size(const Arguments& args);
     static Handle<Value> CreateFromFile(const Arguments& args);
     static void CreateFromFileWork(uv_work_t* req);
     static void CreateFromFileAfterWork(uv_work_t* req);
 
+    struct CreateFromFileBaton {
+      uv_work_t request;
+      const git_error* error;
+      git_oid * id;
+      git_repository * repo;
+      const char * path;
+      Persistent<Function> callback;
+    };
     static Handle<Value> CreateFromBuffer(const Arguments& args);
     static void CreateFromBufferWork(uv_work_t* req);
     static void CreateFromBufferAfterWork(uv_work_t* req);
 
-  private:
-
-    git_blob* blob;
-
-    struct LookupBaton {
+    struct CreateFromBufferBaton {
       uv_work_t request;
       const git_error* error;
-
-      GitBlob* blob;
-      git_blob* rawBlob;
-      git_repository* rawRepo;
-      git_oid rawOid;
-
+      git_oid * oid;
+      git_repository * repo;
+      const void * buffer;
+      size_t len;
       Persistent<Function> callback;
     };
-
-    struct RawContentBaton {
-        uv_work_t request;
-
-        GitBlob* blob;
-        git_blob* rawBlob;
-        std::string rawContent;
-        int rawSize;
-
-        Persistent<Function> callback;
-    };
-
-    struct CreateFromFileBaton {
-        uv_work_t request;
-        const git_error* error;
-
-        GitBlob* blob;
-        git_blob* rawBlob;
-        git_repository* rawRepo;
-        std::string path;
-
-        Persistent<Function> callback;
-    };
-
-    struct CreateFromBufferBaton {
-        uv_work_t request;
-        const git_error* error;
-
-        GitBlob* blob;
-        git_blob* rawBlob;
-        git_repository* rawRepo;
-        const void* data;
-        size_t dataLength;
-
-        Persistent<Function> callback;
-    };
+    static Handle<Value> IsBinary(const Arguments& args);
+    git_blob *raw;
 };
 
 #endif
@@ -20,7 +20,7 @@ class GitOid : public ObjectWrap {
     static Persistent<Function> constructor_template;
     static void Initialize (Handle<v8::Object> target);
 
-    git_oid GetValue();
+    git_oid *GetValue();
 
   private:
     GitOid(git_oid *raw);
 
@@ -0,0 +1,31 @@
+/**
+ * This code is auto-generated; unless you know what you're doing, do not modify!
+ **/
+
+#ifndef WRAPPER_H
+#define WRAPPER_H
+
+#include <v8.h>
+#include <node.h>
+
+using namespace node;
+using namespace v8;
+
+class Wrapper : public ObjectWrap {
+  public:
+
+    static Persistent<Function> constructor_template;
+    static void Initialize (Handle<v8::Object> target);
+
+    void *GetValue();
+
+  private:
+    Wrapper(void *raw);
+
+    static Handle<Value> New(const Arguments& args);
+    static Handle<Value> ToBuffer(const Arguments& args);
+
+    void *raw;
+};
+
+#endif
@@ -45,38 +45,17 @@ Blob.prototype.lookup = function(oid, callback) {
 
 /**
  * Retrieve the blob's raw content buffer.
- *
- * @param {Blob~rawContentCallback} callback
  */
-Blob.prototype.rawContent = function(callback) {
-  /**
-   * @callback Blob~rawContentCallback Callback executed after raw content is retrieved.
-   * @param {GitError|null} error An Error or null if successful.
-   * @param {Buffer|null} content The raw content of the blob or null.
-   */
-  this.rawBlob.rawContent(function(error, content) {
-    if (success(error, callback)) {
-      callback(null, content);
-    }
-  });
+Blob.prototype.rawContent = function() {
+  return this.rawBlob.content().toBuffer(this.rawBlob.size());
 };
 
 /**
  * Retrieve the blob's content.
- *
- * @param {Blob~contentCallback} callback
  */
 Blob.prototype.content = function(callback) {
-  /**
-   * @callback Blob~contentCallback Callback executed after content is retrieved.
-   * @param {GitError|null} error An Error or null if successful.
-   * @param {String|null} content The content of the blob or null.
-   */
-  this.rawContent(function(error, content) {
-    if (success(error, callback)) {
-      callback(null, content.toString());
-    }
-  });
+  var content = this.rawContent();
+  return content.toString();
 };
 
 /**
 
@@ -208,11 +208,8 @@ TreeEntry.prototype.content = function(callback) {
     if (!success(error, callback)) {
       return;
     }
-    blob.content(function blobContent(error, content) {
-      if (success(error, callback)) {
-        callback(null, content);
-      }
-    });
+    var content = blob.content();
+    callback(null, content);
   });
 };
 
 
@@ -10,6 +10,7 @@
 
 #include "git2.h"
 
+#include "../include/wrapper.h"
 #include "../include/reference.h"
 #include "../include/signature.h"
 #include "../include/error.h"
@@ -24,6 +25,10 @@
 #include "../include/threads.h"
 
 extern "C" void init(Handle<v8::Object> target) {
+  HandleScope scope;
+
+  Wrapper::Initialize(target);
+
   GitError::Initialize(target);
 
   GitReference::Initialize(target);