From 3f3bade58e3b258aadab8ecf084004d06e62cede Mon Sep 17 00:00:00 2001
From: Aaron O'Mullan <aaron.omullan@friendco.de>
Date: Mon, 31 Mar 2014 16:21:04 -0700
Subject: [PATCH] Change summary data format

Simplify chapter objects, by making them identical to article objects
besides the .articles attribute
---
 lib/parse/summary.js                 |  5 ++---
 templates/includes/book/summary.html |  2 +-
 test/summary.js                      | 24 ++++++++++++------------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/lib/parse/summary.js b/lib/parse/summary.js
index f0214016a..1237b37d8 100644
--- a/lib/parse/summary.js
+++ b/lib/parse/summary.js
@@ -90,10 +90,9 @@ function parseArticle(nodes) {
 }
 
 function parseChapter(nodes) {
-    return {
-        chapter: parseTitle(_.first(nodes).text),
+    return _.extend(parseTitle(_.first(nodes).text), {
         articles: _.map(listSplit(filterList(nodes), 'list_item_start', 'list_item_end'), parseArticle)
-    };
+    });
 }
 
 function parseSummary(src) {
diff --git a/templates/includes/book/summary.html b/templates/includes/book/summary.html
index 52eeb2f70..161ba7983 100644
--- a/templates/includes/book/summary.html
+++ b/templates/includes/book/summary.html
@@ -9,7 +9,7 @@
     <li class="divider"></li>
     {% for item in summary.chapters %}
         <li>
-            <a href="{{ basePath }}/{{ item.chapter.path }}">{{ item.chapter.title }}</a>
+            <a href="{{ basePath }}/{{ item.path }}">{{ item.title }}</a>
             {% if item.articles.length > 0 %}
             <ul class="articles">
             {% for article in item.articles %}
diff --git a/test/summary.js b/test/summary.js
index 543918218..bf21ce18a 100644
--- a/test/summary.js
+++ b/test/summary.js
@@ -23,21 +23,21 @@ describe('Summary parsing', function () {
     });
 
     it('should detect paths and titles', function() {
-        assert(LEXED.chapters[0].chapter.path);
-        assert(LEXED.chapters[1].chapter.path);
-        assert(LEXED.chapters[2].chapter.path);
+        assert(LEXED.chapters[0].path);
+        assert(LEXED.chapters[1].path);
+        assert(LEXED.chapters[2].path);
 
-        assert(LEXED.chapters[0].chapter.title);
-        assert(LEXED.chapters[1].chapter.title);
-        assert(LEXED.chapters[2].chapter.title);
+        assert(LEXED.chapters[0].title);
+        assert(LEXED.chapters[1].title);
+        assert(LEXED.chapters[2].title);
     });
 
     it('should normalize paths from .md to .html', function() {
-        assert.equal(LEXED.chapters[0].chapter.path,'chapter-1/README.html');
-        assert.equal(LEXED.chapters[0].chapter._path,'chapter-1/README.md');
-        assert.equal(LEXED.chapters[1].chapter.path,'chapter-2/README.html');
-        assert.equal(LEXED.chapters[1].chapter._path,'chapter-2/README.md');
-        assert.equal(LEXED.chapters[2].chapter.path,'chapter-3/README.html');
-        assert.equal(LEXED.chapters[2].chapter._path,'chapter-3/README.md');
+        assert.equal(LEXED.chapters[0].path,'chapter-1/README.html');
+        assert.equal(LEXED.chapters[0]._path,'chapter-1/README.md');
+        assert.equal(LEXED.chapters[1].path,'chapter-2/README.html');
+        assert.equal(LEXED.chapters[1]._path,'chapter-2/README.md');
+        assert.equal(LEXED.chapters[2].path,'chapter-3/README.html');
+        assert.equal(LEXED.chapters[2]._path,'chapter-3/README.md');
     });
 });