Fixed issues with code formatting

pastorsj · Feb 17, 2018 · 1475283 · 1475283
1 parent 30a253f
commit 1475283
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-gist-html",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "A simple library to convert gist code and GitHub files into gist-like html",
   "main": "./lib/node-gist-html.min.js",
   "types": "./index.d.ts",

diff --git a/src/converters/gist.js b/src/converters/gist.js
@@ -22,12 +22,24 @@ function removeLines($, lineNumbers) {
     }
 }
 
+function formatCode($) {
+    // eslint-disable-next-line
+    $('td.blob-code').each(function(index, element) {
+        const outer = $.html(this);
+        const inner = $(this).html();
+        const replacement = `<pre><code>${$(this).html()}</code></pre>`;
+        const replaced = outer.replace(inner, replacement);
+        $(this).replaceWith($(replaced));
+    });
+}
+
 function retrieveGist(response, options) {
     return new Promise((resolve, reject) => {
         try {
             if (response && response.div) {
                 if (response.stylesheet) {
                     if (response.stylesheet.indexOf('<link') === 0) {
+                        // eslint-disable-next-line
                         response.stylesheet = response.stylesheet
                             .replace(/\\/g, '')
                             .match(/href=\"([^\s]*)\"/)[1];
@@ -51,6 +63,7 @@ function retrieveGist(response, options) {
                 if (options.lineNumbers) {
                     removeLines($, options.lineNumbers);
                 }
+                formatCode($);
 
                 const file = $.html();
 

diff --git a/src/converters/github.js b/src/converters/github.js
@@ -21,6 +21,17 @@ function removeLines($, lineNumbers) {
     }
 }
 
+function formatCode($) {
+    // eslint-disable-next-line
+    $('td.blob-code').each(function(index, element) {
+        const outer = $.html(this);
+        const inner = $(this).html();
+        const replacement = `<pre><code>${$(this).html()}</code></pre>`;
+        const replaced = outer.replace(inner, replacement);
+        $(this).replaceWith($(replaced));
+    });
+}
+
 function convertGithubCode(body, url, filename, options) {
     return new Promise((resolve, reject) => {
         try {
@@ -40,8 +51,10 @@ function convertGithubCode(body, url, filename, options) {
                 removeLines($, options.lineNumbers);
             }
 
+            formatCode($);
             let file = $('.file').html();
 
+            // eslint-disable-next-line
             $('link[rel=stylesheet]').each(function (index, element) {
                 const href = $(this).attr('href');
                 if (href.indexOf('frameworks-') === -1) {

diff --git a/tests/test.js b/tests/test.js
@@ -25,7 +25,7 @@ const fs = require('fs');
 //         console.error(err);
 //     });
 
-converter.gistify('https://github.com/pastorsj/blog-api/blob/master/docs/index.html#L2-L18')
+converter.gistify('https://github.com/LighthouseBlog/Blog/blob/master/src/app/_interceptors/response.interceptor.ts')
     .then((result) => {
         fs.writeFileSync('index.html', result.html);
     })