hmpo-template-mixins - npm Package Compare versions

Comparing version 4.3.0 to 4.4.0

lib/template-mixins.js

@@ -194,2 +194,20 @@ 'use strict';
 
+        function renderChild() {
+            return function () {
+                if (this.child) {
+                    var templateString = getTemplate(this.child, this.toggle);
+                    var template = Hogan.compile(templateString);
+                    return template.render(_.extend({
+                        renderMixin: function () {
+                            return function () {
+                                if (this.child && this[this.child]) {
+                                    return this[this.child]().call(this, this.toggle);
+                                }
+                            };
+                        }
+                    }, res.locals, this));
+                }
+            };
+        }
+
         function optionGroup(key) {
@@ -239,19 +257,3 @@ var legend = fields[key] && fields[key].legend;
                 className: classNames(key),
-                renderChild: function () {
-                    return function () {
-                        if (this.child) {
-                            var templateString = getTemplate(this.child, this.toggle);
-                            var template = Hogan.compile(templateString);
-                            return template.render(_.extend({
-                                renderMixin: function () {
-                                    return function () {
-                                        if (this.child && this[this.child]) {
-                                            return this[this.child]().call(this, this.toggle);
-                                        }
-                                    };
-                                }
-                            }, res.locals, this));
-                        }
-                    };
-                }
+                renderChild: renderChild.bind(this)
             };
@@ -275,3 +277,5 @@ }
                 selected: selected,
-                className: classNames(key) || 'block-label'
+                className: classNames(key) || 'block-label',
+                child: fields[key] && fields[key].child,
+                renderChild: renderChild.bind(this)
             });
@@ -278,0 +282,0 @@ }

package.json

 {
   "name": "hmpo-template-mixins",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "description": "A middleware that exposes a series of Mustache mixins on res.locals to ease usage of forms, translations, and some general needs.",
@@ -5,0 +5,0 @@ "main": "index.js",

test/spec.index.js

@@ -1290,8 +1290,42 @@ var mixins = require('../lib/template-mixins');
 
-        describe('renderChild', function () {
-            var renderChild;
+        describe('Multiple lambdas', function () {
 
             beforeEach(function () {
                 middleware = mixins();
+            });
+
+            it('recursively runs lambdas wrapped in other lambdas correctly', function () {
                 middleware(req, res, next);
+                res.locals.value = '2016-01-01T00:00:00.000Z';
+                var result = res.locals['uppercase']().call(res.locals,
+                    '{{#time}}{{#date}}{{value}}|h:mma on D MMMM YYYY{{/date}}{{/time}}');
+                result.should.equal('MIDNIGHT ON 1 JANUARY 2016');
+            });
+
+        });
+
+    });
+
+    describe('child templates', function () {
+        var render,
+            renderChild,
+            fields,
+            options;
+
+        beforeEach(function () {
+            render = sinon.stub();
+            sinon.stub(Hogan, 'compile').returns({
+                render: render
+            });
+        });
+
+        afterEach(function () {
+            Hogan.compile.restore();
+        });
+
+        describe('radio-group renderChild', function () {
+
+            beforeEach(function () {
+                middleware = mixins();
+                middleware(req, res, next);
                 res.locals['radio-group']().call(res.locals, 'field-name');
@@ -1310,5 +1344,11 @@ renderChild = render.lastCall.args[0].renderChild;
             describe('called with child', function () {
-                var scope = {};
 
                 beforeEach(function () {
+                    options = [ {} ];
+                    fields = {
+                        'field-name': {
+                            options: options
+                        },
+                        'child-field-name': {}
+                    };
                     renderChild = renderChild();
@@ -1318,25 +1358,53 @@ });
                 it('accepts an HTML template string', function () {
-                    scope.child = '<div>{{key}}</div>';
-                    scope.key = 'value';
-                    renderChild.call(scope).should.be.equal('<div>value</div>');
+                    Hogan.compile.restore();
+                    options[0] = {
+                        child: '<div>{{key}}</div>',
+                        key: 'value'
+                    };
+                    renderChild.call(fields['field-name'].options[0]).should.be.equal('<div>value</div>');
+                    sinon.stub(Hogan, 'compile').returns({
+                        render: render
+                    });
                 });
 
                 it('accepts a template mixin and renders it in a panel', function () {
-                    scope.child = 'input-text';
-                    scope.toggle = 'child-field-name';
-                    var subfield = res.locals['input-text']().call({}, 'child-field-name');
+                    Hogan.compile.restore();
+                    options[0] = {
+                        value: true,
+                        label: 'True',
+                        toggle: 'child-field-name',
+                        child: 'input-text'
+                    };
+                    sinon.stub(res.locals, 'input-text').returns(function (key) {
+                        return Hogan.compile('<div>{{key}}</div>').render({ key: key });
+                    });
                     var output = '<div id="child-field-name-panel" class="reveal js-hidden">';
                     output += '\n    <div class="panel-indent">\n';
-                    output += subfield;
+                    output += '<div>child-field-name</div>';
                     output += '    </div>';
                     output += '\n</div>\n';
-                    renderChild.call(_.extend({}, scope, res.locals)).should.be.equal(output);
+                    renderChild.call(_.extend({}, fields['field-name'].options[0], res.locals)).should.be.equal(output);
+                    res.locals['input-text'].restore();
+                    sinon.stub(Hogan, 'compile').returns({
+                        render: render
+                    });
                 });
 
                 it('accepts a custom partial', function () {
+                    Hogan.compile.restore();
+                    res.locals.partials = {
+                        'partials-custom-partial': 'partials/custom-partial'
+                    };
                     var customPartial = '<div>Custom Partial</div>';
-                    scope.child = 'partials/custom-partial';
-                    sinon.stub(fs, 'readFileSync').returns(customPartial);
-                    renderChild.call(scope).should.be.equal(customPartial);
+                    options[0] = {
+                        child: 'partials/custom-partial'
+                    };
+                    sinon.stub(fs, 'readFileSync')
+                        .withArgs('partials/custom-partial.html')
+                        .returns(customPartial);
+                    renderChild.call(fields['field-name'].options[0]).should.be.equal(customPartial);
                     fs.readFileSync.restore();
+                    sinon.stub(Hogan, 'compile').returns({
+                        render: render
+                    });
                 });
@@ -1347,15 +1415,76 @@ });
 
-        describe('Multiple lambdas', function () {
+        describe('checkbox renderChild', function () {
+
             beforeEach(function () {
-                middleware = mixins();
+                middleware = mixins({ 'field-name': {} });
+                middleware(req, res, next);
+                res.locals['checkbox']().call(res.locals, 'field-name');
+                renderChild = render.lastCall.args[0].renderChild;
             });
 
-            it('recursively runs lambdas wrapped in other lambdas correctly', function () {
-                middleware(req, res, next);
-                res.locals.value = '2016-01-01T00:00:00.000Z';
-                var result = res.locals['uppercase']().call(res.locals,
-                    '{{#time}}{{#date}}{{value}}|h:mma on D MMMM YYYY{{/date}}{{/time}}');
-                result.should.equal('MIDNIGHT ON 1 JANUARY 2016');
+            it('is a function', function () {
+                renderChild.should.be.a('function');
             });
 
+            it('returns a function', function () {
+                renderChild().should.be.a('function');
+            });
+
+            describe('called with child', function () {
+
+                beforeEach(function () {
+                    options = {};
+                    fields = {
+                        'field-name': options,
+                        'child-field-name': {}
+                    };
+                    renderChild = renderChild();
+                });
+
+                it('accepts an HTML template string', function () {
+                    Hogan.compile.restore();
+                    options.child = '<div>{{key}}</div>';
+                    options.key = 'value';
+                    renderChild.call(fields['field-name']).should.be.equal('<div>value</div>');
+                    sinon.stub(Hogan, 'compile').returns({
+                        render: render
+                    });
+                });
+
+                it('accepts a template mixin and renders it in a panel', function () {
+                    Hogan.compile.restore();
+                    options.child = 'input-text';
+                    options.toggle = 'child-field-name';
+                    sinon.stub(res.locals, 'input-text').returns(function (key) {
+                        return Hogan.compile('<div>{{key}}</div>').render({ key: key });
+                    });
+                    var output = '<div id="child-field-name-panel" class="reveal js-hidden">';
+                    output += '\n    <div class="panel-indent">\n';
+                    output += '<div>child-field-name</div>';
+                    output += '    </div>';
+                    output += '\n</div>\n';
+                    renderChild.call(_.extend({}, fields['field-name'], res.locals)).should.be.equal(output);
+                    sinon.stub(Hogan, 'compile').returns({
+                        render: render
+                    });
+                });
+
+                it('accepts a custom partial', function () {
+                    Hogan.compile.restore();
+                    res.locals.partials = {
+                        'partials-custom-partial': 'partials/custom-partial'
+                    };
+                    var customPartial = '<div>Custom Partial</div>';
+                    options.child = 'partials/custom-partial';
+                    sinon.stub(fs, 'readFileSync')
+                        .withArgs('partials/custom-partial.html')
+                        .returns(customPartial);
+                    renderChild.call(fields['field-name']).should.be.equal(customPartial);
+                    fs.readFileSync.restore();
+                    sinon.stub(Hogan, 'compile').returns({
+                        render: render
+                    });
+                });
+            });
+
         });
@@ -1362,0 +1491,0 @@

No alert changes

Improved metrics

Total package byte prevSize

89764

6.04%

Lines of code

1719

7.3%

No dependency changes