From 25c4441db9d7d232071d331060107a75b74300b6 Mon Sep 17 00:00:00 2001
From: MG <getglad@users.noreply.github.com>
Date: Wed, 13 Apr 2016 10:17:16 -0500
Subject: [PATCH 1/2] Allow multiple rows inside single table; prevents
 unintended spacing created between tables when message is forwarded

---
 lib/componentFactory.js | 22 ++++++++++++++++
 lib/inky.js             |  7 +++--
 lib/makeColumn2.js      | 57 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 lib/makeColumn2.js

diff --git a/lib/componentFactory.js b/lib/componentFactory.js
index 0361e4d..319cc52 100644
--- a/lib/componentFactory.js
+++ b/lib/componentFactory.js
@@ -13,7 +13,29 @@ module.exports = function(element) {
     // <column>
     case this.components.columns:
       return this.makeColumn(element, 'columns');
+    
+    // <column2>  
+    case this.components.columns2:
+      return this.makeColumn2(element, 'columns2');
+    
+    // <innerrow>  
+    case this.components.innerrow:
+      var classes = ['innerrow'];
+      if (element.attr('class')) {
+        classes = classes.concat(element.attr('class').split(' '));
+      }
+
+      return format('<tr class="%s">%s</tr>', classes.join(' '), inner);
+
+    // <row2>
+    case this.components.row2:
+      var classes = ['row2'];
+      if (element.attr('class')) {
+        classes = classes.concat(element.attr('class').split(' '));
+      }
 
+      return format('<table class="%s"><tbody>%s</tbody></table>', classes.join(' '), inner);
+    
     // <row>
     case this.components.row:
       var classes = ['row'];
diff --git a/lib/inky.js b/lib/inky.js
index 510177a..bf16b57 100644
--- a/lib/inky.js
+++ b/lib/inky.js
@@ -23,8 +23,9 @@ function Inky(options) {
     menu: 'menu',
     menuItem: 'item',
     center: 'center',
-    spacer: 'spacer',
-    wrapper: 'wrapper'
+    columns2: 'columns2',
+    innerrow: 'innerrow',
+    row2: 'row2'
   }, options.components || {});
 
   // Column count for grid
@@ -62,3 +63,5 @@ Inky.prototype.releaseTheKraken = function($) {
 Inky.prototype.componentFactory = require('./componentFactory');
 
 Inky.prototype.makeColumn = require('./makeColumn');
+
+Inky.prototype.makeColumn2 = require('./makeColumn2');
diff --git a/lib/makeColumn2.js b/lib/makeColumn2.js
new file mode 100644
index 0000000..22edcc9
--- /dev/null
+++ b/lib/makeColumn2.js
@@ -0,0 +1,57 @@
+var format = require('util').format;
+var multiline = require('multiline');
+var $ = require('cheerio');
+
+/**
+ * Returns output for column elements.
+ * @todo This could be refactored to handle both cols and subcols.
+ * @param {string} col - Column to format.
+ * @returns {string} Column HTML.
+ */
+module.exports = function(col) {
+  var output  = '';
+  var inner   = $(col).html();
+  var classes = [];
+  var expander = '';
+
+  // Add 1 to include current column
+  var colCount = $(col).siblings().length + 1;
+
+  // Inherit classes from the <column> tag
+  if ($(col).attr('class')) {
+    classes = classes.concat($(col).attr('class').split(' '));
+  }
+
+  // Check for sizes. If no attribute is provided, default to small-12. Divide evenly for large columns
+  var smallSize = $(col).attr('small') || this.columnCount;
+  var largeSize = $(col).attr('large') || $(col).attr('small') || Math.floor(this.columnCount / colCount);
+
+  classes.push(format('small-%s', smallSize));
+  classes.push(format('large-%s', largeSize));
+
+  // Add the basic "columns" class also
+  classes.push('columns');
+
+  // Determine if it's the first or last column, or both
+  if (!$(col).prev(this.components.columns).length) classes.push('first');
+  if (!$(col).next(this.components.columns).length) classes.push('last');
+
+  // If the column contains a nested row, the .expander class should not be used
+  // The == on the first check is because we're comparing a string pulled from $.attr() to a number
+  if (largeSize == this.columnCount && col.find('.innerrow, innerrow').length === 0) {
+    expander = '\n<th class="expander"></th>';
+  }
+
+  // Final HTML output
+  output = multiline(function() {/*
+    <th class="%s">
+      <table>
+        <tr>
+          <th>%s</th>%s
+        </tr>
+      </table>
+    </th>
+  */});
+
+  return format(output, classes.join(' '), inner, expander);
+}
\ No newline at end of file

From 0c389d4ef10462ce293410ed717915240b2efd4e Mon Sep 17 00:00:00 2001
From: getglad <getglad@users.noreply.github.com>
Date: Wed, 13 Apr 2016 13:46:14 -0500
Subject: [PATCH 2/2] Update inky.js

Accidently removed spacer/wrapper as components
---
 lib/inky.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/inky.js b/lib/inky.js
index bf16b57..a5769d2 100644
--- a/lib/inky.js
+++ b/lib/inky.js
@@ -23,6 +23,8 @@ function Inky(options) {
     menu: 'menu',
     menuItem: 'item',
     center: 'center',
+    spacer: 'spacer',
+    wrapper: 'wrapper',
     columns2: 'columns2',
     innerrow: 'innerrow',
     row2: 'row2'