Merge branch 'master' of https://github.com/Mozu/mozu-node-sdk

Mozu · Dec 8, 2015 · f757abd · f757abd
2 parents ce0c0c7 + 60c6f7a
commit f757abd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
       "es2015"
     ]
   },
-  "version": "2.1.2",
+  "version": "2.1.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/Mozu/mozu-node-sdk.git"

diff --git a/src/utils/get-url-template.js b/src/utils/get-url-template.js
@@ -17,9 +17,15 @@ function findKeys(rawTpt) {
   return matches.map(x => x.match(varnameRe)[0]);
 }
 
+let badStarRE = /\{\*([^}]+)\}/
+function normalizeTemplateText(txt) {
+  return txt.replace(badStarRE, '{$1}');
+}
+
 const uritemplate = require('uri-template');
 let cache = {};
-module.exports = function(templateText) {
+module.exports = function(rawTemplateText) {
+  let templateText = normalizeTemplateText(rawTemplateText);
   if (cache[templateText]) {
     return cache[templateText];
   }

diff --git a/test/all-uritemplates-parse.js b/test/all-uritemplates-parse.js
@@ -4,7 +4,7 @@ var test = require('tape');
 var acorn = require('acorn');
 var acornWalk = require('acorn/dist/walk');
 var glob = require('glob');
-var uriTemplate = require('uri-template');
+var getUriTemplate = require('../utils/get-url-template');
 
 test('all uri templates in autogenned code are parseable', function(assert) {
   let allClients = glob.sync('./clients/**/*.js');
@@ -16,7 +16,7 @@ test('all uri templates in autogenned code are parseable', function(assert) {
       Property: function(n) {
         if (n.key && n.key.name === 'url') {
           try {
-            uriTemplate.parse(n.value.value);
+            getUriTemplate(n.value.value);
           } catch(e) {
             badness += 
               '\n\nuri template "' + n.value.value + '" does not parse in ' +

diff --git a/utils/get-url-template.js b/utils/get-url-template.js
@@ -20,9 +20,15 @@ function findKeys(rawTpt) {
   });
 }
 
+var badStarRE = /\{\*([^}]+)\}/;
+function normalizeTemplateText(txt) {
+  return txt.replace(badStarRE, '{$1}');
+}
+
 var uritemplate = require('uri-template');
 var cache = {};
-module.exports = function (templateText) {
+module.exports = function (rawTemplateText) {
+  var templateText = normalizeTemplateText(rawTemplateText);
   if (cache[templateText]) {
     return cache[templateText];
   }