From bd4a9a39eb5ae1a9a489c6199b41a60acc97af35 Mon Sep 17 00:00:00 2001
From: Oso Oluwafemi <osofem87@gmail.com>
Date: Fri, 5 May 2017 10:32:46 +0100
Subject: [PATCH 1/5] Update README.md

---
 README.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 04aebbd..ccc1761 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# StringEncode.js #
+# StringEncode.js
 Encode and Decode string to various bases in JavaScript.
 
 
-### INTRODUCTION ###
+### INTRODUCTION
 This library build on String.prototype to encode/decode strings to/from various bases. <br />
 
 
@@ -15,7 +15,8 @@ The currently supported bases are
 Example of how to use the library
 
 
-    <script src="https://cdn.rawgit.com/osofem/StringEncode.js/master/StringEncode.js">
+    <script src="https://cdn.rawgit.com/osofem/StringEncode.js/master/StringEncode.js"></script>
+    <script>
     //Encoding to ASCII85
     document.writeln("Man is distinguished, not only by his reason, but by this singular passion from other animals, which is a lust of the mind, that by a perseverance of delight in the continued and indefatigable generation of knowledge, exceeds the short vehemence of any carnal pleasure.".toAscii85());
     
@@ -32,7 +33,7 @@ Example of how to use the library
 
 ### FUTURE EXTENSION
 Bases planned to be added in the future include
-1. 8BITMIME
+1. 8BITMIME (should I? obsolete)
 2. Base58 (Integer?)
 3. Base36
 4. Base32

From 8bdbed55398acd8123afba8de7723356cc2ff03e Mon Sep 17 00:00:00 2001
From: Oso Oluwafemi <osofem87@gmail.com>
Date: Tue, 6 Jun 2017 15:37:56 +0100
Subject: [PATCH 2/5] Update StringEncode.js

---
 StringEncode.js | 68 ++++++++++---------------------------------------
 1 file changed, 14 insertions(+), 54 deletions(-)

diff --git a/StringEncode.js b/StringEncode.js
index 1877b38..8c4a5a0 100644
--- a/StringEncode.js
+++ b/StringEncode.js
@@ -3,29 +3,22 @@
  * @input {String} - The data to be encoded. This is passed to the function via the "this" keyword
  * @returns {String} The Base85 encoded data as string.
  */
-String.prototype.toAscii85 = function()
-{
+String.prototype.toAscii85 = function(){
 	/**
  	* Turns a single character (it ASCII code) to binary padded to 8 figures when necessary.
  	* @param {String} n - The single character whose ASCII code is to be converted to binary
  	* @returns {String} The binary of the ASCII code of n padded to 8 figures when necessary.
  	*/
-	var encodeToBinary = function(n)
-	{
+	var encodeToBinary = function(n){
 		let bin = n.charCodeAt(0);
 		bin = bin.toString(2);
-		for(let i = bin.length; i < 8; i++)//Pad to 8 characters with "0"
-		{
-			bin = "0" + bin;
-		}
+		bin = "0".repeat(8-bin.length) + bin;
 		return bin;
 	}
 	let txt = [...this];
 	let bin = "";
 	for(let i = 0; i < txt.length; i++)
-	{
 		bin += encodeToBinary(txt[i]);
-	}
 	
 	/* Pad the binary so it length is exactly divisible by 32 
 	 * because we are going to divide it into chucks of 32's 
@@ -34,24 +27,19 @@ String.prototype.toAscii85 = function()
 	let padding = (32-(bin.length%32)); 
 	if(padding%32 == 0) padding = 0; //If length is exactly divisible by 32 padding returns 32, so we reset it to 0
 	for(let counter = 0; padding > 0 && counter < padding; counter++)
-	{
 		bin += "0";
-	}
 	
 	//Divide whole binary to chunk of 32 characters
 	let chunk = [];
 	for(let i = 32; i <= bin.length; i += 32)
-	{
 		chunk.push(bin.slice(i-32, i));
-	}
 	
 	/* Each chunk should be converted from binary to base 10
 	 * The value should then be splitted into five integers
 	 * chunk value (in base 10) = (int1*85^4) + (int2*85^3) + (int3*85^2) + (int4*85^1) + int5
 	*/
 	var ASCII = ""; 
-	for(let i = 0; i < chunk.length; i++)
-	{
+	for(let i = 0; i < chunk.length; i++){
 		let sub = parseInt(chunk[i], 2);
 		let w1 = Math.floor(sub/Math.pow(85, 4));
 		let w2 = Math.floor((sub-(w1*Math.pow(85, 4)))/Math.pow(85, 3));
@@ -75,8 +63,7 @@ String.prototype.toAscii85 = function()
 	}
 	
 	//Remove (padding/8) numbers of character from the final encoded characters
-	for(let i = 0; (padding/8) != 0 && i < (padding/8); i++)
-	{
+	for(let i = 0; (padding/8) != 0 && i < (padding/8); i++){
 		if(ASCII == "z")
 			ASCII = "!!!!!";
 		ASCII = ASCII.substr(0, ASCII.length-1);
@@ -89,8 +76,7 @@ String.prototype.toAscii85 = function()
  * @input {String} - The data to be decoded. This is passed to the function via the "this" keyword
  * @returns {String} The original decoded string from Base85.
  */
-String.prototype.fromAscii85 = function()
-{
+String.prototype.fromAscii85 = function(){
 	//Remove white space and new lines
 	let code = this.replace(/\s|\n/g,"");
 	//remove beginning <~ and ending ~>
@@ -105,16 +91,12 @@ String.prototype.fromAscii85 = function()
 	let padding = 5 - (code.length%5); 
 	if(padding%5 == 0) padding = 0; //If length is exactly divisible by 5 padding returns 5, so we reset it to 0
 	for(let i = 0; i < padding; i++)
-	{
 		code += "u";
-	}
 	
 	//Divide padded data to chunk of 5 characters
 	let chunk = [];
 	for(let i = 5; i <= code.length; i += 5)
-	{
 		chunk.push(code.slice(i-5, i));
-	}
 	
 	/*
 	* Take each character in a chunk
@@ -126,8 +108,7 @@ String.prototype.fromAscii85 = function()
 	* Convert each slice to base 10 and to the corresponding character of ASCII
 	*/
 	let txt = "";
-	for(let i = 0; i < chunk.length; i++)
-	{
+	for(let i = 0; i < chunk.length; i++){
 		let w1 = ((chunk[i][0]).charCodeAt(0)-33)*Math.pow(85,4);
 		let w2 = ((chunk[i][1]).charCodeAt(0)-33)*Math.pow(85,3);
 		let w3 = ((chunk[i][2]).charCodeAt(0)-33)*Math.pow(85,2);
@@ -149,9 +130,7 @@ String.prototype.fromAscii85 = function()
 	
 	//Remove the number of padding added above from the strings
 	for(let i = 0; i < padding; i++)
-	{
 		txt = txt.substr(0, txt.length-1);
-	}
 	return txt;
 }
 
@@ -161,8 +140,7 @@ String.prototype.fromAscii85 = function()
  * @input {String} - The string to be encoded. This is passed to the function via the "this" keyword
  * @returns {String} The Base64 encoded data as string
  */
-String.prototype.toBase64 = function()
-{
+String.prototype.toBase64 = function(){
 	var __codeString = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 	
 	/**
@@ -170,23 +148,17 @@ String.prototype.toBase64 = function()
  	* @param {String} n - The single character whose ASCII code is to be converted to binary
  	* @returns {String} The binary of the ASCII code of n padded to 8 figures when necessary.
  	*/
-	var encodeToBinary = function(n)
-	{
+	var encodeToBinary = function(n){
 		let bin = n.charCodeAt(0);
 		bin = bin.toString(2);
-		for(let i = bin.length; i < 8; i++)//Padd to 8 characters
-		{
-			bin = "0" + bin;
-		}
+		bin = "0".repeat(8-bin.length) + bin;
 		return bin;
 	}
 
 	let txt = [...this];
 	let bin = "";
 	for(let i = 0; i < txt.length; i++)
-	{
 		bin += encodeToBinary(txt[i]);
-	}
 	
 	/* Pad the data so it length is exactly divisible by 24 
 	 * because we are going to divide it into chucks of 24's 
@@ -195,16 +167,12 @@ String.prototype.toBase64 = function()
 	let padding = (24-(bin.length%24)); 
 	if(padding%24 == 0) padding = 0; //If length is exactly divisible by 24 padding returns 24, so we reset it to 0
 	for(let counter = 0; padding > 0 && counter < padding; counter++)
-	{
 		bin += "0";
-	}
 	
 	//Divide padded data to chunk of 24 characters
 	let chunk = [];
 	for(let i = 24; i <= bin.length; i += 24)
-	{
 		chunk.push(bin.slice(i-24, i));
-	}
 	
 	/*
 	* Slice the 24 characters in each chunk into 6 characters in 4 places
@@ -213,8 +181,7 @@ String.prototype.toBase64 = function()
 	* i.e. if the chunk in base10 is 0, it is encoded as "A" (__codeString[0])
 	*/
 	let BASE64 = ""; 
-	for(let i = 0; i < chunk.length; i++)
-	{
+	for(let i = 0; i < chunk.length; i++){
 		let w1 = (chunk[i].slice(0, 6) == "000000")?"=":__codeString[parseInt(chunk[i].slice(0, 6), 2)];
 		let w2 = (chunk[i].slice(6, 12) == "000000")?"=":__codeString[parseInt(chunk[i].slice(6, 12), 2)];
 		let w3 = (chunk[i].slice(12, 18) == "000000")?"=":__codeString[parseInt(chunk[i].slice(12, 18), 2)];
@@ -231,8 +198,7 @@ String.prototype.toBase64 = function()
  * @input {String} - The string to be decoded. This is passed to the function via the "this" keyword
  * @returns {String} The original decoded string form Base64
  */
-String.prototype.fromBase64 = function()
-{
+String.prototype.fromBase64 = function(){
 	var __codeString = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 	let txt = [...this];
 	
@@ -243,24 +209,18 @@ String.prototype.fromBase64 = function()
 	for(let i = 0; i < txt.length; i++)
 	{
 		let tx = ((__codeString.indexOf(txt[i])>0)?__codeString.indexOf(txt[i]):0).toString(2);
-		for(let j = tx.length; j < 6; j++)
-		{
-			tx = "0" + tx;
-		}
+		tx = "0".repeat(6-tx.length) + tx;
 		decode += tx;
 	}
 	
 	//Break the whole binary into chunks of 8 characters
 	let chunk = [];
 	for(let i = 8; i <= decode.length; i += 8)
-	{
 		chunk.push(decode.slice(i-8, i));
-	}
 	
 	//Take each chunk of 8 characters and convert it to base10 and to the corresponding character of ASCII
 	let realText = ""; 
-	for(let i = 0; i < chunk.length; i++)
-	{
+	for(let i = 0; i < chunk.length; i++){
 		if(parseInt(chunk[i],2) == 0)
 			continue;
 		realText += String.fromCharCode(parseInt(chunk[i],2));

From 7a2ae53a41680b927e7f9155140817eea5bc6518 Mon Sep 17 00:00:00 2001
From: Oso Oluwafemi <osofem87@gmail.com>
Date: Thu, 8 Jun 2017 08:36:55 +0100
Subject: [PATCH 3/5] Add files via upload

---
 StringEncode.js | 41 ++++++++++++++---------------------------
 1 file changed, 14 insertions(+), 27 deletions(-)

diff --git a/StringEncode.js b/StringEncode.js
index 8c4a5a0..2f04c9c 100644
--- a/StringEncode.js
+++ b/StringEncode.js
@@ -17,8 +17,7 @@ String.prototype.toAscii85 = function(){
 	}
 	let txt = [...this];
 	let bin = "";
-	for(let i = 0; i < txt.length; i++)
-		bin += encodeToBinary(txt[i]);
+	for(let i = 0; i < txt.length; i++) bin += encodeToBinary(txt[i]);
 	
 	/* Pad the binary so it length is exactly divisible by 32 
 	 * because we are going to divide it into chucks of 32's 
@@ -56,16 +55,14 @@ String.prototype.toAscii85 = function(){
 		sub = sub1 + sub2 + sub3 + sub4 + sub5;
 		
 		//If chunk is just bunch of 0's just represent it with z
-		if(sub == "!!!!!")
-			sub = "z";
+		if(sub == "!!!!!") sub = "z";
 			
 		ASCII += sub;
 	}
 	
 	//Remove (padding/8) numbers of character from the final encoded characters
 	for(let i = 0; (padding/8) != 0 && i < (padding/8); i++){
-		if(ASCII == "z")
-			ASCII = "!!!!!";
+		if(ASCII == "z") ASCII = "!!!!!";
 		ASCII = ASCII.substr(0, ASCII.length-1);
 	}
 	return "<~" + ASCII + "~>";
@@ -90,13 +87,11 @@ String.prototype.fromAscii85 = function(){
 	*/
 	let padding = 5 - (code.length%5); 
 	if(padding%5 == 0) padding = 0; //If length is exactly divisible by 5 padding returns 5, so we reset it to 0
-	for(let i = 0; i < padding; i++)
-		code += "u";
+	code += "u".repeat(padding);
 	
 	//Divide padded data to chunk of 5 characters
 	let chunk = [];
-	for(let i = 5; i <= code.length; i += 5)
-		chunk.push(code.slice(i-5, i));
+	for(let i = 5; i <= code.length; i += 5) chunk.push(code.slice(i-5, i));
 	
 	/*
 	* Take each character in a chunk
@@ -116,11 +111,8 @@ String.prototype.fromAscii85 = function(){
 		let w5 = ((chunk[i][4]).charCodeAt(0)-33);
 		let sub = w1+w2+w3+w4+w5;
 		sub = sub.toString(2);
+		sub = "0".repeat(32-sub.length)+sub;
 		
-		for(let v = sub.length; v < 32; v++)//Pad to 8 digits
-		{
-			sub = "0" + sub;
-		}
 		w1 = String.fromCharCode(parseInt(sub.slice(0, 8), 2));
 		w2 = String.fromCharCode(parseInt(sub.slice(8, 16), 2));
 		w3 = String.fromCharCode(parseInt(sub.slice(16, 24), 2));
@@ -129,8 +121,8 @@ String.prototype.fromAscii85 = function(){
 	}
 	
 	//Remove the number of padding added above from the strings
-	for(let i = 0; i < padding; i++)
-		txt = txt.substr(0, txt.length-1);
+	for(let i = 0; i < padding; i++) txt = txt.substr(0, txt.length-1);
+	
 	return txt;
 }
 
@@ -157,8 +149,7 @@ String.prototype.toBase64 = function(){
 
 	let txt = [...this];
 	let bin = "";
-	for(let i = 0; i < txt.length; i++)
-		bin += encodeToBinary(txt[i]);
+	for(let i = 0; i < txt.length; i++) bin += encodeToBinary(txt[i]);
 	
 	/* Pad the data so it length is exactly divisible by 24 
 	 * because we are going to divide it into chucks of 24's 
@@ -171,8 +162,7 @@ String.prototype.toBase64 = function(){
 	
 	//Divide padded data to chunk of 24 characters
 	let chunk = [];
-	for(let i = 24; i <= bin.length; i += 24)
-		chunk.push(bin.slice(i-24, i));
+	for(let i = 24; i <= bin.length; i += 24) chunk.push(bin.slice(i-24, i));
 	
 	/*
 	* Slice the 24 characters in each chunk into 6 characters in 4 places
@@ -206,8 +196,7 @@ String.prototype.fromBase64 = function(){
 	* Convert it to binary and padd it to 6 chcracters when necessary
 	*/
 	let decode = "";
-	for(let i = 0; i < txt.length; i++)
-	{
+	for(let i = 0; i < txt.length; i++){
 		let tx = ((__codeString.indexOf(txt[i])>0)?__codeString.indexOf(txt[i]):0).toString(2);
 		tx = "0".repeat(6-tx.length) + tx;
 		decode += tx;
@@ -215,15 +204,13 @@ String.prototype.fromBase64 = function(){
 	
 	//Break the whole binary into chunks of 8 characters
 	let chunk = [];
-	for(let i = 8; i <= decode.length; i += 8)
-		chunk.push(decode.slice(i-8, i));
+	for(let i = 8; i <= decode.length; i += 8) chunk.push(decode.slice(i-8, i));
 	
 	//Take each chunk of 8 characters and convert it to base10 and to the corresponding character of ASCII
 	let realText = ""; 
 	for(let i = 0; i < chunk.length; i++){
-		if(parseInt(chunk[i],2) == 0)
-			continue;
+		if(parseInt(chunk[i],2) == 0) continue;
 		realText += String.fromCharCode(parseInt(chunk[i],2));
 	}
 	return realText;
-}
+}
\ No newline at end of file

From 79b0227425fa0b4b9481ac4487af7f65f64d1c70 Mon Sep 17 00:00:00 2001
From: Oso Oluwafemi <osofem87@gmail.com>
Date: Thu, 8 Jun 2017 08:38:44 +0100
Subject: [PATCH 4/5] Create assert.js

---
 Documentation/Test/assert.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 Documentation/Test/assert.js

diff --git a/Documentation/Test/assert.js b/Documentation/Test/assert.js
new file mode 100644
index 0000000..33d3e50
--- /dev/null
+++ b/Documentation/Test/assert.js
@@ -0,0 +1,13 @@
+function assertEqual(actual, expected, message){
+    if(actual !== expected){
+        message = ((typeof message != "undefined")? message+" ":"") + "Assertion failed. Expected "+((typeof expected == "string")?"\"":"")+ expected +((typeof expected == "string")?"\"":"")+ " instead got "+((typeof actual == "string")?"\"":"")+ actual +((typeof actual == "string")?"\"":"");
+        console.error(message);
+    }else console.log("%cTest passed. "+((typeof actual == "string")?"\"":"")+ actual +((typeof actual == "string")?"\"":"")+ " === " +((typeof expected == "string")?"\"":"")+ expected +((typeof expected == "string")?"\"":""), "color: green;");
+}
+
+function assertDeepEqual(actual, expected, message){
+    if(JSON.stringify(actual) !== JSON.stringify(expected)){
+        message = ((typeof message != "undefined")? message+" ":"") + "Assertion failed. Expected " + ((typeof expected == "string")?"\"":"") + JSON.stringify(expected) + ((typeof expected == "string")?"\"":"") + " instead got " + ((typeof actual == "string")?"\"":"") + JSON.stringify(actual) +((typeof actual == "string")?"\"":"");
+        console.error(message);
+    }else console.log("%cTest passed. "+((typeof actual == "string")?"\"":"")+ JSON.stringify(actual) +((typeof actual == "string")?"\"":"")+ " === " +((typeof expected == "string")?"\"":"")+ JSON.stringify(expected) +((typeof expected == "string")?"\"":""), "color: green;");
+}

From bf7919f5e3edf15b6048970a0c7bb82f9a3f6149 Mon Sep 17 00:00:00 2001
From: Oso Oluwafemi <osofem87@gmail.com>
Date: Thu, 8 Jun 2017 08:41:45 +0100
Subject: [PATCH 5/5] Add files via upload

---
 Documentation/Test/StringEncode - Test.html | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 Documentation/Test/StringEncode - Test.html

diff --git a/Documentation/Test/StringEncode - Test.html b/Documentation/Test/StringEncode - Test.html
new file mode 100644
index 0000000..f28dfca
--- /dev/null
+++ b/Documentation/Test/StringEncode - Test.html	
@@ -0,0 +1,16 @@
+<html>
+	<!--Remember to change /v0.0-beta0.0/ to the version you are targeting -->
+	<xscript src="https://cdn.rawgit.com/osofem/StringEncode.js/v0.0-beta0.0/StringEncode.js"></xscript>
+	<script src="../../StringEncode.js"></script>
+	<script src="assert.js"></script>
+	<script>
+		var string = "Man is distinguished, not only by his reason, but by this singular passion from other animals, which is a lust of the mind, that by a perseverance of delight in the continued and indefatigable generation of knowledge, exceeds the short vehemence of any carnal pleasure.";
+		assertEqual("moderate".toAscii85(), "<~D/WrrEaa\'$~>"); 
+		assertEqual("easy".toAscii85(), "<~ARTY*~>");
+		assertEqual("somewhat difficult".toAscii85(), "<~F)Po,GA(E,+Co1uAnbatCif~>");
+		assertEqual(string.toAscii85().fromAscii85(), string);
+		
+		assertEqual(string.toBase64(), btoa(string));
+		assertEqual(string.toBase64().fromBase64(), string);
+	</script>
+</html>
\ No newline at end of file