Merge pull request #7 from curran/dashes

Handle dashes
datavis-tech · Nov 11, 2016 · 2b4d531 · 2b4d531
2 parents 07321aa + b275e87
commit 2b4d531
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -45,7 +45,7 @@ var parseString = (function (){
 
   // This regular expression detects instances of the
   // template parameter syntax such as {{foo}} or {{foo:someDefault}}.
-  var regex = /{{(\w|:|\s)+}}/g;
+  var regex = /{{(\w|:|\s|-)+}}/g;
 
   return function (str){
     if(regex.test(str)){

diff --git a/test.js b/test.js
@@ -76,6 +76,13 @@ describe("json-template", function() {
       assert.equal(template({ firstName: "Jane", lastName: "Doe" }), "Hello Jane Doe, how are you ?");
     });
 
+    it("should handle dashes in defaults", function() {
+      var template = parse("{{startTime:now-24h}}");
+      assert.deepEqual(template.parameters, [{ key: "startTime", defaultValue: "now-24h" }]);
+      assert.equal(template({ startTime: "now-48h"}), "now-48h");
+      assert.equal(template(), "now-24h");
+    });
+
   });