commit 80f80b939189d2670280fe6c71f23bf162b91ccc
author Adam Sadovsky <asadovsky@gmail.com> Thu Sep 24 20:27:10 2015 -0700
committer Adam Sadovsky <asadovsky@gmail.com> Thu Sep 24 20:27:10 2015 -0700
tree 3a713f6556909f7d73dda7af8ef1bba33badcb15
parent e9de931b5bea3ae20b35bb01aade2659eaad6920

syncbase: naming change follow-ups

MultiPart: 7/7
Change-Id: I10acf90d86102925bcc12d12764a4a9e152791b3

src/naming/util.js

diff --git a/src/naming/util.js b/src/naming/util.js
index baeca91..3a079ac 100644
--- a/src/naming/util.js
+++ b/src/naming/util.js
@@ -12,7 +12,7 @@
 module.exports = {
   clean: clean,
   encodeAsNameElement: encodeAsNameElement,
-  decodeAsNameElement: decodeAsNameElement,
+  decodeFromNameElement: decodeFromNameElement,
   join: join,
   isRooted: isRooted,
   basename: basename,
@@ -54,7 +54,7 @@
  * @returns {string} Decoded name element.
  * @memberof module:vanadium.naming
  */
-function decodeAsNameElement(encodedNameElement) {
+function decodeFromNameElement(encodedNameElement) {
   // decodeURIComponent handles decoding hex percent encoded UTF-8 strings.
   var output = decodeURIComponent(encodedNameElement);
   return output;
@@ -274,4 +274,4 @@
   } else {
     return str;
   }
-}
\ No newline at end of file
+}

test/unit/test-namespace-util.js

diff --git a/test/unit/test-namespace-util.js b/test/unit/test-namespace-util.js
index 09f6608..96d1b0d 100644
--- a/test/unit/test-namespace-util.js
+++ b/test/unit/test-namespace-util.js
@@ -199,7 +199,7 @@
 
   tests.forEach(function(t) {
     assert.equal(names.encodeAsNameElement(t[0]), t[1], t[0] + ' encoding');
-    assert.equal(names.decodeAsNameElement(t[1]), t[0], t[1] + ' decoding');
+    assert.equal(names.decodeFromNameElement(t[1]), t[0], t[1] + ' decoding');
   });
   assert.end();
 });