Merge branch 'edge'

Author: neogeek

CHANGELOG.md

@@ -1,5 +1,9 @@
 #Changelog
 
+##0.0.4 (August 10, 2014)
+
+- Improved Node.js support with the addition of a new method: parseFile.
+
 ##0.0.3 (August 10, 2014)
 
 - Updated doxdox to be importable through Node.js

bin/doxdox

@@ -10,15 +10,15 @@ var config = {
     layout: 'bootstrap'
 };
 
-var script = '',
+var file = '',
     output = '';
 
 var args = process.argv.slice(2),
     value;
 
 if (args.length && !args[0].match(/^\-/)) {
 
-    script = args.shift();
+    file = args.shift();
 
 }
 
@@ -76,4 +76,4 @@ while (args.length) {
 
 }
 
-doxdox.parseScript(script, output, config);
+doxdox.parseFile(file, output, config);

lib/doxdox.js

@@ -9,48 +9,49 @@ var templates = {
     markdown: require('../templates/markdown.hbs')
 };
 
-exports.parseScript = function (script, output, config) {
-
-    fs.exists(script, function (exists) {
-
-        var content,
-            data;
+exports.parseFile = function (file, output, config) {
 
-        if (exists) {
+    if (fs.existsSync(file)) {
 
-            data = dox.parseComments(fs.readFileSync(script, 'utf8'));
+        return exports.parseScript(fs.readFileSync(file, 'utf8'), output, config);
 
-            if (templates[config.layout]) {
+    } else {
 
-                content = templates[config.layout]({
-                    title: config.title,
-                    description: config.description,
-                    methods: utils.parseData(data)
-                });
+        process.stdout.write('File not found.' + '\n');
 
-                if (output) {
+    }
 
-                    fs.writeFileSync(output, content, 'utf8');
+}
 
-                } else {
+exports.parseScript = function (script, output, config) {
 
-                    process.stdout.write(content);
+    var content,
+        data = dox.parseComments(script);
 
-                }
+    if (templates[config.layout]) {
 
-            } else {
+        content = templates[config.layout]({
+            title: config.title,
+            description: config.description,
+            methods: utils.parseData(data)
+        });
 
-                process.stdout.write('Invalid layout specified.' + '\n');
+        if (output) {
 
-            }
+            fs.writeFileSync(output, content, 'utf8');
 
         } else {
 
-            process.stdout.write('File not found.' + '\n');
+            process.stdout.write(content);
+
+            return content;
 
         }
 
-    });
+    } else {
 
-}
+        process.stdout.write('Invalid layout specified.' + '\n');
 
+    }
+
+}

package.json

@@ -1,7 +1,7 @@
 {
     "name": "doxdox",
     "description": "HTML and Markdown documentation generator.",
-    "version": "0.0.3",
+    "version": "0.0.4",
     "bin": "./bin/doxdox",
     "license": "MIT",
     "dependencies": {