Bump version to 2.4.2

CHANGES.md

@@ -2,6 +2,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.4.2
+- Default plugins should not be installed by `gitbook install`
+- Limit search index size to avoid crash during generation
+- Fix code highlighting for html without language specified
+- Fix warning message for gitbook version when building a multilingual book
+
 ## 2.4.1
 - Fix disabling of default plugins, ex: `-highlight`
 

lib/book.js

@@ -19,6 +19,8 @@ var PluginsList = require("./pluginslist");
 
 var generators = require("./generators");
 
+var SEARCHINDEX_MAXSIZE = 1000000;
+
 var Book = function(root, context, parent) {
     this.context = _.defaults(context || {}, {
         // Extend book configuration
@@ -79,6 +81,8 @@ var Book = function(root, context, parent) {
     this.langsFile = null;
 
     // Search Index
+    this.searchIndexEnabled = true;
+    this.searchIndexSize = 0;
     this.searchIndex = lunr(function () {
         this.ref("url");
 
@@ -738,13 +742,25 @@ Book.prototype.contentLink = function(link) {
 // Index a page into the search index
 Book.prototype.indexPage = function(page) {
     var nav = this.navigation[page.path];
-    if (!nav) return;
+    if (!nav || !this.searchIndexEnabled) return;
 
     this.log.debug.ln("index page", page.path);
+
+    // Extract text from the page
+    var text = pageUtil.extractText(page.sections);
+
+    // Limit size of index (to avoid #941)
+    this.searchIndexSize = this.searchIndexSize + text.length;
+    if (this.searchIndexSize > SEARCHINDEX_MAXSIZE) {
+        this.log.warn.ln("search index is too big, indexing is now disabled");
+        this.searchIndexEnabled = false;
+        return;
+    }
+
     this.searchIndex.add({
         url: this.contentLink(page.path),
         title: nav.title,
-        body: pageUtil.extractText(page.sections),
+        body: text
     });
 };
 

lib/configuration.js

@@ -7,7 +7,21 @@ var pkg = require("../package.json");
 var i18n = require("./utils/i18n");
 
 // Default plugins added to each books
-var defaultsPlugins = ["highlight"];
+var DEFAULT_PLUGINS = ["highlight"];
+
+// Check if a plugin is a default plugin
+// Plugin should be in the list
+// And version from book.json specified for this plugin should be satisfied
+function isDefaultPlugin(name, version) {
+    if (!_.contains(DEFAULT_PLUGINS, name)) return false;
+
+    try {
+        var pluginPkg = require('gitbook-plugin-'+name+'/package.json');
+        return semver.satisfies(pluginPkg.version, version || '*');
+    } catch(e) {
+        return false;
+    }
+}
 
 // Normalize a list of plugins to use
 function normalizePluginsList(plugins, addDefaults) {
@@ -22,9 +36,12 @@ function normalizePluginsList(plugins, addDefaults) {
         if (plugin.name) return plugin;
 
         var parts = plugin.split("@");
+        var name = parts[0];
+        var version = parts[1];
         return {
-            "name": parts[0],
-            "version": parts[1] // optional
+            "name": name,
+            "version": version, // optional
+            "isDefault": isDefaultPlugin(name, version)
         };
     });
 
@@ -40,19 +57,26 @@ function normalizePluginsList(plugins, addDefaults) {
 
     // Merge with defaults
     if (addDefaults !== false) {
-        plugins = _.chain(plugins)
-        .concat(_.map(defaultsPlugins, function(plugin) {
-            return { "name": plugin };
-        }))
-        .uniq()
-        .value();
+        _.each(DEFAULT_PLUGINS, function(plugin) {
+            if (_.find(plugins, { name: plugin })) {
+                return;
+            }
+
+            plugins.push({
+                "name": plugin,
+                "isDefault": true
+            });
+        });
     }
 
-    // Build final list
+    // Remove plugin that start with '-'
     plugins = _.filter(plugins, function(plugin) {
         return !_.contains(toremove, plugin.name) && !(plugin.name.length > 0 && plugin.name[0] == "-");
     });
 
+    // Remove duplicates
+    plugins = _.uniq(plugins, 'name');
+
     return plugins;
 }
 
@@ -114,11 +138,13 @@ Configuration.prototype.load = function() {
         }
     })
     .then(function() {
-        if (!semver.satisfies(pkg.version, that.options.gitbook)) {
-            throw "GitBook version doesn't satisfy version required by the book: "+that.options.gitbook;
-        }
-        if (that.options.gitbook != "*" && !semver.satisfies(semver.inc(pkg.version, "patch"), that.options.gitbook)) {
-            that.book.log.warn.ln("gitbook version specified in your book.json might be too strict for future patches, \""+(_.first(pkg.version.split("."))+".x.x")+"\" is more adequate");
+        if (!that.book.isSubBook()) {
+            if (!semver.satisfies(pkg.version, that.options.gitbook)) {
+                throw new Error("GitBook version doesn't satisfy version required by the book: "+that.options.gitbook);
+            }
+            if (that.options.gitbook != "*" && !semver.satisfies(semver.inc(pkg.version, "patch"), that.options.gitbook)) {
+                that.book.log.warn.ln("gitbook version specified in your book.json might be too strict for future patches, \""+(_.first(pkg.version.split("."))+".x.x")+"\" is more adequate");
+            }
         }
 
         that.options.output = path.resolve(that.options.output || that.book.resolve("_book"));

lib/pluginslist.js

@@ -146,11 +146,10 @@ PluginsList.prototype.resources = function(namespace) {
 // Install plugins from a book
 PluginsList.prototype.install = function() {
     var that = this;
-    var defaultsPlugins = _.pluck(that.book.options.defaultsPlugins);
 
     // Remove defaults (no need to install)
-    var plugins = _.filter(that.book.options.plugins, function(plugin) {
-        return !_.contains(defaultsPlugins, plugin.name);
+    var plugins = _.reject(that.book.options.plugins, {
+        isDefault: true
     });
 
     // Install plugins one by one

lib/utils/page.js

@@ -244,14 +244,15 @@ function normalizeHtml(src, options) {
             .value();
 
         var source = $(this).text();
-        var html = options.book.template.applyBlock("code", {
+        var blk = options.book.template.applyBlock("code", {
             body: source,
             kwargs: {
                 language: lang
             }
-        }).body;
+        });
 
-        $(this).html(html);
+        if (blk.html === false) $(this).text(blk.body);
+        else $(this).html(blk.body);
     });
 
     // Replace glossary terms

package.json

@@ -1,19 +1,19 @@
 {
     "name": "gitbook",
-    "version": "2.4.1",
+    "version": "2.4.2",
     "homepage": "https://www.gitbook.com",
     "description": "Library and cmd utility to generate GitBooks",
     "main": "lib/index.js",
     "dependencies": {
         "q": "1.0.1",
-        "lunr": "0.5.7",
+        "lunr": "0.5.12",
         "lodash": "3.10.1",
         "graceful-fs": "3.0.5",
         "resolve": "0.6.3",
         "fs-extra": "0.16.5",
         "fstream-ignore": "1.0.2",
         "gitbook-parsers": "0.8.2",
-        "gitbook-plugin-highlight": "1.0.1",
+        "gitbook-plugin-highlight": "1.0.3",
         "nunjucks": "mozilla/nunjucks#dc89bf91611a2101731c2c06afcf5c32160b4dc9",
         "nunjucks-autoescape": "1.0.0",
         "nunjucks-filter": "1.0.0",

test/books/highlight/README.md

@@ -12,4 +12,5 @@ Block with a language
 test 2
 ```
 
-Inline code: `test 3`
+Inline code: `test 3`
+Inline code with html: `<test>`

test/codehighlighting.js

@@ -52,5 +52,14 @@ describe("Code Highlighting", function () {
             }
         });
     });
+
+    it("should correctly replace highlighting for inline code with html tags", function() {
+        PAGE.should.be.html({
+            "code": {
+                index: 3,
+                text: "code_<test>_code"
+            }
+        });
+    });
 });
 

test/plugins/replace_highlight/index.js

@@ -4,7 +4,10 @@ module.exports = {
             process: function(blk) {
                 var lang = blk.kwargs.language || "code";
 
-                return lang+"_"+blk.body+"_"+lang;
+                return {
+                    body: lang+"_"+blk.body+"_"+lang,
+                    html: false
+                };
             }
         }
     }