update hex encoding to use sodium

Author: heapwolf

index.hxx

@@ -10,7 +10,7 @@
 #include <iomanip>
 #include <exception>
 
-#include "deps/datcxx/sodium-base64/index.hxx"
+#include "deps/datcxx/sodium-encodedecode/index.hxx"
 
 ///
 /// namespace Hyper
@@ -166,7 +166,7 @@ namespace Hyper {
         /// method toString(const std::string& encoding, size_t start = 0, size_t end = 0)
         /// comment Get the value of of the buffer as a string.
         ///
-        /// param encoding type.
+        /// param encoding type (currently supports "base64" or "hex").
         ///
         /// return std::string
         ///
@@ -179,20 +179,17 @@ namespace Hyper {
 
           std::stringstream ss;
 
-          //
-          // TODO add more encodings
-          //
-          if (encoding == "hex") {
-            ss << std::hex;
-          }
-
           std::string substring(
             this->value.begin() + start,
             this->value.begin() + end
           );
 
           if (encoding == "base64") {
-            return Hyper::Sodium::base64Encode(substring);
+            return Hyper::Sodium::Base64::encode(substring);
+          }
+
+          if (encoding == "hex") {
+            return Hyper::Sodium::Hex::encode(substring);
           }
 
           ss << substring;

package.json

@@ -21,6 +21,6 @@
     "index.hxx"
   ],
   "dependencies": {
-    "[email protected]:datcxx/sodium-base64": "066fb26f"
+    "[email protected]:datcxx/sodium-encodedecode": "345051bd"
   }
-}
+}

test/index.cxx

@@ -183,19 +183,15 @@ int main() {
 
   t.test("toString(\"hex\", 0, 0)", [](auto t) {
     Buffer<uint8_t> a("abc");
-    std::stringstream ss;
-    ss << std::hex << "abc";
-    std::string expected = ss.str();
+    std::string expected = "616263";
 
-    t->equal(a.toString("hex"), expected, "strings are equal");
+    t->equal(a.toString("hex"), expected, "hex strings are equal");
     t->end();
   });
 
   t.test("toString(\"hex\", 3, 9)", [](auto t) {
     Buffer<uint8_t> a("abcdef0123456789");
-    std::stringstream ss;
-    ss << std::hex << "def012";
-    std::string expected = ss.str();
+    std::string expected = "646566303132";
 
     t->equal(a.toString("hex", 3, 9), expected, "strings are equal");
     t->end();
@@ -204,7 +200,6 @@ int main() {
   t.test("toString(\"base64\")", [](auto t) {
     Buffer<uint8_t> buf("Hello, world!");
     std::string expected = "SGVsbG8sIHdvcmxkIQ==";
-    expected.push_back('\0');
 
     t->equal(buf.toString("base64"), expected, "strings are equal");
     t->end();
@@ -213,7 +208,6 @@ int main() {
   t.test("toString(\"base64\", 1, 5)", [](auto t) {
     Buffer<uint8_t> buf("Hello, world!");
     std::string expected = "ZWxsbw==";
-    expected.push_back('\0');
 
     t->equal(buf.toString("base64", 1, 5), expected, "strings are equal");
     t->notEqual(buf.toString("base64", 1, 4), expected, "strings are not equal");