Rough implementation for handlebars helper to display toc correctly, probably needs a little bit of cleaning... Url in toc doesn't work yet. It needs to be cleaned before './url' -> '/url' and 'url' -> '/url'

This commit is contained in:
Mathieu David 2015-07-29 00:57:47 +02:00
parent 4203b5b1c4
commit f500b4a836
5 changed files with 65 additions and 25 deletions

View File

@ -2,8 +2,8 @@ use std::path::{Path, PathBuf};
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct BookConfig { pub struct BookConfig {
title: String, pub title: String,
author: String, pub author: String,
dest: PathBuf, dest: PathBuf,
src: PathBuf, src: PathBuf,
indent_spaces: i32, indent_spaces: i32,
@ -40,14 +40,4 @@ impl BookConfig {
self.src = src.to_owned(); self.src = src.to_owned();
self self
} }
pub fn set_title(&mut self, title: &str) -> &mut Self {
self.title = title.to_owned();
self
}
pub fn set_author(&mut self, author: &str) -> &mut Self {
self.author = author.to_owned();
self
}
} }

View File

@ -122,12 +122,12 @@ impl MDBook {
} }
pub fn set_title(mut self, title: &str) -> Self { pub fn set_title(mut self, title: &str) -> Self {
self.config.set_title(title); self.config.title = title.to_owned();
self self
} }
pub fn set_author(mut self, author: &str) -> Self { pub fn set_author(mut self, author: &str) -> Self {
self.config.set_author(author); self.config.author = author.to_owned();
self self
} }

View File

@ -12,9 +12,9 @@ use std::error::Error;
use std::io::{self, Read, Write}; use std::io::{self, Read, Write};
use std::collections::BTreeMap; use std::collections::BTreeMap;
use self::handlebars::Handlebars; use self::handlebars::{Handlebars, HelperDef, RenderError, RenderContext, Helper, Context, JsonRender};
use self::rustc_serialize::json::{Json, ToJson}; use self::rustc_serialize::json::{Json, ToJson};
use self::rustc_serialize::{json, Decodable, Decoder};
use self::pulldown_cmark::Parser; use self::pulldown_cmark::Parser;
use self::pulldown_cmark::html; use self::pulldown_cmark::html;
@ -31,6 +31,9 @@ impl Renderer for HtmlHandlebars {
// Register template // Register template
try!(handlebars.register_template_string("index", t.to_owned())); try!(handlebars.register_template_string("index", t.to_owned()));
// Register helper
handlebars.register_helper("toc", Box::new(RenderToc));
let mut data = try!(make_data(book.clone(), config)); let mut data = try!(make_data(book.clone(), config));
// Render a file for every entry in the book // Render a file for every entry in the book
@ -152,7 +155,8 @@ fn make_data(book: BookItems, config: &BookConfig) -> Result<BTreeMap<String,Jso
Function to make the JSon data for the handlebars template: Function to make the JSon data for the handlebars template:
{ {
"language": ???, "language": ...,
"title": ...
"chapters": [ "chapters": [
{ {
"section": section, "section": section,
@ -168,13 +172,15 @@ fn make_data(book: BookItems, config: &BookConfig) -> Result<BTreeMap<String,Jso
let mut data = BTreeMap::new(); let mut data = BTreeMap::new();
data.insert("language".to_string(), "en".to_json()); data.insert("language".to_string(), "en".to_json());
data.insert("title".to_string(), config.title.to_json());
let mut chapters = vec![]; let mut chapters = vec![];
for (section, item) in book { for (section, item) in book {
let mut chapter = BTreeMap::new(); let mut chapter = BTreeMap::new();
chapter.insert("section".to_string(), section.to_json()); chapter.insert("section".to_string(), section.to_json());
chapter.insert("chapter".to_string(), item.to_json()); chapter.insert("name".to_string(), item.name.to_json());
chapter.insert("path".to_string(), item.path.to_str().unwrap().to_json());
chapters.push(chapter); chapters.push(chapter);
} }
@ -190,3 +196,52 @@ fn render_html(text: &str) -> String {
html::push_html(&mut s, p); html::push_html(&mut s, p);
s s
} }
// Handlebars helper to construct TOC
// implement by a structure impls HelperDef
#[derive(Clone, Copy)]
struct RenderToc;
impl HelperDef for RenderToc {
fn call(&self, c: &Context, h: &Helper, _: &Handlebars, rc: &mut RenderContext) -> Result<(), RenderError> {
let param = h.params().get(0).unwrap();
// get value from context data
// rc.get_path() is current json parent path, you should always use it like this
// param is the key of value you want to display
let value = c.navigate(rc.get_path(), param);
try!(rc.writer.write("<ul class=\"chapter\">".as_bytes()));
// Decode json format
let decoded: Vec<BTreeMap<String,String>> = json::decode(&value.to_string()).unwrap();
let mut current_level = 1;
for item in decoded {
let level = item.get("section").expect("Error: section should be Some(_)").len() / 2;
if level > current_level {
try!(rc.writer.write("<li>".as_bytes()));
try!(rc.writer.write("<ul class=\"section\">".as_bytes()));
try!(rc.writer.write("<li>".as_bytes()));
} else if level < current_level {
try!(rc.writer.write("</ul>".as_bytes()));
try!(rc.writer.write("<li>".as_bytes()));
}
else {
try!(rc.writer.write("<li>".as_bytes()));
}
try!(rc.writer.write("<a href=\"#\">".as_bytes()));
try!(rc.writer.write("<strong>".as_bytes()));
try!(rc.writer.write(item.get("section").expect("Error: section should be Some(_)").as_bytes()));
try!(rc.writer.write("</strong>".as_bytes()));
try!(rc.writer.write(item.get("name").expect("Error: name should be Some(_)").as_bytes()));
try!(rc.writer.write("</a>".as_bytes()));
try!(rc.writer.write("</li>".as_bytes()));
}
try!(rc.writer.write("</ul>".as_bytes()));
Ok(())
}
}

View File

@ -1,5 +1,6 @@
html, body { html, body {
font-family: "Open Sans", sans-serif; font-family: "Open Sans", sans-serif;
color: #333;
} }
@media only screen { @media only screen {

View File

@ -14,13 +14,7 @@
<body> <body>
<div id="sidebar" class="sidebar"> <div id="sidebar" class="sidebar">
<ul class="chapter"> {{#toc chapters}}{{/toc}}
{{#each chapters}}
<li><a href="{{ this.chapter.path }}">
<strong>{{ this.section }}</strong> {{ this.chapter.name }}
</a></li>
{{/each}}
</ul>
</div> </div>
<div id="page-wrapper" class="page-wrapper"> <div id="page-wrapper" class="page-wrapper">