Allow alternative path separators in references

src/compiler.js

@@ -1,6 +1,7 @@
 'use strict';
 import Context from './compiler/context';
 import escapableRaw from './compiler/extensions/escapableRaw';
+import references from './compiler/extensions/references';
 import builtinHelpers from './compiler/extensions/builtinHelpers';
 import htmlEntities from './compiler/extensions/htmlEntities';
 import adjustAttrs from './compiler/extensions/adjustAttrs';
@@ -48,6 +49,6 @@ let compiler = {
   }
 };
 
-compiler.useExtensions([builtinHelpers, escapableRaw, htmlEntities, adjustAttrs, buildInstructions]);
+compiler.useExtensions([references, builtinHelpers, escapableRaw, htmlEntities, adjustAttrs, buildInstructions]);
 
 export default compiler;

src/compiler/extensions/references.js

@@ -0,0 +1,22 @@
+'use strict';
+import visitor from '../visitor';
+
+let generatedWalker = visitor.build({
+  TORNADO_REFERENCE(item) {
+    let {node} = item;
+    node = node[1];
+    let sepParam = node.params.filter(param => param[1].key === 'sep')
+                          .reduce(((acc, param) => param[1]), null);
+    if (sepParam && sepParam.val !== '.') {
+      node.key = node.key.join('.').split(sepParam.val);
+    }
+  }
+});
+
+let builtinHelpers = {
+  transforms: [function (ast, options) {
+    return generatedWalker(ast, options.context);
+  }]
+};
+
+export default builtinHelpers;

src/grammar.pegjs

@@ -149,12 +149,12 @@ tornado_body_tag_end
   }
 
 tornado_reference
-  = lbrace r:tornado_key filters:tornado_filters rbrace {
+  = lbrace r:tornado_key p:tornado_params rbrace {
     var key = r.split('.');
     if (r === '.') {
       key = [];
     }
-    return ['TORNADO_REFERENCE', {key: key, filters: filters}]
+    return ['TORNADO_REFERENCE', {key: key, params: p}]
   }
 
 // TODO: tornado partial key can be a reference e.g. {#"{foo}"/}
@@ -167,7 +167,7 @@ tornado_partial
   }
 
 tornado_key
-  = first:[a-zA-Z_$\.] after:[a-zA-Z0-9_$-\.]* {
+  = first:[a-zA-Z_$\.,\|] after:[a-zA-Z0-9_$-\.,\|]* {
     return first + after.join('');
   }
 

test/acceptance/reference.js

@@ -196,6 +196,17 @@ let suite = {
         }
       },
       expectedHTML: '<blockquote>The name is Bond.</blockquote>'
+    },
+    {
+      description: 'Reference with a non-dot separator, where dots in reference are not part of the path',
+      name: 'dots',
+      template: '{com.linkedin.dots.in.path|myVal sep="|"}',
+      context: {
+        'com.linkedin.dots.in.path': {
+          myVal: 'win!'
+        }
+      },
+      expectedHTML: 'win!'
     }
   ]
 };

test/testRunner.es6

@@ -22,8 +22,8 @@ function runSuites(suites) {
         test.setup(parser, compiler);
       }
       let html = test.template;
-      let ast = parser.parse(html);
       for (let i = 0; i < 2; i++) {
+        let ast = parser.parse(html);
         compiler.mode = compilerModes[i];
         let compiledTemplate = compiler.compile(ast, test.name || 'abc');
         let tl;