From f9979731fb5c90a8f724a36cea1c5c18557c116d Mon Sep 17 00:00:00 2001
From: Jeroen Engels <jfm.engels@gmail.com>
Date: Sun, 6 Mar 2016 17:53:11 +0100
Subject: [PATCH] Fix table formatting when there are multiple lines

---
 lib/generate/index.js      | 30 ++++++++++++++++++++----------
 lib/generate/index.test.js |  2 +-
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/lib/generate/index.js b/lib/generate/index.js
index 0b0311d..80c20b0 100644
--- a/lib/generate/index.js
+++ b/lib/generate/index.js
@@ -4,6 +4,14 @@ var _ = require('lodash/fp');
 var formatBadge = require('./formatBadge');
 var formatContributor = require('./formatContributor');
 
+function injectContentBetween(lines, content, startIndex, endIndex) {
+  return [].concat(
+    lines.slice(0, startIndex),
+    content,
+    lines.slice(endIndex)
+  );
+}
+
 var injectBetweenTags = _.curry(function(tag, newContent, previousContent) {
   var lines = previousContent.split('\n');
   var openingTagIndex = _.findIndex(_.startsWith('<!-- ALL-CONTRIBUTORS-' + tag + ':START '), lines);
@@ -11,17 +19,19 @@ var injectBetweenTags = _.curry(function(tag, newContent, previousContent) {
   if (openingTagIndex === -1 || closingTagIndex === -1) {
     return previousContent;
   }
-  return [].concat(
-    lines.slice(0, openingTagIndex + 1),
-    newContent,
-    lines.slice(closingTagIndex)
-  ).join('\n');
+  return injectContentBetween(lines, newContent, openingTagIndex + 1, closingTagIndex)
+    .join('\n');
 });
 
 function formatLine(contributors) {
   return '| ' + contributors.join(' | ') + ' |';
 }
 
+function createColumnLine(options, contributors) {
+  var nbColumns = Math.min(options.contributorsPerLine, contributors.length);
+  return _.repeat(nbColumns, '| :---: ') + '|';
+}
+
 function generateContributorsList(options, contributors) {
   return _.flow(
     _.map(function formatEveryContributor(contributor) {
@@ -29,11 +39,11 @@ function generateContributorsList(options, contributors) {
     }),
     _.chunk(options.contributorsPerLine),
     _.map(formatLine),
-    _.join('\n'),
-    function appendColumns(content) {
-      var nbColumns = Math.min(options.contributorsPerLine, contributors.length);
-      return content + '\n' + _.repeat(nbColumns, '| :---: ') + '|';
-    }
+    function insertColumns(lines) {
+      var columnLine = createColumnLine(options, contributors);
+      return injectContentBetween(lines, columnLine, 1, 1);
+    },
+    _.join('\n')
   )(contributors);
 }
 
diff --git a/lib/generate/index.test.js b/lib/generate/index.test.js
index 5aefa87..0aabcac 100644
--- a/lib/generate/index.test.js
+++ b/lib/generate/index.test.js
@@ -81,8 +81,8 @@ test('should split contributors into multiples lines when there are too many', t
     'These people contributed to the project:',
     '<!-- ALL-CONTRIBUTORS-LIST:START -->',
     '| Kent C. Dodds is awesome! | Kent C. Dodds is awesome! | Kent C. Dodds is awesome! | Kent C. Dodds is awesome! | Kent C. Dodds is awesome! |',
-    '| Kent C. Dodds is awesome! | Kent C. Dodds is awesome! |',
     '| :---: | :---: | :---: | :---: | :---: |',
+    '| Kent C. Dodds is awesome! | Kent C. Dodds is awesome! |',
     '<!-- ALL-CONTRIBUTORS-LIST:END -->',
     '',
     'Thanks a lot guys!'