nodegit · maxkorp · Nov 12, 2014 · Nov 12, 2014 · Nov 12, 2014
diff --git a/generate/descriptor.json b/generate/descriptor.json
@@ -986,9 +986,7 @@
         "ignore": true
       },
       "git_revwalk_new": {
-        "isAsync": false,
-        "jsFunctionName": "createRevwalk",
-        "cppFunctionName": "CreateRevwalk"
+        "isAsync": false
       }
     }
   },

diff --git a/generate/manual/include/wrapper.h b/generate/manual/include/wrapper.h
@@ -17,7 +17,7 @@ class Wrapper : public ObjectWrap {
   public:
 
     static Persistent<FunctionTemplate> constructor_template;
-    static void Initialize (Handle<v8::Object> target);
+    static void InitializeComponent (Handle<v8::Object> target);
 
     void *GetValue();
     static Handle<Value> New(void *raw);

diff --git a/generate/manual/src/wrapper.cc b/generate/manual/src/wrapper.cc
@@ -15,14 +15,14 @@ Wrapper::Wrapper(void *raw) {
   this->raw = raw;
 }
 
-void Wrapper::Initialize(Handle<v8::Object> target) {
+void Wrapper::InitializeComponent(Handle<v8::Object> target) {
   NanScope();
 
   Local<FunctionTemplate> tpl = NanNew<FunctionTemplate>(New);
 
   tpl->InstanceTemplate()->SetInternalFieldCount(1);
   tpl->SetClassName(NanNew<String>("Wrapper"));
-  
+
   NODE_SET_PROTOTYPE_METHOD(tpl, "toBuffer", ToBuffer);
 
   NanAssignPersistent(constructor_template, tpl);
@@ -44,12 +44,12 @@ NAN_METHOD(Wrapper::New) {
 
 Handle<Value> Wrapper::New(void *raw) {
   NanEscapableScope();
-  
+
   Handle<Value> argv[1] = { NanNew<External>((void *)raw) };
   Local<Object> instance;
   Local<FunctionTemplate> constructorHandle = NanNew(constructor_template);
   instance = constructorHandle->GetFunction()->NewInstance(1, argv);
-  
+
   return NanEscapeScope(instance);
 }
 
@@ -67,7 +67,7 @@ NAN_METHOD(Wrapper::ToBuffer) {
   int len = args[0]->ToNumber()->Value();
 
   Local<Function> bufferConstructor = Local<Function>::Cast(
-    NanGetCurrentContext()->Global()->Get(NanNew<String>("Buffer"))); 
+    NanGetCurrentContext()->Global()->Get(NanNew<String>("Buffer")));
 
   Handle<Value> constructorArgs[1] = { NanNew<Integer>(len) };
   Local<Object> nodeBuffer = bufferConstructor->NewInstance(1, constructorArgs);

diff --git a/generate/templates/class_content.cc b/generate/templates/class_content.cc
@@ -38,7 +38,7 @@ using namespace node;
   {%endif%}
 }
 
-void {{ cppClassName }}::Initialize(Handle<v8::Object> target) {
+void {{ cppClassName }}::InitializeComponent(Handle<v8::Object> target) {
   NanScope();
 
   Local<FunctionTemplate> tpl = NanNew<FunctionTemplate>(New);
@@ -98,7 +98,7 @@ Handle<Value> {{ cppClassName }}::New(void *raw, bool selfFreeing) {
   return &this->raw;
 }
 {%else%}
-void {{ cppClassName }}::Initialize(Handle<v8::Object> target) {
+void {{ cppClassName }}::InitializeComponent(Handle<v8::Object> target) {
   NanScope();
 
   Local<Object> object = NanNew<Object>();

diff --git a/generate/templates/class_header.h b/generate/templates/class_header.h
@@ -33,7 +33,7 @@ class {{ cppClassName }} : public ObjectWrap {
   public:
 
     static Persistent<Function> constructor_template;
-    static void Initialize (Handle<v8::Object> target);
+    static void InitializeComponent (Handle<v8::Object> target);
 
     {%if cType%}
     {{ cType }} *GetValue();

diff --git a/generate/templates/nodegit.cc b/generate/templates/nodegit.cc
@@ -12,9 +12,9 @@
 extern "C" void init(Handle<v8::Object> target) {
   NanScope();
 
-  Wrapper::Initialize(target);
+  Wrapper::InitializeComponent(target);
   {%each%}
-  {{ cppClassName }}::Initialize(target);
+  {{ cppClassName }}::InitializeComponent(target);
   {%endeach%}
 }
 

diff --git a/generate/templates/struct_content.cc b/generate/templates/struct_content.cc
@@ -75,7 +75,7 @@ void {{ cppClassName }}::ConstructFields() {
   {%endeach%}
 }
 
-void {{ cppClassName }}::Initialize(Handle<v8::Object> target) {
+void {{ cppClassName }}::InitializeComponent(Handle<v8::Object> target) {
   NanScope();
 
   Local<FunctionTemplate> tpl = NanNew<FunctionTemplate>(New);

diff --git a/generate/templates/struct_header.h b/generate/templates/struct_header.h
@@ -22,7 +22,7 @@ class {{ cppClassName }} : public ObjectWrap {
   public:
     {{ cppClassName }}({{ cType }}* raw, bool selfFreeing);
     static Persistent<Function> constructor_template;
-    static void Initialize (Handle<v8::Object> target);
+    static void InitializeComponent (Handle<v8::Object> target);
 
     {{ cType }} *GetValue();
     {{ cType }} **GetRefValue();

diff --git a/generate/utils.js b/generate/utils.js
@@ -23,6 +23,10 @@ var cTypeMappings = {
   "uint64_t": "Number"
 }
 
+var collisionMappings = {
+  "new": "create"
+}
+
 var Utils = {
   titleCase: function(str) {
     return str.split(/_|\//).map(function(val, index) {
@@ -318,6 +322,16 @@ var Utils = {
       Utils.decorateArg(fnDef.return, classDef, fnDef, fnOverrides.return || {});
     }
 
+    _(collisionMappings).forEach(function(newName, collidingName) {
+      if (fnDef.cppFunctionName == Utils.titleCase(collidingName)) {
+        fnDef.cppFunctionName = Utils.titleCase(newName);
+      }
+
+      if (fnDef.jsFunctionName == Utils.camelCase(collidingName)) {
+        fnDef.jsFunctionName = Utils.camelCase(newName);
+      }
+    });
+
     _.merge(fnDef, _.omit(fnOverrides, "args", "return"));
   },
 

diff --git a/lib/repository.js b/lib/repository.js
@@ -183,7 +183,7 @@ Repository.prototype.getTag = function(oid, callback) {
  * @return {RevWalk}
  */
 Repository.prototype.createRevWalk = function() {
-  var revWalk = Revwalk.createRevwalk(this);
+  var revWalk = Revwalk.create(this);
   revWalk.repo = this;
   return revWalk;
 };