Merge pull request #84 from zenparsing/receiver-errors

Bind subscription observer methods

Author: zenparsing

src/Observable.js

@@ -163,7 +163,14 @@ class Subscription {
     this._queue = undefined;
     this._state = 'initializing';
 
-    let subscriptionObserver = new SubscriptionObserver(this);
+    let self = this;
+
+    let subscriptionObserver = {
+      get closed() { return self._state === 'closed' },
+      next(value) { onNotify(self, 'next', value) },
+      error(value) { onNotify(self, 'error', value) },
+      complete() { onNotify(self, 'complete') },
+    };
 
     try {
       this._cleanup = subscriber.call(undefined, subscriptionObserver);
@@ -187,14 +194,6 @@ class Subscription {
   }
 }
 
-class SubscriptionObserver {
-  constructor(subscription) { this._subscription = subscription }
-  get closed() { return this._subscription._state === 'closed' }
-  next(value) { onNotify(this._subscription, 'next', value) }
-  error(value) { onNotify(this._subscription, 'error', value) }
-  complete() { onNotify(this._subscription, 'complete') }
-}
-
 export class Observable {
 
   constructor(subscriber) {

test/observer-closed.js

@@ -5,10 +5,11 @@ describe('observer.closed', () => {
   it('is a getter on SubscriptionObserver.prototype', () => {
     let observer;
     new Observable(x => { observer = x }).subscribe();
-    testMethodProperty(Object.getPrototypeOf(observer), 'closed', {
+    testMethodProperty(observer, 'closed', {
       get: true,
       configurable: true,
       writable: true,
+      enumerable: true,
       length: 1
     });
   });

test/observer-complete.js

@@ -9,15 +9,24 @@ describe('observer.complete', () => {
     return observer;
   }
 
-  it('is a method of SubscriptionObserver', () => {
+  it('is a method', () => {
     let observer = getObserver();
-    testMethodProperty(Object.getPrototypeOf(observer), 'complete', {
+    testMethodProperty(observer, 'complete', {
       configurable: true,
       writable: true,
+      enumerable: true,
       length: 0,
     });
   });
 
+  it('is bound', () => {
+    let done = false;
+    let observer = getObserver({ complete() { done = true } });
+    let { complete } = observer;
+    complete();
+    assert.ok(done);
+  });
+
   it('does not forward arguments', () => {
     let args;
     let observer = getObserver({ complete(...a) { args = a } });

test/observer-error.js

@@ -9,15 +9,24 @@ describe('observer.error', () => {
     return observer;
   }
 
-  it('is a method of SubscriptionObserver', () => {
+  it('is a method', () => {
     let observer = getObserver();
-    testMethodProperty(Object.getPrototypeOf(observer), 'error', {
+    testMethodProperty(observer, 'error', {
       configurable: true,
       writable: true,
+      enumerable: true,
       length: 1,
     });
   });
 
+  it('is bound', () => {
+    let err;
+    let observer = getObserver({ error(e) { err = e } });
+    let { error } = observer;
+    error('err');
+    assert.equal(err, 'err');
+  });
+
   it('forwards the argument', () => {
     let args;
     let observer = getObserver({ error(...a) { args = a } });

test/observer-next.js

@@ -9,15 +9,24 @@ describe('observer.next', () => {
     return observer;
   }
 
-  it('is a method of SubscriptionObserver', () => {
+  it('is a method', () => {
     let observer = getObserver();
-    testMethodProperty(Object.getPrototypeOf(observer), 'next', {
+    testMethodProperty(observer, 'next', {
       configurable: true,
       writable: true,
+      enumerable: true,
       length: 1,
     });
   });
 
+  it('is bound', () => {
+    let value;
+    let observer = getObserver({ next(v) { value = v } });
+    let { next } = observer;
+    next(123);
+    assert.equal(value, 123);
+  });
+
   it('forwards the first argument', () => {
     let args;
     let observer = getObserver({ next(...a) { args = a } });