Making encode more modular

Author: Josema

src/api/encode.js

@@ -1,4 +1,6 @@
 
-dop.encode = function(data) {
-    return JSON.stringify(data, dop.core.encode);
+dop.encode = function(data, encoder) {
+    if (typeof encoder != 'function')
+        encoder = dop.core.encode;
+    return JSON.stringify(data, encoder);
 };

src/core/protocol/encode.js

@@ -1,72 +1,19 @@
-dop={core:{}}
-var data = {
-    function: function(){},
-    NaN: NaN,
-    Infinity: -Infinity,
-    undefined: undefined,
 
+dop.core.encode = function(property, value) {
+    return dop.core.encodeProtocol(
+        property, dop.core.encodeUtil(
+            property, dop.core.encodeSpecial(property, value)));
 };
-dop.core.encode1 = function(property, value) {
-
-    var tof = typeof value;
-
-    if (value === Infinity)
-        return '~I';
-
-    if (value === -Infinity)
-        return '~i';
-    
-    if (tof == 'number' && isNaN(value))
-        return '~N';
-
-    if (tof == 'object' && value instanceof RegExp)
-        return '~R' + value.toString();
-
-    return value;
-
-};
-dop.core.encode2 = function(property, value) {
-
-    var tof = typeof value;
-    if (value === '~i')
-        return 'LOOOL';
-    if (tof == 'function')
-        return '~F';
-
-    if (tof == 'undefined') // http://stackoverflow.com/questions/17648150/how-does-json-parse-manage-undefined
-        return '~U';
-
-    if (tof == 'string' && value[0] === '~') // https://jsperf.com/charat-vs-index/5
-        return '~'+value;
-
-    return value;
-
-};
-
-
-
-encode = function(data, encoders) {
-    var length = encoders.length;
-    return JSON.stringify(data, function recursion(property, value, index) {
-        if (index === undefined)
-            index = 0;
-        if (index<length) {
-            value = encoders[index](property, value);
-            return (index<length-1) ? recursion(property, value, index+1) : value;
-        }
-    })
-}
-
-console.log(encode(data, [dop.core.encode1,dop.core.encode2]));
-
-
-// // Extending example
-// (function() {
-//     var encode = dop.core.encode;
-//     dop.core.encode = function(property, value) {
-//         if (typeof value == 'boolean')
-//             return '~BOOL';
-//         return encode(property, value);
-//     };
-// })();
 
+// dop.core.multiEncode = function() {
+//     var encoders = arguments,
+//         length = encoders.length;
+//     return function recursion(property, value, index) {
+//         if (index === undefined)
+//             index = 0;
+//         if (index<length) {
+//             value = encoders[index](property, value);
+//             return (index<length-1) ? recursion(property, value, index+1) : value;
+//         }
+//     }
+// };

src/core/protocol/encodeProtocol.js

@@ -0,0 +1,13 @@
+
+dop.core.encodeProtocol = function(property, value) {
+
+    var tof = typeof value;
+
+    if (tof == 'function')
+        return '~F';
+
+    if (tof == 'undefined') // http://stackoverflow.com/questions/17648150/how-does-json-parse-manage-undefined
+        return '~U';
+
+    return value;
+};

src/core/protocol/encodeSpecial.js

@@ -0,0 +1,4 @@
+
+dop.core.encodeSpecial = function(property, value) {
+    return (typeof value == 'string' && value[0] == '~') ? '~'+value : value;
+};

src/core/protocol/encodeUtil.js

@@ -0,0 +1,31 @@
+
+dop.core.encodeUtil = function(property, value) {
+
+    var tof = typeof value;
+
+    if (value === Infinity)
+        return '~I';
+
+    if (value === -Infinity)
+        return '~i';
+    
+    if (tof == 'number' && isNaN(value))
+        return '~N';
+
+    if (tof == 'object' && value instanceof RegExp)
+        return '~R' + value.toString();
+
+    return value;
+};
+
+
+// // Extending example
+// (function() {
+//     var encode = dop.core.encodeUtil;
+//     dop.core.encodeUtil = function(property, value) {
+//         if (typeof value == 'boolean')
+//             return '~BOOL';
+//         return encode(property, value);
+//     };
+// })();
+

test/encode_decode.js

@@ -19,19 +19,20 @@ var data = {
     inf: '~I',
     fun: '~F',
     nan: '~N',
-    reg: '~R',
+    reg: '~R'
 };
 
 
 test('Multiple data', function(t) {
-    var decoded = dop.decode(dop.encode(data));
+    var encoded = dop.encode(data);
+    var decoded = dop.decode(encoded);
     t.deepEqual(decoded, data, 'deepEqual');
     data.NaN = NaN;
     data.function = function(){};
     decoded = dop.decode(dop.encode(data));
     t.equal(JSON.stringify(decoded), JSON.stringify(data), 'Stringify');
     t.equal(typeof decoded.function, 'function', 'Has function');
-    // console.log( decoded);
+    console.log( decoded);
     t.end();
 });
 

test/mutations_objects.js

@@ -23,14 +23,14 @@ function maketest(t, collectorServer, checkactions) {
     var objectClientCopy = dop.util.merge({},objectClient);
 
 
-    var actionServer = decode(encode(removeObjects(collectorServer.getAction())));
-    var unaction = decode(encode(removeObjects(collectorServer.getUnaction())));
+    var actionServer = decode(encode(collectorServer.getAction()));
+    var unaction = decode(encode(collectorServer.getUnaction()));
     collectorServer.destroy();
     var collectorClient = dopClient.setAction(attachObjects(actionServer, objectClient));
-    var actionClient = decode(encode(removeObjects(collectorClient.getAction())));
+    var actionClient = decode(encode(collectorClient.getAction()));
     var collectorClientTwo = dopClientTwo.setAction(attachObjects(actionClient, objectClientTwo));
     consolelog("### Mutations length: " +  collectorServer.mutations.length, collectorClient.mutations.length, collectorClientTwo.mutations.length );
-    var actionClientTwo = removeObjects(collectorClientTwo.getAction());
+    var actionClientTwo = collectorClientTwo.getAction();
 
     consolelog("### After server: " + encode(objectServer));
     consolelog("### After client: " + encode(objectClient));
@@ -43,7 +43,7 @@ function maketest(t, collectorServer, checkactions) {
     t.deepEqual(objectClientTwo, objectServer, 'deepEqual objectClientTwo');
     t.equal(encode(objectClientTwo), encode(objectServer), 'equal objectClientTwo');
     if (checkactions!==false)
-    t.equal(encode(removeObjects(actionServer)), encode(actionClientTwo), 'equal encode actions');
+    t.equal(encode(actionServer), encode(actionClientTwo), 'equal encode actions');
 
     // Unaction
     dopClient.setAction(attachObjects(unaction, objectClient));
@@ -55,13 +55,6 @@ function maketest(t, collectorServer, checkactions) {
 }
 
 
-
-// helpers
-function removeObjects(actions) {
-    for (var object_id in actions)
-        delete actions[object_id].object;
-    return actions;
-}
 function attachObjects(actions, obj) {
     for (var object_id in actions)
         actions[object_id].object = obj;