Refactored blob.js

faceleg · faceleg · commit 545ceeb8fa08 · 2013-03-28T01:39:02.000+13:00
diff --git a/lib/blob.js b/lib/blob.js
@@ -1,33 +1,65 @@
-var git = require( '../' );
+var git = require('../'),
+  success = require('./utilities').success;
 
-var _Blob = function( obj ) {
-  var self = {};
-
-  if( obj instanceof git.raw.Repo ) {
-    self.repo = obj;
-    self.blob = new git.raw.Blob( obj );
+/**
+ * Blob convenience class constructor.
+ *
+ * @param {git.raw.Repo} rawRepo
+ * @param {git.raw.Blob|null} rawBlob
+ */
+var Blob = function(rawRepo, rawBlob) {
+  if(!(rawRepo instanceof git.raw.Repo)) {
+    throw git.error('First parameter for Blob must be a raw repo');
   }
-  else if( obj instanceof git.raw.Blob ) {
-    self.blob = obj;
+  this.rawRepo = rawRepo;
+
+  if(rawBlob instanceof git.raw.Blob) {
+    this.rawBlob = rawBlob;
+  } else {
+    this.rawBlob = new git.raw.Blob(this.rawRepo);
   }
+};
 
-  Object.defineProperty( self, 'raw', {
-    get: function() {
-      return self.blob.rawContent().toString();
-    },
-    enumerable: true
+/**
+ * Retrieve the blob represented by the oid.
+ *
+ * @param  {git.raw.Oid} oid
+ * @param  {Function} callback
+ */
+Blob.prototype.lookup = function(oid, callback) {
+  var self = this;
+  self.rawBlob.lookup(self.rawRepo, oid, function blobLookup(error, rawBlob) {
+    if (success(error, callback)) {
+      self.rawBlob = rawBlob;
+      callback(null, self);
+    }
   });
+};
 
-  self.lookup = function( oid ) {
-    self.blob.lookup( self.repo, oid, function() {
-      var args = Array.prototype.slice.call( arguments );
-      args[0] = git.util().error( args[0] );
-
-      callback.apply( self, args.concat( self ) );
-    });
-  };
+/**
+ * Retrieve the blob's raw content buffer.
+ *
+ * @param  {Function} callback
+ */
+Blob.prototype.rawContent = function(callback) {
+  this.rawBlob.rawContent(function(error, content) {
+    if (success(error, callback)) {
+      callback(null, content);
+    }
+  });
+};
 
-  return self;
+/**
+ * Retrieve the blob's content.
+ *
+ * @param  {Function} callback
+ */
+Blob.prototype.content = function(callback) {
+  this.rawContent(function(error, content) {
+    if (success(error, callback)) {
+      callback(null, content.toString());
+    }
+  });
 };
 
-exports.blob = _Blob;
+exports.blob = Blob;
