refactor: use custom EOL for cross platform

edge-js · Mar 28, 2017 · cf6f99c · cf6f99c
1 parent c384452
commit cf6f99c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/lib/EOL.js b/lib/EOL.js
@@ -0,0 +1,3 @@
+'use strict'
+
+module.exports = /\r\n|\r|\n/g
diff --git a/src/Ast/index.js b/src/Ast/index.js
@@ -10,7 +10,7 @@
 */
 
 const _ = require('lodash')
-const os = require('os')
+const EOL = require('../../lib/EOL')
 const CE = require('../Exceptions')
 
 /**
@@ -195,7 +195,7 @@ class Ast {
     this
       ._template
       .trim()
-      .split(os.EOL)
+      .split(EOL)
       .forEach((line, index) => {
         /**
          * Do not process anything when inside the block

diff --git a/src/Buffer/index.js b/src/Buffer/index.js
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
 */
 
-const os = require('os')
+const EOL = require('../../lib/EOL')
 const identString = require('indent-string')
 
 /**
@@ -82,7 +82,7 @@ class Buffer {
    * @return {String}
    */
   get EOL () {
-    return os.EOL
+    return EOL
   }
 
   /**
@@ -172,7 +172,7 @@ class Buffer {
    */
   getLines () {
     const lines = this._lines.concat(this._getEndLines())
-    return lines.join(os.EOL)
+    return lines.join('\n')
   }
 
   /**

diff --git a/src/Tags/LayoutTag.js b/src/Tags/LayoutTag.js
@@ -128,7 +128,7 @@ class LayoutTag extends BaseTag {
         inheritParent = true
       }
 
-      const sectionOutput = childs.map((child) => compiler.parseAndReturnLine(child)).join(buffer.EOL)
+      const sectionOutput = childs.map((child) => compiler.parseAndReturnLine(child)).join('\n')
 
       /**
        * Store the output of section inside a key on the

diff --git a/test/functional/conditionals/test.async.spec.js b/test/functional/conditionals/test.async.spec.js
@@ -90,6 +90,6 @@ test.group('Functional | Conditionals', (group) => {
     const $ = cheerio.load(browser.html())
     const error = JSON.parse($('body').text())
     assert.equal(error.name, 'InvalidExpressionException')
-    assert.equal(error.stack.split('\n')[1].trim(), `at (${viewsPath}/error-if-else.edge:9:0)`)
+    assert.equal(error.stack.split('\n')[1].trim(), `at (${path.join(viewsPath, 'error-if-else.edge')}:9:0)`)
   })
 })