Bump version to 3.2.0-pre.0

add open and browser args to serve command

.eslintrc

@@ -13,8 +13,10 @@
     "env": {
         "node": true,
         "browser": true,
-        "jest": true,
-        "jasmine": true
+        "mocha": true
+    },
+    "globals": {
+        "expect": true
     },
     "extends": "eslint:recommended"
 }

CHANGES.md

@@ -2,7 +2,36 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## 3.0.0 (pre)
+## 3.2.0 (pre)
+- Switch markdown parser from `kramed` to `markup-it`
+- Fix support of `|` in tables
+
+## 3.1.1
+- Fix order of plugins during loading
+- Fix error when using math and conrefs
+- Fix target attribute for external links
+- Fix serve command
+
+## 3.1.0
+- Always load themes after plugins
+- README/Introduction doesn't require to be the first entry in the summary
+- Highlight active entry in summary when scrolling a page with anchors
+- Support empty parts in summary
+
+## 3.0.3
+- Fix redirection in `gitbook serve` when accessing a folder without trailing slash
+- Fix links/annotations for glossary not being correctly resolved
+- Fix regression for supporting uppercase filenames in structure files
+- Fix `gitbook install` when using Git URLs for plugins
+
+## 3.0.2
+- Fix crash for anchor links
+
+## 3.0.1
+- Fix regression in link resolution when contain anchor
+- Fix `structure.<name>` configuration not supporting filenames with dots
+
+## 3.0.0
 - Summary can contain external links and anchors (Fix [#776](https://github.com/GitbookIO/gitbook/issues/776))
 - Summary can contain differents entitled sections
 - Glossary is generated as a normal page
@@ -11,7 +40,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - `links.sidebar` configuration is no longer supported, use summary sections instead
 - `pdf.headerTemplate` and `pdf.footerTemplate` have been replaced by a template in theme/book: `_layout/ebook/pdf_header.html` and `_layout/ebook/pdf_footer.html`
 - Markdown parser is now using CommonMark
-- Root folder for the book can be specified in a `.gitbook` file
+- Root folder for the book can be specified in the `"root"` property of the `book.json` file
 - Multi-lingual books share assets folder
 - YAML front matter is parsed and can extend page's properties
 - Fix `uk` translation

appveyor.yml

@@ -5,13 +5,18 @@ init:
 # Test against these versions of Node.js.
 environment:
   matrix:
+    - nodejs_version: "6"
     - nodejs_version: "5"
     - nodejs_version: "4"
 
+matrix:
+  fast_finish: true
+
 # Install scripts. (runs after repo cloning)
 install:
   # Get the latest stable version of Node.js or io.js
   - ps: Install-Product node $env:nodejs_version
+  - set CI=true
   # install svgexport
   - npm install svgexport -g
   # install modules
@@ -27,3 +32,7 @@ test_script:
 
 # Don't actually build.
 build: off
+
+# Clone only last commit
+shallow_clone: true
+clone_depth: 1

docs/config.md

@@ -7,6 +7,7 @@ GitBook allows you to customize your book using a flexible configuration. These
 | Variable | Description |
 | -------- | ----------- |
 | `root` | Path to the root folder containing all the book's files, except `book.json`|
+| `structure` | To specify paths for Readme, Summary, Glossary etc. See [Structure paragraph](#structure). |
 | `title` | Title of your book, default value is extracted from the README. On GitBook.com this field is pre-filled. |
 | `description` | Description of your book, default value is extracted from the README. On GitBook.com this field is pre-filled. |
 | `author` | Name of the author. On GitBook.com this field is pre-filled. |
@@ -19,18 +20,24 @@ GitBook allows you to customize your book using a flexible configuration. These
 
 Plugins and their configurations are specified in the `book.json`. See [the plugins section](plugins/README.md) for more details.
 
+Since version 3.0.0, GitBook can use themes. See [the theming section](themes/README.md) for more details.
+
 | Variable | Description |
 | -------- | ----------- |
 | `plugins` | List of plugins to load |
 | `pluginsConfig` |Configuration for plugins |
 
-### Theme
+### Structure
 
-Since version 3.0.0, GitBook can use themes. See [the theming section](themes/README.md) for more details.
+In addition to the `root` variable, you can tell Gitbook the name of the files for Readme, Summary, Glossary, Languages (instead of using the default names such as `README.md`).
+These files must be at the root of your book (or the root of every language book). Paths such as `dir/MY_README.md` are not accepted.
 
 | Variable | Description |
 | -------- | ----------- |
-| `theme` | The theme to use for the book |
+| `structure.readme` | Readme file name (defaults to `README.md`) |
+| `structure.summary` | Summary file name (defaults to `SUMMARY.md`) |
+| `structure.glossary` | Glossary file name (defaults to `GLOSSARY.md`) |
+| `structure.languages` | Languages file name (defaults to `LANGS.md`) |
 
 ### PDF Options
 

docs/ebook.md

@@ -29,12 +29,13 @@ You can replace `/usr/bin` with any directory that is in your $PATH.
 
 ### Cover
 
-Covers are used for all the ebook formats. It's an important part of an ebook brandline.
+Covers are used for all the ebook formats. You can either provide one yourself, or generate one using the [autocover plugin](https://plugins.gitbook.com/plugin/autocover).
+
+To provide a cover, place a **`cover.jpg`** file at the root directory of your book. Adding a **`cover_small.jpg`** will specify a smaller version of the cover. The cover should be a **JPEG** file.
 
 A good cover should respect the following guidelines:
 
-* Size of 1800x2360 (pixels)
+* Size of 1800x2360 pixels for `cover.jpg`, 200x262 for `cover_small.jpg`
 * No border
 * Clearly visible book title
 * Any important text should be visible in the small version
-

docs/lexicon.md

@@ -2,13 +2,13 @@
 
 Allows you to specify terms and their respective definitions to be displayed as annotations. Based on those terms, GitBook will automatically build an index and highlight those terms in pages.
 
-The `GLOSSARY.md` format is very simple :
+The `GLOSSARY.md` format is a list of `h2` headings, along with a description paragraph:
 
 ```markdown
-# Term
+## Term
 Definition for this term
 
-# Another term
+## Another term
 With it's definition, this can contain bold text
 and all other kinds of inline markup ...
 ```

docs/plugins/api.md

@@ -37,7 +37,7 @@ var filepath = output.resolve('myimage.png');
 var fileurl = output.toURL('mychapter/README.md');
 
 // Write a file in the output folder
-output.write('hello.txt', 'Hello World')
+output.writeFile('hello.txt', 'Hello World')
     .then(function() { ... });
 
 // Copy a file to the output folder

docs/setup.md

@@ -14,7 +14,7 @@ It integrates well with the [GitBook Editor](https://www.gitbook.com/editor).
 
 Installing GitBook is easy and straightforward. Your system just needs to meet these two requirements:
 
-* NodeJS (v4.0.0 and above are adviced)
+* NodeJS (v4.0.0 and above is recommended)
 * Windows, Linux, Unix, or Mac OS X
 
 ##### Install with NPM

docs/templating/conrefs.md

@@ -51,5 +51,5 @@ This is the default content
 
 # License
 
-{% import "./LICENSE" %}
+{% include "./LICENSE" %}
 ```

docs/themes/README.md

@@ -17,7 +17,22 @@ A theme is a plugin containing templates and assets. Overriding any individual t
 
 ### Extend/Customize theme in a book
 
-Authors can extend the templates of a theme directly from their book's source (without creating an external theme). Templates will be resolved in the `_layouts` folder of the book first, then in
+Authors can extend the templates of a theme directly from their book's source (without creating an external theme). Templates will be resolved in the `_layouts` folder of the book first, then in the installed plugins/themes.
+
+### Extend instead of Forking
+
+When you want to make your theme changes available to multiple books, instead of forking the default theme, you can extend it using the [templating syntax](../templating/README.md):
+
+```html
+{% extends template.self %}
+
+{% block body %}
+    {{ super() }}
+    ... This will be added to the "body" block
+{% endblock %}
+```
+
+Take a look at the [API](https://github.com/GitbookIO/theme-api) theme for a more complete example.
 
 ### Publish a theme
 

jest/customMatchers.js

@@ -1,25 +0,0 @@
-var path = require('path');
-var fs = require('fs');
-
-var matchers = {
-    /**
-        Verify that a file exists in a directory
-    */
-    toHaveFile: function () {
-        return {
-            compare: function (actual, expected) {
-                var filePath = path.join(actual, expected);
-                var exists = fs.existsSync(filePath);
-
-                return {
-                    pass: exists
-                };
-            }
-        };
-    }
-};
-
-jasmine.getEnv().beforeEach(function () {
-    jasmine.DEFAULT_TIMEOUT_INTERVAL = 20000;
-    jasmine.addMatchers(matchers);
-});

lib/__tests__/init.js

@@ -3,7 +3,7 @@ var initBook = require('../init');
 
 describe('initBook', function() {
 
-    pit('should create a README and SUMMARY for empty book', function() {
+    it('should create a README and SUMMARY for empty book', function() {
         var dir = tmp.dirSync();
 
         return initBook(dir.name)

lib/api/decodeConfig.js

@@ -1,5 +1,3 @@
-var Config = require('../models/config');
-
 /**
     Decode changes from a JS API to a config object
 
@@ -13,7 +11,7 @@ function decodeGlobal(config, result) {
     delete values.generator;
     delete values.output;
 
-    return Config.updateValues(config, values);
+    return config.updateValues(values);
 }
 
 module.exports = decodeGlobal;

lib/api/encodeGlobal.js

@@ -8,10 +8,12 @@ var deprecate = require('./deprecate');
 var fileToURL = require('../output/helper/fileToURL');
 var defaultBlocks = require('../constants/defaultBlocks');
 var gitbook = require('../gitbook');
+var parsers = require('../parsers');
 
 var encodeConfig = require('./encodeConfig');
 var encodeSummary = require('./encodeSummary');
 var encodeNavigation = require('./encodeNavigation');
+var encodePage = require('./encodePage');
 
 /**
     Encode a global context into a JS object
@@ -81,6 +83,47 @@ function encodeGlobal(output) {
             return path.resolve(book.getContentRoot(), fileName);
         },
 
+        /**
+            Resolve a page by it path
+
+            @param {String} filePath
+            @return {String}
+        */
+        getPageByPath: function(filePath) {
+            var page = output.getPage(filePath);
+            if (!page) return undefined;
+
+            return encodePage(output, page);
+        },
+
+        /**
+            Render a block of text (markdown/asciidoc)
+
+            @param {String} type
+            @param {String} text
+            @return {Promise<String>}
+        */
+        renderBlock: function(type, text) {
+            var parser = parsers.get(type);
+
+            return parser.parsePage(text)
+                .get('content');
+        },
+
+        /**
+            Render an inline text (markdown/asciidoc)
+
+            @param {String} type
+            @param {String} text
+            @return {Promise<String>}
+        */
+        renderInline: function(type, text) {
+            var parser = parsers.get(type);
+
+            return parser.parseInline(text)
+                .get('content');
+        },
+
         template: {
             /**
                 Apply a templating block and returns its result
@@ -128,6 +171,21 @@ function encodeGlobal(output) {
                 return fileToURL(output, filePath);
             },
 
+            /**
+                Check that a file exists.
+
+                @param {String} fileName
+                @return {Promise}
+            */
+            hasFile: function(fileName, content) {
+                return Promise()
+                .then(function() {
+                    var filePath = PathUtils.resolveInRoot(outputFolder, fileName);
+
+                    return fs.exists(filePath);
+                });
+            },
+
             /**
                 Write a file to the output folder,
                 It creates the required folder
@@ -146,6 +204,27 @@ function encodeGlobal(output) {
                         return fs.writeFile(filePath, content);
                     });
                 });
+            },
+
+            /**
+                Copy a file to the output folder
+                It creates the required folder.
+
+                @param {String} inputFile
+                @param {String} outputFile
+                @param {Buffer} content
+                @return {Promise}
+            */
+            copyFile: function(inputFile, outputFile, content) {
+                return Promise()
+                .then(function() {
+                    var outputFilePath = PathUtils.resolveInRoot(outputFolder, outputFile);
+
+                    return fs.ensureFile(outputFilePath)
+                    .then(function() {
+                        return fs.copy(inputFile, outputFilePath);
+                    });
+                });
             }
         },
 

lib/browser.js

@@ -8,8 +8,18 @@ module.exports = {
     FS:                 require('./models/fs'),
     Summary:            require('./models/summary'),
     Glossary:           require('./models/glossary'),
+    Config:             require('./models/config'),
+    Page:               require('./models/page'),
+    PluginDependency:   require('./models/pluginDependency'),
 
     // Modifiers
-    SummaryModifier: Modifiers.Summary,
-    ConfigModifier: Modifiers.Config
+    SummaryModifier:    Modifiers.Summary,
+    ConfigModifier:     Modifiers.Config,
+
+    // Constants
+    CONFIG_FILES:        require('./constants/configFiles.js'),
+    IGNORE_FILES:        require('./constants/ignoreFiles.js'),
+    DEFAULT_PLUGINS:     require('./constants/defaultPlugins'),
+    EXTENSIONS_MARKDOWN: require('./constants/extsMarkdown'),
+    EXTENSIONS_ASCIIDOC: require('./constants/extsAsciidoc')
 };

lib/cli/buildEbook.js

@@ -18,8 +18,10 @@ module.exports = function(format) {
             options.log
         ],
         exec: function(args, kwargs) {
+            var extension = '.' + format;
+
             // Output file will be stored in
-            var outputFile = args[1] || ('book.' + format);
+            var outputFile = args[1] || ('book' + extension);
 
             // Create temporary directory
             var outputFolder = tmp.dirSync().name;
@@ -42,23 +44,23 @@ module.exports = function(format) {
                 var languages = book.getLanguages();
 
                 if (book.isMultilingual()) {
-                    return Promise.ForEach(languages, function(lang) {
+                    return Promise.forEach(languages.getList(), function(lang) {
                         var langID = lang.getID();
 
                         var langOutputFile = path.join(
                             path.dirname(outputFile),
-                            path.basename(outputFile, format) + '_' + langID + '.' + format
+                            path.basename(outputFile, extension) + '_' + langID + extension
                         );
 
                         return fs.copy(
-                            path.resolve(outputFolder, langID, 'index.' + format),
+                            path.resolve(outputFolder, langID, 'index' + extension),
                             langOutputFile
                         );
                     })
                     .thenResolve(languages.getCount());
                 } else {
                     return fs.copy(
-                        path.resolve(outputFolder, 'index.' + format),
+                        path.resolve(outputFolder, 'index' + extension),
                         outputFile
                     ).thenResolve(1);
                 }

lib/cli/serve.js

@@ -1,6 +1,7 @@
 /* eslint-disable no-console */
 
 var tinylr = require('tiny-lr');
+var open = require('open');
 
 var Parse = require('../parse');
 var Output = require('../output');
@@ -32,9 +33,11 @@ function generateBook(args, kwargs) {
     var outputFolder = getOutputFolder(args);
     var book = getBook(args, kwargs);
     var Generator = Output.getGenerator(kwargs.format);
+    var browser = kwargs['browser'];
 
     var hasWatch = kwargs['watch'];
     var hasLiveReloading = kwargs['live'];
+    var hasOpen = kwargs['open'];
 
     // Stop server if running
     if (server.isRunning()) console.log('Stopping server');
@@ -45,7 +48,9 @@ function generateBook(args, kwargs) {
         .then(function(resultBook) {
             if (hasLiveReloading) {
                 // Enable livereload plugin
-                resultBook = ConfigModifier.addPlugin(resultBook, 'livereload');
+                var config = resultBook.getConfig();
+                config = ConfigModifier.addPlugin(config, 'livereload');
+                resultBook = resultBook.set('config', config);
             }
 
             return Output.generate(Generator, resultBook, {
@@ -69,6 +74,10 @@ function generateBook(args, kwargs) {
                 }
             });
         }
+
+        if (hasOpen) {
+            open('http://localhost:'+port, browser);
+        }
     })
     .then(function() {
         if (!hasWatch) {
@@ -110,6 +119,16 @@ module.exports = {
             description: 'Enable live reloading',
             defaults: true
         },
+        {
+            name: 'open',
+            description: 'Enable opening book in browser',
+            defaults: false
+        },
+        {
+            name: 'browser',
+            description: 'Specify browser for opening book',
+            defaults: ''
+        },
         options.log,
         options.format
     ],

lib/cli/server.js

@@ -71,11 +71,18 @@ Server.prototype.start = function(dir, port) {
 
             // Redirect to directory's index.html
             function redirect() {
+                var resultURL = urlTransform(req.url, function(parsed) {
+                    parsed.pathname += '/';
+                    return parsed;
+                });
+
                 res.statusCode = 301;
-                res.setHeader('Location', req.url + '/');
-                res.end('Redirecting to ' + req.url + '/');
+                res.setHeader('Location', resultURL);
+                res.end('Redirecting to ' + resultURL);
             }
 
+            res.setHeader('X-Current-Location', req.url);
+
             // Send file
             send(req, url.parse(req.url).pathname, {
                 root: dir
@@ -106,4 +113,16 @@ Server.prototype.start = function(dir, port) {
     });
 };
 
+/**
+    urlTransform is a helper function that allows a function to transform
+    a url string in it's parsed form and returns the new url as a string
+
+    @param {String} uri
+    @param {Function} fn
+    @return {String}
+*/
+function urlTransform(uri, fn) {
+    return url.format(fn(url.parse(uri)));
+}
+
 module.exports = Server;

lib/constants/__tests__/configSchema.js

@@ -0,0 +1,46 @@
+var jsonschema = require('jsonschema');
+var schema = require('../configSchema');
+
+describe('configSchema', function() {
+
+    function validate(cfg) {
+        var v = new jsonschema.Validator();
+        return v.validate(cfg, schema, {
+            propertyName: 'config'
+        });
+    }
+
+    describe('structure', function() {
+
+        it('should accept dot in filename', function() {
+            var result = validate({
+                structure: {
+                    readme: 'book-intro.adoc'
+                }
+            });
+
+            expect(result.errors.length).toBe(0);
+        });
+
+        it('should accept uppercase in filename', function() {
+            var result = validate({
+                structure: {
+                    readme: 'BOOK.adoc'
+                }
+            });
+
+            expect(result.errors.length).toBe(0);
+        });
+
+        it('should not accept filepath', function() {
+            var result = validate({
+                structure: {
+                    readme: 'folder/myFile.md'
+                }
+            });
+
+            expect(result.errors.length).toBe(1);
+        });
+
+    });
+});

lib/constants/configSchema.js

@@ -1,3 +1,5 @@
+var FILENAME_REGEX = '^[a-zA-Z-._\d,\s]+$';
+
 module.exports = {
     '$schema': 'http://json-schema.org/schema#',
     'id': 'https://gitbook.com/schemas/book.json',
@@ -57,25 +59,25 @@ module.exports = {
                     'default': 'LANGS.md',
                     'type': 'string',
                     'title': 'File to use as languages index',
-                    'pattern': '^[0-9a-zA-Z ... ]+$'
+                    'pattern': FILENAME_REGEX
                 },
                 'readme': {
                     'default': 'README.md',
                     'type': 'string',
                     'title': 'File to use as preface',
-                    'pattern': '^[0-9a-zA-Z ... ]+$'
+                    'pattern': FILENAME_REGEX
                 },
                 'glossary': {
                     'default': 'GLOSSARY.md',
                     'type': 'string',
                     'title': 'File to use as glossary index',
-                    'pattern': '^[0-9a-zA-Z ... ]+$'
+                    'pattern': FILENAME_REGEX
                 },
                 'summary': {
                     'default': 'SUMMARY.md',
                     'type': 'string',
                     'title': 'File to use as table of contents',
-                    'pattern': '^[0-9a-zA-Z ... ]+$'
+                    'pattern': FILENAME_REGEX
                 }
             },
             'additionalProperties': false

lib/constants/defaultPlugins.js

@@ -1,9 +1,24 @@
 var Immutable = require('immutable');
+var PluginDependency = require('../models/pluginDependency');
+
+var pkg = require('../../package.json');
+
+/**
+ * Create a PluginDependency from a dependency of gitbook
+ * @param {String} pluginName
+ * @return {PluginDependency}
+ */
+function createFromDependency(pluginName) {
+    var npmID = PluginDependency.nameToNpmID(pluginName);
+    var version = pkg.dependencies[npmID];
+
+    return PluginDependency.create(pluginName, version);
+}
 
 /*
-    List of default plugins for all books,
-    default plugins should be installed in node dependencies of GitBook
-*/
+ * List of default plugins for all books,
+ * default plugins should be installed in node dependencies of GitBook
+ */
 module.exports = Immutable.List([
     'highlight',
     'search',
@@ -11,4 +26,4 @@ module.exports = Immutable.List([
     'sharing',
     'fontsettings',
     'theme-default'
-]);
+]).map(createFromDependency);

lib/constants/extsAsciidoc.js

@@ -0,0 +1,4 @@
+module.exports = [
+    '.adoc',
+    '.asciidoc'
+];

lib/constants/extsMarkdown.js

@@ -0,0 +1,5 @@
+module.exports = [
+    '.md',
+    '.markdown',
+    '.mdown'
+];

lib/constants/themePrefix.js

@@ -0,0 +1,4 @@
+/*
+    All GitBook themes plugins name start with this prefix once shorted.
+*/
+module.exports = 'theme-';

lib/fs/__tests__/mock.js

@@ -1,7 +1,6 @@
-jest.autoMockOff();
+var createMockFS = require('../mock');
 
 describe('MockFS', function() {
-    var createMockFS = require('../mock');
     var fs = createMockFS({
         'README.md': 'Hello World',
         'SUMMARY.md': '# Summary',
@@ -15,35 +14,35 @@ describe('MockFS', function() {
     });
 
     describe('exists', function() {
-        pit('must return true for a file', function() {
+        it('must return true for a file', function() {
             return fs.exists('README.md')
             .then(function(result) {
                 expect(result).toBeTruthy();
             });
         });
 
-        pit('must return false for a non existing file', function() {
+        it('must return false for a non existing file', function() {
             return fs.exists('README_NOTEXISTS.md')
             .then(function(result) {
                 expect(result).toBeFalsy();
             });
         });
 
-        pit('must return true for a directory', function() {
+        it('must return true for a directory', function() {
             return fs.exists('folder')
             .then(function(result) {
                 expect(result).toBeTruthy();
             });
         });
 
-        pit('must return true for a deep file', function() {
+        it('must return true for a deep file', function() {
             return fs.exists('folder/test.md')
             .then(function(result) {
                 expect(result).toBeTruthy();
             });
         });
 
-        pit('must return true for a deep file (2)', function() {
+        it('must return true for a deep file (2)', function() {
             return fs.exists('folder/folder2/hello.md')
             .then(function(result) {
                 expect(result).toBeTruthy();
@@ -52,14 +51,14 @@ describe('MockFS', function() {
     });
 
     describe('readAsString', function() {
-        pit('must return content for a file', function() {
+        it('must return content for a file', function() {
             return fs.readAsString('README.md')
             .then(function(result) {
                 expect(result).toBe('Hello World');
             });
         });
 
-        pit('must return content for a deep file', function() {
+        it('must return content for a deep file', function() {
             return fs.readAsString('folder/test.md')
             .then(function(result) {
                 expect(result).toBe('Cool');
@@ -68,7 +67,7 @@ describe('MockFS', function() {
     });
 
     describe('readDir', function() {
-        pit('must return content for a directory', function() {
+        it('must return content for a directory', function() {
             return fs.readDir('./')
             .then(function(files) {
                 expect(files.size).toBe(3);

lib/json/encodeBook.js

@@ -4,6 +4,7 @@ var gitbook = require('../gitbook');
 var encodeSummary = require('./encodeSummary');
 var encodeGlossary = require('./encodeGlossary');
 var encodeReadme = require('./encodeReadme');
+var encodeLanguages = require('./encodeLanguages');
 
 /**
     Encode a book to JSON
@@ -22,6 +23,9 @@ function encodeBookToJson(book) {
         glossary: encodeGlossary(book.getGlossary()),
         readme: encodeReadme(book.getReadme()),
         config: book.getConfig().getValues().toJS(),
+
+        languages: book.isMultilingual()? encodeLanguages(book.getLanguages()) : undefined,
+
         gitbook: {
             version: gitbook.version,
             time: gitbook.START_TIME

lib/json/encodeLanguages.js

@@ -0,0 +1,26 @@
+var encodeFile = require('./encodeFile');
+
+/**
+    Encode a languages listing to JSON
+
+    @param {Languages}
+    @return {Object}
+*/
+function encodeLanguages(languages) {
+    var file = languages.getFile();
+    var list = languages.getList();
+
+    return {
+        file: encodeFile(file),
+        list: list
+            .valueSeq()
+            .map(function(lang) {
+                return {
+                    id: lang.getID(),
+                    title: lang.getTitle()
+                };
+            }).toJS()
+    };
+}
+
+module.exports = encodeLanguages;

lib/json/index.js

@@ -7,5 +7,6 @@ module.exports = {
     encodePage:             require('./encodePage'),
     encodeSummary:          require('./encodeSummary'),
     encodeSummaryArticle:   require('./encodeSummaryArticle'),
-    encodeReadme:           require('./encodeReadme')
+    encodeReadme:           require('./encodeReadme'),
+    encodeLanguages:        require('./encodeLanguages')
 };

lib/models/__tests__/config.js

@@ -1,10 +1,7 @@
-jest.autoMockOff();
-
 var Immutable = require('immutable');
+var Config = require('../config');
 
 describe('Config', function() {
-    var Config = require('../config');
-
     var config = Config.createWithValues({
         hello: {
             world: 1,
@@ -58,6 +55,36 @@ describe('Config', function() {
             expect(world).toBe(2);
         });
     });
+
+    describe('toReducedVersion', function() {
+        it('must only return diffs for simple values', function() {
+            var _config = Config.createWithValues({
+                gitbook: '3.0.0'
+            });
+
+            var reducedVersion = _config.toReducedVersion();
+
+            expect(reducedVersion.toJS()).toEqual({
+                gitbook: '3.0.0'
+            });
+        });
+
+        it('must only return diffs for deep values', function() {
+            var _config = Config.createWithValues({
+                structure: {
+                    readme: 'intro.md'
+                }
+            });
+
+            var reducedVersion = _config.toReducedVersion();
+
+            expect(reducedVersion.toJS()).toEqual({
+                structure: {
+                    readme: 'intro.md'
+                }
+            });
+        });
+    });
 });
 
 

lib/models/__tests__/glossary.js

@@ -1,10 +1,8 @@
-jest.autoMockOff();
+var File = require('../file');
+var Glossary = require('../glossary');
+var GlossaryEntry = require('../glossaryEntry');
 
 describe('Glossary', function() {
-    var File = require('../file');
-    var Glossary = require('../glossary');
-    var GlossaryEntry = require('../glossaryEntry');
-
     var glossary = Glossary.createFromEntries(File(), [
         {
             name: 'Hello World',
@@ -30,7 +28,7 @@ describe('Glossary', function() {
     });
 
     describe('toText', function() {
-        pit('return as markdown', function() {
+        it('return as markdown', function() {
             return glossary.toText('.md')
             .then(function(text) {
                 expect(text).toContain('# Glossary');

lib/models/__tests__/glossaryEntry.js

@@ -1,8 +1,6 @@
-jest.autoMockOff();
+var GlossaryEntry = require('../glossaryEntry');
 
 describe('GlossaryEntry', function() {
-    var GlossaryEntry = require('../glossaryEntry');
-
     describe('getID', function() {
         it('must return a normalized ID', function() {
             var entry = new GlossaryEntry({

lib/models/__tests__/page.js

@@ -0,0 +1,28 @@
+var Immutable = require('immutable');
+var Page = require('../page');
+
+describe('Page', function() {
+
+    describe('toText', function() {
+        it('must not prepend frontmatter if no attributes', function() {
+            var page = Page().merge({
+                content: 'Hello World'
+            });
+
+            expect(page.toText()).toBe('Hello World');
+        });
+
+        it('must prepend frontmatter if attributes', function() {
+            var page = Page().merge({
+                content: 'Hello World',
+                attributes: Immutable.fromJS({
+                    hello: 'world'
+                })
+            });
+
+            expect(page.toText()).toBe('---\nhello: world\n---\n\nHello World');
+        });
+    });
+});
+
+

lib/models/__tests__/pluginDependency.js

@@ -1,6 +1,7 @@
-describe('PluginDependency', function() {
-    var PluginDependency = require('../pluginDependency');
+var Immutable = require('immutable');
+var PluginDependency = require('../pluginDependency');
 
+describe('PluginDependency', function() {
     describe('createFromString', function() {
         it('must parse name', function() {
             var plugin = PluginDependency.createFromString('hello');
@@ -41,7 +42,39 @@ describe('PluginDependency', function() {
                 expect(plugin.getVersion()).toBe('git+ssh://samy@github.com/GitbookIO/plugin-ga.git');
             });
         });
+
+        describe('listToArray', function() {
+            it('must create an array from a list of plugin dependencies', function() {
+                var list = PluginDependency.listToArray(Immutable.List([
+                    PluginDependency.createFromString('hello@1.0.0'),
+                    PluginDependency.createFromString('noversion'),
+                    PluginDependency.createFromString('-disabled')
+                ]));
+
+                expect(list).toEqual([
+                    'hello@1.0.0',
+                    'noversion',
+                    '-disabled'
+                ]);
+            });
+        });
+
+        describe('listFromArray', function() {
+            it('must create an array from a list of plugin dependencies', function() {
+                var arr = Immutable.fromJS([
+                    'hello@1.0.0',
+                    {
+                        'name': 'plugin-ga',
+                        'version': 'git+ssh://samy@github.com/GitbookIO/plugin-ga.git'
+                    }
+                ]);
+                var list = PluginDependency.listFromArray(arr);
+
+                expect(list.first().getName()).toBe('hello');
+                expect(list.first().getVersion()).toBe('1.0.0');
+                expect(list.last().getName()).toBe('plugin-ga');
+                expect(list.last().getVersion()).toBe('git+ssh://samy@github.com/GitbookIO/plugin-ga.git');
+            });
+        });
     });
 });
-
-

lib/models/__tests__/summary.js

@@ -82,7 +82,7 @@ describe('Summary', function() {
     });
 
     describe('toText', function() {
-        pit('return as markdown', function() {
+        it('return as markdown', function() {
             return summary.toText('.md')
             .then(function(text) {
                 expect(text).toContain('# Summary');

lib/models/__tests__/summaryArticle.js

@@ -0,0 +1,53 @@
+var SummaryArticle = require('../summaryArticle');
+var File = require('../file');
+
+describe('SummaryArticle', function() {
+    describe('createChildLevel', function() {
+        it('must create the right level', function() {
+            var article = SummaryArticle.create({}, '1.1');
+            expect(article.createChildLevel()).toBe('1.1.1');
+        });
+
+        it('must create the right level when has articles', function() {
+            var article = SummaryArticle.create({
+                articles: [
+                    {
+                        title: 'Test'
+                    }
+                ]
+            }, '1.1');
+            expect(article.createChildLevel()).toBe('1.1.2');
+        });
+    });
+
+    describe('isFile', function() {
+        it('must return true when exactly the file', function() {
+            var article = SummaryArticle.create({
+                ref: 'hello.md'
+            }, '1.1');
+            var file = File.createWithFilepath('hello.md');
+
+            expect(article.isFile(file)).toBe(true);
+        });
+
+        it('must return true when path is not normalized', function() {
+            var article = SummaryArticle.create({
+                ref: '/hello.md'
+            }, '1.1');
+            var file = File.createWithFilepath('hello.md');
+
+            expect(article.isFile(file)).toBe(true);
+        });
+
+        it('must return false when has anchor', function() {
+            var article = SummaryArticle.create({
+                ref: 'hello.md#world'
+            }, '1.1');
+            var file = File.createWithFilepath('hello.md');
+
+            expect(article.isFile(file)).toBe(false);
+        });
+    });
+});
+
+

lib/models/__tests__/summaryPart.js

@@ -0,0 +1,23 @@
+var SummaryPart = require('../summaryPart');
+
+describe('SummaryPart', function() {
+    describe('createChildLevel', function() {
+        it('must create the right level', function() {
+            var article = SummaryPart.create({}, '1');
+            expect(article.createChildLevel()).toBe('1.1');
+        });
+
+        it('must create the right level when has articles', function() {
+            var article = SummaryPart.create({
+                articles: [
+                    {
+                        title: 'Test'
+                    }
+                ]
+            }, '1');
+            expect(article.createChildLevel()).toBe('1.2');
+        });
+    });
+});
+
+

lib/models/__tests__/templateBlock.js

@@ -6,7 +6,7 @@ describe('TemplateBlock', function() {
     var TemplateBlock = require('../templateBlock');
 
     describe('create', function() {
-        pit('must initialize a simple TemplateBlock from a function', function() {
+        it('must initialize a simple TemplateBlock from a function', function() {
             var templateBlock = TemplateBlock.create('sayhello', function(block) {
                 return {
                     body: '<p>Hello, World!</p>',
@@ -41,7 +41,7 @@ describe('TemplateBlock', function() {
                 };
             });
 
-            expect(templateBlock.getShortcuts()).not.toBeDefined();
+            expect(templateBlock.getShortcuts()).toNotExist();
         });
 
         it('must return complete shortcut', function() {
@@ -67,7 +67,7 @@ describe('TemplateBlock', function() {
     });
 
     describe('toNunjucksExt()', function() {
-        pit('should replace by block anchor', function() {
+        it('should replace by block anchor', function() {
             var templateBlock = TemplateBlock.create('sayhello', function(block) {
                 return 'Hello';
             });
@@ -97,7 +97,7 @@ describe('TemplateBlock', function() {
             });
         });
 
-        pit('must create a valid nunjucks extension', function() {
+        it('must create a valid nunjucks extension', function() {
             var templateBlock = TemplateBlock.create('sayhello', function(block) {
                 return {
                     body: '<p>Hello, World!</p>',
@@ -120,7 +120,7 @@ describe('TemplateBlock', function() {
             });
         });
 
-        pit('must apply block arguments correctly', function() {
+        it('must apply block arguments correctly', function() {
             var templateBlock = TemplateBlock.create('sayhello', function(block) {
                 return {
                     body: '<'+block.kwargs.tag+'>Hello, '+block.kwargs.name+'!</'+block.kwargs.tag+'>',
@@ -143,7 +143,7 @@ describe('TemplateBlock', function() {
             });
         });
 
-        pit('must accept an async function', function() {
+        it('must accept an async function', function() {
             var templateBlock = TemplateBlock.create('sayhello', function(block) {
                 return Promise()
                 .then(function() {
@@ -169,7 +169,7 @@ describe('TemplateBlock', function() {
             });
         });
 
-        pit('must handle nested blocks', function() {
+        it('must handle nested blocks', function() {
             var templateBlock = new TemplateBlock({
                 name: 'yoda',
                 blocks: Immutable.List(['start', 'end']),

lib/models/book.js

@@ -1,6 +1,5 @@
 var path = require('path');
 var Immutable = require('immutable');
-var Ignore = require('ignore');
 
 var Logger = require('../utils/logger');
 
@@ -10,7 +9,7 @@ var Readme = require('./readme');
 var Summary = require('./summary');
 var Glossary = require('./glossary');
 var Languages = require('./languages');
-
+var Ignore = require('./ignore');
 
 var Book = Immutable.Record({
     // Logger for outptu message
@@ -128,8 +127,7 @@ Book.prototype.isFileIgnored = function(filename) {
         filename = path.join(language, filename);
     }
 
-
-    return ignore.filter([filename]).length == 0;
+    return ignore.isFileIgnored(filename);
 };
 
 /**
@@ -177,6 +175,17 @@ Book.prototype.isLanguageBook = function() {
     return Boolean(this.getLanguage());
 };
 
+/**
+    Return a languages book
+
+    @param {String} language
+    @return {Book}
+*/
+Book.prototype.getLanguageBook = function(language) {
+    var books = this.getBooks();
+    return books.get(language);
+};
+
 /**
     Add a new language book
 
@@ -221,6 +230,16 @@ Book.prototype.setConfig = function(config) {
     return this.set('config', config);
 };
 
+/**
+    Set the ignore instance for this book
+
+    @param {Ignore}
+    @return {Book}
+*/
+Book.prototype.setIgnore = function(ignore) {
+    return this.set('ignore', ignore);
+};
+
 /**
     Change log level
 
@@ -274,26 +293,47 @@ Book.prototype.getDefaultExt = function() {
 
 /**
     Infer the default path for a Readme.
+    @param {Boolean} [absolute=false] False for a path relative to
+        this book's content root
     @return {String}
 */
-Book.prototype.getDefaultReadmePath = function() {
-    return this.getContentRoot()+'README'+this.getDefaultExt();
+Book.prototype.getDefaultReadmePath = function(absolute) {
+    var defaultPath = 'README'+this.getDefaultExt();
+    if (absolute) {
+        return path.join(this.getContentRoot(), defaultPath);
+    } else {
+        return defaultPath;
+    }
 };
 
 /**
     Infer the default path for a Summary.
+    @param {Boolean} [absolute=false] False for a path relative to
+        this book's content root
     @return {String}
 */
-Book.prototype.getDefaultSummaryPath = function() {
-    return this.getContentRoot()+'SUMMARY'+this.getDefaultExt();
+Book.prototype.getDefaultSummaryPath = function(absolute) {
+    var defaultPath = 'SUMMARY'+this.getDefaultExt();
+    if (absolute) {
+        return path.join(this.getContentRoot(), defaultPath);
+    } else {
+        return defaultPath;
+    }
 };
 
 /**
     Infer the default path for a Glossary.
+    @param {Boolean} [absolute=false] False for a path relative to
+        this book's content root
     @return {String}
 */
-Book.prototype.getDefaultGlossaryPath = function() {
-    return this.getContentRoot()+'GLOSSARY'+this.getDefaultExt();
+Book.prototype.getDefaultGlossaryPath = function(absolute) {
+    var defaultPath = 'GLOSSARY'+this.getDefaultExt();
+    if (absolute) {
+        return path.join(this.getContentRoot(), defaultPath);
+    } else {
+        return defaultPath;
+    }
 };
 
 /**
@@ -305,12 +345,16 @@ Book.prototype.getDefaultGlossaryPath = function() {
 */
 Book.createFromParent = function createFromParent(parent, language) {
     var ignore = parent.getIgnore();
+    var config = parent.getConfig();
+
+    // Set language in configuration
+    config = config.setValue('language', language);
 
     return new Book({
         // Inherits config. logegr and list of ignored files
         logger: parent.getLogger(),
-        config: parent.getConfig(),
-        ignore: Ignore().add(ignore),
+        config: config,
+        ignore: ignore,
 
         language: language,
         fs: FS.reduceScope(parent.getContentFS(), language)

lib/models/config.js

@@ -4,6 +4,7 @@ var Immutable = require('immutable');
 var File = require('./file');
 var PluginDependency = require('./pluginDependency');
 var configDefault = require('../constants/configDefault');
+var reducedObject = require('../utils/reducedObject');
 
 var Config = Immutable.Record({
     file:       File(),
@@ -19,11 +20,36 @@ Config.prototype.getValues = function() {
 };
 
 /**
-    Return a configuration value by its key path
+ * Return minimum version of configuration,
+ * Basically it returns the current config minus the default one
+ * @return {Map}
+ */
+Config.prototype.toReducedVersion = function() {
+    return reducedObject(configDefault, this.getValues());
+};
 
-    @param {String} key
-    @return {Mixed}
-*/
+/**
+ * Render config as text
+ * @return {Promise<String>}
+ */
+Config.prototype.toText = function() {
+    return JSON.stringify(this.toReducedVersion().toJS(), null, 4);
+};
+
+/**
+ * Change the file for the configuration
+ * @param {File} file
+ * @return {Config}
+ */
+Config.prototype.setFile = function(file) {
+    return this.set('file', file);
+};
+
+/**
+ * Return a configuration value by its key path
+ * @param {String} key
+ * @return {Mixed}
+ */
 Config.prototype.getValue = function(keyPath, def) {
     var values = this.getValues();
     keyPath = Config.keyToKeyPath(keyPath);
@@ -36,12 +62,11 @@ Config.prototype.getValue = function(keyPath, def) {
 };
 
 /**
-    Update a configuration value
-
-    @param {String} key
-    @param {Mixed} value
-    @return {Mixed}
-*/
+ * Update a configuration value
+ * @param {String} key
+ * @param {Mixed} value
+ * @return {Config}
+ */
 Config.prototype.setValue = function(keyPath, value) {
     keyPath = Config.keyToKeyPath(keyPath);
 
@@ -54,10 +79,9 @@ Config.prototype.setValue = function(keyPath, value) {
 };
 
 /**
-    Return a list of plugin dependencies
-
-    @return {List<PluginDependency>}
-*/
+ * Return a list of plugin dependencies
+ * @return {List<PluginDependency>}
+ */
 Config.prototype.getPluginDependencies = function() {
     var plugins = this.getValue('plugins');
 
@@ -69,24 +93,62 @@ Config.prototype.getPluginDependencies = function() {
 };
 
 /**
-    Update the list of plugins dependencies
+ * Return a plugin dependency by its name
+ * @param {String} name
+ * @return {PluginDependency}
+ */
+Config.prototype.getPluginDependency = function(name) {
+    var plugins = this.getPluginDependencies();
 
-    @param {List<PluginDependency>}
-    @return {Config}
-*/
+    return plugins.find(function(dep) {
+        return dep.getName() === name;
+    });
+};
+
+/**
+ * Update the list of plugins dependencies
+ * @param {List<PluginDependency>}
+ * @return {Config}
+ */
 Config.prototype.setPluginDependencies = function(deps) {
-    var plugins = PluginDependency.listFromArray(deps);
+    var plugins = PluginDependency.listToArray(deps);
 
     return this.setValue('plugins', plugins);
 };
 
-/**
-    Create a new config for a file
 
-    @param {File} file
-    @param {Object} values
-    @returns {Config}
-*/
+/**
+ * Update values for an existing configuration
+ * @param {Object} values
+ * @returns {Config}
+ */
+Config.prototype.updateValues = function(values) {
+    values = Immutable.fromJS(values);
+
+    return this.set('values', values);
+};
+
+/**
+ * Update values for an existing configuration
+ * @param {Config} config
+ * @param {Object} values
+ * @returns {Config}
+ */
+Config.prototype.mergeValues = function(values) {
+    var currentValues = this.getValues();
+    values = Immutable.fromJS(values);
+
+    currentValues = currentValues.mergeDeep(values);
+
+    return this.set('values', currentValues);
+};
+
+/**
+ * Create a new config for a file
+ * @param {File} file
+ * @param {Object} values
+ * @returns {Config}
+ */
 Config.create = function(file, values) {
     return new Config({
         file: file,
@@ -95,37 +157,22 @@ Config.create = function(file, values) {
 };
 
 /**
-    Create a new config
-
-    @param {Object} values
-    @returns {Config}
-*/
+ * Create a new config
+ * @param {Object} values
+ * @returns {Config}
+ */
 Config.createWithValues = function(values) {
     return new Config({
         values: Immutable.fromJS(values)
     });
 };
 
-/**
-    Update values for an existing configuration
-
-    @param {Config} config
-    @param {Object} values
-    @returns {Config}
-*/
-Config.updateValues = function(config, values) {
-    values = Immutable.fromJS(values);
-
-    return config.set('values', values);
-};
-
 
 /**
-    Convert a keyPath to an array of keys
-
-    @param {String|Array}
-    @return {Array}
-*/
+ * Convert a keyPath to an array of keys
+ * @param {String|Array}
+ * @return {Array}
+ */
 Config.keyToKeyPath = function(keyPath) {
     if (is.string(keyPath)) keyPath = keyPath.split('.');
     return keyPath;

lib/models/fs.js

@@ -198,23 +198,29 @@ FS.prototype.listFiles = function(dirname) {
 /**
     List all files in a directory
 
-    @param {String} dirname
+    @param {String} dirName
+    @param {Function(dirName)} filterFn: call it for each file/directory to test if it should stop iterating
     @return {Promise<List<String>>}
 */
-FS.prototype.listAllFiles = function(folder) {
+FS.prototype.listAllFiles = function(dirName, filterFn) {
     var that = this;
-    folder = folder || '.';
+    dirName = dirName || '.';
 
-    return this.readDir(folder)
+    return this.readDir(dirName)
     .then(function(files) {
         return Promise.reduce(files, function(out, file) {
             var isDirectory = pathIsFolder(file);
+            var newDirName = path.join(dirName, file);
 
-            if (!isDirectory) {
-                return out.push(path.join(folder, file));
+            if (filterFn && filterFn(newDirName) === false) {
+                return out;
             }
 
-            return that.listAllFiles(path.join(folder, file))
+            if (!isDirectory) {
+                return out.push(newDirName);
+            }
+
+            return that.listAllFiles(newDirName, filterFn)
             .then(function(inner) {
                 return out.concat(inner);
             });
@@ -223,7 +229,7 @@ FS.prototype.listAllFiles = function(folder) {
 };
 
 /**
-    Find a file in a folder (case incensitive)
+    Find a file in a folder (case insensitive)
     Return the found filename
 
     @param {String} dirname

lib/models/ignore.js

@@ -0,0 +1,42 @@
+var Immutable = require('immutable');
+var IgnoreMutable = require('ignore');
+
+/*
+    Immutable version of node-ignore
+*/
+var Ignore = Immutable.Record({
+    ignore: new IgnoreMutable()
+}, 'Ignore');
+
+Ignore.prototype.getIgnore = function() {
+    return this.get('ignore');
+};
+
+/**
+    Test if a file is ignored by these rules
+
+    @param {String} filePath
+    @return {Boolean}
+*/
+Ignore.prototype.isFileIgnored = function(filename) {
+    var ignore = this.getIgnore();
+    return ignore.filter([filename]).length == 0;
+};
+
+/**
+    Add rules
+
+    @param {String}
+    @return {Ignore}
+*/
+Ignore.prototype.add = function(rule) {
+    var ignore = this.getIgnore();
+    var newIgnore = new IgnoreMutable();
+
+    newIgnore.add(ignore);
+    newIgnore.add(rule);
+
+    return this.set('ignore', newIgnore);
+};
+
+module.exports = Ignore;

lib/models/output.js

@@ -1,6 +1,7 @@
 var Immutable = require('immutable');
 
 var Book = require('./book');
+var LocationUtils = require('../utils/location');
 
 var Output = Immutable.Record({
     book:       Book(),
@@ -52,6 +53,19 @@ Output.prototype.getState = function() {
     return this.get('state');
 };
 
+/**
+    Return a page byt its file path
+
+    @param {String} filePath
+    @return {Page|undefined}
+*/
+Output.prototype.getPage = function(filePath) {
+    filePath = LocationUtils.normalize(filePath);
+
+    var pages = this.getPages();
+    return pages.get(filePath);
+};
+
 /**
     Get root folder for output
 

lib/models/page.js

@@ -1,4 +1,5 @@
 var Immutable = require('immutable');
+var yaml = require('js-yaml');
 
 var File = require('./file');
 
@@ -32,19 +33,33 @@ Page.prototype.getDir = function() {
 };
 
 /**
-    Return path of the page
+ * Return page as text
+ * @return {String}
+*/
+Page.prototype.toText = function() {
+    var attrs = this.getAttributes();
+    var content = this.getContent();
 
-    @return {String}
+    if (attrs.size === 0) {
+        return content;
+    }
+
+    var frontMatter = '---\n' + yaml.safeDump(attrs.toJS(), { skipInvalid: true }) + '---\n\n';
+    return (frontMatter + content);
+};
+
+/**
+ * Return path of the page
+ * @return {String}
 */
 Page.prototype.getPath = function() {
     return this.getFile().getPath();
 };
 
 /**
-    Create a page for a file
-
-    @param {File} file
-    @return {Page}
+ * Create a page for a file
+ * @param {File} file
+ * @return {Page}
 */
 Page.createForFile = function(file) {
     return new Page({

lib/models/parser.js

@@ -55,6 +55,11 @@ Parser.prototype.parsePage = function(content) {
     return Promise(page(content));
 };
 
+Parser.prototype.parseInline = function(content) {
+    var inline = this.get('inline');
+    return Promise(inline(content));
+};
+
 Parser.prototype.parseLanguages = function(content) {
     var langs = this.get('langs');
     return Promise(langs(content));

lib/models/plugin.js

@@ -1,7 +1,9 @@
 var Immutable = require('immutable');
 
 var TemplateBlock = require('./templateBlock');
-var PREFIX = require('../constants/pluginPrefix');
+var PluginDependency = require('./pluginDependency');
+var THEME_PREFIX = require('../constants/themePrefix');
+
 var DEFAULT_VERSION = '*';
 
 var Plugin = Immutable.Record({
@@ -16,6 +18,9 @@ var Plugin = Immutable.Record({
     // Depth of this plugin in the dependency tree
     depth:      Number(0),
 
+    // Parent depending on this plugin
+    parent:     String(),
+
     // Content of the "package.json"
     package:    Immutable.Map(),
 
@@ -47,38 +52,48 @@ Plugin.prototype.getDepth = function() {
     return this.get('depth');
 };
 
-/**
-    Return the ID on NPM for this plugin
-
-    @return {String}
-*/
-Plugin.prototype.getNpmID = function() {
-    return Plugin.nameToNpmID(this.getName());
+Plugin.prototype.getParent = function() {
+    return this.get('parent');
 };
 
 /**
-    Check if a plugin is loaded
+ * Return the ID on NPM for this plugin
+ * @return {String}
+ */
+Plugin.prototype.getNpmID = function() {
+    return PluginDependency.nameToNpmID(this.getName());
+};
 
-    @return {Boolean}
-*/
+/**
+ * Check if a plugin is loaded
+ * @return {Boolean}
+ */
 Plugin.prototype.isLoaded = function() {
     return Boolean(this.getPackage().size > 0);
 };
 
 /**
-    Return map of hooks
-    @return {Map<String:Function>}
-*/
+ * Check if a plugin is a theme given its name
+ * @return {Boolean}
+ */
+Plugin.prototype.isTheme = function() {
+    var name = this.getName();
+    return (name && name.indexOf(THEME_PREFIX) === 0);
+};
+
+/**
+ * Return map of hooks
+ * @return {Map<String:Function>}
+ */
 Plugin.prototype.getHooks = function() {
     return this.getContent().get('hooks') || Immutable.Map();
 };
 
 /**
-    Return infos about resources for a specific type
-
-    @param {String} type
-    @return {Map<String:Mixed>}
-*/
+ * Return infos about resources for a specific type
+ * @param {String} type
+ * @return {Map<String:Mixed>}
+ */
 Plugin.prototype.getResources = function(type) {
     if (type != 'website' && type != 'ebook') {
         throw new Error('Invalid assets type ' + type);
@@ -91,17 +106,17 @@ Plugin.prototype.getResources = function(type) {
 };
 
 /**
-    Return map of filters
-    @return {Map<String:Function>}
-*/
+ * Return map of filters
+ * @return {Map<String:Function>}
+ */
 Plugin.prototype.getFilters = function() {
     return this.getContent().get('filters');
 };
 
 /**
-    Return map of blocks
-    @return {Map<String:TemplateBlock>}
-*/
+ * Return map of blocks
+ * @return {Map<String:TemplateBlock>}
+ */
 Plugin.prototype.getBlocks = function() {
     var blocks = this.getContent().get('blocks');
     blocks = blocks || Immutable.Map();
@@ -113,21 +128,19 @@ Plugin.prototype.getBlocks = function() {
 };
 
 /**
-    Return a specific hook
-
-    @param {String} name
-    @return {Function|undefined}
-*/
+ * Return a specific hook
+ * @param {String} name
+ * @return {Function|undefined}
+ */
 Plugin.prototype.getHook = function(name) {
     return this.getHooks().get(name);
 };
 
 /**
-    Create a plugin from a string
-
-    @param {String}
-    @return {Plugin}
-*/
+ * Create a plugin from a string
+ * @param {String}
+ * @return {Plugin}
+ */
 Plugin.createFromString = function(s) {
     var parts = s.split('@');
     var name = parts[0];
@@ -140,11 +153,10 @@ Plugin.createFromString = function(s) {
 };
 
 /**
-    Create a plugin from a dependency
-
-    @param {PluginDependency}
-    @return {Plugin}
-*/
+ * Create a plugin from a dependency
+ * @param {PluginDependency}
+ * @return {Plugin}
+ */
 Plugin.createFromDep = function(dep) {
     return new Plugin({
         name: dep.getName(),
@@ -152,14 +164,6 @@ Plugin.createFromDep = function(dep) {
     });
 };
 
-/**
-    Return NPM id for a plugin name
-
-    @param {String}
-    @return {String}
-*/
-Plugin.nameToNpmID = function(s) {
-    return PREFIX + s;
-};
+Plugin.nameToNpmID = PluginDependency.nameToNpmID;
 
 module.exports = Plugin;

lib/models/pluginDependency.js

@@ -1,12 +1,14 @@
 var is = require('is');
+var semver = require('semver');
 var Immutable = require('immutable');
 
+var PREFIX = require('../constants/pluginPrefix');
 var DEFAULT_VERSION = '*';
 
 /*
-    PluginDependency represents the informations about a plugin
-    stored in config.plugins
-*/
+ * PluginDependency represents the informations about a plugin
+ * stored in config.plugins
+ */
 var PluginDependency = Immutable.Record({
     name:       String(),
 
@@ -30,11 +32,56 @@ PluginDependency.prototype.isEnabled = function() {
 };
 
 /**
-    Create a plugin from a string
+ * Toggle this plugin state
+ * @param  {Boolean}
+ * @return {PluginDependency}
+ */
+PluginDependency.prototype.toggle = function(state) {
+    if (is.undef(state)) {
+        state = !this.isEnabled();
+    }
 
-    @param {String}
-    @return {Plugin|undefined}
-*/
+    return this.set('enabled', state);
+};
+
+/**
+ * Return NPM ID for the dependency
+ * @return {String}
+ */
+PluginDependency.prototype.getNpmID = function() {
+    return PluginDependency.nameToNpmID(this.getName());
+};
+
+/**
+ * Is the plugin using a git dependency
+ * @return {Boolean}
+ */
+PluginDependency.prototype.isGitDependency = function() {
+    return !semver.validRange(this.getVersion());
+};
+
+/**
+ * Create a plugin with a name and a plugin
+ * @param {String}
+ * @return {Plugin|undefined}
+ */
+PluginDependency.create = function(name, version, enabled) {
+    if (is.undefined(enabled)) {
+        enabled = true;
+    }
+
+    return new PluginDependency({
+        name: name,
+        version: version || DEFAULT_VERSION,
+        enabled: Boolean(enabled)
+    });
+};
+
+/**
+ * Create a plugin from a string
+ * @param {String}
+ * @return {Plugin|undefined}
+ */
 PluginDependency.createFromString = function(s) {
     var parts = s.split('@');
     var name = parts[0];
@@ -54,22 +101,20 @@ PluginDependency.createFromString = function(s) {
 };
 
 /**
-    Create a PluginDependency from a string
-
-    @param {String}
-    @return {List<PluginDependency>}
-*/
+ * Create a PluginDependency from a string
+ * @param {String}
+ * @return {List<PluginDependency>}
+ */
 PluginDependency.listFromString = function(s) {
     var parts = s.split(',');
     return PluginDependency.listFromArray(parts);
 };
 
 /**
-    Create a PluginDependency from an array
-
-    @param {Array}
-    @return {List<PluginDependency>}
-*/
+ * Create a PluginDependency from an array
+ * @param {Array}
+ * @return {List<PluginDependency>}
+ */
 PluginDependency.listFromArray = function(arr) {
     return Immutable.List(arr)
         .map(function(entry) {
@@ -77,8 +122,8 @@ PluginDependency.listFromArray = function(arr) {
                 return PluginDependency.createFromString(entry);
             } else {
                 return PluginDependency({
-                    name: entry.name,
-                    version: entry.version
+                    name: entry.get('name'),
+                    version: entry.get('version')
                 });
             }
         })
@@ -88,17 +133,16 @@ PluginDependency.listFromArray = function(arr) {
 };
 
 /**
-    Export plugin dependencies as an array
-
-    @param {List<PluginDependency>}
-    @return {Array<String>}
-*/
-PluginDependency.listToArray = function(arr) {
-    return arr
+ * Export plugin dependencies as an array
+ * @param {List<PluginDependency>} list
+ * @return {Array<String>}
+ */
+PluginDependency.listToArray = function(list) {
+    return list
         .map(function(dep) {
-            var result;
+            var result = '';
 
-            if (dep.isEnabled()) {
+            if (!dep.isEnabled()) {
                 result += '-';
             }
 
@@ -112,4 +156,13 @@ PluginDependency.listToArray = function(arr) {
         .toJS();
 };
 
+/**
+ * Return NPM id for a plugin name
+ * @param {String}
+ * @return {String}
+ */
+PluginDependency.nameToNpmID = function(s) {
+    return PREFIX + s;
+};
+
 module.exports = PluginDependency;

lib/models/summaryArticle.js

@@ -30,20 +30,21 @@ SummaryArticle.prototype.getArticles = function() {
 };
 
 /**
-    Return how deep the article is.
-    The README has a depth of 1
-
-    @return {Number}
-*/
+ * Return how deep the article is.
+ * The README has a depth of 1
+ *
+ * @return {Number}
+ */
 SummaryArticle.prototype.getDepth = function() {
     return (this.getLevel().split('.').length - 1);
 };
 
 /**
-    Get path (without anchor) to the pointing file
-
-    @return {String}
-*/
+ * Get path (without anchor) to the pointing file.
+ * It also normalizes the file path.
+ *
+ * @return {String}
+ */
 SummaryArticle.prototype.getPath = function() {
     if (this.isExternal()) {
         return undefined;
@@ -54,29 +55,28 @@ SummaryArticle.prototype.getPath = function() {
         return undefined;
     }
 
-
     var parts = ref.split('#');
 
     var pathname = (parts.length > 1? parts.slice(0, -1).join('#') : ref);
 
-    // Normalize path to remove ('./', etc)
-    return location.normalize(pathname);
+    // Normalize path to remove ('./', '/...', etc)
+    return location.flatten(pathname);
 };
 
 /**
-    Return url if article is external
-
-    @return {String}
-*/
+ * Return url if article is external
+ *
+ * @return {String}
+ */
 SummaryArticle.prototype.getUrl = function() {
     return this.isExternal()? this.getRef() : undefined;
 };
 
 /**
-    Get anchor for this article (or undefined)
-
-    @return {String}
-*/
+ * Get anchor for this article (or undefined)
+ *
+ * @return {String}
+ */
 SummaryArticle.prototype.getAnchor = function() {
     var ref = this.getRef();
     var parts = ref.split('#');
@@ -86,29 +86,68 @@ SummaryArticle.prototype.getAnchor = function() {
 };
 
 /**
-    Is article pointing to a page of an absolute url
+ * Create a new level for a new child article
+ *
+ * @return {String}
+ */
+SummaryArticle.prototype.createChildLevel = function() {
+    var level       = this.getLevel();
+    var subArticles = this.getArticles();
+    var childLevel  = level + '.' + (subArticles.size + 1);
 
-    @return {Boolean}
-*/
+    return childLevel;
+};
+
+/**
+ * Is article pointing to a page of an absolute url
+ *
+ * @return {Boolean}
+ */
 SummaryArticle.prototype.isPage = function() {
     return !this.isExternal() && this.getRef();
 };
 
 /**
-    Is article pointing to aan absolute url
+ * Check if this article is a file (exatcly)
+ *
+ * @param {File} file
+ * @return {Boolean}
+ */
+SummaryArticle.prototype.isFile = function(file) {
+    return (
+        file.getPath() === this.getPath()
+        && this.getAnchor() === undefined
+    );
+};
 
-    @return {Boolean}
-*/
+/**
+ * Check if this article is the introduction of the book
+ *
+ * @param {Book|Readme} book
+ * @return {Boolean}
+ */
+SummaryArticle.prototype.isReadme = function(book) {
+    var readme = book.getFile? book : book.getReadme();
+    var file = readme.getFile();
+
+    return this.isFile(file);
+};
+
+/**
+ * Is article pointing to aan absolute url
+ *
+ * @return {Boolean}
+ */
 SummaryArticle.prototype.isExternal = function() {
     return location.isExternal(this.getRef());
 };
 
 /**
-    Create a SummaryArticle
-
-    @param {Object} def
-    @return {SummaryArticle}
-*/
+ * Create a SummaryArticle
+ *
+ * @param {Object} def
+ * @return {SummaryArticle}
+ */
 SummaryArticle.create = function(def, level) {
     var articles = (def.articles || []).map(function(article, i) {
         if (article instanceof SummaryArticle) {
@@ -125,14 +164,13 @@ SummaryArticle.create = function(def, level) {
     });
 };
 
-
 /**
-    Find an article from a base one
-
-    @param {Article|Part} base
-    @param {Function(article)} iter
-    @return {Article}
-*/
+ * Find an article from a base one
+ *
+ * @param {Article|Part} base
+ * @param {Function(article)} iter
+ * @return {Article}
+ */
 SummaryArticle.findArticle = function(base, iter) {
     var articles = base.getArticles();
 

lib/models/summaryPart.js

@@ -25,11 +25,24 @@ SummaryPart.prototype.getArticles = function() {
 };
 
 /**
-    Create a SummaryPart
+ * Create a new level for a new child article
+ *
+ * @return {String}
+ */
+SummaryPart.prototype.createChildLevel = function() {
+    var level       = this.getLevel();
+    var subArticles = this.getArticles();
+    var childLevel  = level + '.' + (subArticles.size + 1);
 
-    @param {Object} def
-    @return {SummaryPart}
-*/
+    return childLevel;
+};
+
+/**
+ * Create a SummaryPart
+ *
+ * @param {Object} def
+ * @return {SummaryPart}
+ */
 SummaryPart.create = function(def, level) {
     var articles = (def.articles || []).map(function(article, i) {
         if (article instanceof SummaryArticle) {

lib/models/templateBlock.js

@@ -43,10 +43,9 @@ TemplateBlock.prototype.getBlocks = function() {
 
 
 /**
-    Return shortcuts associated with this block or undefined
-
-    @return {TemplateShortcut|undefined}
-*/
+ * Return shortcuts associated with this block or undefined
+ * @return {TemplateShortcut|undefined}
+ */
 TemplateBlock.prototype.getShortcuts = function() {
     var shortcuts = this.get('shortcuts');
     if (shortcuts.size === 0) {
@@ -57,19 +56,17 @@ TemplateBlock.prototype.getShortcuts = function() {
 };
 
 /**
-    Return name for the nunjucks extension
-
-    @return {String}
-*/
+ * Return name for the nunjucks extension
+ * @return {String}
+ */
 TemplateBlock.prototype.getExtensionName = function() {
     return 'Block' + this.getName() + 'Extension';
 };
 
 /**
-    Return a nunjucks extension to represents this block
-
-    @return {Nunjucks.Extension}
-*/
+ * Return a nunjucks extension to represents this block
+ * @return {Nunjucks.Extension}
+ */
 TemplateBlock.prototype.toNunjucksExt = function(mainContext, blocksOutput) {
     blocksOutput = blocksOutput || {};
 
@@ -192,11 +189,11 @@ TemplateBlock.prototype.toNunjucksExt = function(mainContext, blocksOutput) {
 };
 
 /**
-    Apply a block to a content
-    @param {Object} inner
-    @param {Object} context
-    @return {Promise<String>|String}
-*/
+ * Apply a block to a content
+ * @param {Object} inner
+ * @param {Object} context
+ * @return {Promise<String>|String}
+ */
 TemplateBlock.prototype.applyBlock = function(inner, context) {
     var processFn = this.getProcess();
 
@@ -215,11 +212,10 @@ TemplateBlock.prototype.applyBlock = function(inner, context) {
 };
 
 /**
-    Normalize result from a block process function
-
-    @param {Object|String} result
-    @return {Object}
-*/
+ * Normalize result from a block process function
+ * @param {Object|String} result
+ * @return {Object}
+ */
 TemplateBlock.prototype.normalizeBlockResult = function(result) {
     if (is.string(result)) {
         result = { body: result };
@@ -230,12 +226,11 @@ TemplateBlock.prototype.normalizeBlockResult = function(result) {
 };
 
 /**
-    Convert a block result to HTML
-
-    @param {Object} result
-    @param {Object} blocksOutput: stored post processing blocks in this object
-    @return {String}
-*/
+ * Convert a block result to HTML
+ * @param {Object} result
+ * @param {Object} blocksOutput: stored post processing blocks in this object
+ * @return {String}
+ */
 TemplateBlock.prototype.blockResultToHtml = function(result, blocksOutput) {
     var indexedKey;
     var toIndex = (!result.parse) || (result.post !== undefined);
@@ -256,12 +251,11 @@ TemplateBlock.prototype.blockResultToHtml = function(result, blocksOutput) {
 };
 
 /**
-    Create a template block from a function or an object
-
-    @param {String} blockName
-    @param {Object} block
-    @return {TemplateBlock}
-*/
+ * Create a template block from a function or an object
+ * @param {String} blockName
+ * @param {Object} block
+ * @return {TemplateBlock}
+ */
 TemplateBlock.create = function(blockName, block) {
     if (is.fn(block)) {
         block = new Immutable.Map({
@@ -275,11 +269,10 @@ TemplateBlock.create = function(blockName, block) {
 };
 
 /**
-    Extract kwargs from an arguments array
-
-    @param {Array} args
-    @return {Object}
-*/
+ * Extract kwargs from an arguments array
+ * @param {Array} args
+ * @return {Object}
+ */
 function extractKwargs(args) {
     var last = args[args.length - 1];
     return (is.object(last) && last.__keywords)? args.pop() : {};

lib/models/templateOutput.js

@@ -17,23 +17,21 @@ TemplateOutput.prototype.getBlocks = function() {
 };
 
 /**
-    Update content of this output
-
-    @param {String} content
-    @return {TemplateContent}
-*/
+ * Update content of this output
+ * @param {String} content
+ * @return {TemplateContent}
+ */
 TemplateOutput.prototype.setContent = function(content) {
     return this.set('content', content);
 };
 
 /**
-    Create a TemplateOutput from a text content
-    and an object containing block definition
-
-    @param {String} content
-    @param {Object} blocks
-    @return {TemplateOutput}
-*/
+ * Create a TemplateOutput from a text content
+ * and an object containing block definition
+ * @param {String} content
+ * @param {Object} blocks
+ * @return {TemplateOutput}
+ */
 TemplateOutput.create = function(content, blocks) {
     return new TemplateOutput({
         content:    content,

lib/modifiers/config/__tests__/addPlugin.js

@@ -0,0 +1,32 @@
+var addPlugin = require('../addPlugin');
+var Config = require('../../../models/config');
+
+describe('addPlugin', function() {
+    var config = Config.createWithValues({
+        plugins: ['hello', 'world', '-disabled']
+    });
+
+    it('should have correct state of dependencies', function() {
+        var disabledDep = config.getPluginDependency('disabled');
+
+        expect(disabledDep).toBeDefined();
+        expect(disabledDep.getVersion()).toEqual('*');
+        expect(disabledDep.isEnabled()).toBeFalsy();
+    });
+
+    it('should add the plugin to the list', function() {
+        var newConfig = addPlugin(config, 'test');
+
+        var testDep = newConfig.getPluginDependency('test');
+        expect(testDep).toBeDefined();
+        expect(testDep.getVersion()).toEqual('*');
+        expect(testDep.isEnabled()).toBeTruthy();
+
+        var disabledDep = newConfig.getPluginDependency('disabled');
+        expect(disabledDep).toBeDefined();
+        expect(disabledDep.getVersion()).toEqual('*');
+        expect(disabledDep.isEnabled()).toBeFalsy();
+    });
+});
+
+

lib/modifiers/config/__tests__/removePlugin.js

@@ -0,0 +1,33 @@
+var removePlugin = require('../removePlugin');
+var Config = require('../../../models/config');
+
+describe('removePlugin', function() {
+    var config = Config.createWithValues({
+        plugins: ['hello', 'world', '-disabled']
+    });
+
+    it('should remove the plugin from the list', function() {
+        var newConfig = removePlugin(config, 'hello');
+
+        var testDep = newConfig.getPluginDependency('hello');
+        expect(testDep).toNotBeDefined();
+    });
+
+    it('should remove the disabled plugin from the list', function() {
+        var newConfig = removePlugin(config, 'disabled');
+
+        var testDep = newConfig.getPluginDependency('disabled');
+        expect(testDep).toNotBeDefined();
+    });
+
+    it('should disable default plugin', function() {
+        var newConfig = removePlugin(config, 'search');
+
+        var disabledDep = newConfig.getPluginDependency('search');
+        expect(disabledDep).toBeDefined();
+        expect(disabledDep.getVersion()).toEqual('*');
+        expect(disabledDep.isEnabled()).toBeFalsy();
+    });
+});
+
+

lib/modifiers/config/__tests__/togglePlugin.js

@@ -0,0 +1,28 @@
+var togglePlugin = require('../togglePlugin');
+var Config = require('../../../models/config');
+
+describe('togglePlugin', function() {
+    var config = Config.createWithValues({
+        plugins: ['hello', 'world', '-disabled']
+    });
+
+    it('should enable plugin', function() {
+        var newConfig = togglePlugin(config, 'disabled');
+
+        var testDep = newConfig.getPluginDependency('disabled');
+        expect(testDep).toBeDefined();
+        expect(testDep.getVersion()).toEqual('*');
+        expect(testDep.isEnabled()).toBeTruthy();
+    });
+
+    it('should disable plugin', function() {
+        var newConfig = togglePlugin(config, 'world');
+
+        var testDep = newConfig.getPluginDependency('world');
+        expect(testDep).toBeDefined();
+        expect(testDep.getVersion()).toEqual('*');
+        expect(testDep.isEnabled()).toBeFalsy();
+    });
+});
+
+

lib/modifiers/config/addPlugin.js

@@ -1,25 +1,25 @@
 var PluginDependency = require('../../models/pluginDependency');
+var togglePlugin = require('./togglePlugin');
+var isDefaultPlugin = require('./isDefaultPlugin');
+
 /**
-    Add a plugin to a book's configuration
+ * Add a plugin to a book's configuration
+ * @param {Config} config
+ * @param {String} pluginName
+ * @param {String} version (optional)
+ * @return {Config}
+ */
+function addPlugin(config, pluginName, version) {
+    // For default plugin, we only ensure it is enabled
+    if (isDefaultPlugin(pluginName, version)) {
+        return togglePlugin(config, pluginName, true);
+    }
 
-    @param {Book} book
-    @param {String} plugin
-    @param {String} version (optional)
-    @return {Book}
-*/
-function addPlugin(book, plugin, version) {
-    var config = book.getConfig();
     var deps = config.getPluginDependencies();
-
-    var dep = PluginDependency({
-        name: plugin,
-        version: version
-    });
+    var dep = PluginDependency.create(pluginName, version);
 
     deps = deps.push(dep);
-    config = config.setPluginDependencies(deps);
-
-    return book.setConfig(config);
+    return config.setPluginDependencies(deps);
 }
 
 module.exports = addPlugin;

lib/modifiers/config/editPlugin.js

@@ -0,0 +1,13 @@
+
+/**
+ * Edit configuration of a plugin
+ * @param {Config} config
+ * @param {String} plugin
+ * @param {Object} pluginConfig
+ * @return {Config}
+ */
+function editPlugin(config, pluginName, pluginConfig) {
+    return config.set('pluginsConfig.'+pluginName, pluginConfig);
+}
+
+module.exports = editPlugin;

lib/modifiers/config/hasPlugin.js

@@ -0,0 +1,15 @@
+
+/**
+ * Test if a plugin is listed
+ * @param { {List<PluginDependency}} deps
+ * @param {String} plugin
+ * @param {String} version
+ * @return {Boolean}
+ */
+function hasPlugin(deps, pluginName, version) {
+    return !!deps.find(function(dep) {
+        return dep.getName() === pluginName && (!version || dep.getVersion() === version);
+    });
+}
+
+module.exports = hasPlugin;

lib/modifiers/config/index.js

@@ -1,5 +1,9 @@
 
 module.exports = {
-    addPlugin:          require('./addPlugin'),
-    removePlugin:       require('./removePlugin')
+    addPlugin:       require('./addPlugin'),
+    removePlugin:    require('./removePlugin'),
+    togglePlugin:    require('./togglePlugin'),
+    editPlugin:      require('./editPlugin'),
+    hasPlugin:       require('./hasPlugin'),
+    isDefaultPlugin: require('./isDefaultPlugin')
 };

lib/modifiers/config/isDefaultPlugin.js

@@ -0,0 +1,14 @@
+var DEFAULT_PLUGINS = require('../../constants/defaultPlugins');
+var hasPlugin = require('./hasPlugin');
+
+/**
+ * Test if a plugin is a default one
+ * @param {String} plugin
+ * @param {String} version
+ * @return {Boolean}
+ */
+function isDefaultPlugin(pluginName, version) {
+    return hasPlugin(DEFAULT_PLUGINS, pluginName, version);
+}
+
+module.exports = isDefaultPlugin;

lib/modifiers/config/removePlugin.js

@@ -1,22 +1,25 @@
+var togglePlugin = require('./togglePlugin');
+var isDefaultPlugin = require('./isDefaultPlugin');
 
 /**
-    Remove a plugin from a book's configuration
-
-    @param {Book} book
-    @param {String} plugin
-    @return {Book}
-*/
-function removePlugin(book, pluginName) {
-    var config = book.getConfig();
+ * Remove a plugin from a book's configuration
+ * @param {Config} config
+ * @param {String} plugin
+ * @return {Config}
+ */
+function removePlugin(config, pluginName) {
     var deps = config.getPluginDependencies();
 
+    // For default plugin, we have to disable it instead of removing from the list
+    if (isDefaultPlugin(pluginName)) {
+        return togglePlugin(config, pluginName, false);
+    }
 
-    deps = deps.filter(function(dep) {
+    // Remove the dependency from the list
+    deps = deps.filterNot(function(dep) {
         return dep.getName() === pluginName;
     });
-    config = config.setPluginDependencies(deps);
-
-    return book.setConfig(config);
+    return config.setPluginDependencies(deps);
 }
 
 module.exports = removePlugin;

lib/modifiers/config/togglePlugin.js

@@ -0,0 +1,31 @@
+var PluginDependency = require('../../models/pluginDependency');
+var hasPlugin = require('./hasPlugin');
+var isDefaultPlugin = require('./isDefaultPlugin');
+
+/**
+ * Enable/disable a plugin dependency
+ * @param {Config} config
+ * @param {String} pluginName
+ * @param {Boolean} state (optional)
+ * @return {Config}
+ */
+function togglePlugin(config, pluginName, state) {
+    var deps = config.getPluginDependencies();
+
+    // For default plugin, we should ensure it's listed first
+    if (isDefaultPlugin(pluginName) && !hasPlugin(deps, pluginName)) {
+        deps = deps.push(PluginDependency.create(pluginName));
+    }
+
+    deps = deps.map(function(dep) {
+        if (dep.getName() === pluginName) {
+            return dep.toggle(state);
+        }
+
+        return dep;
+    });
+
+    return config.setPluginDependencies(deps);
+}
+
+module.exports = togglePlugin;

lib/modifiers/summary/__tests__/insertArticle.js

@@ -0,0 +1,78 @@
+var Summary = require('../../../models/summary');
+var SummaryArticle = require('../../../models/summaryArticle');
+var File = require('../../../models/file');
+
+describe('insertArticle', function() {
+    var insertArticle = require('../insertArticle');
+    var summary = Summary.createFromParts(File(), [
+        {
+            articles: [
+                {
+                    title: '1.1',
+                    path: '1.1'
+                },
+                {
+                    title: '1.2',
+                    path: '1.2'
+                }
+            ]
+        },
+        {
+            title: 'Part I',
+            articles: [
+                {
+                    title: '2.1',
+                    path: '2.1',
+                    articles: [
+                        {
+                            title: '2.1.1',
+                            path: '2.1.1'
+                        },
+                        {
+                            title: '2.1.2',
+                            path: '2.1.2'
+                        }
+                    ]
+                },
+                {
+                    title: '2.2',
+                    path: '2.2'
+                }
+            ]
+        }
+    ]);
+
+    it('should insert an article at a given level', function() {
+        var article = SummaryArticle.create({
+            title: 'Inserted'
+        }, 'fake.level');
+
+        var newSummary = insertArticle(summary, article, '2.1.1');
+
+        var inserted = newSummary.getByLevel('2.1.1');
+        var nextOne = newSummary.getByLevel('2.1.2');
+
+        expect(inserted.getTitle()).toBe('Inserted');
+        expect(inserted.getLevel()).toBe('2.1.1');
+
+        expect(nextOne.getTitle()).toBe('2.1.1');
+        expect(nextOne.getLevel()).toBe('2.1.2');
+    });
+
+    it('should insert an article in last position', function() {
+        var article = SummaryArticle.create({
+            title: 'Inserted'
+        }, 'fake.level');
+
+        var newSummary = insertArticle(summary, article, '2.2');
+
+        var inserted = newSummary.getByLevel('2.2');
+        var previousOne = newSummary.getByLevel('2.1');
+
+        expect(inserted.getTitle()).toBe('Inserted');
+        expect(inserted.getLevel()).toBe('2.2');
+
+        expect(previousOne.getTitle()).toBe('2.1'); // Unchanged
+        expect(previousOne.getLevel()).toBe('2.1');
+    });
+});

lib/modifiers/summary/__tests__/insertPart.js

@@ -0,0 +1,60 @@
+var Summary = require('../../../models/summary');
+var SummaryPart = require('../../../models/summaryPart');
+
+var File = require('../../../models/file');
+
+describe('insertPart', function() {
+    var insertPart = require('../insertPart');
+    var summary = Summary.createFromParts(File(), [
+        {
+            articles: [
+                {
+                    title: '1.1',
+                    path: '1.1'
+                }
+            ]
+        },
+        {
+            title: 'Part I',
+            articles: [
+                {
+                    title: '2.1',
+                    path: '2.1',
+                    articles: []
+                },
+                {
+                    title: '2.2',
+                    path: '2.2'
+                }
+            ]
+        }
+    ]);
+
+    it('should insert an part at a given level', function() {
+        var part = SummaryPart.create({
+            title: 'Inserted'
+        }, 'meaningless.level');
+
+        var newSummary = insertPart(summary, part, 1);
+
+        var inserted = newSummary.getPart(1);
+        expect(inserted.getTitle()).toBe('Inserted');
+        expect(newSummary.getParts().count()).toBe(3);
+
+        var otherArticle = newSummary.getByLevel('3.1');
+        expect(otherArticle.getTitle()).toBe('2.1');
+        expect(otherArticle.getLevel()).toBe('3.1');
+    });
+
+    it('should insert an part in last position', function() {
+        var part = SummaryPart.create({
+            title: 'Inserted'
+        }, 'meaningless.level');
+
+        var newSummary = insertPart(summary, part, 2);
+
+        var inserted = newSummary.getPart(2);
+        expect(inserted.getTitle()).toBe('Inserted');
+        expect(newSummary.getParts().count()).toBe(3);
+    });
+});

lib/modifiers/summary/__tests__/moveArticle.js

@@ -42,7 +42,7 @@ describe('moveArticle', function() {
         }
     ]);
 
-    it('should move an article at in place', function() {
+    it('should move an article to the same place', function() {
         var newSummary = moveArticle(summary, '2.1', '2.1');
 
         expect(Immutable.is(summary, newSummary)).toBe(true);

lib/modifiers/summary/__tests__/moveArticleAfter.js

@@ -0,0 +1,82 @@
+var Immutable = require('immutable');
+var Summary = require('../../../models/summary');
+var File = require('../../../models/file');
+
+describe('moveArticleAfter', function() {
+    var moveArticleAfter = require('../moveArticleAfter');
+    var summary = Summary.createFromParts(File(), [
+        {
+            articles: [
+                {
+                    title: '1.1',
+                    path: '1.1'
+                },
+                {
+                    title: '1.2',
+                    path: '1.2'
+                }
+            ]
+        },
+        {
+            title: 'Part I',
+            articles: [
+                {
+                    title: '2.1',
+                    path: '2.1',
+                    articles: [
+                        {
+                            title: '2.1.1',
+                            path: '2.1.1'
+                        },
+                        {
+                            title: '2.1.2',
+                            path: '2.1.2'
+                        }
+                    ]
+                },
+                {
+                    title: '2.2',
+                    path: '2.2'
+                }
+            ]
+        }
+    ]);
+
+    it('moving right after itself should be invariant', function() {
+        var newSummary = moveArticleAfter(summary, '2.1', '2.1');
+
+        expect(Immutable.is(summary, newSummary)).toBe(true);
+    });
+
+    it('moving after previous one should be invariant too', function() {
+        var newSummary = moveArticleAfter(summary, '2.1', '2.0');
+
+        expect(Immutable.is(summary, newSummary)).toBe(true);
+    });
+
+    it('should move an article after a previous level', function() {
+        var newSummary = moveArticleAfter(summary, '2.2', '2.0');
+        var moved = newSummary.getByLevel('2.1');
+
+        expect(moved.getTitle()).toBe('2.2');
+        expect(newSummary.getByLevel('2.2').getTitle()).toBe('2.1');
+    });
+
+    it('should move an article after a previous and less deep level', function() {
+        var newSummary = moveArticleAfter(summary, '2.1.1', '2.0');
+        var moved = newSummary.getByLevel('2.1');
+
+        expect(moved.getTitle()).toBe('2.1.1');
+        expect(newSummary.getByLevel('2.2.1').getTitle()).toBe('2.1.2');
+        expect(newSummary.getByLevel('2.2').getTitle()).toBe('2.1');
+    });
+
+    it('should move an article after a next level', function() {
+        var newSummary = moveArticleAfter(summary, '2.1', '2.2');
+        var moved = newSummary.getByLevel('2.2');
+
+        expect(moved.getTitle()).toBe('2.1');
+        expect(newSummary.getByLevel('2.1').getTitle()).toBe('2.2');
+    });
+
+});

lib/modifiers/summary/__tests__/removeArticle.js

@@ -0,0 +1,53 @@
+var Summary = require('../../../models/summary');
+var File = require('../../../models/file');
+
+describe('removeArticle', function() {
+    var removeArticle = require('../removeArticle');
+    var summary = Summary.createFromParts(File(), [
+        {
+            articles: [
+                {
+                    title: '1.1',
+                    path: '1.1'
+                },
+                {
+                    title: '1.2',
+                    path: '1.2'
+                }
+            ]
+        },
+        {
+            title: 'Part I',
+            articles: [
+                {
+                    title: '2.1',
+                    path: '2.1',
+                    articles: [
+                        {
+                            title: '2.1.1',
+                            path: '2.1.1'
+                        },
+                        {
+                            title: '2.1.2',
+                            path: '2.1.2'
+                        }
+                    ]
+                },
+                {
+                    title: '2.2',
+                    path: '2.2'
+                }
+            ]
+        }
+    ]);
+
+    it('should remove an article at a given level', function() {
+        var newSummary = removeArticle(summary, '2.1.1');
+
+        var removed = newSummary.getByLevel('2.1.1');
+        var nextOne = newSummary.getByLevel('2.1.2');
+
+        expect(removed.getTitle()).toBe('2.1.2');
+        expect(nextOne).toBe(null);
+    });
+});

lib/modifiers/summary/editArticleRef.js

@@ -0,0 +1,17 @@
+var mergeAtLevel = require('./mergeAtLevel');
+
+/**
+    Edit the ref of an article
+
+    @param {Summary} summary
+    @param {String} level
+    @param {String} newRef
+    @return {Summary}
+*/
+function editArticleRef(summary, level, newRef) {
+    return mergeAtLevel(summary, level, {
+        ref: newRef
+    });
+}
+
+module.exports = editArticleRef;

lib/modifiers/summary/index.js

@@ -1,9 +1,13 @@
 module.exports = {
     insertArticle:      require('./insertArticle'),
     moveArticle:        require('./moveArticle'),
+    moveArticleAfter:   require('./moveArticleAfter'),
     removeArticle:      require('./removeArticle'),
     unshiftArticle:     require('./unshiftArticle'),
+    editArticleTitle:   require('./editArticleTitle'),
+    editArticleRef:     require('./editArticleRef'),
 
-    editPartTitle:      require('./editPartTitle'),
-    editArticleTitle:   require('./editArticleTitle')
+    insertPart:         require('./insertPart'),
+    removePart:         require('./removePart'),
+    editPartTitle:      require('./editPartTitle')
 };

lib/modifiers/summary/insertArticle.js

@@ -8,11 +8,11 @@ var indexArticleLevels = require('./indexArticleLevels');
     subsequent article shifted.
 
     @param {Summary} summary
-    @param {String|Article} level: level to insert at
     @param {Article} article
+    @param {String|Article} level: level to insert at
     @return {Summary}
 */
-function insertArticle(summary, level, article) {
+function insertArticle(summary, article, level) {
     article = SummaryArticle(article);
     level = is.string(level)? level : level.getLevel();
 

lib/modifiers/summary/insertPart.js

@@ -0,0 +1,19 @@
+var SummaryPart = require('../../models/summaryPart');
+var indexLevels = require('./indexLevels');
+
+/**
+    Returns a new Summary with a part inserted at given index
+
+    @param {Summary} summary
+    @param {Part} part
+    @param {Number} index
+    @return {Summary}
+*/
+function insertPart(summary, part, index) {
+    part = SummaryPart(part);
+
+    var parts = summary.getParts().insert(index, part);
+    return indexLevels(summary.set('parts', parts));
+}
+
+module.exports = insertPart;

lib/modifiers/summary/moveArticle.js

@@ -15,68 +15,11 @@ function moveArticle(summary, origin, target) {
     // Coerce to level
     var originLevel = is.string(origin)? origin : origin.getLevel();
     var targetLevel = is.string(target)? target : target.getLevel();
-
     var article = summary.getByLevel(originLevel);
 
-    // Remove
-    var removed = removeArticle(summary, origin);
-
-    // Adjust targetLevel if removing impacted it
-    targetLevel = arrayToLevel(
-        shiftLevel(levelToArray(originLevel),
-                   levelToArray(targetLevel)));
-    // Re-insert
-    return insertArticle(removed, target, article);
-}
-
-/**
-    @param {Array<Number>} removedLevel
-    @param {Array<Number>} level The level to udpate
-    @return {Array<Number>}
- */
-function shiftLevel(removedLevel, level) {
-    if (level.length === 0) {
-        // `removedLevel` is under level, so no effect
-        return level;
-    } else if (removedLevel.length === 0) {
-        // Either `level` is a child of `removedLevel`... or they are equal
-        // This is undefined behavior.
-        return level;
-    }
-
-    var removedRoot = removedLevel[0];
-    var root = level[0];
-    var removedRest = removedLevel.slice(1);
-    var rest = level.slice(1);
-
-    if (removedRoot < root) {
-        // It will shift levels at this point. The rest is unchanged.
-        return Array.prototype.concat(root - 1, rest);
-    } else if (removedRoot === root) {
-        // Look deeper
-        return Array.prototype.concat(root, shiftLevel(removedRest, rest));
-    } else {
-        // No impact
-        return level;
-    }
-}
-
-/**
-    @param {String}
-    @return {Array<Number>}
- */
-function levelToArray(l) {
-    return l.split('.').map(function (char) {
-        return parseInt(char, 10);
-    });
-}
-
-/**
-    @param {Array<Number>}
-    @return {String}
- */
-function arrayToLevel(a) {
-    return a.join('.');
+    // Remove first
+    var removed = removeArticle(summary, originLevel);
+    return insertArticle(removed, article, targetLevel);
 }
 
 module.exports = moveArticle;

lib/modifiers/summary/moveArticleAfter.js

@@ -0,0 +1,60 @@
+var is = require('is');
+var removeArticle = require('./removeArticle');
+var insertArticle = require('./insertArticle');
+
+/**
+    Returns a new summary, with the an article moved after another
+    article. Unlike `moveArticle`, does not ensure that the article
+    will be found at the target's level plus one.
+
+    @param {Summary} summary
+    @param {String|SummaryArticle} origin
+    @param {String|SummaryArticle} afterTarget
+    @return {Summary}
+*/
+function moveArticleAfter(summary, origin, afterTarget) {
+    // Coerce to level
+    var originLevel = is.string(origin)? origin : origin.getLevel();
+    var afterTargetLevel = is.string(afterTarget)? afterTarget : afterTarget.getLevel();
+    var article = summary.getByLevel(originLevel);
+
+    var targetLevel = increment(afterTargetLevel);
+
+    if (targetLevel < origin) {
+        // Remove first
+        var removed = removeArticle(summary, originLevel);
+        // Insert then
+        return insertArticle(removed, article, targetLevel);
+    } else {
+        // Insert right after first
+        var inserted = insertArticle(summary, article, targetLevel);
+        // Remove old one
+        return removeArticle(inserted, originLevel);
+    }
+}
+
+/**
+    @param {String}
+    @return {Array<Number>}
+ */
+function levelToArray(l) {
+    return l.split('.').map(function (char) {
+        return parseInt(char, 10);
+    });
+}
+
+/**
+    @param {Array<Number>}
+    @return {String}
+ */
+function arrayToLevel(a) {
+    return a.join('.');
+}
+
+function increment(level) {
+    level = levelToArray(level);
+    level[level.length - 1]++;
+    return arrayToLevel(level);
+}
+
+module.exports = moveArticleAfter;

lib/modifiers/summary/removePart.js

@@ -0,0 +1,15 @@
+var indexLevels = require('./indexLevels');
+
+/**
+    Remove a part at given index
+
+    @param {Summary} summary
+    @param {Number|} index
+    @return {Summary}
+*/
+function removePart(summary, index) {
+    var parts = summary.getParts().remove(index);
+    return indexLevels(summary.set('parts', parts));
+}
+
+module.exports = removePart;

lib/output/__tests__/ebook.js

@@ -3,7 +3,7 @@ var EbookGenerator = require('../ebook');
 
 describe('EbookGenerator', function() {
 
-    pit('should generate a SUMMARY.html', function() {
+    it('should generate a SUMMARY.html', function() {
         return generateMock(EbookGenerator, {
             'README.md': 'Hello World'
         })

lib/output/__tests__/json.js

@@ -3,7 +3,7 @@ var JSONGenerator = require('../json');
 
 describe('JSONGenerator', function() {
 
-    pit('should generate a README.json', function() {
+    it('should generate a README.json', function() {
         return generateMock(JSONGenerator, {
             'README.md': 'Hello World'
         })
@@ -12,7 +12,7 @@ describe('JSONGenerator', function() {
         });
     });
 
-    pit('should generate a json file for each articles', function() {
+    it('should generate a json file for each articles', function() {
         return generateMock(JSONGenerator, {
             'README.md': 'Hello World',
             'SUMMARY.md': '# Summary\n\n* [Page](test/page.md)',
@@ -25,5 +25,22 @@ describe('JSONGenerator', function() {
             expect(folder).toHaveFile('test/page.json');
         });
     });
+
+    it('should generate a multilingual book', function() {
+        return generateMock(JSONGenerator, {
+            'LANGS.md': '# Languages\n\n* [en](en)\n* [fr](fr)',
+            'en': {
+                'README.md': 'Hello'
+            },
+            'fr': {
+                'README.md': 'Bonjour'
+            }
+        })
+        .then(function(folder) {
+            expect(folder).toHaveFile('en/README.json');
+            expect(folder).toHaveFile('fr/README.json');
+            expect(folder).toHaveFile('README.json');
+        });
+    });
 });
 

lib/output/__tests__/website.js

@@ -1,9 +1,10 @@
+var fs = require('fs');
 var generateMock = require('../generateMock');
 var WebsiteGenerator = require('../website');
 
 describe('WebsiteGenerator', function() {
 
-    pit('should generate an index.html', function() {
+    it('should generate an index.html', function() {
         return generateMock(WebsiteGenerator, {
             'README.md': 'Hello World'
         })
@@ -12,7 +13,55 @@ describe('WebsiteGenerator', function() {
         });
     });
 
-    pit('should copy asset files', function() {
+    describe('Glossary', function() {
+        var folder;
+
+        before(function() {
+            return generateMock(WebsiteGenerator, {
+                'README.md': 'Hello World',
+                'SUMMARY.md': '* [Deep](folder/page.md)',
+                'folder': {
+                    'page.md': 'Hello World'
+                },
+                'GLOSSARY.md': '# Glossary\n\n## Hello\n\nHello World'
+            })
+            .then(function(_folder) {
+                folder = _folder;
+            });
+        });
+
+        it('should generate a GLOSSARY.html', function() {
+            expect(folder).toHaveFile('GLOSSARY.html');
+        });
+
+        it('should correctly resolve glossary links in README', function() {
+            var html = fs.readFileSync(folder + '/index.html', 'utf8');
+            expect(html).toHaveDOMElement('.page-inner a[href="GLOSSARY.html#hello"]');
+        });
+
+        it('should correctly resolve glossary links in directory', function() {
+            var html = fs.readFileSync(folder + '/folder/page.html', 'utf8');
+            expect(html).toHaveDOMElement('.page-inner a[href="../GLOSSARY.html#hello"]');
+        });
+
+        it('should accept a custom glossary file', function() {
+            return generateMock(WebsiteGenerator, {
+                'README.md': 'Hello World',
+                'book.json': '{ "structure": { "glossary": "custom.md" } }',
+                'custom.md': '# Glossary\n\n## Hello\n\nHello World'
+            })
+            .then(function(folder) {
+                expect(folder).toHaveFile('custom.html');
+                expect(folder).toNotHaveFile('GLOSSARY.html');
+
+                var html = fs.readFileSync(folder + '/index.html', 'utf8');
+                expect(html).toHaveDOMElement('.page-inner a[href="custom.html#hello"]');
+            });
+        });
+    });
+
+
+    it('should copy asset files', function() {
         return generateMock(WebsiteGenerator, {
             'README.md': 'Hello World',
             'myJsFile.js': 'var a = "test";',
@@ -27,7 +76,7 @@ describe('WebsiteGenerator', function() {
         });
     });
 
-    pit('should generate an index.html for AsciiDoc', function() {
+    it('should generate an index.html for AsciiDoc', function() {
         return generateMock(WebsiteGenerator, {
             'README.adoc': 'Hello World'
         })
@@ -36,7 +85,7 @@ describe('WebsiteGenerator', function() {
         });
     });
 
-    pit('should generate an HTML file for each articles', function() {
+    it('should generate an HTML file for each articles', function() {
         return generateMock(WebsiteGenerator, {
             'README.md': 'Hello World',
             'SUMMARY.md': '# Summary\n\n* [Page](test/page.md)',
@@ -50,7 +99,7 @@ describe('WebsiteGenerator', function() {
         });
     });
 
-    pit('should not generate file if entry file doesn\'t exist', function() {
+    it('should not generate file if entry file doesn\'t exist', function() {
         return generateMock(WebsiteGenerator, {
             'README.md': 'Hello World',
             'SUMMARY.md': '# Summary\n\n* [Page 1](page.md)\n* [Page 2](test/page.md)',
@@ -60,12 +109,12 @@ describe('WebsiteGenerator', function() {
         })
         .then(function(folder) {
             expect(folder).toHaveFile('index.html');
-            expect(folder).not.toHaveFile('page.html');
+            expect(folder).toNotHaveFile('page.html');
             expect(folder).toHaveFile('test/page.html');
         });
     });
 
-    pit('should generate a multilingual book', function() {
+    it('should generate a multilingual book', function() {
         return generateMock(WebsiteGenerator, {
             'LANGS.md': '# Languages\n\n* [en](en)\n* [fr](fr)',
             'en': {
@@ -81,12 +130,12 @@ describe('WebsiteGenerator', function() {
             expect(folder).toHaveFile('fr/index.html');
 
             // Should not copy languages as assets
-            expect(folder).not.toHaveFile('en/README.md');
-            expect(folder).not.toHaveFile('fr/README.md');
+            expect(folder).toNotHaveFile('en/README.md');
+            expect(folder).toNotHaveFile('fr/README.md');
 
             // Should copy assets only once
             expect(folder).toHaveFile('gitbook/style.css');
-            expect(folder).not.toHaveFile('en/gitbook/style.css');
+            expect(folder).toNotHaveFile('en/gitbook/style.css');
 
             expect(folder).toHaveFile('index.html');
         });

lib/output/createTemplateEngine.js

@@ -28,7 +28,8 @@ function createTemplateEngine(output) {
     filters = defaultFilters.merge(filters);
 
     // Create loader
-    var loader = new Templating.ConrefsLoader(rootFolder, logger);
+    var transformFn = Templating.replaceShortcuts.bind(null, blocks);
+    var loader = new Templating.ConrefsLoader(rootFolder, transformFn, logger);
 
     // Create API context
     var context = Api.encodeGlobal(output);

lib/output/ebook/getCoverPath.js

@@ -11,17 +11,17 @@ function getCoverPath(output) {
     var outputRoot = output.getRoot();
     var book = output.getBook();
     var config = book.getConfig();
-    var cover = config.getValue('cover', 'cover.jpg');
+    var coverName = config.getValue('cover', 'cover.jpg');
 
     // Resolve to absolute
-    cover = fs.pickFile(outputRoot, cover);
+    var cover = fs.pickFile(outputRoot, coverName);
     if (cover) {
         return cover;
     }
 
     // Multilingual? try parent folder
     if (book.isLanguageBook()) {
-        cover = fs.pickFile(path.join(outputRoot, '..'), cover);
+        cover = fs.pickFile(path.join(outputRoot, '..'), coverName);
     }
 
     return cover;

lib/output/generateBook.js

@@ -2,7 +2,6 @@ var path = require('path');
 var Immutable = require('immutable');
 
 var Output = require('../models/output');
-var Config = require('../models/config');
 var Promise = require('../utils/promise');
 var fs = require('../utils/fs');
 
@@ -41,7 +40,7 @@ function processOutput(generator, startOutput) {
                 var book = output.getBook();
                 var config = book.getConfig();
 
-                config = Config.updateValues(config, result);
+                config = config.updateValues(result);
                 book = book.set('config', config);
                 return output.set('book', book);
             }
@@ -78,6 +77,7 @@ function processOutput(generator, startOutput) {
             return;
         }
 
+        var logger = book.getLogger();
         var books = book.getBooks();
         var outputRoot = output.getRoot();
         var plugins = output.getPlugins();
@@ -95,6 +95,8 @@ function processOutput(generator, startOutput) {
                 plugins:    plugins
             });
 
+            logger.info.ln('');
+            logger.info.ln('generating language "' + langBook.getLanguage() + '"');
             return processOutput(generator, langOutput);
         });
     })

lib/output/generateMock.js

@@ -19,7 +19,13 @@ var generateBook = require('./generateBook');
 function generateMock(Generator, files) {
     var fs = createMockFS(files);
     var book = Book.createForFS(fs);
-    var dir = tmp.dirSync();
+    var dir;
+
+    try {
+        dir = tmp.dirSync();
+    } catch(err) {
+        throw err;
+    }
 
     book = book.setLogLevel('disabled');
 

lib/output/generatePage.js

@@ -1,8 +1,9 @@
+var path = require('path');
+
 var Promise = require('../utils/promise');
 var error = require('../utils/error');
 var timing = require('../utils/timing');
 
-var Parse = require('../parse');
 var Templating = require('../templating');
 var JSONUtils = require('../json');
 var createTemplateEngine = require('./createTemplateEngine');
@@ -21,7 +22,7 @@ function generatePage(output, page) {
 
     return timing.measure(
         'page.generate',
-        Parse.parsePage(book, page)
+        Promise(page)
         .then(function(resultPage) {
             var file = resultPage.getFile();
             var filePath = file.getPath();
@@ -44,7 +45,8 @@ function generatePage(output, page) {
 
             // Render templating syntax
             .then(function(content) {
-                return Templating.render(engine, filePath, content, context);
+                var absoluteFilePath = path.join(book.getContentRoot(), filePath);
+                return Templating.render(engine, absoluteFilePath, content, context);
             })
 
             .then(function(output) {

lib/output/getModifiers.js

@@ -4,22 +4,27 @@ var Api = require('../api');
 var Plugins = require('../plugins');
 var Promise = require('../utils/promise');
 var defaultBlocks = require('../constants/defaultBlocks');
+var fileToOutput = require('./helper/fileToOutput');
 
 var CODEBLOCK = 'code';
 
 /**
-    Return default modifier to prepare a page for
-    rendering.
-
-    @return {Array<Modifier>}
-*/
+ * Return default modifier to prepare a page for
+ * rendering.
+ *
+ * @return {Array<Modifier>}
+ */
 function getModifiers(output, page) {
     var book = output.getBook();
     var plugins = output.getPlugins();
     var glossary = book.getGlossary();
-    var entries = glossary.getEntries();
     var file = page.getFile();
 
+    // Glossary entries
+    var entries = glossary.getEntries();
+    var glossaryFile = glossary.getFile();
+    var glossaryFilename = fileToOutput(output, glossaryFile.getPath());
+
     // Current file path
     var currentFilePath = file.getPath();
 
@@ -34,18 +39,18 @@ function getModifiers(output, page) {
         // Normalize IDs on headings
         Modifiers.addHeadingId,
 
+        // Annotate text with glossary entries
+        Modifiers.annotateText.bind(null, entries, glossaryFilename),
+
+        // Resolve images
+        Modifiers.resolveImages.bind(null, currentFilePath),
+
         // Resolve links (.md -> .html)
         Modifiers.resolveLinks.bind(null,
             currentFilePath,
             resolveFileToURL.bind(null, output)
         ),
 
-        // Resolve images
-        Modifiers.resolveImages.bind(null, currentFilePath),
-
-        // Annotate text with glossary entries
-        Modifiers.annotateText.bind(null, entries),
-
         // Highlight code blocks using "code" block
         Modifiers.highlightCode.bind(null, function(lang, source) {
             return Promise(code.applyBlock({

lib/output/helper/fileToOutput.js

@@ -6,12 +6,12 @@ var LocationUtils = require('../../utils/location');
 var OUTPUT_EXTENSION = '.html';
 
 /**
-    Convert a filePath (absolute) to a filename for output
-
-    @param {Output} output
-    @param {String} filePath
-    @return {String}
-*/
+ * Convert a filePath (absolute) to a filename for output
+ *
+ * @param {Output} output
+ * @param {String} filePath
+ * @return {String}
+ */
 function fileToOutput(output, filePath) {
     var book = output.getBook();
     var readme = book.getReadme();

lib/output/helper/resolveFileToURL.js

@@ -3,18 +3,17 @@ var LocationUtils = require('../../utils/location');
 var fileToURL = require('./fileToURL');
 
 /**
-    Resolve an absolute path (extracted from a link)
-
-    @param {Output} output
-    @param {String} filePath
-    @return {String}
-*/
+ * Resolve an absolute path (extracted from a link)
+ *
+ * @param {Output} output
+ * @param {String} filePath
+ * @return {String}
+ */
 function resolveFileToURL(output, filePath) {
     // Convert /test.png -> test.png
     filePath = LocationUtils.toAbsolute(filePath, '', '');
 
-    var pages = output.getPages();
-    var page = pages.get(filePath);
+    var page = output.getPage(filePath);
 
     // if file is a page, return correct .html url
     if (page) {

lib/output/json/index.js

@@ -2,5 +2,6 @@
 module.exports = {
     name:       'json',
     Options:    require('./options'),
-    onPage:     require('./onPage')
+    onPage:     require('./onPage'),
+    onFinish:   require('./onFinish')
 };

lib/output/json/onFinish.js

@@ -2,6 +2,7 @@ var path = require('path');
 
 var Promise = require('../../utils/promise');
 var fs = require('../../utils/fs');
+var JSONUtils = require('../../json');
 
 /**
     Finish the generation
@@ -21,11 +22,25 @@ function onFinish(output) {
     var languages = book.getLanguages();
     var mainLanguage = languages.getDefaultLanguage();
 
-    // Copy README.json from it
-    return fs.copy(
-        path.resolve(outputRoot, mainLanguage.getID(), 'README.json'),
-        path.resolve(outputRoot, 'README.json')
-    )
+    // Read the main JSON
+    return fs.readFile(path.resolve(outputRoot, mainLanguage.getID(), 'README.json'), 'utf8')
+
+    // Extend the JSON
+    .then(function(content) {
+        var json = JSON.parse(content);
+
+        json.languages = JSONUtils.encodeLanguages(languages);
+
+        return json;
+    })
+
+    .then(function(json) {
+        return fs.writeFile(
+            path.resolve(outputRoot, 'README.json'),
+            JSON.stringify(json, null, 4)
+        );
+    })
+
     .thenResolve(output);
 }
 

lib/output/modifiers/__tests__/addHeadingId.js

@@ -1,11 +1,8 @@
-jest.autoMockOff();
-
 var cheerio = require('cheerio');
+var addHeadingId = require('../addHeadingId');
 
 describe('addHeadingId', function() {
-    var addHeadingId = require('../addHeadingId');
-
-    pit('should add an ID if none', function() {
+    it('should add an ID if none', function() {
         var $ = cheerio.load('<h1>Hello World</h1><h2>Cool !!</h2>');
 
         return addHeadingId($)
@@ -15,7 +12,7 @@ describe('addHeadingId', function() {
         });
     });
 
-    pit('should not change existing IDs', function() {
+    it('should not change existing IDs', function() {
         var $ = cheerio.load('<h1 id="awesome">Hello World</h1>');
 
         return addHeadingId($)

lib/output/modifiers/__tests__/annotateText.js

@@ -1,12 +1,9 @@
-jest.autoMockOff();
-
 var Immutable = require('immutable');
 var cheerio = require('cheerio');
 var GlossaryEntry = require('../../../models/glossaryEntry');
+var annotateText = require('../annotateText');
 
 describe('annotateText', function() {
-    var annotateText = require('../annotateText');
-
     var entries = Immutable.List([
         GlossaryEntry({ name: 'Word' }),
         GlossaryEntry({ name: 'Multiple Words' })
@@ -15,7 +12,7 @@ describe('annotateText', function() {
     it('should annotate text', function() {
         var $ = cheerio.load('<p>This is a word, and multiple words</p>');
 
-        annotateText(entries, $);
+        annotateText(entries, 'GLOSSARY.md', $);
 
         var links = $('a');
         expect(links.length).toBe(2);
@@ -34,14 +31,14 @@ describe('annotateText', function() {
     it('should not annotate scripts', function() {
         var $ = cheerio.load('<script>This is a word, and multiple words</script>');
 
-        annotateText(entries, $);
+        annotateText(entries, 'GLOSSARY.md', $);
         expect($('a').length).toBe(0);
     });
 
     it('should not annotate when has class "no-glossary"', function() {
         var $ = cheerio.load('<p class="no-glossary">This is a word, and multiple words</p>');
 
-        annotateText(entries, $);
+        annotateText(entries, 'GLOSSARY.md', $);
         expect($('a').length).toBe(0);
     });
 });

lib/output/modifiers/__tests__/fetchRemoteImages.js

@@ -12,7 +12,7 @@ describe('fetchRemoteImages', function() {
         dir = tmp.dirSync();
     });
 
-    pit('should download image file', function() {
+    it('should download image file', function() {
         var $ = cheerio.load('<img src="' + URL + '" />');
 
         return fetchRemoteImages(dir.name, 'index.html', $)
@@ -24,7 +24,7 @@ describe('fetchRemoteImages', function() {
         });
     });
 
-    pit('should download image file and replace with relative path', function() {
+    it('should download image file and replace with relative path', function() {
         var $ = cheerio.load('<img src="' + URL + '" />');
 
         return fetchRemoteImages(dir.name, 'test/index.html', $)

lib/output/modifiers/__tests__/highlightCode.js

@@ -1,11 +1,8 @@
-jest.autoMockOff();
-
 var cheerio = require('cheerio');
 var Promise = require('../../../utils/promise');
+var highlightCode = require('../highlightCode');
 
 describe('highlightCode', function() {
-    var highlightCode = require('../highlightCode');
-
     function doHighlight(lang, code) {
         return {
             text: '' + (lang || '') + '$' + code
@@ -19,7 +16,7 @@ describe('highlightCode', function() {
         });
     }
 
-    pit('should call it for normal code element', function() {
+    it('should call it for normal code element', function() {
         var $ = cheerio.load('<p>This is a <code>test</code></p>');
 
         return highlightCode(doHighlight, $)
@@ -29,7 +26,7 @@ describe('highlightCode', function() {
         });
     });
 
-    pit('should call it for markdown code block', function() {
+    it('should call it for markdown code block', function() {
         var $ = cheerio.load('<pre><code class="lang-js">test</code></pre>');
 
         return highlightCode(doHighlight, $)
@@ -39,7 +36,7 @@ describe('highlightCode', function() {
         });
     });
 
-    pit('should call it for asciidoc code block', function() {
+    it('should call it for asciidoc code block', function() {
         var $ = cheerio.load('<pre><code class="language-python">test</code></pre>');
 
         return highlightCode(doHighlight, $)
@@ -49,7 +46,7 @@ describe('highlightCode', function() {
         });
     });
 
-    pit('should accept async highlighter', function() {
+    it('should accept async highlighter', function() {
         var $ = cheerio.load('<pre><code class="language-python">test</code></pre>');
 
         return highlightCode(doHighlightAsync, $)

lib/output/modifiers/__tests__/inlinePng.js

@@ -9,7 +9,7 @@ describe('inlinePng', function() {
         dir = tmp.dirSync();
     });
 
-    pit('should write an inline PNG using data URI as a file', function() {
+    it('should write an inline PNG using data URI as a file', function() {
         var $ = cheerio.load('<img alt="GitBook Logo 20x20" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUEAYAAADdGcFOAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAsTAAALEwEAmpwYAAABWWlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyI+CiAgICAgICAgIDx0aWZmOk9yaWVudGF0aW9uPjE8L3RpZmY6T3JpZW50YXRpb24+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgpMwidZAAAF+klEQVRIDY3Wf5CVVR3H8c9z791fyI9dQwdQ4TTI7wEWnQZZAa/mJE4Z0OaKUuN1KoaykZxUGGHay+iIVFMoEYrUPhDCKEKW2ChT8dA0RCSxWi6EW3sYYpcfxq5C+4O9957O+7m7O/qHQ9/XzH1+nHuec57z8wkWTsKw0y6N/LxXN6KzTnEUHi8eP/l3YStSU/MdsYvBbGh8six2YXcbcgc++QkfTQkWz/81KtqDA0hlUoWnsX+5uxe5X365BB9my2bjrHNHccLk16BpS9CExjcmXMDbD6wehdyEjxbjz1uK1zn9qga6dcfnMLXeXY/qjuQqTF4W1MKke8ZgeNhjMCxMPIWSd4OF78C55CFI/1kF6WwXpMqjkAZ/CKniNDrCsmU4lE1YbPlgR2x7R39FF23D4mq3A1+Z35PGTNs1E1XhxcGQOh6HNPwXkK56BVJhOaRg/pvoHXNxHFw410B25EYE2RMvI0i/twFJvXcrFObykEa+DmnQGLwYqR0l2a6JqItaj8C/4E2QxtZCofkC8tF1t8HZc/fAZaLnIF2xEsoEtW1w7vBSSFtfhDTnCki9cSi81Ain1uko2Ld+Dmf2rkUq0/5t+PYbFtPQdkjzNiAXTWtDEF49FgkzJInAVPwNyhzcDOmrdZCm/Rn+ebWtcPs+/U24hmg2XL0rRkPPELh9R8fDtXR2oC/VuZbGaci79Ajkb6lZgfyYtyzy/X9s6T/pO/ZfN/RdNxxIwTWM2wbX8KVmuIaEqmKm6zEondwGpd0SyOy5DrJ//TFkX9kMhd3XQHbEVCSsm4OECV5HIv2p15CwfWPSntoHRbv2Q1HzSvSlSqZwATIuBxk/zZBOBbdB+u9hSKU3Q7pwAjInZkFm6U8hu7MSMqe/Dqn8fUj5GVCmpxK+4N/F1LMa0p5eSOPqIPP7NGSunAI/+R6GnzQzIBt8A1LC/QZ+6HwLst1rITv0n5CtXgSZ78yFTNkR+FdeDZneJkip3fAtsQ5Scilkek7CH9dAmjIWvkK7IXXOh6/IzZDNPQdZXR1TQmdjKv0ZfEu0YKDpNflpyG5aDtnRv8VAuu3dBV+huyBbvgdS97tQNLQc0mfugKy5Cb4BipPIXvsUpK5N8Mvao/Bd3QDZRH9Rrtj3Cl6FHwPFMLmNkKrj8BnHoT+XX6f2wl+XxFS4Ab7C72Dgf7bi+5DpTkNm8kQMpCs/BzIlz8LfPxnzLdh3EjwMX4GX4Ju4GNb9A1L7k/D3J8b6kv2LFCtmCmcgUzoJsr2z4MfwFsh87xikZefg188fYaAhpPUxm3ge/vFnYkoED0HqeQiyJYcwkNGWnoNv6s9C1p1Bf/389VYoCjohW7UfMms3wXdpBv7+FEiPLIHs4DIMNERUNhbSpY3wk6QOsqlCDVx2xCrInMpBmfNPQOnzKxBkkrugdOl9GKigSZZCUWIm/GqwDtLUI5D+WAOlb9wKP0YvQLbjZSjsaYaL/n0/FA3fDtnCGihK5UYjCK+ZDr+TDIKLdm2Fs1UOzo76F5wO74XSZj0S6d7RCMLkCshcXALZxaWQRjXDZQ62oRAdCeG/Ju5HELX2QFH3C0hkRy6GovyfwF58AoVbguOxyB2H7/I34Gf11yANnQSp7Vr4MbQH0vg7kbNNp5AM3UrIVDchnz56B1Jm573wW9gZSFVPwO/hefg5FsIvN09CchtQCIOFw/F5U8ii3CZn4cqo7C8YlXEPYkx9cacZl00+iwnprrtwVdj1Q/gXmAs/pu6LZc9XQOGgSvh19n2cDZN341g2EcfxTEGwH/RewqlMsUfbbWIGLjUG+j/j9nokD1beiOvLS5dhjr30Gu6ZnivgdtM/6VJvY1+6pBHbH+h9CX84vfMxNJtisYVFlys+WNCIZJNmIsjohlhNSQC3f8R55H+y/hjkN8GPR9ndCLJxT4/3n0Px51ay8XQnNrYfDJHf//Fc0oMrEZSeeQGJ7+Z+gKCgLbHNWgXnB9FlYt5JaN38JIINC95EakjtAqQeuUx21c5B6tEFf0fSfbEFQf28Z6D6y+X/H0jf40QQJhYwAAAAAElFTkSuQmCC"/>');
 
         return inlinePng(dir.name, 'index.html', $)

lib/output/modifiers/__tests__/resolveLinks.js

@@ -1,13 +1,10 @@
-jest.autoMockOff();
-
 var path = require('path');
 var cheerio = require('cheerio');
+var resolveLinks = require('../resolveLinks');
 
 describe('resolveLinks', function() {
-    var resolveLinks = require('../resolveLinks');
-
     function resolveFileBasic(href) {
-        return href;
+        return 'fakeDir/' + href;
     }
 
     function resolveFileCustom(href) {
@@ -21,23 +18,47 @@ describe('resolveLinks', function() {
     describe('Absolute path', function() {
         var TEST = '<p>This is a <a href="/test/cool.md"></a></p>';
 
-        pit('should resolve path starting by "/" in root directory', function() {
+        it('should resolve path starting by "/" in root directory', function() {
             var $ = cheerio.load(TEST);
 
             return resolveLinks('hello.md', resolveFileBasic, $)
             .then(function() {
                 var link = $('a');
-                expect(link.attr('href')).toBe('test/cool.md');
+                expect(link.attr('href')).toBe('fakeDir/test/cool.md');
             });
         });
 
-        pit('should resolve path starting by "/" in child directory', function() {
+        it('should resolve path starting by "/" in child directory', function() {
             var $ = cheerio.load(TEST);
 
             return resolveLinks('afolder/hello.md', resolveFileBasic, $)
             .then(function() {
                 var link = $('a');
-                expect(link.attr('href')).toBe('../test/cool.md');
+                expect(link.attr('href')).toBe('../fakeDir/test/cool.md');
+            });
+        });
+    });
+
+    describe('Anchor', function() {
+        it('should prevent anchors in resolution', function() {
+            var TEST = '<p>This is a <a href="test/cool.md#an-anchor"></a></p>';
+            var $ = cheerio.load(TEST);
+
+            return resolveLinks('hello.md', resolveFileCustom, $)
+            .then(function() {
+                var link = $('a');
+                expect(link.attr('href')).toBe('test/cool.html#an-anchor');
+            });
+        });
+
+        it('should ignore pure anchor links', function() {
+            var TEST = '<p>This is a <a href="#an-anchor"></a></p>';
+            var $ = cheerio.load(TEST);
+
+            return resolveLinks('hello.md', resolveFileCustom, $)
+            .then(function() {
+                var link = $('a');
+                expect(link.attr('href')).toBe('#an-anchor');
             });
         });
     });
@@ -45,7 +66,7 @@ describe('resolveLinks', function() {
     describe('Custom Resolver', function() {
         var TEST = '<p>This is a <a href="/test/cool.md"></a> <a href="afile.png"></a></p>';
 
-        pit('should resolve path correctly for absolute path', function() {
+        it('should resolve path correctly for absolute path', function() {
             var $ = cheerio.load(TEST);
 
             return resolveLinks('hello.md', resolveFileCustom, $)
@@ -55,7 +76,7 @@ describe('resolveLinks', function() {
             });
         });
 
-        pit('should resolve path correctly for absolute path (2)', function() {
+        it('should resolve path correctly for absolute path (2)', function() {
             var $ = cheerio.load(TEST);
 
             return resolveLinks('afodler/hello.md', resolveFileCustom, $)
@@ -66,6 +87,18 @@ describe('resolveLinks', function() {
         });
     });
 
+    describe('External link', function() {
+        var TEST = '<p>This is a <a href="http://www.github.com">external link</a></p>';
+
+        it('should have target="_blank" attribute', function() {
+            var $ = cheerio.load(TEST);
+
+            return resolveLinks('hello.md', resolveFileBasic, $)
+            .then(function() {
+                var link = $('a');
+                expect(link.attr('target')).toBe('_blank');
+            });
+        });
+    });
+
 });
-
-

lib/output/modifiers/__tests__/svgToImg.js

@@ -9,7 +9,7 @@ describe('svgToImg', function() {
         dir = tmp.dirSync();
     });
 
-    pit('should write svg as a file', function() {
+    it('should write svg as a file', function() {
         var $ = cheerio.load('<svg xmlns="http://www.w3.org/2000/svg" width="200" height="100" version="1.1"><rect width="200" height="100" stroke="black" stroke-width="6" fill="green"/></svg>');
 
         return svgToImg(dir.name, 'index.html', $)

lib/output/modifiers/__tests__/svgToPng.js

@@ -2,16 +2,17 @@ var cheerio = require('cheerio');
 var tmp = require('tmp');
 var path = require('path');
 
+var svgToImg = require('../svgToImg');
+var svgToPng = require('../svgToPng');
+
 describe('svgToPng', function() {
     var dir;
-    var svgToImg = require('../svgToImg');
-    var svgToPng = require('../svgToPng');
 
     beforeEach(function() {
         dir = tmp.dirSync();
     });
 
-    pit('should write svg as png file', function() {
+    it('should write svg as png file', function() {
         var $ = cheerio.load('<svg xmlns="http://www.w3.org/2000/svg" width="200" height="100" version="1.1"><rect width="200" height="100" stroke="black" stroke-width="6" fill="green"/></svg>');
         var fileName = 'index.html';
 

lib/output/modifiers/annotateText.js

@@ -59,18 +59,18 @@ function replaceText($, el, search, replace, text_only ) {
 }
 
 /**
-    Annotate text using a list of GlossaryEntry
-
-    @param {List<GlossaryEntry>}
-    @param {HTMLDom} $
-*/
-function annotateText(entries, $) {
+ * Annotate text using a list of GlossaryEntry
+ *
+ * @param {List<GlossaryEntry>}
+ * @param {String} glossaryFilePath
+ * @param {HTMLDom} $
+ */
+function annotateText(entries, glossaryFilePath, $) {
     entries.forEach(function(entry) {
-        var entryId = entry.getID();
-        var name = entry.getName();
+        var entryId     = entry.getID();
+        var name        = entry.getName();
         var description = entry.getDescription();
-
-        var searchRegex =  new RegExp( '\\b(' + pregQuote(name.toLowerCase()) + ')\\b' , 'gi' );
+        var searchRegex = new RegExp( '\\b(' + pregQuote(name.toLowerCase()) + ')\\b' , 'gi' );
 
         $('*').each(function() {
             var $this = $(this);
@@ -81,7 +81,7 @@ function annotateText(entries, $) {
             ) return;
 
             replaceText($, this, searchRegex, function(match) {
-                return '<a href="/GLOSSARY.md#' + entryId + '" '
+                return '<a href="/' + glossaryFilePath + '#' + entryId + '" '
                     + 'class="glossary-term" title="' + escape(description) + '">'
                     + match
                     + '</a>';

lib/output/modifiers/resolveLinks.js

@@ -1,4 +1,5 @@
 var path = require('path');
+var url = require('url');
 
 var LocationUtils = require('../../utils/location');
 var editHTMLElement = require('./editHTMLElement');
@@ -23,18 +24,27 @@ function resolveLinks(currentFile, resolveFile, $) {
         }
 
         if (LocationUtils.isExternal(href)) {
-            $a.attr('_target', 'blank');
+            $a.attr('target', '_blank');
             return;
         }
 
-        // Calcul absolute path for this
-        href = LocationUtils.toAbsolute(href, currentDirectory, '.');
+        // Split anchor
+        var parsed = url.parse(href);
+        href = parsed.pathname || '';
 
-        // Resolve file
-        href = resolveFile(href);
+        if (href) {
+            // Calcul absolute path for this
+            href = LocationUtils.toAbsolute(href, currentDirectory, '.');
 
-        // Convert back to relative
-        href = LocationUtils.relative(currentDirectory, href);
+            // Resolve file
+            href = resolveFile(href);
+
+            // Convert back to relative
+            href = LocationUtils.relative(currentDirectory, href);
+        }
+
+        // Add back anchor
+        href = href + (parsed.hash || '');
 
         $a.attr('href', href);
     });

lib/output/preparePages.js

@@ -1,4 +1,5 @@
 var Parse = require('../parse');
+var Promise = require('../utils/promise');
 
 /**
     List and prepare all pages
@@ -10,6 +11,10 @@ function preparePages(output) {
     var book = output.getBook();
     var logger = book.getLogger();
 
+    if (book.isMultilingual()) {
+        return Promise(output);
+    }
+
     return Parse.parsePagesList(book)
     .then(function(pages) {
         logger.info.ln('found', pages.size, 'pages');

lib/output/website/createTemplateEngine.js

@@ -3,6 +3,7 @@ var nunjucks = require('nunjucks');
 var DoExtension = require('nunjucks-do')(nunjucks);
 
 var Api = require('../../api');
+var deprecate = require('../../api/deprecate');
 var JSONUtils = require('../../json');
 var LocationUtils = require('../../utils/location');
 var fs = require('../../utils/fs');
@@ -51,24 +52,58 @@ function createTemplateEngine(output, currentFile) {
     // Create API context
     var context = Api.encodeGlobal(output);
 
+
+    /**
+        Check if a file exists
+
+        @param {String} fileName
+        @return {Boolean}
+    */
+    function fileExists(fileName) {
+        if (!fileName) {
+            return false;
+        }
+
+        var filePath = PathUtils.resolveInRoot(outputFolder, fileName);
+        return fs.existsSync(filePath);
+    }
+
+    /**
+        Return an article by its path
+
+        @param {String} filePath
+        @return {Object|undefined}
+    */
+    function getArticleByPath(filePath) {
+        var article = summary.getByPath(filePath);
+        if (!article) return undefined;
+
+        return JSONUtils.encodeSummaryArticle(article);
+    }
+
+    /**
+        Return a page by its path
+
+        @param {String} filePath
+        @return {Object|undefined}
+    */
+    function getPageByPath(filePath) {
+        var page = output.getPage(filePath);
+        if (!page) return undefined;
+
+        return JSONUtils.encodePage(page, summary);
+    }
+
+
     return TemplateEngine.create({
         loader: loader,
 
         context: context,
 
         globals: {
-            /**
-                Return an article by its path
-
-                @param {String} articlePath
-                @return {Object|undefined}
-            */
-            getArticleByPath: function(articlePath) {
-                var article = summary.getByPath(articlePath);
-                if (!article) return undefined;
-
-                return JSONUtils.encodeSummaryArticle(article);
-            }
+            getArticleByPath: getArticleByPath,
+            getPageByPath: getPageByPath,
+            fileExists: fileExists
         },
 
         filters: defaultFilters.merge({
@@ -102,13 +137,9 @@ function createTemplateEngine(output, currentFile) {
                 return LocationUtils.normalize(filePath);
             },
 
-            /**
-                Check if a file exists
-            */
-            fileExists: function(fileName) {
-                var filePath = PathUtils.resolveInRoot(outputFolder, fileName);
-                return fs.existsSync(filePath);
-            },
+
+            fileExists: deprecate.method(book, 'fileExists', fileExists, 'Filter "fileExists" is deprecated, use "fileExists(filename)" '),
+            getArticleByPath: deprecate.method(book, 'getArticleByPath', fileExists, 'Filter "getArticleByPath" is deprecated, use "getArticleByPath(filename)" '),
 
             contentURL: function(filePath) {
                 return fileToURL(output, filePath);

lib/parse/__tests__/listAssets.js

@@ -6,7 +6,7 @@ var listAssets = require('../listAssets');
 var parseGlossary = require('../parseGlossary');
 
 describe('listAssets', function() {
-    pit('should not list glossary as asset', function() {
+    it('should not list glossary as asset', function() {
         var fs = createMockFS({
             'GLOSSARY.md': '# Glossary\n\n## Hello\nDescription for hello',
             'assetFile.js': '',

lib/parse/__tests__/parseBook.js

@@ -4,7 +4,7 @@ var createMockFS = require('../../fs/mock');
 describe('parseBook', function() {
     var parseBook = require('../parseBook');
 
-    pit('should parse multilingual book', function() {
+    it('should parse multilingual book', function() {
         var fs = createMockFS({
             'LANGS.md': '# Languages\n\n* [en](en)\n* [fr](fr)',
             'en': {
@@ -27,7 +27,42 @@ describe('parseBook', function() {
         });
     });
 
-    pit('should parse book in a directory', function() {
+    it('should extend configuration for multilingual book', function() {
+        var fs = createMockFS({
+            'LANGS.md': '# Languages\n\n* [en](en)\n* [fr](fr)',
+            'book.json': '{ "title": "Test", "author": "GitBook" }',
+            'en': {
+                'README.md': 'Hello',
+                'book.json': '{ "title": "Test EN" }'
+            },
+            'fr': {
+                'README.md': 'Bonjour'
+            }
+        });
+        var book = Book.createForFS(fs);
+
+        return parseBook(book)
+        .then(function(resultBook) {
+            var books = resultBook.getBooks();
+
+            expect(resultBook.isMultilingual()).toBe(true);
+            expect(books.size).toBe(2);
+
+            var en = books.get('en');
+            var fr = books.get('fr');
+
+            var enConfig = en.getConfig();
+            var frConfig = fr.getConfig();
+
+            expect(enConfig.getValue('title')).toBe('Test EN');
+            expect(enConfig.getValue('author')).toBe('GitBook');
+
+            expect(frConfig.getValue('title')).toBe('Test');
+            expect(frConfig.getValue('author')).toBe('GitBook');
+        });
+    });
+
+    it('should parse book in a directory', function() {
         var fs = createMockFS({
             'book.json': JSON.stringify({
                 root: './test'

lib/parse/__tests__/parseGlossary.js

@@ -4,7 +4,7 @@ var createMockFS = require('../../fs/mock');
 describe('parseGlossary', function() {
     var parseGlossary = require('../parseGlossary');
 
-    pit('should parse glossary if exists', function() {
+    it('should parse glossary if exists', function() {
         var fs = createMockFS({
             'GLOSSARY.md': '# Glossary\n\n## Hello\nDescription for hello'
         });
@@ -21,7 +21,7 @@ describe('parseGlossary', function() {
         });
     });
 
-    pit('should not fail if doesn\'t exist', function() {
+    it('should not fail if doesn\'t exist', function() {
         var fs = createMockFS({});
         var book = Book.createForFS(fs);