Refactored reference.js

faceleg · faceleg · commit cb7d0941fe0d · 2013-03-28T21:23:37.000+13:00
diff --git a/lib/reference.js b/lib/reference.js
@@ -1,37 +1,54 @@
-var git = require('../');
+var git = require('../'),
+    success = require('./utilities').success;
 
-var Reference = function(rawReference) {
-  var self = {};
-
-  if(rawReference instanceof git.raw.Reference) {
-    self.reference = rawReference;
-  } else if(rawReference instanceof git.raw.Repo) {
-    self.repo = rawReference;
-    self.reference = new git.raw.Reference(rawReference);
+/**
+ * Convenience reference constructor.
+ *
+ * @constructor
+ * @param {git.raw.Repo} rawRepo
+ * @param {git.raw.Reference|null} rawReference
+ */
+var Reference = function(rawRepo, rawReference) {
+  if (!(rawRepo instanceof git.raw.Repo)) {
+    throw git.error('First parameter for Reference must be a raw repo');
   }
+  this.rawRepo = rawRepo;
 
-  self.lookup = function(name, callback) {
-    self.reference.lookup(self.repo, name, function(error, reference) {
-      if (error) {
-        callback(git.error(error), self);
-        return;
-      }
-      self.reference = reference;
-      callback(null, self);
-    });
-  };
+  if (rawReference instanceof git.raw.Reference) {
+    this.rawReference = rawReference;
+  } else {
+    this.rawReference = new git.raw.Reference(this.rawRepo);
+  }
+};
 
-  self.oid = function(callback) {
-    self.reference.oid(function(error, rawOid) {
-      if (error) {
-        callback(git.error(error, self));
-        return;
-      }
-      callback(null, git.oid(rawOid));
-    });
-  };
+/**
+ * Lookup the reference with the given name.
+ *
+ * @param  {String}   name
+ * @param  {Function} callback
+ */
+Reference.prototype.lookup = function(name, callback) {
+  var self = this;
+  self.rawReference.lookup(self.rawRepo, name, function referenceLookup(error, rawReference) {
+    if (!success(error, callback)) {
+      return;
+    }
+    self.rawReference = rawReference;
+    callback(null, self);
+  });
+};
 
-  return self;
+/**
+ * Get the Oid representing this reference.
+ *
+ * @param  {Function} callback
+ */
+Reference.prototype.oid = function(callback) {
+  this.rawReference.oid(function referenceOid(error, rawOid) {
+    if (success(error, callback)) {
+      callback(null, new git.oid(rawOid));
+    }
+  });
 };
 
 exports.reference = Reference;
