Updated observeApi

Author: Josema

src/core/constructors/observer.js

@@ -6,40 +6,25 @@ dop.core.observer = function Observer(callback, id) {
     this.observers_all = {} // need it for destroy()
 }
 
-dop.core.observer.prototype.observe = function(object, property) {
+dop.core.observer.prototype.observeProperty = function(object, property) {
+    var path = observerCheckObject(object, 'observeProperty')
     dop.util.invariant(
-        dop.isRegistered(object),
-        'observer.observe() needs a registered object as first parameter'
+        arguments.length === 2,
+        'observer.observeProperty() You must pass a name property as second parameter'
     )
-    var path = dop.getObjectPath(object)
-    dop.util.invariant(
-        isArray(path),
-        'observer.observe() The object you are passing is not allocated to a registered object'
+    return this.observe(
+        dop.core.getPathId(path) + dop.core.pathSeparator(property),
+        'observers_prop'
     )
+}
 
-    var path_id = dop.core.getPathId(path),
-        type = 'observers'
-
-    // is observeProperty
-    if (arguments.length === 2) {
-        path_id += dop.core.pathSeparator(property)
-        type = 'observers_prop'
-    }
-
-    return this.observe(path_id, type)
+dop.core.observer.prototype.observeObject = function(object) {
+    var path = observerCheckObject(object, 'observeObject')
+    return this.observe(dop.core.getPathId(path), 'observers')
 }
 
 dop.core.observer.prototype.observeAll = function(object) {
-    dop.util.invariant(
-        dop.isRegistered(object),
-        'observer.observeAll() needs a registered object as first parameter'
-    )
-    var path = dop.getObjectPath(object)
-    dop.util.invariant(
-        isArray(path),
-        'observer.observeAll() The object you are passing is not allocated to a registered object'
-    )
-
+    var path = observerCheckObject(object, 'observeAll')
     return this.observe(dop.core.getPathId(path), 'observers_all')
 }
 
@@ -70,3 +55,18 @@ dop.core.observer.prototype.destroy = function() {
     for (path_id in this.observers_prop)
         delete data_path[path_id].observers_prop[this.id]
 }
+
+function observerCheckObject(object, method) {
+    dop.util.invariant(
+        dop.isRegistered(object),
+        'observer.' + method + '() needs a registered object as first parameter'
+    )
+    var path = dop.getObjectPath(object)
+    dop.util.invariant(
+        isArray(path),
+        'observer.' +
+            method +
+            '() The object you are passing is not allocated to a registered object'
+    )
+    return path
+}

test/interceptors.js

@@ -1,39 +1,45 @@
-var test = require('tape');
+var test = require('tape')
 // require('tabe').createStream( test );
 dop = require('./.proxy').create()
 var set = dop.set
 
-
-
-var object = dop.register({name:'Enzo'});
-
-
+var object = dop.register({ name: 'Enzo' })
 
 test('Passing wrong arguments', function(t) {
-
-    var disposer;
-    try {disposer = dop.intercept()}
-    catch(e){t.equal(e.message.indexOf('needs a registered object')>-1,true, e.message)}
-
-    try {disposer = dop.intercept(object)}
-    catch(e){t.equal(e.message.indexOf('needs a callback')>-1,true, e.message)}
-
-    try {disposer = dop.intercept(object, 'name')}
-    catch(e){t.equal(e.message.indexOf('needs a callback')>-1,true, e.message)}
-
-    var disposer = dop.intercept(object, function(){})
+    var disposer
+    try {
+        disposer = dop.intercept()
+    } catch (e) {
+        t.equal(
+            e.message.indexOf('needs a registered object') > -1,
+            true,
+            e.message
+        )
+    }
+
+    try {
+        disposer = dop.intercept(object)
+    } catch (e) {
+        t.equal(e.message.indexOf('needs a callback') > -1, true, e.message)
+    }
+
+    try {
+        disposer = dop.intercept(object, 'name')
+    } catch (e) {
+        t.equal(e.message.indexOf('needs a callback') > -1, true, e.message)
+    }
+
+    var disposer = dop.intercept(object, function() {})
     t.equal(typeof disposer, 'function')
     disposer()
-  
-    disposer = dop.intercept(object, 'name', function(){})
+
+    disposer = dop.intercept(object, 'name', function() {})
     t.equal(typeof disposer, 'function')
     disposer()
 
-    t.end();
+    t.end()
 })
 
-
-
 test('Multiple interceptors', function(t) {
     var inc = 1
     var disposer1 = dop.intercept(object, 'name', function(mutation) {
@@ -49,20 +55,17 @@ test('Multiple interceptors', function(t) {
         return true
     })
     var observer = dop.createObserver(function(mutation) {
-        disposer1();
-        disposer2();
-        disposer3();
+        disposer1()
+        disposer2()
+        disposer3()
         observer.destroy()
         t.equal(inc++, 4, 'observer')
-        t.end();
+        t.end()
     })
-    observer.observe(object, 'name')
+    observer.observeProperty(object, 'name')
     set(object, 'name', 'John')
 })
 
-
-
-
 test('Second interceptor do not return true', function(t) {
     var inc = 1
     var disposer1 = dop.intercept(object, function(mutation) {
@@ -71,13 +74,13 @@ test('Second interceptor do not return true', function(t) {
     })
     var disposer2 = dop.intercept(object, 'name', function(mutation) {
         disposer1()
-        disposer2();
+        disposer2()
         t.equal(inc++, 2)
-        t.end();
+        t.end()
     })
     var observer = dop.createObserver(function(mutation) {
-        t.end(false,true, 'this shouldnt happen')
+        t.end(false, true, 'this shouldnt happen')
     })
-    observer.observe(object, 'name')
+    observer.observeProperty(object, 'name')
     set(object, 'name', 'Josema')
 })