diff --git a/archive/dustjs-helpers-1.3.0.tar.gz b/archive/dustjs-helpers-1.3.0.tar.gz new file mode 100644 index 0000000..6866460 Binary files /dev/null and b/archive/dustjs-helpers-1.3.0.tar.gz differ diff --git a/archive/dustjs-helpers-1.3.0.zip b/archive/dustjs-helpers-1.3.0.zip new file mode 100644 index 0000000..2f639c3 Binary files /dev/null and b/archive/dustjs-helpers-1.3.0.zip differ diff --git a/dist/dust-helpers.js b/dist/dust-helpers.js index 23f4b07..d4a0d24 100644 --- a/dist/dust-helpers.js +++ b/dist/dust-helpers.js @@ -1,19 +1,10 @@ -/*! dustjs-helpers - v1.2.0 +/*! dustjs-helpers - v1.3.0 * https://github.com/linkedin/dustjs-helpers * Copyright (c) 2014 Aleksander Williams; Released under the MIT License */ (function(dust){ -// Note: all error conditions are logged to console and failed silently - -/* make a safe version of console if it is not available - * currently supporting: - * _console.log - * */ -var _console = (typeof console !== 'undefined')? console: { - log: function(){ - /* a noop*/ - } -}; +//using the built in logging method of dust when accessible +var _log = dust.log ? function(mssg) { dust.log(mssg, "INFO"); } : function() {}; function isSelect(context) { var value = context.current(); @@ -57,7 +48,7 @@ function filter(chunk, context, bodies, params, filterOp) { } } else { - _console.log ("No key specified for filter in:" + filterOpType + " helper "); + _log("No key specified for filter in:" + filterOpType + " helper "); return chunk; } expectedValue = dust.helpers.tap(params.value, chunk, context); @@ -71,7 +62,7 @@ function filter(chunk, context, bodies, params, filterOp) { return chunk.render(body, context); } else { - _console.log( "Missing body block in the " + filterOpType + " helper "); + _log("No key specified for filter in:" + filterOpType + " helper "); return chunk; } } @@ -191,7 +182,7 @@ var helpers = { dump = JSON.stringify(context.stack.head, jsonFilter, 2); } if (to === 'console') { - _console.log(dump); + _log(dump); return chunk; } else { @@ -226,7 +217,7 @@ var helpers = { return chunk.render( bodies.block, context ); } else { - _console.log( "Missing body block in the if helper!" ); + _log("Missing body block in the if helper!"); return chunk; } } @@ -236,7 +227,7 @@ var helpers = { } // no condition else { - _console.log( "No condition given in the if helper!" ); + _log("No condition given in the if helper!"); } return chunk; }, @@ -257,14 +248,17 @@ var helpers = { operand = params.operand, round = params.round, mathOut = null, - operError = function(){_console.log("operand is required for this math method"); return null;}; + operError = function(){ + _log("operand is required for this math method"); + return null; + }; key = dust.helpers.tap(key, chunk, context); operand = dust.helpers.tap(operand, chunk, context); // TODO: handle and tests for negatives and floats in all math operations switch(method) { case "mod": if(operand === 0 || operand === -0) { - _console.log("operand for divide operation is 0/-0: expect Nan!"); + _log("operand for divide operation is 0/-0: expect Nan!"); } mathOut = parseFloat(key) % parseFloat(operand); break; @@ -279,7 +273,7 @@ var helpers = { break; case "divide": if(operand === 0 || operand === -0) { - _console.log("operand for divide operation is 0/-0: expect Nan/Infinity!"); + _log("operand for divide operation is 0/-0: expect Nan/Infinity!"); } mathOut = parseFloat(key) / parseFloat(operand); break; @@ -296,7 +290,7 @@ var helpers = { mathOut = Math.abs(parseFloat(key)); break; default: - _console.log( "method passed is not supported" ); + _log("method passed is not supported"); } if (mathOut !== null){ @@ -317,7 +311,7 @@ var helpers = { } // no key parameter and no method else { - _console.log( "Key is a required parameter for math helper along with method/operand!" ); + _log("Key is a required parameter for math helper along with method/operand!"); } return chunk; }, @@ -340,13 +334,13 @@ var helpers = { return chunk.render(bodies.block, context.push({ isSelect: true, isResolved: false, selectKey: key })); } else { - _console.log( "Missing body block in the select helper "); + _log("Missing body block in the select helper "); return chunk; } } // no key else { - _console.log( "No key given in the select helper!" ); + _log("No key given in the select helper!"); } return chunk; }, @@ -512,6 +506,12 @@ var helpers = { }; -dust.helpers = helpers; + for (var key in helpers) { + dust.helpers[key] = helpers[key]; + } + + if(typeof exports !== 'undefined') { + module.exports = dust; + } -})(typeof exports !== 'undefined' ? module.exports = require('dustjs-linkedin') : dust); +})(typeof exports !== 'undefined' ? require('dustjs-linkedin') : dust); \ No newline at end of file diff --git a/dist/dust-helpers.min.js b/dist/dust-helpers.min.js index 34cc3f9..c18717b 100644 --- a/dist/dust-helpers.min.js +++ b/dist/dust-helpers.min.js @@ -1,4 +1,4 @@ -/*! dustjs-helpers - v1.2.0 +/*! dustjs-helpers - v1.3.0 * https://github.com/linkedin/dustjs-helpers * Copyright (c) 2014 Aleksander Williams; Released under the MIT License */ -!function(dust){function isSelect(a){var b=a.current();return"object"==typeof b&&b.isSelect===!0}function jsonFilter(a,b){return"function"==typeof b?b.toString().replace(/(^\s+|\s+$)/gm,"").replace(/\n/gm,"").replace(/,\s*/gm,", ").replace(/\)\{/gm,") {"):b}function filter(a,b,c,d,e){d=d||{};var f,g,h=c.block,i=d.filterOpType||"";if("undefined"!=typeof d.key)f=dust.helpers.tap(d.key,a,b);else{if(!isSelect(b))return _console.log("No key specified for filter in:"+i+" helper "),a;f=b.current().selectKey,b.current().isResolved&&(e=function(){return!1})}return g=dust.helpers.tap(d.value,a,b),e(coerce(g,d.type,b),coerce(f,d.type,b))?(isSelect(b)&&(b.current().isResolved=!0),h?a.render(h,b):(_console.log("Missing body block in the "+i+" helper "),a)):c["else"]?a.render(c["else"],b):a}function coerce(a,b,c){if(a)switch(b||typeof a){case"number":return+a;case"string":return String(a);case"boolean":return a="false"===a?!1:a,Boolean(a);case"date":return new Date(a);case"context":return c.get(a)}return a}var _console="undefined"!=typeof console?console:{log:function(){}},helpers={tap:function(a,b,c){if("function"!=typeof a)return a;var d,e="";return d=b.tap(function(a){return e+=a,""}).render(a,c),b.untap(),d.constructor!==b.constructor?d:""===e?!1:e},sep:function(a,b,c){var d=c.block;return b.stack.index===b.stack.of-1?a:d?c.block(a,b):a},idx:function(a,b,c){var d=c.block;return d?c.block(a,b.push(b.stack.index)):a},contextDump:function(a,b,c,d){var e,f=d||{},g=f.to||"output",h=f.key||"current";return g=dust.helpers.tap(g,a,b),h=dust.helpers.tap(h,a,b),e="full"===h?JSON.stringify(b.stack,jsonFilter,2):JSON.stringify(b.stack.head,jsonFilter,2),"console"===g?(_console.log(e),a):a.write(e)},"if":function(chunk,context,bodies,params){var body=bodies.block,skip=bodies["else"];if(params&¶ms.cond){var cond=params.cond;if(cond=dust.helpers.tap(cond,chunk,context),eval(cond))return body?chunk.render(bodies.block,context):(_console.log("Missing body block in the if helper!"),chunk);if(skip)return chunk.render(bodies["else"],context)}else _console.log("No condition given in the if helper!");return chunk},math:function(a,b,c,d){if(d&&"undefined"!=typeof d.key&&d.method){var e=d.key,f=d.method,g=d.operand,h=d.round,i=null;switch(e=dust.helpers.tap(e,a,b),g=dust.helpers.tap(g,a,b),f){case"mod":(0===g||g===-0)&&_console.log("operand for divide operation is 0/-0: expect Nan!"),i=parseFloat(e)%parseFloat(g);break;case"add":i=parseFloat(e)+parseFloat(g);break;case"subtract":i=parseFloat(e)-parseFloat(g);break;case"multiply":i=parseFloat(e)*parseFloat(g);break;case"divide":(0===g||g===-0)&&_console.log("operand for divide operation is 0/-0: expect Nan/Infinity!"),i=parseFloat(e)/parseFloat(g);break;case"ceil":i=Math.ceil(parseFloat(e));break;case"floor":i=Math.floor(parseFloat(e));break;case"round":i=Math.round(parseFloat(e));break;case"abs":i=Math.abs(parseFloat(e));break;default:_console.log("method passed is not supported")}return null!==i?(h&&(i=Math.round(i)),c&&c.block?a.render(c.block,b.push({isSelect:!0,isResolved:!1,selectKey:i})):a.write(i)):a}return _console.log("Key is a required parameter for math helper along with method/operand!"),a},select:function(a,b,c,d){var e=c.block;if(d&&"undefined"!=typeof d.key){var f=dust.helpers.tap(d.key,a,b);return e?a.render(c.block,b.push({isSelect:!0,isResolved:!1,selectKey:f})):(_console.log("Missing body block in the select helper "),a)}return _console.log("No key given in the select helper!"),a},eq:function(a,b,c,d){return d&&(d.filterOpType="eq"),filter(a,b,c,d,function(a,b){return b===a})},ne:function(a,b,c,d){return d?(d.filterOpType="ne",filter(a,b,c,d,function(a,b){return b!==a})):a},lt:function(a,b,c,d){return d?(d.filterOpType="lt",filter(a,b,c,d,function(a,b){return a>b})):void 0},lte:function(a,b,c,d){return d?(d.filterOpType="lte",filter(a,b,c,d,function(a,b){return a>=b})):a},gt:function(a,b,c,d){return d?(d.filterOpType="gt",filter(a,b,c,d,function(a,b){return b>a})):a},gte:function(a,b,c,d){return d?(d.filterOpType="gte",filter(a,b,c,d,function(a,b){return b>=a})):a},"default":function(a,b,c,d){return d&&(d.filterOpType="default"),filter(a,b,c,d,function(){return!0})},size:function(a,b,c,d){var e,f,g,h=0;if(d=d||{},e=d.key,e&&e!==!0)if(dust.isArray(e))h=e.length;else if(!isNaN(parseFloat(e))&&isFinite(e))h=e;else if("object"==typeof e){f=0;for(g in e)Object.hasOwnProperty.call(e,g)&&f++;h=f}else h=(e+"").length;else h=0;return a.write(h)}};dust.helpers=helpers}("undefined"!=typeof exports?module.exports=require("dustjs-linkedin"):dust); \ No newline at end of file +!function(dust){function isSelect(a){var b=a.current();return"object"==typeof b&&b.isSelect===!0}function jsonFilter(a,b){return"function"==typeof b?b.toString().replace(/(^\s+|\s+$)/gm,"").replace(/\n/gm,"").replace(/,\s*/gm,", ").replace(/\)\{/gm,") {"):b}function filter(a,b,c,d,e){d=d||{};var f,g,h=c.block,i=d.filterOpType||"";if("undefined"!=typeof d.key)f=dust.helpers.tap(d.key,a,b);else{if(!isSelect(b))return _log("No key specified for filter in:"+i+" helper "),a;f=b.current().selectKey,b.current().isResolved&&(e=function(){return!1})}return g=dust.helpers.tap(d.value,a,b),e(coerce(g,d.type,b),coerce(f,d.type,b))?(isSelect(b)&&(b.current().isResolved=!0),h?a.render(h,b):(_log("No key specified for filter in:"+i+" helper "),a)):c["else"]?a.render(c["else"],b):a}function coerce(a,b,c){if(a)switch(b||typeof a){case"number":return+a;case"string":return String(a);case"boolean":return a="false"===a?!1:a,Boolean(a);case"date":return new Date(a);case"context":return c.get(a)}return a}var _log=dust.log?function(a){dust.log(a,"INFO")}:function(){},helpers={tap:function(a,b,c){if("function"!=typeof a)return a;var d,e="";return d=b.tap(function(a){return e+=a,""}).render(a,c),b.untap(),d.constructor!==b.constructor?d:""===e?!1:e},sep:function(a,b,c){var d=c.block;return b.stack.index===b.stack.of-1?a:d?c.block(a,b):a},idx:function(a,b,c){var d=c.block;return d?c.block(a,b.push(b.stack.index)):a},contextDump:function(a,b,c,d){var e,f=d||{},g=f.to||"output",h=f.key||"current";return g=dust.helpers.tap(g,a,b),h=dust.helpers.tap(h,a,b),e="full"===h?JSON.stringify(b.stack,jsonFilter,2):JSON.stringify(b.stack.head,jsonFilter,2),"console"===g?(_log(e),a):a.write(e)},"if":function(chunk,context,bodies,params){var body=bodies.block,skip=bodies["else"];if(params&¶ms.cond){var cond=params.cond;if(cond=dust.helpers.tap(cond,chunk,context),eval(cond))return body?chunk.render(bodies.block,context):(_log("Missing body block in the if helper!"),chunk);if(skip)return chunk.render(bodies["else"],context)}else _log("No condition given in the if helper!");return chunk},math:function(a,b,c,d){if(d&&"undefined"!=typeof d.key&&d.method){var e=d.key,f=d.method,g=d.operand,h=d.round,i=null;switch(e=dust.helpers.tap(e,a,b),g=dust.helpers.tap(g,a,b),f){case"mod":(0===g||g===-0)&&_log("operand for divide operation is 0/-0: expect Nan!"),i=parseFloat(e)%parseFloat(g);break;case"add":i=parseFloat(e)+parseFloat(g);break;case"subtract":i=parseFloat(e)-parseFloat(g);break;case"multiply":i=parseFloat(e)*parseFloat(g);break;case"divide":(0===g||g===-0)&&_log("operand for divide operation is 0/-0: expect Nan/Infinity!"),i=parseFloat(e)/parseFloat(g);break;case"ceil":i=Math.ceil(parseFloat(e));break;case"floor":i=Math.floor(parseFloat(e));break;case"round":i=Math.round(parseFloat(e));break;case"abs":i=Math.abs(parseFloat(e));break;default:_log("method passed is not supported")}return null!==i?(h&&(i=Math.round(i)),c&&c.block?a.render(c.block,b.push({isSelect:!0,isResolved:!1,selectKey:i})):a.write(i)):a}return _log("Key is a required parameter for math helper along with method/operand!"),a},select:function(a,b,c,d){var e=c.block;if(d&&"undefined"!=typeof d.key){var f=dust.helpers.tap(d.key,a,b);return e?a.render(c.block,b.push({isSelect:!0,isResolved:!1,selectKey:f})):(_log("Missing body block in the select helper "),a)}return _log("No key given in the select helper!"),a},eq:function(a,b,c,d){return d&&(d.filterOpType="eq"),filter(a,b,c,d,function(a,b){return b===a})},ne:function(a,b,c,d){return d?(d.filterOpType="ne",filter(a,b,c,d,function(a,b){return b!==a})):a},lt:function(a,b,c,d){return d?(d.filterOpType="lt",filter(a,b,c,d,function(a,b){return a>b})):void 0},lte:function(a,b,c,d){return d?(d.filterOpType="lte",filter(a,b,c,d,function(a,b){return a>=b})):a},gt:function(a,b,c,d){return d?(d.filterOpType="gt",filter(a,b,c,d,function(a,b){return b>a})):a},gte:function(a,b,c,d){return d?(d.filterOpType="gte",filter(a,b,c,d,function(a,b){return b>=a})):a},"default":function(a,b,c,d){return d&&(d.filterOpType="default"),filter(a,b,c,d,function(){return!0})},size:function(a,b,c,d){var e,f,g,h=0;if(d=d||{},e=d.key,e&&e!==!0)if(dust.isArray(e))h=e.length;else if(!isNaN(parseFloat(e))&&isFinite(e))h=e;else if("object"==typeof e){f=0;for(g in e)Object.hasOwnProperty.call(e,g)&&f++;h=f}else h=(e+"").length;else h=0;return a.write(h)}};for(var key in helpers)dust.helpers[key]=helpers[key];"undefined"!=typeof exports&&(module.exports=dust)}("undefined"!=typeof exports?require("dustjs-linkedin"):dust); \ No newline at end of file diff --git a/gruntfile.js b/gruntfile.js index b766a22..bb8a7b5 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -116,7 +116,7 @@ module.exports = function (grunt) { thresholds: { lines: 90, statements: 90, - branches: 85, + branches: 80, functions: 80 } } @@ -280,4 +280,4 @@ module.exports = function (grunt) { //default task - full test grunt.registerTask('default', ['test']); -}; \ No newline at end of file +}; diff --git a/package.json b/package.json index be23b9a..9120efe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dustjs-helpers", - "version": "1.2.0", + "version": "1.3.0", "author": { "name": "Aleksander Williams", "url": "http://akdubya.github.com/dustjs"