Merge pull request #106 from cosminlupu/dev

Remove extension on -o option #102
angrykoala · Oct 15, 2016 · d4df56b · d4df56b
2 parents 70b8678 + 232f671
commit d4df56b
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 0 deletions.
diff --git a/app/renderers/html_renderer.js b/app/renderers/html_renderer.js
@@ -20,6 +20,7 @@ module.exports = class HtmlRenderer extends Renderer {
 
     //args: content, done
     fileOutput(content,filename, done) {
+        filename = filename.replace(/\.html$/, '');
         if (this.options.minify) content = htmlMinifier(content);
         fs.writeFile(filename + ".html", content, (err) => {
             if (err) return done(new Error("Error writing html file" + err),filename+".html");

diff --git a/app/renderers/pdf_renderer.js b/app/renderers/pdf_renderer.js
@@ -18,6 +18,7 @@ module.exports = class PdfRenderer extends Renderer {
 
     //args: content, done
     fileOutput(content,filename, done) {
+        filename = filename.replace(/\.pdf$/, '');
         html2pdf(content, filename, (err) => {
             if (err) return done(new Error("Error writing file" + err),filename+".pdf");
             else return done(null,filename+".pdf");

diff --git a/app/renderers/remark_renderer.js b/app/renderers/remark_renderer.js
@@ -22,6 +22,7 @@ module.exports = class RemarkRenderer extends Renderer {
 
     //args: content, done
     fileOutput(content,filename, done) {
+        filename = filename.replace(/\.html$/, '');
         if (this.options.minify) content = htmlMinifier(content);
         fs.writeFile(filename + '.html', content, (err) => {
             if (err) return done(new Error("Error writing remark (html) file" + err),filename+".html");

diff --git a/test/renderers/html.test.js b/test/renderers/html.test.js
@@ -54,6 +54,21 @@ describe("Html Renderer", () => {
             });
         });
     });
+    it("Create Html file with supplied extension", (done) => {
+        const renderer = new HtmlRenderer({
+            outputFilename: testDir + "/test.html"
+        });
+
+        renderer.renderFile(testDir + "/" + testMdFiles[0], (renderFileError) => {
+            assert.notOk(renderFileError);
+            fs.stat(testDir + "/test.html", (err, res) => {
+                assert.notOk(err);
+                assert.ok(res);
+                assert.ok(res.isFile());
+                done();
+            });
+        });
+    });
     it("Wrong input file", (done) => {
         const renderer = new HtmlRenderer();
         assert.ok(renderer);

diff --git a/test/renderers/pdf.test.js b/test/renderers/pdf.test.js
@@ -39,6 +39,22 @@ describe("Pdf Renderer", function() {
             });
         });
 
+    });
+    it("Create PDF file with supplied extension", function(done) {
+        this.timeout(5000);
+        const renderer = new PdfRenderer({
+            outputFilename: testDir + "/prueba.pdf"
+        });
+        renderer.renderFile(testDir + "/" + testFiles[0], function(err) {
+            assert.notOk(err);
+            fs.stat(testDir + "/prueba.pdf", function(err, res) {
+                assert.notOk(err);
+                assert.ok(res);
+                assert.ok(res.isFile());
+                done();
+            });
+        });
+
     });
     describe.skip("Renderer options", () => {
         it("Highlight", () => {

diff --git a/test/renderers/remark.test.js b/test/renderers/remark.test.js
@@ -52,5 +52,21 @@ describe("Remark Renderer", function() {
         });
 
     });
+    it("Create Remark file with supplied extension", (done) => {
+        const renderer = new remarkRenderer({
+            outputFilename: testDir + "/remark_test.html"
+        });
+
+        renderer.renderFile(testDir + "/" + testFile, (renderFileError) => {
+            assert.notOk(renderFileError);
+            fs.stat(testDir + "/remark_test.html", (err, res) => {
+                assert.notOk(err);
+                assert.ok(res);
+                assert.ok(res.isFile());
+                done();
+            });
+        });
+
+    });
 
 });