Merge pull request #287 from keanu-delgado/patch-1

fix(template): allow periods in the variable name
medialize · Mar 24, 2016 · 670ea0d · 670ea0d
2 parents c9c395d + d11373d
commit 670ea0d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/URITemplate.js b/src/URITemplate.js
@@ -133,9 +133,9 @@
   // pattern to identify expressions [operator, variable-list] in template
   URITemplate.EXPRESSION_PATTERN = /\{([^a-zA-Z0-9%_]?)([^\}]+)(\}|$)/g;
   // pattern to identify variables [name, explode, maxlength] in variable-list
-  URITemplate.VARIABLE_PATTERN = /^([^*:]+)((\*)|:(\d+))?$/;
+  URITemplate.VARIABLE_PATTERN = /^([^*:.](?:\.?[^*:.])*)((\*)|:(\d+))?$/;
   // pattern to verify variable name integrity
-  URITemplate.VARIABLE_NAME_PATTERN = /[^a-zA-Z0-9%_]/;
+  URITemplate.VARIABLE_NAME_PATTERN = /[^a-zA-Z0-9%_.]/;
 
   // expand parsed expression (expression, not template!)
   URITemplate.expand = function(expression, data) {

diff --git a/test/test_template.js b/test/test_template.js
@@ -387,4 +387,12 @@
     window.URITemplate = actual_lib;
   });
 
+  test('Periods in varnames', function() {
+    var template = new URITemplate('{hello.world.var}');
+    var literal = 'replacement'
+    var data = {'hello.world.var': literal};
+    var expansion = template.expand(data);
+    equal(expansion, literal, 'period in varname');
+  });
+
 })();