Merge pull request #14 from maniator/cleanup

Cleanup some code in preparation for testing

Author: maniator

example/index.js

@@ -24,18 +24,18 @@ const countSubscription = countObservable$
     }
   });
 
-// // test event binding
-// const inputObservable$ = Observable.fromEvent('input', document.getElementById('myInput'), (event) => event.currentTarget.value);
-// const divReverse = document.getElementById('myTextReverse');
-// const div = document.getElementById('myText');
-//
-// console.log(inputObservable$);
-//
-// inputObservable$
-//   .map((text) => text.split('').reverse().join(''))
-//   .do((text) => divReverse.textContent = text)
-//   .subscribe();
-//
-// inputObservable$
-//   .do((text) => div.textContent = text)
-//   .subscribe();
+// test event binding
+const inputObservable$ = Observable.fromEvent('input', document.getElementById('myInput'), (event) => event.currentTarget.value);
+const divReverse = document.getElementById('myTextReverse');
+const div = document.getElementById('myText');
+
+console.log(inputObservable$);
+
+inputObservable$
+  .map((text) => text.split('').reverse().join(''))
+  .do((text) => divReverse.textContent = text)
+  .subscribe();
+
+inputObservable$
+  .do((text) => div.textContent = text)
+  .subscribe();

src/Observable.js

@@ -6,6 +6,10 @@ export class Observable {
     this.observerCallback = observerCallback;
   }
 
+  static create (observerCallback) {
+    return new Observable(observerCallback);
+  }
+  
   subscribe (next = noop, error = noop, complete = noop) {
     return new Subscription(this.observerCallback, { next, error, complete });
   }

src/Subject.js

@@ -1,48 +1,64 @@
-import { Subscription } from './Subscription';
+import {Subscription} from './Subscription';
 
 export class Subject {
   constructor () {
     this.next = this.next.bind(this);
     this.error = this.error.bind(this);
     this.complete = this.complete.bind(this);
 
-    this.subscriptionList = [];
+    this.observers = [];
   }
 
   subscribe (observer) {
     const subscription = Subscription.createSimple(observer);
 
-    this.subscriptionList.push(subscription);
+    this.observers.push(subscription.observer);
 
     return subscription;
   }
 
+  unsubscribe () {
+    this
+      .cleanup((observer) => {
+        observer.cleanup();
+        
+        return false;
+      });
+  }
+  
   cleanup (callback) {
-    this.subscriptionList = this.subscriptionList.filter((subscription) => {
-      if (!subscription.isComplete) {
-        callback(subscription);
+    this.observers = this.observers.filter((observer) => {
+      if (!observer.isComplete) {
+        const ret = callback(observer);
+        
+        if (typeof ret === 'boolean') {
+          return ret;
+        }
+        
         return true;
       }
 
       return false;
     });
+    
+    return this;
   }
 
   next (...args) {
-    this.cleanup((subscription) => {
-        subscription.onNext(...args);
+    this.cleanup((observer) => {
+        observer.onNext(...args);
     });
   }
 
   error (...errors) {
-    this.cleanup((subscription) => {
-      subscription.onError(...errors);
+    this.cleanup((observer) => {
+      observer.onError(...errors);
     });
   }
 
   complete () {
-    this.cleanup((subscription) => {
-      subscription.onComplete();
+    this.cleanup((observer) => {
+      observer.onComplete();
     });
   }
 }

src/Subscription.js

@@ -2,7 +2,7 @@ import { Observer } from './Observer';
 import { noop } from './utilities';
 
 export class Subscription {
-  constructor (callback, observer) {
+  constructor (callback = noop, observer = {}) {
     this.observer = new Observer(observer);
 
     this.observer.use(callback);