Changed onsubscribe instruction on protocol to be more standard

Author: Josema

Gruntfile.js

@@ -90,7 +90,7 @@ module.exports = function(grunt) {
                 dest: 'dist/'+dopmin
             },
             options: {
-                banner: '/* dop@<%= pkg.version %> - (c) 2016 Josema Gonzalez - MIT Licensed */\n'
+                banner: '/* dop - (c) 2016 Josema Gonzalez - MIT Licensed */\n'
             }
         },
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dop",
-  "version": "0.22.9",
+  "version": "0.22.10",
   "main": "./dist/dop.nodejs.js",
   "browser": "./dist/dop.js",
   "unpkg": "./dist/dop.min.js",

src/core/constructors/node.js

@@ -28,5 +28,6 @@ dop.core.node.prototype.subscribe = function() {
 };
 
 dop.core.node.prototype.unsubscribe = function(object) {
+    dop.util.invariant(dop.isRegistered(object), 'Node.unsubscribe needs a subscribed object');
     return dop.protocol.unsubscribe(this, object);
 };

src/dop.js

@@ -1,7 +1,6 @@
 (function factory(root) {
 
 var dop = {
-    name: 'dop',
     version: '{{VERSION}}',
     create: factory,
 

src/protocol/_onsubscribe.js

@@ -7,38 +7,41 @@ dop.protocol._onsubscribe = function(node, request_id, request, response) {
             request.promise.reject(dop.core.getRejectError(response[0]));
 
         else {
-            var object_path = typeof response[1]=='number' ? [response[1]] : response[1],
-                object_owner_id = object_path[0],
+            var object_owner_id = response[1],
                 object_owner = response[2],
+                object_path = isArray(object_owner) ? object_owner : [],
                 object, collector;
-            
-            if (!isArray(object_path) || typeof object_owner_id!='number')
-                request.promise.reject(dop.core.error.reject_local.OBJECT_NOT_FOUND);
 
-            else {
-                if (node.owner[object_owner_id] === undefined) {
-                    collector = dop.collect();
-                    if (dop.isRegistered(request.into))
-                        object = dop.core.setPatch(request.into, object_owner, dop.core.setPatchFunctionMutator);
-                    else
-                        object = dop.register((request.into===undefined) ? 
-                            object_owner
-                        :
-                            dop.core.setPatch(request.into, object_owner, dop.core.setPatchMutator)
-                        );
-                    dop.core.registerOwner(node, object, object_owner_id);
-                    collector.emit();
-                }
-                else
-                    object = dop.data.object[node.owner[object_owner_id]].object;
+            // New object
+            if (node.owner[object_owner_id] === undefined) {
 
-                object = dop.util.get(object, object_path.slice(1));
-
-                if (!isObject(object))
+                // If is new object and third parameter is an array we must reject
+                if (object_owner===object_path)
                     request.promise.reject(dop.core.error.reject_local.OBJECT_NOT_FOUND);
+
+                collector = dop.collect();
+                if (dop.isRegistered(request.into))
+                    object = dop.core.setPatch(request.into, object_owner, dop.core.setPatchFunctionMutator);
                 else
-                    request.promise.resolve(dop.getObjectProxy(object));
+                    object = dop.register((request.into===undefined) ? 
+                        object_owner
+                    :
+                        dop.core.setPatch(request.into, object_owner, dop.core.setPatchMutator)
+                    );
+                dop.core.registerOwner(node, object, object_owner_id);
+                collector.emit();
             }
+            // Already registered
+            else
+                object = dop.data.object[node.owner[object_owner_id]].object;
+
+            object = dop.util.get(object, object_path);
+
+            if (!isObject(object))
+                request.promise.reject(dop.core.error.reject_local.OBJECT_NOT_FOUND);
+            else
+                request.promise.resolve(dop.getObjectProxy(object));
+            
         }
     }
 };

src/protocol/instructions.js

@@ -26,7 +26,7 @@ dop.protocol.instructions = {
                         // Subscriptor -> Owner
     subscribe: 1,       // [ 1234, <instruction>, <params...>]
                         // [-1234, 0, <object_id>, <data_object>]
-                        // [-1234, 0, [<object_id>, 'path']]
+                        // [-1234, 0, <object_id>, ['path']]
 
                         // Subscriptor -> Owner
     unsubscribe: 2,     // [ 1234, <instruction>, <object_id>]

src/protocol/onsubscribe.js

@@ -17,10 +17,9 @@ dop.protocol.onsubscribe = function(node, request_id, request) {
                 if (dop.core.registerSubscriber(node, object_root))
                     response.push(object_id, object_root);
 
-                // Object already registered
+                // Object already subscribed
                 else
-                    response.push(object_path);
-
+                    response.push(object_id, object_path.slice(1));
 
                 dop.core.storeSendMessages(node, response, dop.encodeFunction);
                 return object;