Changeset 548

Timestamp:

01/22/06 05:31:35 (3 years ago)

Author:

therve@gmail.com

Message:

DeferredList?

Files:

• mochikit/branches/scriptaculous/MochiKit/Async.js (modified) (2 diffs)
• mochikit/branches/scriptaculous/tests/test_MochiKit-Async.html (modified) (2 diffs)

mochikit/branches/scriptaculous/MochiKit/Async.js

@@ -355 +355 @@
-    }
-};
+
+MochiKit.Async.DeferredList = function (list, /* optional */fireOnOneCallback, fireOnOneErrback, consumeErrors, canceller) {
+    this.list = list;
+    this.resultList = new Array(this.list.length);
+
+    // Deferred init
+    this.chain = [];
+    this.id = this._nextId();
+    this.fired = -1;
+    this.paused = 0;
+    this.results = [null, null];
+    this.canceller = canceller;
+    this.silentlyCancelled = false;
+    
+    if (this.list.length == 0 && !fireOnOneCallback) {
+        this.callback(this.resultList);
+    }
+    
+    this.finishedCount = 0
+    this.fireOnOneCallback = fireOnOneCallback;
+    this.fireOnOneErrback = fireOnOneErrback;
+    this.consumeErrors = consumeErrors;
+
+    var index = 0;
+    MochiKit.Base.map(MochiKit.Base.bind(function (d) {
+        d.addCallback(MochiKit.Base.bind(this._cbDeferred, this), index, true);
+        d.addErrback(MochiKit.Base.bind(this._cbDeferred, this), index, false);
+        index += 1;
+    }, this), this.list);
+};
+
+MochiKit.Base.update(MochiKit.Async.DeferredList.prototype,
+                     MochiKit.Async.Deferred.prototype);
+
+MochiKit.Base.update(MochiKit.Async.DeferredList.prototype, {
+    _cbDeferred: function (index, succeeded, result) {
+        this.resultList[index] = [succeeded, result];
+        this.finishedCount += 1;
+        if (this.fired != 0) {
+            if (succeeded && this.fireOnOneCallback) {
+                this.callback([index, result]);
+            } else if (!succeeded && this.fireOnOneErrback) {
+                this.errback(result);
+            } else if (this.finishedCount == this.list.length) {
+                this.callback(this.resultList);
+            }
+        }
+        if (!succeeded && this.consumeErrors) {
+            result = null;
+        }
+        return result;
+    }
+});
-
-MochiKit.Base.update(MochiKit.Async, {
@@ -621 +674 @@
-    "XMLHttpRequestError",
-    "Deferred",
+    "DeferredList",
-    "succeed",
-    "fail",

mochikit/branches/scriptaculous/tests/test_MochiKit-Async.html

@@ -13 +13 @@
-        
-    // Counting the number of tests is really lame
-5
+9
-
-    var increment = function (res) {
@@ -163 +163 @@
-        ok(e instanceof AlreadyCalledError, "non-swallowed cancel");
-    }
+
+    /*
+        Test DeferredList
+    */
+    
+    var callList = new Array(3);
+    callList[0] = new Deferred();
+    callList[1] = new Deferred();
+    callList[2] = new Deferred();
+    callList[0].addCallback(increment);
+    callList[1].addCallback(increment);
+    callList[2].addCallback(increment);
+    var defList = new DeferredList(callList);
+    callList[0].callback(3);
+    callList[1].callback(5);
+    callList[2].callback(4);
+    
+    defList.addCallback(function (lst) {
+        is( arrayEqual(lst, [[true, 4], [true, 6], [true, 5]]), 1,
+           "deferredlist result ok" );
+    });
+   
+    /*
+        Test fireOnOneCallback
+    */
+   
+    var callList2 = new Array(3);
+    callList2[0] = new Deferred();
+    callList2[1] = new Deferred();
+    callList2[2] = new Deferred();
+    callList2[0].addCallback(increment);
+    callList2[1].addCallback(increment);
+    callList2[2].addCallback(increment);
+    var defList2 = new DeferredList(callList2, true);
+    callList2[1].callback(5);
+    callList2[0].callback(3);
+    callList2[2].callback(4);
+    
+    defList2.addCallback(function (lst) {
+        is( arrayEqual(lst, [1, 6]), 1, "deferredlist fireOnOneCallback ok" );
+    });
+
+    /*
+        Test fireOnOneErrback
+    */
+
+    var callList3 = new Array(3);
+    callList3[0] = new Deferred();
+    callList3[1] = new Deferred();
+    callList3[2] = new Deferred();
+    callList3[0].addCallback(increment);
+    callList3[1].addCallback(throwStuff);
+    callList3[2].addCallback(increment);
+    var defList3 = new DeferredList(callList3, false, true);
+    callList3[0].callback(3);
+    callList3[1].callback("foo");
+    callList3[2].callback(4);
+    
+    defList3.addErrback(function (err) {
+        is( err.message, "foo", "deferredlist fireOnOneErrback ok" );
+    });
+
+    /*
+        Test consumeErrors
+    */
+
+    var callList4 = new Array(3);
+    callList4[0] = new Deferred();
+    callList4[1] = new Deferred();
+    callList4[2] = new Deferred();
+    callList4[0].addCallback(increment);
+    callList4[1].addCallback(throwStuff);
+    callList4[2].addCallback(increment);
+    var defList4 = new DeferredList(callList4, false, false, true);
+    defList4.addErrback(neverHappen);
+    callList4[1].addCallback(function (arg) {
+        is(arg, null, "deferredlist consumeErrors ok" );
+    });
+    callList4[0].callback(3);
+    callList4[1].callback("foo");
+    callList4[2].callback(4);
+    
-    
-    /*