From 97eafcd2f76856e8430d68c5e5bfd0f3ab0e50c4 Mon Sep 17 00:00:00 2001
From: Paulo Bu <pbu_98@yahoo.com>
Date: Sun, 27 Dec 2015 11:08:24 +0100
Subject: [PATCH 1/2] Add tests to generateLineHtml for LineByLine tests

---
 test/line-by-line-tests.js | 42 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/test/line-by-line-tests.js b/test/line-by-line-tests.js
index 9331fd8..f30defa 100644
--- a/test/line-by-line-tests.js
+++ b/test/line-by-line-tests.js
@@ -16,6 +16,48 @@ describe('LineByLinePrinter', function() {
         '  </td>\n' +
         '</tr>\n';
 
+      assert.equal(expected, fileHtml);
+    });
+  });
+  describe('_generateLineHtml', function() {
+    it('should work for insertions', function() {
+
+      var diffParser = require('../src/diff-parser.js').DiffParser;
+      var lineByLinePrinter = new LineByLinePrinter({});
+      var fileHtml = lineByLinePrinter._generateLineHtml(
+        diffParser.LINE_TYPE.INSERTS, '', 30, '+', 'test');
+      var expected = '<tr>\n' +
+      '  <td class="d2h-code-linenumber d2h-ins">' +
+      '    <div class="line-num1"></div>' +
+      '    <div class="line-num2">30</div>' +
+      '  </td>\n' +
+      '  <td class="d2h-ins">' +
+      '    <div class="d2h-code-line d2h-ins">' +
+      '<span class="d2h-code-line-prefix">test</span>' +
+      '<span class="d2h-code-line-ctn">+</span></div>' +
+      '  </td>\n' +
+      '</tr>\n';
+
+      assert.equal(expected, fileHtml);
+    });
+    it('should work for deletions', function() {
+
+      var diffParser = require('../src/diff-parser.js').DiffParser;
+      var lineByLinePrinter = new LineByLinePrinter({});
+      var fileHtml = lineByLinePrinter._generateLineHtml(
+        diffParser.LINE_TYPE.DELETES, 30, '', '-', 'test');
+      var expected = '<tr>\n' +
+      '  <td class="d2h-code-linenumber d2h-del">' +
+      '    <div class="line-num1">30</div>' +
+      '    <div class="line-num2"></div>' +
+      '  </td>\n' +
+      '  <td class="d2h-del">' +
+      '    <div class="d2h-code-line d2h-del">' +
+      '<span class="d2h-code-line-prefix">test</span>' +
+      '<span class="d2h-code-line-ctn">-</span></div>' +
+      '  </td>\n' +
+      '</tr>\n';
+
       assert.equal(expected, fileHtml);
     });
   });

From a37176cc26020e74b3fd66ec7c2b5312c10e97ba Mon Sep 17 00:00:00 2001
From: Paulo Bu <pbu_98@yahoo.com>
Date: Sun, 27 Dec 2015 11:08:50 +0100
Subject: [PATCH 2/2] Refactors HTML code into their own methods

---
 src/line-by-line-printer.js | 91 ++++++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 41 deletions(-)

diff --git a/src/line-by-line-printer.js b/src/line-by-line-printer.js
index 1f248d9..e464bb4 100644
--- a/src/line-by-line-printer.js
+++ b/src/line-by-line-printer.js
@@ -16,42 +16,44 @@
     this.config = config;
   }
 
+  LineByLinePrinter.prototype.makeFileDiffHtml = function(file, diffs) {
+    return '<div id="' + printerUtils.getHtmlId(file) + '" class="d2h-file-wrapper" data-lang="' + file.language + '">\n' +
+      '     <div class="d2h-file-header">\n' +
+      '       <div class="d2h-file-stats">\n' +
+      '         <span class="d2h-lines-added">' +
+      '           <span>+' + file.addedLines + '</span>\n' +
+      '         </span>\n' +
+      '         <span class="d2h-lines-deleted">' +
+      '           <span>-' + file.deletedLines + '</span>\n' +
+      '         </span>\n' +
+      '       </div>\n' +
+      '       <div class="d2h-file-name">' + printerUtils.getDiffName(file) + '</div>\n' +
+      '     </div>\n' +
+      '     <div class="d2h-file-diff">\n' +
+      '       <div class="d2h-code-wrapper">\n' +
+      '         <table class="d2h-diff-table">\n' +
+      '           <tbody class="d2h-diff-tbody">\n' +
+      '         ' + diffs +
+      '           </tbody>\n' +
+      '         </table>\n' +
+      '       </div>\n' +
+      '     </div>\n' +
+      '   </div>\n';
+  };
+
   LineByLinePrinter.prototype.generateLineByLineJsonHtml = function(diffFiles) {
     var that = this;
-    return '<div class="d2h-wrapper">\n' +
-      diffFiles.map(function(file) {
-
+    var htmlDiffs = diffFiles.map(function(file) {
         var diffs;
         if (file.blocks.length) {
           diffs = that._generateFileHtml(file);
         } else {
           diffs = that._generateEmptyDiff();
         }
+        return that.makeFileDiffHtml(file, diffs);
+      });
 
-        return '<div id="' + printerUtils.getHtmlId(file) + '" class="d2h-file-wrapper" data-lang="' + file.language + '">\n' +
-          '     <div class="d2h-file-header">\n' +
-          '       <div class="d2h-file-stats">\n' +
-          '         <span class="d2h-lines-added">' +
-          '           <span>+' + file.addedLines + '</span>\n' +
-          '         </span>\n' +
-          '         <span class="d2h-lines-deleted">' +
-          '           <span>-' + file.deletedLines + '</span>\n' +
-          '         </span>\n' +
-          '       </div>\n' +
-          '       <div class="d2h-file-name">' + printerUtils.getDiffName(file) + '</div>\n' +
-          '     </div>\n' +
-          '     <div class="d2h-file-diff">\n' +
-          '       <div class="d2h-code-wrapper">\n' +
-          '         <table class="d2h-diff-table">\n' +
-          '           <tbody class="d2h-diff-tbody">\n' +
-          '         ' + diffs +
-          '           </tbody>\n' +
-          '         </table>\n' +
-          '       </div>\n' +
-          '     </div>\n' +
-          '   </div>\n';
-      }).join('\n') +
-      '</div>\n';
+    return '<div class="d2h-wrapper">\n' + htmlDiffs.join('\n') + '</div>\n';
   };
 
   var matcher = Rematch.rematch(function(a, b) {
@@ -61,17 +63,20 @@
     return Rematch.distance(amod, bmod);
   });
 
-  LineByLinePrinter.prototype._generateFileHtml = function(file) {
-    var that = this;
-    return file.blocks.map(function(block) {
-
-      var lines = '<tr>\n' +
+  LineByLinePrinter.prototype.makeColumnLineNumberHtml = function(block) {
+      return '<tr>\n' +
         '  <td class="d2h-code-linenumber ' + diffParser.LINE_TYPE.INFO + '"></td>\n' +
         '  <td class="' + diffParser.LINE_TYPE.INFO + '">' +
         '    <div class="d2h-code-line ' + diffParser.LINE_TYPE.INFO + '">' + utils.escape(block.header) + '</div>' +
         '  </td>\n' +
         '</tr>\n';
+  };
 
+  LineByLinePrinter.prototype._generateFileHtml = function(file) {
+    var that = this;
+    return file.blocks.map(function(block) {
+
+      var lines = that.makeColumnLineNumberHtml(block);
       var oldLines = [];
       var newLines = [];
 
@@ -172,6 +177,18 @@
     return lines;
   };
 
+  LineByLinePrinter.prototype.makeLineHtml = function(type, oldNumber, newNumber, htmlPrefix, htmlContent) {
+    return '<tr>\n' +
+      '  <td class="d2h-code-linenumber ' + type + '">' +
+      '    <div class="line-num1">' + utils.valueOrEmpty(oldNumber) + '</div>' +
+      '    <div class="line-num2">' + utils.valueOrEmpty(newNumber) + '</div>' +
+      '  </td>\n' +
+      '  <td class="' + type + '">' +
+      '    <div class="d2h-code-line ' + type + '">' + htmlPrefix + htmlContent + '</div>' +
+      '  </td>\n' +
+      '</tr>\n';
+  };
+
   LineByLinePrinter.prototype._generateLineHtml = function(type, oldNumber, newNumber, content, prefix) {
     var htmlPrefix = '';
     if (prefix) {
@@ -183,15 +200,7 @@
       htmlContent = '<span class="d2h-code-line-ctn">' + content + '</span>';
     }
 
-    return '<tr>\n' +
-      '  <td class="d2h-code-linenumber ' + type + '">' +
-      '    <div class="line-num1">' + utils.valueOrEmpty(oldNumber) + '</div>' +
-      '    <div class="line-num2">' + utils.valueOrEmpty(newNumber) + '</div>' +
-      '  </td>\n' +
-      '  <td class="' + type + '">' +
-      '    <div class="d2h-code-line ' + type + '">' + htmlPrefix + htmlContent + '</div>' +
-      '  </td>\n' +
-      '</tr>\n';
+    return this.makeLineHtml(type, oldNumber, newNumber, htmlPrefix, htmlContent);
   };
 
   LineByLinePrinter.prototype._generateEmptyDiff = function() {