feature: separate options for value/tag trimming, working on #17

test/options/cache.js

@@ -0,0 +1,42 @@
+const chai = require('chai')
+const expect = chai.expect
+const mock = require('mock-fs')
+const Liquid = require('../..')
+chai.use(require('chai-as-promised'))
+
+describe('cache options', function () {
+  var engine
+  beforeEach(function () {
+    engine = Liquid({
+      root: '/root/',
+      extname: '.html'
+    })
+    mock({ '/root/files/foo.html': 'foo' })
+  })
+  afterEach(function () {
+    mock.restore()
+  })
+  it('should be disabled by default', function () {
+    return engine.renderFile('files/foo')
+      .then(x => expect(x).to.equal('foo'))
+      .then(() => mock({
+        '/root/files/foo.html': 'bar'
+      }))
+      .then(() => engine.renderFile('files/foo'))
+      .then(x => expect(x).to.equal('bar'))
+  })
+  it('should respect cache=true option', function () {
+    engine = Liquid({
+      root: '/root/',
+      extname: '.html',
+      cache: true
+    })
+    return engine.renderFile('files/foo')
+      .then(x => expect(x).to.equal('foo'))
+      .then(() => mock({
+        '/root/files/foo.html': 'bar'
+      }))
+      .then(() => engine.renderFile('files/foo'))
+      .then(x => expect(x).to.equal('foo'))
+  })
+})

test/options/strict.js

@@ -0,0 +1,35 @@
+const chai = require('chai')
+const expect = chai.expect
+const Liquid = require('../..')
+chai.use(require('chai-as-promised'))
+
+describe('strict options', function () {
+  var engine
+  var ctx = {}
+  beforeEach(function () {
+    engine = Liquid({
+      root: '/root/',
+      extname: '.html'
+    })
+  })
+  it('should not throw when strict_variables false (default)', function () {
+    return expect(engine.parseAndRender('before{{notdefined}}after', ctx)).to
+      .eventually.equal('beforeafter')
+  })
+  it('should throw when strict_variables true', function () {
+    var tpl = engine.parse('before{{notdefined}}after')
+    var opts = {
+      strict_variables: true
+    }
+    return expect(engine.render(tpl, ctx, opts)).to
+      .be.rejectedWith(/undefined variable: notdefined/)
+  })
+  it('should pass strict_variables to render by parseAndRender', function () {
+    var html = 'before{{notdefined}}after'
+    var opts = {
+      strict_variables: true
+    }
+    return expect(engine.parseAndRender(html, ctx, opts)).to
+      .be.rejectedWith(/undefined variable: notdefined/)
+  })
+})

test/options/trimming.js

@@ -0,0 +1,84 @@
+const chai = require('chai')
+const expect = chai.expect
+const Liquid = require('../..')
+chai.use(require('chai-as-promised'))
+
+describe('trimming', function () {
+  var ctx = {name: 'harttle'}
+
+  describe('tag trimming', function () {
+    it('should respect trim_tag_left', function () {
+      var engine = Liquid({ trim_tag_left: true })
+      return expect(engine.parseAndRender(' \n \t{%if true%}foo{%endif%} '))
+        .to.eventually.equal('foo ')
+    })
+    it('should respect trim_tag_right', function () {
+      var engine = Liquid({ trim_tag_right: true })
+      return expect(engine.parseAndRender('\t{%if true%}foo{%endif%} \n'))
+        .to.eventually.equal('\tfoo')
+    })
+    it('should not trim value', function () {
+      var engine = Liquid({ trim_tag_left: true, trim_tag_right: true })
+      return expect(engine.parseAndRender('{%if true%}a {{name}} b{%endif%}', ctx))
+        .to.eventually.equal('a harttle b')
+    })
+  })
+  describe('value trimming', function () {
+    it('should respect trim_value_left', function () {
+      var engine = Liquid({ trim_value_left: true })
+      return expect(engine.parseAndRender(' \n \t{{name}} ', ctx))
+        .to.eventually.equal('harttle ')
+    })
+    it('should respect trim_value_right', function () {
+      var engine = Liquid({ trim_value_right: true })
+      return expect(engine.parseAndRender(' \n \t{{name}} ', ctx))
+        .to.eventually.equal(' \n \tharttle')
+    })
+    it('should respect not trim tag', function () {
+      var engine = Liquid({ trim_value_left: true, trim_value_right: true })
+      return expect(engine.parseAndRender('\t{% if true %} aha {%endif%}\t'))
+        .to.eventually.equal('\t aha \t')
+    })
+  })
+  describe('greedy', function () {
+    var src = '\n {%-if true-%}\n a \n{{-name-}}{%-endif-%}\n '
+    it('should enable greedy by default', function () {
+      var engine = Liquid()
+      return expect(engine.parseAndRender(src, ctx))
+        .to.eventually.equal('aharttle')
+    })
+    it('should respect to greedy:false by default', function () {
+      var engine = Liquid({greedy: false})
+      return expect(engine.parseAndRender(src, ctx))
+        .to.eventually.equal('\n a \nharttle ')
+    })
+  })
+  describe('markup', function () {
+    it('should support trim using markup', function () {
+      var engine = Liquid()
+      var src = [
+        '{%- assign username = "John G. Chalmers-Smith" -%}',
+        '{%- if username and username.length > 10 -%}',
+        '  Wow, {{ username }}, you have a long name!',
+        '{%- else -%}',
+        '  Hello there!',
+        '{%- endif -%}'
+      ].join('\n')
+      var dst = 'Wow, John G. Chalmers-Smith, you have a long name!'
+      return expect(engine.parseAndRender(src)).to.eventually.equal(dst)
+    })
+    it('should not trim when not specified', function () {
+      var engine = Liquid()
+      var src = [
+        '{% assign username = "John G. Chalmers-Smith" %}',
+        '{% if username and username.length > 10 %}',
+        '  Wow, {{ username }}, you have a long name!',
+        '{% else %}',
+        '  Hello there!',
+        '{% endif %}'
+      ].join('\n')
+      var dst = '\n\n  Wow, John G. Chalmers-Smith, you have a long name!\n'
+      return expect(engine.parseAndRender(src)).to.eventually.equal(dst)
+    })
+  })
+})