Blame methods

tbranyen · John Haley · commit 4ef34a3904ad · 2014-10-24T22:28:21.000-07:00
diff --git a/generate/descriptor.json b/generate/descriptor.json
@@ -30,7 +30,8 @@
   },
 
   "blame": {
-    "cType": null,
+    "cType": "git_blame",
+    "forwardDeclare": true,
 
     "functions": {
       "git_blame_init_options": {
@@ -46,7 +47,7 @@
       },
 
       "git_blame_get_hunk_byline": {
-        "ignore": true
+        "ignore": false
       },
 
       "git_blame_file": {
diff --git a/generate/filters/cpp_to_v8.js b/generate/filters/cpp_to_v8.js
@@ -1,5 +1,9 @@
 var isV8Value = require("./is_v8_value");
 
 module.exports = function(cppClassName) {
+  if (cppClassName === "Integer") {
+    cppClassName = "Number";
+  }
+
   return isV8Value(cppClassName) ? cppClassName : "Object";
 };
diff --git a/generate/partials/convert_from_v8.cc b/generate/partials/convert_from_v8.cc
@@ -4,11 +4,11 @@
 
   if (args[{{ jsArg }}]->Is{{ cppClassName|cppToV8 }}()) {
   {%endif%}
-  {%if cppClassName == 'String' %}
+  {%if cppClassName == 'String'%}
 
   String::Utf8Value {{ name }}(args[{{ jsArg }}]->ToString());
   from_{{ name }} = ({{ cType }}) strdup(*{{ name }});
-  {%elsif cppClassName == 'Array' %}
+  {%elsif cppClassName == 'Array'%}
 
   Array *tmp_{{ name }} = Array::Cast(*args[{{ jsArg }}]);
   from_{{ name }} = ({{ cType }})malloc(tmp_{{ name }}->Length() * sizeof({{ cType|replace '**' '*' }}));
@@ -18,8 +18,8 @@
     --%}
       from_{{ name }}[i] = ObjectWrap::Unwrap<{{ arrayElementCppClassName }}>(tmp_{{ name }}->Get(NanNew<Number>(static_cast<double>(i)))->ToObject())->GetValue();
       }
-  {%elsif cppClassName == 'Function' %}
-  {%elsif cppClassName == 'Buffer' %}
+  {%elsif cppClassName == 'Function'%}
+  {%elsif cppClassName == 'Buffer'%}
 
   from_{{ name }} = Buffer::Data(args[{{ jsArg }}]->ToObject());
   {%elsif cppClassName|isV8Value %}
diff --git a/generate/partials/doc.cc b/generate/partials/doc.cc
@@ -1,15 +1,15 @@
 /**
- {%each args as arg %}
-   {%if not arg.isReturn %}
-     {%if not arg.isSelf %}
+{%each args as arg %}
+  {%if not arg.isReturn %}
+    {%if not arg.isSelf %}
  * @param {{ arg.jsClassName }} {{ arg.name }}
-     {%endif%}
-   {%endif%}
- {%endeach%}{%each .|returnsInfo as returnInfo %}
-   {%if isAsync %}
+    {%endif%}
+  {%endif%}
+{%endeach%}{%each .|returnsInfo as returnInfo %}
+  {%if isAsync %}
  * @param {{ returnInfo.jsOrCppClassName }} callback
-   {%else%}
+  {%else%}
  * @return {{ returnInfo.jsOrCppClassName }} {%if returnInfo.name %}{{ returnInfo.name }}{%else%}result{%endif%}
-   {%endif%}
-   {%endeach%}
+  {%endif%}
+{%endeach%}
  */
diff --git a/generate/templates/binding.gyp b/generate/templates/binding.gyp
@@ -50,6 +50,6 @@
           }
         ]
       ]
-    },
+    }
   ]
 }
diff --git a/generate/templates/class_content.cc b/generate/templates/class_content.cc
@@ -1,4 +1,4 @@
-// This is a generated file, modify: generate/templates/class.cc.
+// This is a generated file, modify: generate/templates/class_content.cc.
 #include <nan.h>
 #include <string.h>
 
diff --git a/generate/templates/struct_content.cc b/generate/templates/struct_content.cc
@@ -1,4 +1,4 @@
-// This is a generated file, modify: generate/templates/class.cc.
+// This is a generated file, modify: generate/templates/struct_content.cc.
 #include <nan.h>
 #include <string.h>
 #include <chrono>
diff --git a/generate/types.json b/generate/types.json
@@ -9239,5 +9239,17 @@
   "const git_cred_acquire_cb *": {
     "cpp": "GitCredAcquireCb",
     "js": "CredAcquireCb"
+	},
+  "git_blame_init_options": {
+    "cpp": "InitOptions",
+    "js": "initOptions"
+  },
+  "git_blame_init_options *": {
+    "cpp": "InitOptions",
+    "js": "initOptions"
+  },
+  "const git_blame_init_options *": {
+    "cpp": "InitOptions",
+    "js": "initOptions"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,6 @@`
`50`	`50`	`}`
`51`	`51`	`]`
`52`	`52`	`]`
`53`		`- },`
	`53`	`+ }`
`54`	`54`	`]`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// This is a generated file, modify: generate/templates/class.cc.`
	`1`	`+// This is a generated file, modify: generate/templates/class_content.cc.`
`2`	`2`	`#include <nan.h>`
`3`	`3`	`#include <string.h>`
`4`	`4`