fixing filter argument parsing from macros breaking them

paularmstrong · Sep 24, 2011 · 1d53aaf · 1d53aaf
1 parent 58db4c9
commit 1d53aaf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/lib/helpers.js b/lib/helpers.js
@@ -152,7 +152,7 @@ exports.wrapFilter = function (variable, filter) {
     if (filters.hasOwnProperty(filter.name)) {
         args = [variable];
         filter.args.forEach(function (f) {
-            args.push('\'' + f.replace(/\\/g, '\\\\') + '\'');
+            args.push('\'' + f.replace(/\\/g, '\\\\').replace(/^\"|\"$/g, '') + '\'');
         });
         output = '__filters.' + filter.name + '.apply(this, [' + args.toString() + '])';
     }

diff --git a/lib/parser.js b/lib/parser.js
@@ -24,29 +24,29 @@ function getMethod(input) {
 
 function getArgs(input) {
     var parts = input.replace(/^\w+\(|\)$/g, '').split(', '),
-        i = parts.length,
+        l = parts.length,
+        i = 0,
         part = '',
         partial = '',
         out = [];
 
-    while (i) {
-        i -= 1;
+    for (; i < l; i += 1) {
         part = parts[i];
         if ((/^\'|^\"/).test(part) && !(/\"$|\'$/).test(part)) {
             partial = part;
             continue;
         }
 
         if (partial !== '') {
-            partial += part;
+            partial += ', ' + part;
             if (!(/\"$|\'$/).test(partial)) {
                 continue;
             }
             part = partial;
         }
         out.push(part);
     }
-    return parts;
+    return out;
 }
 
 function parseVariable(token, escape) {

diff --git a/tests/templates.test.js b/tests/templates.test.js
@@ -60,6 +60,9 @@ exports.Variables = testCase({
 
         var tmpl8 = swig.fromString('{{ asdf|lower }}');
         test.strictEqual(tmpl8.render({ asdf: 'BLAH' }), 'blah');
+
+        tmpl8 = swig.fromString('{{ date|date("F jS, Y") }}');
+        test.strictEqual(tmpl8.render({ date: new Date(2011, 8, 24) }), 'September 24th, 2011');
         test.done();
     },