bug fixes

nkallen · nkallen · commit 25ae260b40fb · 2013-07-21T19:04:26.000+02:00
diff --git a/example/general.js b/example/general.js
@@ -308,7 +308,7 @@ git.Repo.open(path.resolve(__dirname, '../.git'), function(error, repo) {
   // references such as branches, tags and remote references (everything in
   // the .git/refs directory).
 
-  repo.getReferences(git.Reference.Type.Oid | git.Reference.Type.Symbolic, function(error, referenceNames) {
+  repo.getReferences(git.Reference.Type.All, function(error, referenceNames) {
     if (error) throw error;
 
     referenceNames.forEach(function(referenceName) {
diff --git a/include/reference.h b/include/reference.h
@@ -47,8 +47,9 @@ class GitReference : public ObjectWrap {
       Persistent<Function> callback;
     };
     static Handle<Value> Oid(const Arguments& args);
-    static Handle<Value> Name(const Arguments& args);
+    static Handle<Value> SymbolicTarget(const Arguments& args);
     static Handle<Value> Type(const Arguments& args);
+    static Handle<Value> Name(const Arguments& args);
     static Handle<Value> Resolve(const Arguments& args);
     static void ResolveWork(uv_work_t* req);
     static void ResolveAfterWork(uv_work_t* req);
diff --git a/lib/reference.js b/lib/reference.js
@@ -3,7 +3,8 @@ var git = require('../'),
 
 Reference.Type = {
   Oid: 1,
-  Symbolic: 2
+  Symbolic: 2,
+  All: 3
 };
 
 Reference.prototype.isOid = function() {
@@ -13,3 +14,17 @@ Reference.prototype.isOid = function() {
 Reference.prototype.isSymbolic = function() {
   return this.type() == Reference.Type.Symbolic;
 };
+
+var oldSymbolicTarget = Reference.prototype.symbolicTarget;
+Reference.prototype.symbolicTarget = function() {
+  if (!this.isSymbolic()) throw this.name() + " is not symbolic";
+
+  return oldSymbolicTarget.call(this);
+};
+
+var oldOid = Reference.prototype.oid;
+Reference.prototype.oid = function() {
+  if (!this.isOid()) throw this.name() + " is not oid";
+
+  return oldOid.call(this);
+};
diff --git a/src/reference.cc b/src/reference.cc
@@ -35,8 +35,9 @@ void GitReference::Initialize(Handle<v8::Object> target) {
 
   NODE_SET_METHOD(tpl, "oidForName", OidForName);
   NODE_SET_PROTOTYPE_METHOD(tpl, "oid", Oid);
-  NODE_SET_PROTOTYPE_METHOD(tpl, "name", Name);
+  NODE_SET_PROTOTYPE_METHOD(tpl, "symbolicTarget", SymbolicTarget);
   NODE_SET_PROTOTYPE_METHOD(tpl, "type", Type);
+  NODE_SET_PROTOTYPE_METHOD(tpl, "name", Name);
   NODE_SET_PROTOTYPE_METHOD(tpl, "resolve", Resolve);
   NODE_SET_PROTOTYPE_METHOD(tpl, "setSymbolicTarget", SetSymbolicTarget);
   NODE_SET_PROTOTYPE_METHOD(tpl, "setTarget", setTarget);
@@ -179,7 +180,7 @@ Handle<Value> GitReference::Oid(const Arguments& args) {
 /**
  * @return {String} result
  */
-Handle<Value> GitReference::Name(const Arguments& args) {
+Handle<Value> GitReference::SymbolicTarget(const Arguments& args) {
   HandleScope scope;
   
 
@@ -208,6 +209,22 @@ Handle<Value> GitReference::Type(const Arguments& args) {
   return scope.Close(to);
 }
 
+/**
+ * @return {String} result
+ */
+Handle<Value> GitReference::Name(const Arguments& args) {
+  HandleScope scope;
+  
+
+  const char * result = git_reference_name(
+    ObjectWrap::Unwrap<GitReference>(args.This())->GetValue()
+  );
+
+  Handle<Value> to;
+    to = String::New(result);
+  return scope.Close(to);
+}
+
 /**
  * @param {Reference} callback
  */
diff --git a/test/repo.js b/test/repo.js
@@ -11,8 +11,8 @@ exports.open = function(test){
   test.expect(2);
 
   // Test invalid repository
-  git.Repo.open('/private/etc/hosts', function(error, repository) {
-    test.equals(error.message, "The `.git` file at '/private/etc/hosts' is malformed");
+  git.Repo.open('../templates', function(error, repository) {
+    test.equals(error.message, "Could not find repository from '../templates'");
 
     // Test valid repository
     git.Repo.open('../.git', function(error, repository) {
diff --git a/v0.18.0.json b/v0.18.0.json
@@ -8123,8 +8123,8 @@
         "isAsync": false,
         "isConstructorMethod": false,
         "isPrototypeMethod": true,
-        "jsFunctionName": "name",
-        "cppFunctionName": "Name",
+        "jsFunctionName": "symbolicTarget",
+        "cppFunctionName": "SymbolicTarget",
         "return": {
           "cType": "const char *",
           "cppClassName": "String"
@@ -8162,7 +8162,6 @@
             "isSelf": true
           }
         ],
-        "ignore": true,
         "isAsync": false,
         "isConstructorMethod": false,
         "isPrototypeMethod": true,
