2 files changed, 65 insertions, 56 deletions
diff --git a/lib/output/callHook.js b/lib/output/callHook.js
index 1ff1a41..4914e52 100644
--- a/lib/output/callHook.js
+++ b/lib/output/callHook.js
@@ -1,4 +1,5 @@
 var Promise = require('../utils/promise');
+var timing = require('../utils/timing');
 var Api = require('../api');
 
 function defaultGetArgument() {
@@ -30,26 +31,30 @@ function callHook(name, getArgument, handleResult, output) {
     // Create the JS context for plugins
     var context = Api.encodeGlobal(output);
 
-    // Get the arguments
-    return Promise(getArgument(output))
-
-    // Call the hooks in serie
-    .then(function(arg) {
-        return Promise.reduce(plugins, function(prev, plugin) {
-            var hook = plugin.getHook(name);
-            if (!hook) {
-                return prev;
-            }
-
-            return hook.call(context, prev);
-        }, arg);
-    })
-
-    // Handle final result
-    .then(function(result) {
-        output = Api.decodeGlobal(output, context);
-        return handleResult(output, result);
-    });
+    return timing.measure(
+        'call.hook.' + name,
+
+        // Get the arguments
+        Promise(getArgument(output))
+
+        // Call the hooks in serie
+        .then(function(arg) {
+            return Promise.reduce(plugins, function(prev, plugin) {
+                var hook = plugin.getHook(name);
+                if (!hook) {
+                    return prev;
+                }
+
+                return hook.call(context, prev);
+            }, arg);
+        })
+
+        // Handle final result
+        .then(function(result) {
+            output = Api.decodeGlobal(output, context);
+            return handleResult(output, result);
+        })
+    );
 }
 
 module.exports = callHook;
diff --git a/lib/output/generatePage.js b/lib/output/generatePage.js
index 30a798a..a93d4b0 100644
--- a/lib/output/generatePage.js
+++ b/lib/output/generatePage.js
@@ -1,5 +1,6 @@
 var Promise = require('../utils/promise');
 var error = require('../utils/error');
+var timing = require('../utils/timing');
 
 var Parse = require('../parse');
 var Templating = require('../templating');
@@ -18,50 +19,53 @@ function generatePage(output, page) {
     var book = output.getBook();
     var engine = createTemplateEngine(output);
 
-    return Parse.parsePage(book, page)
-    .then(function(resultPage) {
-        var file = resultPage.getFile();
-        var filePath = file.getPath();
-        var parser = file.getParser();
-        var context = JSONUtils.encodeBookWithPage(book, resultPage);
+    return timing.measure(
+        'page.generate',
+        Parse.parsePage(book, page)
+        .then(function(resultPage) {
+            var file = resultPage.getFile();
+            var filePath = file.getPath();
+            var parser = file.getParser();
+            var context = JSONUtils.encodeBookWithPage(book, resultPage);
 
-        if (!parser) {
-            return Promise.reject(error.FileNotParsableError({
-                filename: filePath
-            }));
-        }
+            if (!parser) {
+                return Promise.reject(error.FileNotParsableError({
+                    filename: filePath
+                }));
+            }
 
-        // Call hook "page:before"
-        return callPageHook('page:before', output, resultPage)
+            // Call hook "page:before"
+            return callPageHook('page:before', output, resultPage)
 
-        // Escape code blocks with raw tags
-        .then(function(currentPage) {
-            return parser.page.prepare(currentPage.getContent());
-        })
+            // Escape code blocks with raw tags
+            .then(function(currentPage) {
+                return parser.page.prepare(currentPage.getContent());
+            })
 
-        // Render templating syntax
-        .then(function(content) {
-            return Templating.render(engine, filePath, content, context);
-        })
+            // Render templating syntax
+            .then(function(content) {
+                return Templating.render(engine, filePath, content, context);
+            })
 
-        // Render page using parser (markdown -> HTML)
-        .then(parser.page).get('content')
+            // Render page using parser (markdown -> HTML)
+            .then(parser.page).get('content')
 
-        // Post processing for templating syntax
-        .then(function(content) {
-            return Templating.postRender(engine, content);
-        })
+            // Post processing for templating syntax
+            .then(function(content) {
+                return Templating.postRender(engine, content);
+            })
 
-        // Return new page
-        .then(function(content) {
-            return resultPage.set('content', content);
-        })
+            // Return new page
+            .then(function(content) {
+                return resultPage.set('content', content);
+            })
 
-        // Call final hook
-        .then(function(currentPage) {
-            return callPageHook('page', output, currentPage);
-        });
-    });
+            // Call final hook
+            .then(function(currentPage) {
+                return callPageHook('page', output, currentPage);
+            });
+        })
+    );
 }
 
 module.exports = generatePage;