Merge pull request #52 from devhammed/devhammed/issue49

replace env vars with underscores, fixes #49

Author: jozsefsallai

src/lib/applyEnv.js

@@ -4,7 +4,7 @@ export default function (value, env) {
   }
 
   Object.keys(env.data).forEach(key => {
-    value = value.replace(new RegExp('{{(\\s*' + key + '\\s*)}}', 'g'), env.data[key]);
+    value = value.replace(new RegExp('{{(\\s*(_.)?' + key + '\\s*)}}', 'g'), env.data[key]);
   });
 
   return value;

src/lib/applyEnv.test.js

@@ -15,13 +15,26 @@ describe('applyEnv', function () {
     );
   });
 
+  it('should replace the env vars with root underscores', function () {
+    const env = {
+      data: {
+        url: 'http://localhost',
+        method: 'GET'
+      }
+    };
+
+    return expect(applyEnv('The url is {{_.url}} and the method is {{ _.method }}', env)).to.eql(
+      'The url is http://localhost and the method is GET'
+    );
+  });
+
   it('should handle multiple spaces correctly', function () {
     const env = {
       data: {
         foo: 'bla'
       }
     };
 
-    return expect(applyEnv('foo is {{    foo  }}', env)).to.eql('foo is bla');
+    return expect(applyEnv('foo is {{    foo  }} and {{    _.foo }}', env)).to.eql('foo is bla and bla');
   });
 });

src/lib/formatEnv.js

@@ -1,3 +1,3 @@
 export default function (variable) {
-  return variable.replace(/{{\s*([a-zA-Z0-9_]+)\s*}}/g, '<span class="env-variable">$1</span>');
+  return variable.replace(/{{\s*(_.)?([a-zA-Z0-9_]+)\s*}}/g, '<span class="env-variable">$2</span>');
 }

src/lib/formatEnv.test.js

@@ -0,0 +1,16 @@
+import { expect } from 'chai';
+import formatEnv from './formatEnv';
+
+describe('formatEnv', function () {
+  it('should replace env vars', function () {
+    return expect(formatEnv('The url is {{url}} and {{_.url}}')).to.eql(
+      'The url is <span class="env-variable">url</span> and <span class="env-variable">url</span>'
+    );
+  });
+
+  it('should replace env vars with spaces', function () {
+    return expect(formatEnv('The url is {{  url }} and {{ _.url  }}')).to.eql(
+      'The url is <span class="env-variable">url</span> and <span class="env-variable">url</span>'
+    );
+  });
+});