fixes #8: default home document will fallback to REAME.md

kaelzhang · Oct 16, 2013 · c0764f2 · c0764f2
1 parent cdc3484
commit c0764f2
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -6,8 +6,6 @@
 
 Create your document site with only one command.
 
-`document` also contains utility methods to parse the document tree.
-
 # Life gets easier
 
 To create your document site, just:

diff --git a/lib/config.js b/lib/config.js
@@ -168,7 +168,6 @@ config.get_config = function (cli_args, callback) {
                     'doc'
             );
 
-
         config.read_config_json(doc, function (err, cfg) {
             if ( err ) {
                 return callback(err);
@@ -186,19 +185,26 @@ config.get_config = function (cli_args, callback) {
 
                 var theme = cli_args.theme || node_path.join(__dirname, '..', 'theme');
 
+                var readme = node_path.join(cwd, 'README.md');
+                var sys = {
+                    cwd: cwd,
+                    doc: doc,
+
+                    // hard coded
+                    theme: theme,
+                    public_root: node_path.join(theme, 'public')
+                };
+
+                if ( fs.isFile(readme) ) {
+                    sys.readme = readme;
+                }
+
                 callback(null, {
                     // user configurations that is mainly used by templates
                     user: result,
 
                     // configurations relevant to the system, which are critical and should not be exposed
-                    sys: {
-                        cwd: cwd,
-                        doc: doc,
-
-                        // hard coded
-                        theme: theme,
-                        public_root: node_path.join(theme, 'public')
-                    }
+                    sys: sys
                 });
             });
         });

diff --git a/lib/dao.js b/lib/dao.js
@@ -32,7 +32,7 @@ dao.tree = function (options, callback) {
 
         var ltree = parser.language_tree(raw_tree, user.languages);
 
-        parser.create_data(ltree, function (err, data) {
+        parser.create_data(ltree, sys, function (err, data) {
             if ( err ) {
                 return dao._complete(err);
             }

diff --git a/lib/parser.js b/lib/parser.js
@@ -217,7 +217,7 @@ parser.sort_pages = function (pages) {
 
 
 // create a cache
-parser.create_data = function (language_tree, callback) {
+parser.create_data = function (language_tree, sys, callback) {
     var counter = Object.keys(language_tree).length;
     var error;
     var nodes = [];
@@ -261,6 +261,12 @@ parser.create_data = function (language_tree, callback) {
     };
 
     lang.each(language_tree, function (l, language) {
+        var tree = l.tree;
+
+        if ( !tree.path ) {
+            tree.path = sys.readme;
+        }
+
         parser.walk(l.tree, iterator, function (err) {
             if ( err ) {
                 error = err;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "document",
-  "version": "0.2.3",
+  "version": "0.3.1",
   "description": "Create your document site with just one command.",
   "// main": "index.js",
   "bin": {