Removed extraneous callback vars, fixed Oid method name for now, need namespacing

tbranyen · tbranyen · commit cc513ea85ff1 · 2011-03-03T19:03:12.000-05:00
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -1,5 +1,9 @@
 nodegit2 contributors (sorted alphabeticaly)
 ============================================
+* **[Ben Alman](https://github.com/cowboy)**
+
+  * JS API suggestions
+
 * **[inimino](https://github.com/inimino)**
 
   * JS API suggestions 
diff --git a/README.md b/README.md
@@ -11,7 +11,8 @@ Building and installing
 ### Dependancies ###
 To run `nodegit2` you need `Node.js` and to run unit tests you will need to have `git` installed and accessible from your `PATH` to fetch any `vendor/` addons.
 
-### Easy install ###
+### Easy install (Recommended!) ###
+    This will install and configure everything you need to use `nodegit2`.
 
     [tim@thinkpad Projects]$ sudo npm install nodegit2
 
@@ -97,7 +98,7 @@ Running tests
 
 __ `nodegit2` library code is written adhering to a modified `JSHint`. Run these tests with `make lint`. __
 
-__ Ensure the submodules `nodeunit` and `rimraf` are located in the `vendor/` subdirectory. __
+__ To run unit tests ensure the submodules `nodeunit` and `rimraf` are located in the `vendor/` subdirectory. __
 
 If they are not, `cd` into the `nodegit2` dir and run the following `git` commands to automatically fetch them:
     [tim@thinkpad Projects]$ cd nodegit2
diff --git a/example/convenience-repo.js b/example/convenience-repo.js
@@ -1,21 +1,17 @@
 var git = require( '../' );
 
-// Read the current repository
-git.repo( './dummyrepo/.git', function( err, path, repo ) {
+git.repo( './dummyrepo/.git', function( err, repo ) {
   if( err ) { throw err; }
  
-  // Read a commit
-  //repo.commit( '2f6cbe055f1a6ca0a3ba524ba88a7806ba507a89', function( err, commit ) {
-  //  if( err ) { throw err; }
-
-  //  console.log( commit.msg() );
-
-  //  var author = commit.author();
-  //  console.log( author.name );
-  //  console.log( author.email );
-  //});
+  // Read a commit when you know the sha1
+  repo.commit( '2f6cbe055f1a6ca0a3ba524ba88a7806ba507a89', function( err, commit ) {
+    console.log( commit.author().name );
+  });
 
-  repo.head( 'master', function( err, path, head ) {
-    console.log( git.error( err ) );
+  // Read a commit when you know the name
+  repo.head( 'master', function( err, head ) {
+    git.commit( repo.repo ).lookup( head.oid().oid, function( err, commit ) {
+      console.log( commit.author().name );
+    });
   });
 });
diff --git a/lib/ref.js b/lib/ref.js
@@ -11,6 +11,14 @@ var _Ref = function( obj ) {
     self.ref = obj;
   }
 
+  self.oid = function() {
+    var oid = git.oid();
+
+    self.ref.oid( oid.oid );
+
+    return oid;
+  };
+
   return self;
 };
 
diff --git a/src/oid.cc b/src/oid.cc
@@ -28,11 +28,6 @@ void Oid::Initialize(Handle<Object> target) {
   target->Set(String::NewSymbol("Oid"), constructor_template->GetFunction());
 }
 
-Handle<Value> Oid::WrapObj(Local<Object> obj) {
-  this->Wrap(obj);
-  return obj;
-}
-
 git_oid* Oid::GetValue() {
   return &this->oid;
 }
@@ -53,7 +48,7 @@ char* Oid::Fmt(char* buffer) {
   git_oid_fmt(*&buffer, &this->oid);
 }
 
-void Oid::PathFmt(char *str) {
+void Oid::PathFmt(char* str) {
   git_oid_pathfmt(str, &this->oid);
 }
 
diff --git a/src/oid.h b/src/oid.h
@@ -14,7 +14,7 @@ Copyright (c) 2011, Tim Branyen @tbranyen <tim@tabdeveloper.com>
 using namespace node;
 using namespace v8;
 
-class Oid : public ObjectWrap {
+class Oid : public EventEmitter {
   public:
     static Persistent<FunctionTemplate> constructor_template;
     static void Initialize (Handle<v8::Object> target);
diff --git a/src/reference.cc b/src/reference.cc
@@ -24,7 +24,7 @@ void Reference::Initialize(Handle<Object> target) {
   constructor_template->InstanceTemplate()->SetInternalFieldCount(1);
   constructor_template->SetClassName(String::NewSymbol("Ref"));
 
-  NODE_SET_PROTOTYPE_METHOD(constructor_template, "oid", Oid);
+  NODE_SET_PROTOTYPE_METHOD(constructor_template, "oid", _Oid);
 
   target->Set(String::NewSymbol("Ref"), constructor_template->GetFunction());
 }
@@ -41,7 +41,7 @@ int Reference::New(git_repository* repo) {
   return git_reference_new(&this->ref, repo);
 }
 
-const git_oid* Reference::Oid() {
+const git_oid* Reference::_Oid() {
   return git_reference_oid(*&this->ref);
 }
 
@@ -62,16 +62,16 @@ Handle<Value> Reference::New(const Arguments& args) {
   return args.This();
 }
 
-Handle<Value> Reference::Oid(const Arguments& args) {
+Handle<Value> Reference::_Oid(const Arguments& args) {
   Reference *ref = ObjectWrap::Unwrap<Reference>(args.This());
   HandleScope scope;
 
   if(args.Length() == 0 || !args[0]->IsObject()) {
     return ThrowException(Exception::Error(String::New("Oid is required and must be an Object.")));
   }
 
-  //Oid *oid = ObjectWrap::Unwrap<Oid>(args[0]->ToObject());
-  //oid->SetValue( (git_oid *)ref->Oid() );
+  Oid *oid = ObjectWrap::Unwrap<Oid>(args[0]->ToObject());
+  oid->SetValue( const_cast<git_oid *>(ref->_Oid()) );
 
   return Undefined();
 }
diff --git a/src/reference.h b/src/reference.h
@@ -24,14 +24,14 @@ class Reference : public EventEmitter {
     // Synchronous
     int New(git_repository* repo);
     void SetValue(git_reference* ref);
-    const git_oid* Oid();
+    const git_oid* _Oid();
 
   protected:
     Reference() {}
     ~Reference() {}
     static Handle<Value> New(const Arguments& args);
 
-    static Handle<Value> Oid(const Arguments& args);
+    static Handle<Value> _Oid(const Arguments& args);
 
   private:
     git_reference *ref;
diff --git a/src/repo.cc b/src/repo.cc
@@ -119,13 +119,12 @@ int Repo::EIO_AfterOpen(eio_req *req) {
   ev_unref(EV_DEFAULT_UC);
   ar->repo->Unref();
 
-  Local<Value> argv[2];
+  Local<Value> argv[1];
   argv[0] = Number::Cast(*ar->err);
-  argv[1] = String::Cast(*ar->path);
 
   TryCatch try_catch;
 
-  ar->callback->Call(Context::GetCurrent()->Global(), 2, argv);
+  ar->callback->Call(Context::GetCurrent()->Global(), 1, argv);
 
   if(try_catch.HasCaught())
     FatalException(try_catch);
@@ -281,12 +280,11 @@ int Repo::EIO_AfterInit(eio_req *req) {
 
   Local<Value> argv[3];
   argv[0] = Number::Cast(*ar->err);
-  argv[1] = String::Cast(*ar->path);
-  argv[2] = *ar->is_bare;
+  argv[1] = *ar->is_bare;
 
   TryCatch try_catch;
 
-  ar->callback->Call(Context::GetCurrent()->Global(), 3, argv);
+  ar->callback->Call(Context::GetCurrent()->Global(), 2, argv);
 
   if(try_catch.HasCaught())
     FatalException(try_catch);
@@ -359,13 +357,12 @@ int Repo::EIO_AfterLookupRef(eio_req *req) {
   ev_unref(EV_DEFAULT_UC);
   ar->repo->Unref();
 
-  Local<Value> argv[2];
+  Local<Value> argv[1];
   argv[0] = Number::Cast(*ar->err);
-  argv[1] = String::Cast(*ar->name);
 
   TryCatch try_catch;
 
-  ar->callback->Call(Context::GetCurrent()->Global(), 2, argv);
+  ar->callback->Call(Context::GetCurrent()->Global(), 1, argv);
 
   if(try_catch.HasCaught())
     FatalException(try_catch);

Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,6 @@ void Oid::Initialize(Handle<Object> target) {`
`28`	`28`	`target->Set(String::NewSymbol("Oid"), constructor_template->GetFunction());`
`29`	`29`	`}`
`30`	`30`
`31`		`-Handle<Value> Oid::WrapObj(Local<Object> obj) {`
`32`		`- this->Wrap(obj);`
`33`		`- return obj;`
`34`		`-}`
`35`		`-`
`36`	`31`	`git_oid* Oid::GetValue() {`
`37`	`32`	`return &this->oid;`
`38`	`33`	`}`
`@@ -53,7 +48,7 @@ char* Oid::Fmt(char* buffer) {`
`53`	`48`	`git_oid_fmt(*&buffer, &this->oid);`
`54`	`49`	`}`
`55`	`50`
`56`		`-void Oid::PathFmt(char *str) {`
	`51`	`+void Oid::PathFmt(char* str) {`
`57`	`52`	`git_oid_pathfmt(str, &this->oid);`
`58`	`53`	`}`
`59`	`54`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ void Reference::Initialize(Handle<Object> target) {`
`24`	`24`	`constructor_template->InstanceTemplate()->SetInternalFieldCount(1);`
`25`	`25`	`constructor_template->SetClassName(String::NewSymbol("Ref"));`
`26`	`26`
`27`		`- NODE_SET_PROTOTYPE_METHOD(constructor_template, "oid", Oid);`
	`27`	`+ NODE_SET_PROTOTYPE_METHOD(constructor_template, "oid", _Oid);`
`28`	`28`
`29`	`29`	`target->Set(String::NewSymbol("Ref"), constructor_template->GetFunction());`
`30`	`30`	`}`
`@@ -41,7 +41,7 @@ int Reference::New(git_repository* repo) {`
`41`	`41`	`return git_reference_new(&this->ref, repo);`
`42`	`42`	`}`
`43`	`43`
`44`		`-const git_oid* Reference::Oid() {`
	`44`	`+const git_oid* Reference::_Oid() {`
`45`	`45`	`return git_reference_oid(*&this->ref);`
`46`	`46`	`}`
`47`	`47`
`@@ -62,16 +62,16 @@ Handle<Value> Reference::New(const Arguments& args) {`
`62`	`62`	`return args.This();`
`63`	`63`	`}`
`64`	`64`
`65`		`-Handle<Value> Reference::Oid(const Arguments& args) {`
	`65`	`+Handle<Value> Reference::_Oid(const Arguments& args) {`
`66`	`66`	`Reference *ref = ObjectWrap::Unwrap<Reference>(args.This());`
`67`	`67`	`HandleScope scope;`
`68`	`68`
`69`	`69`	`if(args.Length() == 0 \|\| !args[0]->IsObject()) {`
`70`	`70`	`return ThrowException(Exception::Error(String::New("Oid is required and must be an Object.")));`
`71`	`71`	`}`
`72`	`72`
`73`		`- //Oid *oid = ObjectWrap::Unwrap<Oid>(args[0]->ToObject());`
`74`		`- //oid->SetValue( (git_oid *)ref->Oid() );`
	`73`	`+ Oid *oid = ObjectWrap::Unwrap<Oid>(args[0]->ToObject());`
	`74`	`+ oid->SetValue( const_cast<git_oid *>(ref->_Oid()) );`
`75`	`75`
`76`	`76`	`return Undefined();`
`77`	`77`	`}`