Prevent parse file other than html and markdown #1

fians · Sep 6, 2014 · 07d50ca · 07d50ca
1 parent 984cd85
commit 07d50ca
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 10 deletions.
diff --git a/src/compiler.js b/src/compiler.js
@@ -16,8 +16,7 @@ var print       = require('./print.js');
 var dir         = require('./dir.js');
 
 module.exports = {
-    build: build,
-    getFileList: getFileList
+    build: build
 };
 
 /**
@@ -50,10 +49,16 @@ function render(file, callback) {
 
     // Get full path dan file content
     var filePath    = path.resolve(process.cwd(), config.get('source')+'/'+file);
-    var fileExt     = path.extname(filePath).toLowerCase();
-
-    // Detect markdown file
-    var markdownExt = ['.markdown', '.mdown', '.mkdn', '.mkd', '.md'];
+
+    // Prevent parse file other than html and markdown
+    if (!parser.isHtml(filePath) && !parser.isMarkdown(filePath)) {
+
+        var destPath = path.resolve(process.cwd(), config.get('destination')+'/'+file);
+
+        return fs.copy(filePath, destPath, function(err) {
+            callback(err);
+        });
+    }
 
     fs.readFile(filePath, {encoding: 'utf8'}, function(err, string) {
 
@@ -80,7 +85,7 @@ function render(file, callback) {
         /**
          * Parse markdown file
          */
-        if (config.get('markdown') && (markdownExt.indexOf(fileExt) !== -1)) {
+        if (config.get('markdown') && parser.isMarkdown(filePath)) {
 
             // Convert string
             string = marked(string, {sanitize: false});
@@ -106,7 +111,7 @@ function render(file, callback) {
             /**
              * Convert to html file
              */
-            if (config.get('markdown') && (markdownExt.indexOf(fileExt) !== -1)) {
+            if (config.get('markdown') && parser.isMarkdown(filePath)) {
                 file = path.basename(file, fileExt) + '.html';
             }
 
@@ -115,7 +120,7 @@ function render(file, callback) {
              */
             if (
                 config.get('permalink') && 
-                path.extname(file) === '.html' && 
+                parser.isHtml(filePath) && 
                 file.indexOf('index.html') === -1
             ) {
                 file = file.replace('.html', '') + '/index.html';

diff --git a/src/parser.js b/src/parser.js
@@ -13,7 +13,9 @@ module.exports = {
     stripData: stripData,
     insertString: insertString,
 	includeFile: includeFile,
-	getData: getData
+	getData: getData,
+    isHtml: isHtml,
+    isMarkdown: isMarkdown
 };
 
 
@@ -120,4 +122,24 @@ function getData(string) {
 
     data.content = JSON.parse(capture[1]);
     return data;
+}
+
+/**
+ * Check if file is HTML or not
+ */
+function isHtml(filePath) {
+
+    var fileExt = path.extname(filePath).toLowerCase();
+    return fileExt === '.html';
+}
+
+/**
+ * Check if file is markdown file or not
+ */
+function isMarkdown(filePath) {
+
+    var fileExt     = path.extname(filePath).toLowerCase();
+    var markdownExt = ['.markdown', '.mdown', '.mkdn', '.mkd', '.md'];
+
+    return markdownExt.indexOf(fileExt) !== -1;
 }
diff --git a/test/testParser.js b/test/testParser.js
@@ -146,4 +146,34 @@ describe('Parser module:', function() {
 
         });
     });
+
+    describe('isHtml() test', function() {
+
+        it('should return false if file is not html', function() {
+            assert.equal(false, parser.isHtml('file.css'));
+        });
+
+        it('should return true if file is html', function() {
+            assert.equal(true, parser.isHtml('file.html'));
+        });
+
+    });
+
+    describe('isMarkdown() test', function() {
+
+        it('should return false if file is not markdown', function() {
+            assert.equal(false, parser.isMarkdown('file.html'));
+
+        });
+
+        it('should return true if file is markdown', function() {
+            assert.equal(true, parser.isMarkdown('file.markdown'));
+            assert.equal(true, parser.isMarkdown('file.mdown'));
+            assert.equal(true, parser.isMarkdown('file.mkdn'));
+            assert.equal(true, parser.isMarkdown('file.mkd'));
+            assert.equal(true, parser.isMarkdown('file.md'));
+        });
+
+    });
+
 });