1 files changed, 29 insertions, 16 deletions

diff --git a/lib/generate/index.js b/lib/generate/index.js
index 7cc7b6b..1606bd5 100644
--- a/lib/generate/index.js
+++ b/lib/generate/index.js
@@ -12,11 +12,16 @@ var generators = {
     "json": require("./generator_json")
 };
 
-var generate = function(root, output, options) {
+var generate = function(options) {
     var generator = null;
-    var files, summary, navigation, tpl;
+    var files;
 
     options = _.defaults(options || {}, {
+        // Folders to use
+        input: null,
+        output: null,
+
+        // Output generator
         generator: "site",
 
         // Book title, keyword, description
@@ -28,8 +33,8 @@ var generate = function(root, output, options) {
         githubHost: 'https://github.com/'
     });
 
-    if (!options.github || !options.title) {
-        return Q.reject(new Error("Need options.github and options.title"));
+    if (!options.github || !options.title || !options.input || !options.output) {
+        return Q.reject(new Error("Need options: github, title, input, output"));
     }
 
     if (!generators[options.generator]) {
@@ -37,15 +42,15 @@ var generate = function(root, output, options) {
     }
 
     // Clean output folder
-    return fs.remove(output)
+    return fs.remove(options.output)
 
     .then(function() {
-        return fs.mkdirp(output);
+        return fs.mkdirp(options.output);
     })
 
     // List all files in the repository
     .then(function() {
-        return fs.list(root);
+        return fs.list(options.input);
     })
 
     // Check repository is valid
@@ -59,18 +64,18 @@ var generate = function(root, output, options) {
 
     // Get summary
     .then(function() {
-        return fs.readFile(path.join(root, "SUMMARY.md"), "utf-8")
+        return fs.readFile(path.join(options.input, "SUMMARY.md"), "utf-8")
         .then(function(_summary) {
-            summary = parse.summary(_summary);
+            options.summary = parse.summary(_summary);
 
             // Parse navigation
-            navigation = parse.navigation(summary);
+            options.navigation = parse.navigation(options.summary);
         });
     })
 
     // Create the generator
     .then(function() {
-        generator = new generators[options.generator]();
+        generator = new generators[options.generator](options);
     })
 
     // Copy file and replace markdown file
@@ -81,11 +86,14 @@ var generate = function(root, output, options) {
                 if (!file) return;
 
                 if (file[file.length -1] == "/") {
-                    return generator.transferFolder(file);
-                } else if (path.extname(file) == ".md" && navigation[file] != null) {
-                    return generator.convertFile(file);
+                    return Q(generator.transferFolder(file));
+                } else if (path.extname(file) == ".md" && options.navigation[file] != null) {
+                    return fs.readFile(path.join(options.input, file), "utf-8")
+                    .then(function(content) {
+                        return Q(generator.convertFile(content, file));
+                    });
                 } else {
-                    return generator.transferFile(file);
+                    return Q(generator.transferFile(file));
                 }
             })
             .value()
@@ -95,7 +103,12 @@ var generate = function(root, output, options) {
     // Finish gneration
     .then(function() {
         return generator.finish();
-    });
+    })
+
+    .fail(function(err) {
+        console.log(err);
+        return Q.reject(err);
+    })
 };
 
 module.exports = {