Merge pull request #979 from GitbookIO/feature/plugins_config

Improvements for plugin configurations

1 files changed, 34 insertions, 22 deletions

diff --git a/lib/pluginslist.js b/lib/pluginslist.js
index e4594d6..8830950 100644
--- a/lib/pluginslist.js
+++ b/lib/pluginslist.js
@@ -78,34 +78,46 @@ PluginsList.prototype.load = function(plugin) {
         that.list.push(plugin);
     }
 
-    // Extract filters
-    that.book.template.addFilters(plugin.getFilters());
+    return Q()
 
-    // Extract blocks
-    that.book.template.addBlocks(plugin.getBlocks());
+    // Validate and normalize configuration
+    .then(function() {
+        var config = plugin.getConfig();
+        return plugin.validateConfig(config);
+    })
+    .then(function(config) {
+        // Update configuration
+        plugin.setConfig(config);
 
-    return _.reduce(_.keys(that.namespaces), function(prev, namespaceName) {
-        return prev.then(function() {
-            return plugin.getResources(namespaceName)
-            .then(function(plResources) {
-                var namespace = that.namespaces[namespaceName];
-
-                // Extract js and css
-                _.each(Plugin.RESOURCES, function(resourceType) {
-                    namespace.resources[resourceType] = (namespace.resources[resourceType] || []).concat(plResources[resourceType] || []);
-                });
+        // Extract filters
+        that.book.template.addFilters(plugin.getFilters());
 
-                // Map of html resources by name added by each plugin
-                _.each(plResources.html || {}, function(value, tag) {
-                    // Turn into function if not one already
-                    if (!_.isFunction(value)) value = _.constant(value);
+        // Extract blocks
+        that.book.template.addBlocks(plugin.getBlocks());
 
-                    namespace.html[tag] = namespace.html[tag] || [];
-                    namespace.html[tag].push(value);
+        return _.reduce(_.keys(that.namespaces), function(prev, namespaceName) {
+            return prev.then(function() {
+                return plugin.getResources(namespaceName)
+                .then(function(plResources) {
+                    var namespace = that.namespaces[namespaceName];
+
+                    // Extract js and css
+                    _.each(Plugin.RESOURCES, function(resourceType) {
+                        namespace.resources[resourceType] = (namespace.resources[resourceType] || []).concat(plResources[resourceType] || []);
+                    });
+
+                    // Map of html resources by name added by each plugin
+                    _.each(plResources.html || {}, function(value, tag) {
+                        // Turn into function if not one already
+                        if (!_.isFunction(value)) value = _.constant(value);
+
+                        namespace.html[tag] = namespace.html[tag] || [];
+                        namespace.html[tag].push(value);
+                    });
                 });
             });
-        });
-    }, Q());
+        }, Q());
+    });
 };
 
 // Call a hook