Change format of conrefs and folder mixins

1 files changed, 53 insertions, 45 deletions

diff --git a/lib/output/conrefs.js b/lib/output/conrefs.js
index c91885e..f1cd123 100644
--- a/lib/output/conrefs.js
+++ b/lib/output/conrefs.js
@@ -1,60 +1,68 @@
 var path = require('path');
+var util = require('util');
 
-var Output = require('./base');
+var FolderOutput = require('./folder')();
 var Git = require('../utils/git');
 var fs = require('../utils/fs');
 var pathUtil = require('../utils/path');
 
 /*
-Middleware for output to resolve git conrefs
+Mixin for output to resolve git conrefs
 */
 
-var ConrefsLoader = Output.createMixin(function() {
-    this.git = new Git();
-});
-
-// Read a template by its source URL
-ConrefsLoader.prototype.onGetTemplate = function(sourceURL) {
-    var that = this;
-
-    return this.git.resolve(sourceURL)
-    .then(function(filepath) {
-        // Is local file
-        if (!filepath) {
-            filepath = that.book.resolve(sourceURL);
-        } else {
-            that.book.log.debug.ln('resolve from git', sourceURL, 'to', filepath);
-        }
+module.exports = function conrefsLoader(Base) {
+    Base = Base || FolderOutput;
 
-        //  Read file from absolute path
-        return fs.readFile(filepath)
-        .then(function(source) {
-            return {
-                src: source.toString('utf8'),
-                path: filepath
-            };
-        });
-    });
-};
+    function ConrefsLoader() {
+        Base.apply(this, arguments);
 
-// Generate a source URL for a template
-ConrefsLoader.prototype.onResolveTemplate = function(from, to) {
-    // If origin is in the book, we enforce result file to be in the book
-    if (this.book.isInBook(from)) {
-        return this.book.resolve(
-            this.book.relative(path.dirname(from)),
-            to
-        );
+        this.git = new Git();
     }
+    util.inherits(ConrefsLoader, Base);
 
-    // If origin is in a git repository, we resolve file in the git repository
-    var gitRoot = this.git.resolveRoot(from);
-    if (gitRoot) {
-        return pathUtil.resolveInRoot(gitRoot, to);
-    }
+    // Read a template by its source URL
+    ConrefsLoader.prototype.onGetTemplate = function(sourceURL) {
+        var that = this;
 
-    // If origin is not in the book (include from a git content ref)
-    return path.resolve(path.dirname(from), to);
-};
+        return this.git.resolve(sourceURL)
+        .then(function(filepath) {
+            // Is local file
+            if (!filepath) {
+                filepath = that.book.resolve(sourceURL);
+            } else {
+                that.book.log.debug.ln('resolve from git', sourceURL, 'to', filepath);
+            }
+
+            //  Read file from absolute path
+            return fs.readFile(filepath)
+            .then(function(source) {
+                return {
+                    src: source.toString('utf8'),
+                    path: filepath
+                };
+            });
+        });
+    };
 
-module.exports = ConrefsLoader;
+    // Generate a source URL for a template
+    ConrefsLoader.prototype.onResolveTemplate = function(from, to) {
+        // If origin is in the book, we enforce result file to be in the book
+        if (this.book.isInBook(from)) {
+            return this.book.resolve(
+                this.book.relative(path.dirname(from)),
+                to
+            );
+        }
+
+        // If origin is in a git repository, we resolve file in the git repository
+        var gitRoot = this.git.resolveRoot(from);
+        if (gitRoot) {
+            return pathUtil.resolveInRoot(gitRoot, to);
+        }
+
+        // If origin is not in the book (include from a git content ref)
+        return path.resolve(path.dirname(from), to);
+    };
+
+    return ConrefsLoader;
+};