Merge branch 'release-1.0.1'

CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="1.0.1"></a>
+## 1.0.1 (2016-06-11)
+
+
+### Features
+
+* **markdown:** expose marked renderer and option to wrap toc inside a div([05e1b6b](https://github.com/poppinss/docketjs/commit/05e1b6b))
+
+
+
 <a name="1.0.0"></a>
 # 1.0.0 (2016-06-10)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "docketjs",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "DocketJs is a battery included Markdown to HTML converter for Node.js. It has everything you need to successfully convert a bunch of markdown files to HTML and generate toc and a menu file.",
   "main": "index.js",
   "scripts": {

src/Markdown/index.js

@@ -19,9 +19,12 @@ class Markdown {
 
   constructor (markedOptions, tocOptions) {
     this.marked = marked.setOptions(markedOptions)
+    this.renderer = new marked.Renderer()
     this.tocOptions = _.merge({
       minDepth: 1,
-      maxDepth: 6
+      maxDepth: 6,
+      wrap: true,
+      divId: 'toc'
     }, tocOptions)
   }
 
@@ -63,10 +66,12 @@ class Markdown {
    */
   _getToc (markdown) {
     const generatedToc = toc(markdown, this.tocOptions)
-    return _(generatedToc.json)
+    let tocUl = _(generatedToc.json)
     .filter((heading) => this._filterHeadingsForToc(heading))
     .map((heading) => this._makeTocHeading(heading))
     .value().join('\n')
+    tocUl = this.marked(tocUl)
+    return this.tocOptions.wrap ? `<div id="${this.tocOptions.divId}">${tocUl}</div>` : tocUl
   }
 
   /**
@@ -84,7 +89,7 @@ class Markdown {
     contents = contents.trim()
     const parsedDoc = meta(contents)
     const markdown = parsedDoc.content.replace(/{{\s*TOC\s*}}/, this._getToc(parsedDoc.content))
-    const html = this.marked(markdown)
+    const html = this.marked(markdown, {renderer: this.renderer})
     return {html, meta: parsedDoc.data}
   }