Fix TreeEntry

John Haley · John Haley · commit 295f50703e6d · 2016-04-26T11:09:57.000-07:00
diff --git a/generate/input/libgit2-supplement.json b/generate/input/libgit2-supplement.json
@@ -82,28 +82,6 @@
     },
     "git_note_iterator": {
       "decl": "git_iterator"
-    },
-    "git_tree_entry": {
-      "fields": [
-        {
-          "name": "attr",
-          "type": "uint16_t"
-        },
-        {
-          "name": "oid",
-          "type": "git_oid"
-        },
-        {
-          "name": "filename_len",
-          "type": "size_t"
-        },
-        {
-          "name": "filename",
-          "structType": "char",
-          "structName": "filename[1]",
-          "type": "char *"
-        }
-      ]
     }
   },
   "new" : {
@@ -305,6 +283,18 @@
           "git_status_list_get_perfdata",
           "git_status_list_new"
         ]
+      ],
+      [
+        "tree_entry",
+        [
+          "git_tree_entry_filemode",
+          "git_tree_entry_filemode_raw",
+          "git_tree_entry_free",
+          "git_tree_entry_id",
+          "git_tree_entry_name",
+          "git_tree_entry_to_object",
+          "git_tree_entry_type"
+        ]
       ]
     ],
     "types": [
@@ -722,6 +712,17 @@
         "git_status_list_get_perfdata",
         "git_status_list_new"
       ]
+    },
+    "tree": {
+      "functions": [
+        "git_tree_entry_filemode",
+        "git_tree_entry_filemode_raw",
+        "git_tree_entry_free",
+        "git_tree_entry_id",
+        "git_tree_entry_name",
+        "git_tree_entry_to_object",
+        "git_tree_entry_type"
+      ]
     }
   },
   "groups": {
diff --git a/lib/tree_entry.js b/lib/tree_entry.js
@@ -1,23 +1,22 @@
 var path = require("path");
 var NodeGit = require("../");
-var Tree = NodeGit.Tree;
 var TreeEntry = NodeGit.TreeEntry;
 
 /**
  * Is this TreeEntry a blob? (i.e., a file)
  * @return {Boolean}
  */
 TreeEntry.prototype.isFile = function() {
-  return this.attr() === TreeEntry.FILEMODE.BLOB ||
-         this.attr() === TreeEntry.FILEMODE.EXECUTABLE;
+  return this.filemode() === TreeEntry.FILEMODE.BLOB ||
+         this.filemode() === TreeEntry.FILEMODE.EXECUTABLE;
 };
 
 /**
  * Is this TreeEntry a tree? (i.e., a directory)
  * @return {Boolean}
  */
 TreeEntry.prototype.isTree = function() {
-  return this.attr() === TreeEntry.FILEMODE.TREE;
+  return this.filemode() === TreeEntry.FILEMODE.TREE;
 };
 
 /**
@@ -37,7 +36,7 @@ TreeEntry.prototype.isBlob = TreeEntry.prototype.isFile;
  * @return {String}
  */
 TreeEntry.prototype.sha = function() {
-  return this.oid().toString();
+  return this.id().toString();
 };
 
 /**
@@ -48,7 +47,7 @@ TreeEntry.prototype.sha = function() {
 TreeEntry.prototype.getTree = function(callback) {
   var entry = this;
 
-  return this.parent.repo.getTree(this.oid()).then(function(tree) {
+  return this.parent.repo.getTree(this.id()).then(function(tree) {
     tree.entry = entry;
 
     if (typeof callback === "function") {
@@ -65,7 +64,7 @@ TreeEntry.prototype.getTree = function(callback) {
  * @return {Blob}
  */
 TreeEntry.prototype.getBlob = function(callback) {
-  return this.parent.repo.getBlob(this.oid()).then(function(blob) {
+  return this.parent.repo.getBlob(this.id()).then(function(blob) {
     if (typeof callback === "function") {
       callback(null, blob);
     }
@@ -80,7 +79,7 @@ TreeEntry.prototype.getBlob = function(callback) {
  */
 TreeEntry.prototype.path = function(callback) {
   var dirtoparent = this.dirtoparent || "";
-  return path.join(this.parent.path(), dirtoparent, this.filename());
+  return path.join(this.parent.path(), dirtoparent, this.name());
 };
 
 /**
@@ -91,5 +90,5 @@ TreeEntry.prototype.toString = function() {
 };
 
 TreeEntry.prototype.oid = function() {
-  return Tree.entryId(this).toString();
+  return this.id().toString();
 };
diff --git a/test/tests/tree_entry.js b/test/tests/tree_entry.js
@@ -41,14 +41,14 @@ describe("TreeEntry", function() {
   it("provides the correct length for a file", function() {
     return this.commit.getEntry("README.md")
 	  .then(function(entry) {
-              assert.equal(entry.filenameLen(), 9);
+              assert.equal(entry.name().length, 9);
 	  });
   });
 
   it("provides the filename", function() {
     return this.commit.getEntry("test/raw-commit.js")
       .then(function(entry) {
-        assert.equal(entry.filename(), "raw-commit.js");
+        assert.equal(entry.name(), "raw-commit.js");
     });
   });
 
@@ -64,7 +64,7 @@ describe("TreeEntry", function() {
       var dir = _dir || "",
         testPromises = [];
       tree.entries().forEach(function(entry) {
-        var currentPath = path.join(dir, entry.filename());
+        var currentPath = path.join(dir, entry.name());
         if (entry.isTree()) {
           testPromises.push(
             entry.getTree().then(function (subtree) {
