Improve book.resolve to ensure file is in the book

Adapt tests to plugin-highlight

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/template.js b/lib/template.js
index 4b2035f..b1bc632 100644
--- a/lib/template.js
+++ b/lib/template.js
@@ -30,7 +30,7 @@ var BookLoader = nunjucks.Loader.extend({
         git.resolveFile(fileurl)
         .then(function(filepath) {
             // Is local file
-            if (!filepath) filepath = that.book.resolve(fileurl);
+            if (!filepath) filepath = path.resolve(fileurl);
             else that.book.log.debug.ln("resolve from git", fileurl, "to", filepath)
 
             //  Read file from absolute path
@@ -46,6 +46,12 @@ var BookLoader = nunjucks.Loader.extend({
     },
 
     resolve: function(from, to) {
+        // If origin is in the book, we enforce result file to be in the book
+        if (this.book.fileIsInBook(from)) {
+            return this.book.resolve(path.dirname(from), to);
+        }
+
+        // If origin is not in the book (include from a git content ref)
         return path.resolve(path.dirname(from), to);
     }
 });