Refactored options normalization to be more generic

tbranyen · tbranyen · commit 016f61f1729e · 2014-10-23T10:47:33.000-04:00
diff --git a/lib/clone.js b/lib/clone.js
@@ -1,5 +1,20 @@
 var NodeGit = require("../");
+var normalizeOptions = require("./util/normalize_options");
 
 var Clone = NodeGit.Clone;
+var clone = Clone.clone;
+
+/**
+ * Patch repository cloning to automatically coerce objects.
+ *
+ * @param url
+ * @param local_path
+ * @param options
+ */
+Clone.clone = function(url, local_path, options) {
+  options = normalizeOptions(options, NodeGit.CloneOptions);
+
+  return clone.apply(this, arguments);
+};
 
 module.exports = Clone;
diff --git a/lib/clone_options.js b/lib/clone_options.js
diff --git a/lib/util/normalize_options.js b/lib/util/normalize_options.js
@@ -0,0 +1,19 @@
+/**
+ * Normalize an object to match a struct.
+ *
+ * @param {String, Object} oid - The oid string or instance.
+ * @return {Object} An Oid instance.
+ */
+function normalizeOptions(options, Ctor) {
+  var instance = new Ctor();
+
+  if (!options) {
+    return instance;
+  }
+
+  Object.keys(options).forEach(function(key) {
+    instance[key] = options[key];
+  });
+}
+
+module.exports = normalizeOptions;
diff --git a/test/tests/clone.js b/test/tests/clone.js
@@ -12,7 +12,6 @@ describe("Clone", function() {
 
   var Repository = require("../../lib/repository");
   var Clone = require("../../lib/clone");
-  var CloneOptions = require("../../lib/clone_options");
 
   before(function() {
     return Promise.all([
@@ -25,7 +24,7 @@ describe("Clone", function() {
 
   it("can clone with http", function() {
     var url = "http://github.com/nodegit/test.git";
-    var opts = CloneOptions.fromObj({ ignoreCertErrors: 1});
+    var opts = { ignoreCertErrors: 1 };
 
     return Clone.clone(url, http, opts).then(function(repository) {
       assert.ok(repository instanceof Repository);
