Bump version to 0.6.3

Fixes #384

CHANGES.md

@@ -1,5 +1,10 @@
 # Release notes
 
+## 0.6.2
+- Support generating a plugin's book info dynamically
+- Improve navigation on dark theme
+- Improve path normalization when parsing SUMMARY.md
+
 ## 0.6.0
 - Generate header id the same as github
 - Custom links can be added at top of sidebar

lib/generate/generator.js

@@ -14,13 +14,13 @@ var BaseGenerator = function(options) {
 };
 
 BaseGenerator.prototype.callHook = function(name, data) {
-    return this.plugins.hook(name, this, data);
+    return this.plugins.hook(name, data);
 };
 
 BaseGenerator.prototype.loadPlugins = function() {
     var that = this;
 
-    return Plugin.fromList(this.options.plugins, this.options.input)
+    return Plugin.fromList(this.options.plugins, this.options.input, this)
     .then(function(_plugins) {
         that.plugins = _plugins;
 

lib/generate/plugin.js

@@ -10,11 +10,15 @@ var pkg = require("../../package.json");
 
 var  RESOURCES = ["js", "css"];
 
-var Plugin = function(name, root) {
+var Plugin = function(name, root, generator) {
     this.name = name;
     this.root = root;
     this.packageInfos = {};
     this.infos = {};
+    this.generator = generator;
+
+    // Bind methods
+    _.bindAll(this);
 
     _.each([
         "gitbook-plugin-"+name,
@@ -43,28 +47,67 @@ Plugin.prototype.load = function(name, baseDir) {
     }
 };
 
-// Return resources
-Plugin.prototype.getResources = function(resource) {
-    if (!this.infos.book || !this.infos.book[resource]) {
-        return [];
+Plugin.prototype.normalizeResource = function(resource) {
+    // Parse the resource path
+    var parsed = url.parse(resource);
+
+    // This is a remote resource
+    // so we will simply link to using it's URL
+    if (parsed.protocol) {
+        return {
+            "url": resource
+        };
     }
-    return _.chain(this.infos.book[resource])
-    .map(function(resource) {
-        var parsed = url.parse(resource);
-        if (parsed.protocol) return {"url": resource}
-        else return { "path": this.name+"/"+resource };
-    }.bind(this))
-    .value();
+
+    // This will be copied over from disk
+    // and shipped with the book's build
+    return { "path": this.name+"/"+resource };
+};
+
+// Return resources
+Plugin.prototype._getResources = function() {
+    var book = this.infos.book;
+
+    // Nothing specified, fallback to default
+    if (!book) {
+        return Q({});
+    }
+
+    // Dynamic function
+    if(typeof book === "function") {
+        // Call giving it the context of our generator
+        return Q().then(book.bind(this.generator));
+    }
+
+    // Plain data object
+    return Q(_.cloneDeep(book));
+};
+
+// Normalize resources and return them
+Plugin.prototype.getResources = function() {
+    var that = this;
+
+
+
+    return this._getResources()
+    .then(function(resources) {
+
+        _.each(RESOURCES, function(resourceType) {
+            resources[resourceType] = (resources[resourceType] || []).map(that.normalizeResource);
+        });
+
+        return resources;
+    });
 };
 
 // Test if it's a valid plugin
 Plugin.prototype.isValid = function() {
     return (
-        this.packageInfos
-        && this.packageInfos.name
-        && this.packageInfos.engines
-        && this.packageInfos.engines.gitbook
-        && semver.satisfies(pkg.version, this.packageInfos.engines.gitbook)
+        this.packageInfos &&
+        this.packageInfos.name &&
+        this.packageInfos.engines &&
+        this.packageInfos.engines.gitbook &&
+        semver.satisfies(pkg.version, this.packageInfos.engines.gitbook)
     );
 };
 
@@ -74,7 +117,10 @@ Plugin.prototype.resolveFile = function(filename) {
 };
 
 // Resolve file path
-Plugin.prototype.callHook = function(name, context, data) {
+Plugin.prototype.callHook = function(name, data) {
+    // Our generator will be the context to apply
+    var context = this.generator;
+
     var hookFunc = this.infos.hooks? this.infos.hooks[name] : null;
     data = data || {};
 
@@ -86,18 +132,20 @@ Plugin.prototype.callHook = function(name, context, data) {
     });
 };
 
-// Has assets
-Plugin.prototype.hasAssets = function(out) {
-    return (this.infos.book && this.infos.book.assets);
-};
-
 // Copy plugin assets fodler
 Plugin.prototype.copyAssets = function(out) {
-    if (!this.hasAssets()) return Q();
-    return fs.copy(
-        this.resolveFile(this.infos.book.assets),
-        out
-    );
+    var that = this;
+
+    return this.getResources().get('assets')
+    .then(function(assets) {
+        // Assets are undefined
+        if(!assets) return false;
+
+        return fs.copy(
+            that.resolveFile(assets),
+            out
+        ).then(_.constant(true));
+    }, _.constant(false));
 };
 
 
@@ -114,7 +162,7 @@ Plugin.normalizeNames = function(names) {
         return name.length > 0 && name[0] == "-";
     })
     .map(function(name) {
-        return name.slice(1)
+        return name.slice(1);
     })
     .value();
 
@@ -133,69 +181,93 @@ Plugin.normalizeNames = function(names) {
 };
 
 // Extract data from a list of plugin
-Plugin.fromList = function(names, root) {
+Plugin.fromList = function(names, root, generator) {
     var failed = [];
 
     // Load plugins
     var plugins = _.map(names, function(name) {
-        var plugin = new Plugin(name, root);
+        var plugin = new Plugin(name, root, generator);
         if (!plugin.isValid()) failed.push(name);
         return plugin;
     });
 
     if (_.size(failed) > 0) return Q.reject(new Error("Error loading plugins: "+failed.join(",")));
 
-    // Get all resources
-    var resources = _.chain(RESOURCES)
-    .map(function(resource) {
-        return [
-            resource,
-            _.chain(plugins)
-            .map(function(plugin) {
-                return plugin.getResources(resource);
-            })
-            .flatten()
-            .value()
-        ];
-    })
-    .object()
-    .value();
-    resources.html = {}
+    // The raw resources extracted from each plugin
+    var pluginResources;
 
-    _.each(plugins, function(plugin) {
-        if (!plugin.infos.book || !plugin.infos.book.html) return;
-        var html = plugin.infos.book.html || {};
-        _.each(html, function(code, key) {
-            if (!_.isFunction(code)) code = _.constant(code);
-            if (!resources.html[key]) resources.html[key] = [];
-            resources.html[key].push(code);
+    // Get resources of plugins
+    return Q.all(_.map(plugins, function(plugin) {
+        return plugin.getResources();
+    }))
+    // Extract resources out
+    // css, js, etc ...
+    .then(function(resources) {
+        pluginResources = resources;
+        // Group by resource types
+        return _.chain(RESOURCES)
+        .map(function(resourceType) {
+            // Get resources from all the plugins for this current type
+            return [
+                // Key
+                resourceType,
+                // Value
+                _.chain(resources)
+                .pluck(resourceType)
+                .compact()
+                .flatten()
+                .value()
+            ];
         })
-    });
-
-    return Q({
-        'list': plugins,
-        'resources': resources,
-        'hook': function(name, context, data) {
-            return _.reduce(plugins, function(prev, plugin) {
-                return prev.then(function(ret) {
-                    return plugin.callHook(name, context, ret);
-                })
-            }, Q(data));
-        },
-        'template': function(name) {
-            var withTpl = _.find(plugins, function(plugin) {
-                return (plugin.infos.templates
-                    && plugin.infos.templates[name]);
+        .object()
+        .value();
+    })
+    // Extract html snippets
+    .then(function(resources) {
+        // Map of html resources by name added by each plugin
+        resources.html = pluginResources.reduce(function(accu, resource) {
+            var html = (resource && resource.html) || {};
+            _.each(html, function(code, key) {
+                // Turn into function if not one already
+                if (!_.isFunction(code)) code = _.constant(code);
+                // Append
+                accu[key] = (accu[key] || []).concat([code]);
             });
 
-            if (!withTpl) return null;
-            return withTpl.resolveFile(withTpl.infos.templates[name]);
-        },
-        'html': function(tag, context, options) {
-            return _.map(resources.html[tag] || [], function(code) {
-                return code.call(context, options);
-            }).join("\n");
-        }
+            return accu;
+        }, {});
+
+        return resources;
+    })
+    // Return big multi-plugin object
+    .then(function(resources) {
+        return {
+            'list': plugins,
+            'resources': resources,
+            'hook': function(name, data) {
+                return _.reduce(plugins, function(prev, plugin) {
+                    return prev.then(function(ret) {
+                        return plugin.callHook(name, ret);
+                    });
+                }, Q(data));
+            },
+            'template': function(name) {
+                var withTpl = _.find(plugins, function(plugin) {
+                    return (
+                        plugin.infos.templates &&
+                        plugin.infos.templates[name]
+                    );
+                });
+
+                if (!withTpl) return null;
+                return withTpl.resolveFile(withTpl.infos.templates[name]);
+            },
+            'html': function(tag, context, options) {
+                return _.map(resources.html[tag] || [], function(code) {
+                    return code.call(context, options);
+                }).join("\n");
+            }
+        };
     });
 };
 

lib/generate/site/index.js

@@ -198,16 +198,16 @@ Generator.prototype.copyAssets = function() {
     .then(function() {
         return Q.all(
             _.map(that.plugins.list, function(plugin) {
-                if (!plugin.hasAssets()) return Q();
-
                 var pluginAssets = path.join(that.options.output, "gitbook/plugins/", plugin.name);
                 return plugin.copyAssets(pluginAssets)
-                .then(function() {
+                .then(function(copiedStuff) {
+                    // Nothing was copied
+                    if(!copiedStuff) { return; }
                     return that.manifest.addFolder(pluginAssets, "gitbook/plugins/"+plugin.name);
                 });
             })
         );
-    })
+    });
 };
 
 // Dump search index to disk

lib/parse/summary.js

@@ -81,8 +81,10 @@ function parseTitle(src, nums) {
         title: matches[1],
         level: level,
 
-        // Replace .md references with .html
-        path: matches[2].replace(/\\/g, '/'),
+        // Normalize path
+        // 1. Convert Window's "\" to "/"
+        // 2. Remove leading "/" if exists
+        path: matches[2].replace(/\\/g, '/').replace(/^\/+/, ''),
     };
 }
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "gitbook",
-    "version": "0.6.1",
+    "version": "0.6.3",
     "homepage": "http://www.gitbook.io/",
     "description": "Library and cmd utility to generate GitBooks",
     "main": "lib/index.js",

test/fixtures/SUMMARY.md

@@ -3,8 +3,8 @@
 * [Chapter 1](chapter-1/README.md)
     * [Article 1](chapter-1/ARTICLE1.md)
     * [Article 2](chapter-1/ARTICLE2.md)
-        * [article 1.2.1](chapter-1/ARTICLE-1-2-1.md)
-        * [article 1.2.2](chapter-1/ARTICLE-1-2-2.md)
+        * [article 1.2.1](\chapter-1\ARTICLE-1-2-1.md)
+        * [article 1.2.2](/chapter-1/ARTICLE-1-2-2.md)
 * [Chapter 2](chapter-2/README.md)
 * [Chapter 3](chapter-3/README.md)
 * [Chapter 4](chapter-4/README.md)

theme/stylesheets/website/navigation.less

@@ -49,10 +49,14 @@
     }
 }
 .book.color-theme-1 .book-body  {
-    .navigation:hover{
-    }
+
 }
 .book.color-theme-2 .book-body  {
-    .navigation:hover{
+    .navigation {
+        color: rgba(255, 255, 255, 0.4);
+
+        &:hover {
+            color: rgba(255, 255, 255, 0.9);
+        }
     }
 }