From 46b3033e2a563718cef55dc9f48ace527598b20f Mon Sep 17 00:00:00 2001
From: Vit Brunner <vit.brunner@gmail.com>
Date: Mon, 17 Jun 2013 23:02:22 +0100
Subject: [PATCH] Fix markdown metadata reading

Was breaking on trailing whitespace, which is markdown for <br> and
something people could commonly put after metadata, as it makes things
more readable when processed by regular markdown.
---
 .../scripts/services/reader/markdown.js.coffee         | 10 +++++-----
 .../documents/tests/services/reader/markdown.js.coffee |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/documents/scripts/services/reader/markdown.js.coffee b/source/documents/scripts/services/reader/markdown.js.coffee
index a73b15d..f3717b6 100644
--- a/source/documents/scripts/services/reader/markdown.js.coffee
+++ b/source/documents/scripts/services/reader/markdown.js.coffee
@@ -14,9 +14,9 @@ angular.module("sideBySide").factory("markdownReader", () ->
 		# @return [Object] Meta properties
 		readMeta = (text, inlineLexer) ->
 			meta = {}
-			lexed = inlineLexer.output(text)
-			for line in lexed.split("\n")
-				match = /([^:]*):(.*)/.exec(line)
+			for line in text.split("\n")
+				lexed = inlineLexer.output(line)
+				match = /([^:]*):(.*)/.exec(lexed)
 				meta[match[1].trim()] = match[2].trim()
 			return meta
 
@@ -53,10 +53,10 @@ angular.module("sideBySide").factory("markdownReader", () ->
 
 		lexed = marked.lexer(source)
 		meta = lexed.shift()
-		inlineLexer = new marked.InlineLexer(lexed.links)
+		meta = readMeta(meta.text, new marked.InlineLexer(lexed.links))
 
 		return {
-			meta: readMeta(meta.text, inlineLexer)
+			meta: meta
 			content: readContent(lexed)
 		}
 )
diff --git a/source/documents/tests/services/reader/markdown.js.coffee b/source/documents/tests/services/reader/markdown.js.coffee
index e0b2cd3..9657cf2 100644
--- a/source/documents/tests/services/reader/markdown.js.coffee
+++ b/source/documents/tests/services/reader/markdown.js.coffee
@@ -1,10 +1,10 @@
 test("markdownReader", () ->
 	testCases = [{
 		tested: """
-			Title: Universal Declaration of Human Rights
+			Title: Universal Declaration of Human Rights  
 			Author: John Peters Humphrey
-			Date: 1948
-			Source: http://en.wikisource.org/wiki/Universal_Declaration_of_Human_Rights
+			Date: 1948  
+			Source: http://en.wikisource.org/wiki/Universal_Declaration_of_Human_Rights  
 
 			## 1
 			All human beings are born *free* and equal in dignity and rights...