Changeset 15859 for lang/javascript/jsdeferred

Timestamp:

07/15/08 23:07:10 (6 months ago)

Author:

cho45

Message:

• jquery binding を更新
  
• テストを追加
  
• テストの skip とかを実装
  
• サンプルに自動分割ループを追加
  

Location:

lang/javascript/jsdeferred/trunk

Files:

• binding/jquery.js (modified) (1 diff)
• jsdeferred.jquery.js (modified) (2 diffs)
• jsdeferred.js (modified) (1 diff)
• jsdeferred.mini.js (modified) (1 diff)
• jsdeferred.nodoc.js (modified) (1 diff)
• jsdeferred.userscript.js (modified) (1 diff)
• sample.html (modified) (1 diff)
• test-jsdeferred.js (modified) (8 diffs)
• test-rhino.js (modified) (4 diffs)
• test.html (modified) (1 diff)

lang/javascript/jsdeferred/trunk/binding/jquery.js

@@ -1 +1 @@
 (function ($) {
         $.deferred = Deferred;
-        // override jQuery Ajax functions
-        $.each(["get", "post"], function (n, i) {
-                var orig = $[i];
-                $[i] = function (url, data, callback, type) {
-                        if (typeof data == "function") {
-                                data = undefined;
-                                callback = data;
-                        }
-                        var d = $.deferred();
-                        orig(url, data, function (data) {
-                                d.call(data);
-                        }, type);
-                        if (callback) d = d.next(callback);
-                        return d;
+
+        // override jQuery Ajax function for returning Deferred.
+        var orig_ajax = $.ajax; $.ajax = function (opts) {
+                var d = $.deferred(), orig = {};
+                $.extend(orig, opts);
+
+                opts.success = function () {
+                        if (orig.success) orig.success.apply(this, arguments);
+                        d.call.apply(d, arguments);
                 };
-        });
+
+                opts.error = function () {
+                        if (orig.error) orig.error.apply(this, arguments);
+                        d.fail.apply(d, arguments);
+                };
+
+                orig_ajax(opts);
+
+                return d;
+        };
 })(jQuery);
 

lang/javascript/jsdeferred/trunk/jsdeferred.jquery.js

@@ -61 +61 @@
 return ret;}
 }
-return Deferred.call(_loop,o.begin);});};Deferred.register=function(name,fun){
+if(o.begin<o.end)return Deferred.call(_loop,o.begin);});};Deferred.register=function(name,fun){
 this.prototype[name]=function(){
 return this.next(Deferred.wrap(fun).apply(null,arguments));};};Deferred.wrap=function(dfun){
@@ -70 +70 @@
 var n=list[i];obj[n]=Deferred[n];}
 return Deferred;};(function($){
-$.deferred=Deferred;$.each(["get","post"],function(n,i){
-var orig=$[i];$[i]=function(url,data,callback,type){
-if(typeof data=="function"){
-data=undefined;callback=data;}
-var d=$.deferred();orig(url,data,function(data){
-d.call(data);},type);if(callback)d=d.next(callback);return d;};});})(jQuery);
+$.deferred=Deferred;var orig_ajax=$.ajax;$.ajax=function(opts){
+var d=$.deferred(),orig={};$.extend(orig,opts);opts.success=function(){
+if(orig.success)orig.success.apply(this,arguments);d.call.apply(d,arguments);};opts.error=function(){
+if(orig.error)orig.error.apply(this,arguments);d.fail.apply(d,arguments);};orig_ajax(opts);return d;};})(jQuery);

lang/javascript/jsdeferred/trunk/jsdeferred.js

@@ -287 +287 @@
                         }
                 }
-                return Deferred.call(_loop, o.begin);
+                if (o.begin < o.end) return Deferred.call(_loop, o.begin);
         });
 };

lang/javascript/jsdeferred/trunk/jsdeferred.mini.js

@@ -61 +61 @@
 return ret;}
 }
-return Deferred.call(_loop,o.begin);});};Deferred.register=function(name,fun){
+if(o.begin<o.end)return Deferred.call(_loop,o.begin);});};Deferred.register=function(name,fun){
 this.prototype[name]=function(){
 return this.next(Deferred.wrap(fun).apply(null,arguments));};};Deferred.wrap=function(dfun){

lang/javascript/jsdeferred/trunk/jsdeferred.nodoc.js

@@ -129 +129 @@
                         }
                 }
-                return Deferred.call(_loop, o.begin);
+                if (o.begin < o.end) return Deferred.call(_loop, o.begin);
         });
 };

lang/javascript/jsdeferred/trunk/jsdeferred.userscript.js

@@ -133 +133 @@
                         }
                 }
-                return Deferred.call(_loop, o.begin);
+                if (o.begin < o.end) return Deferred.call(_loop, o.begin);
         });
 };

lang/javascript/jsdeferred/trunk/sample.html

@@ -209 +209 @@
 
 function print (m) { $("#loop-code1").append("\n// "+m) }
+</pre>
+                                </div>
+                                <div clsss="section">
+                                        <h2>Auto Divided Loop</h2>
+                                        <pre id="aloop-code" onclick="eval($(this).text());">
+function aloop (n, f) {
+        var i   = 0;
+        var end = new Object;
+        var ret = null;
+        return Deferred.next(function () {
+                var t = (new Date()).getTime();
+                try {
+                        do {
+                                ret = f(i)
+                                i++;
+                                if (i > n) throw end;
+                        } while ((new Date()).getTime() - t < 50);
+                        print("Devided: " + ((new Date()).getTime() - t) + "msec.");
+                        return Deferred.call(arguments.callee);
+                } catch (e) {
+                        if (e == end) {
+                                print("End");
+                                return ret;
+                        } else {
+                                throw e;
+                        }
+                }
+        });
+}
+
+aloop(100, function (n, o) {
+        print(n);
+        for (var i = 0; i < Math.pow(n, 2); i++) {
+                for (var j = n; j; j--);
+        }
+});
+
+
+function print (m) { $("#aloop-code").append("\n// "+m) }
 </pre>
                                 </div>

lang/javascript/jsdeferred/trunk/test-jsdeferred.js

@@ -1 +1 @@
 $(function () { $.get("test-jsdeferred.js", {}, function (data) {
+Global = (function () { return this })();
 
 // get tests number.
@@ -14 +15 @@
 function show (msg, expect, result) {
         var okng = this;
-        testfuns.pop();
+        if (okng == "skip") {
+                result = "skipped " + expect + "tests:" + msg;
+                while (expect--) testfuns.pop();
+                expect = "skipped";
+        } else {
+                testfuns.pop();
+                expect = (typeof expect == "function") ? uneval(expect).match(/[^{]+/)+"..." : uneval(expect);
+                result = (typeof result == "function") ? uneval(result).match(/[^{]+/)+"..." : uneval(result);
+        }
         $("#nums").text([expects - testfuns.length, expects].join("/"));
-        expect = (typeof expect == "function") ? uneval(expect).match(/[^{]+/)+"..." : uneval(expect);
-        result = (typeof result == "function") ? uneval(result).match(/[^{]+/)+"..." : uneval(result);
         $("<tr class='"+okng+"'><td>"+[msg, expect, result].join("</td><td>")+"</td></tr>").appendTo(results);
         if (testfuns.length) {
@@ -46 +53 @@
 function ok () {
         show.apply("ok", arguments);
+        return true;
 }
 
 function ng () {
         show.apply("ng", arguments);
+        return true;
+}
+
+function skip () {
+        show.apply("skip", arguments);
+        return true;
 }
 
@@ -58 +72 @@
                 show.apply("ng", arguments);
         }
+        return true;
 }
 
@@ -93 +108 @@
 d.call();
 
-// comment out for test on rhino
-// msg("jQuery binding test")
-// expect//("$.get deferred",     true, $.get(".")     instanceof $.deferred);
-// expect//("$.post deferred",    true, $.post(".")    instanceof $.deferred);
-// expect//("$.getJSON deferred", true, $.getJSON(".") instanceof $.deferred);
 
 // Start Main Test
@@ -354 +364 @@
 next(function () {
         msg("Stack over flow test: check not waste stack.");
+        if (skip("too heavy", 1)) return;
+
         var num = 1000;
         return loop(num, function (n) {
@@ -368 +380 @@
 next(function () {
         msg("Done Main.");
+}).
+next(function () {
+        msg("jQuery binding test")
+        if (Global.navigator) {
+                return next(function() {
+                        expect("$.ajax should return deferred",    true, $.ajax({ url: "." }) instanceof $.deferred);
+                        expect("$.get should return deferred",     true, $.get(".")           instanceof $.deferred);
+                        expect("$.post should return deferred",    true, $.post(".")          instanceof $.deferred);
+                        expect("$.getJSON should return deferred", true, $.getJSON(".")       instanceof $.deferred);
+                }).
+                next(function () {
+                        return $.ajax({
+                                url : ".",
+                                success : function () {
+                                        ok("$.ajax#success");
+                                },
+                                error : function () {
+                                        ng("$.ajax#success");
+                                }
+                        }).
+                        next(function () {
+                                ok("$.ajax#success");
+                        }).
+                        error(function (e) {
+                                ng("$.ajax#success");
+                        });
+                }).
+                next(function () {
+                        return $.ajax({
+                                url : "error-404" + Math.random(),
+                                success : function () {
+                                        ng("$.ajax#errro");
+                                },
+                                error : function () {
+                                        ok("$.ajax#error", "You may see error on console but it is correct.");
+                                }
+                        }).
+                        next(function () {
+                                ng("$.ajax#error");
+                        }).
+                        error(function (e) {
+                                ok("$.ajax#error");
+                        });
+                }).
+                error(function (e) {
+                        ng("Error on jQuery Test:", "", e);
+                });
+        } else {
+                skip("Not in browser", 8);
+        }
+}).
+next(function () {
         msg("Canceling Test:");
         return next(function () {
@@ -381 +445 @@
 next(function () {
         ng("Must not be called!! calceled");
+}).
+error(function (e) {
+        ng(e);
 });
 

lang/javascript/jsdeferred/trunk/test-rhino.js

@@ -17 +17 @@
 function show (msg, expect, result) {
         var okng = this;
-        testfuns.pop();
 
         var out = [];
         out.push(color(46, "[", [expects - testfuns.length, expects].join("/"), "]"));
+        if (okng == "skip") {
+                out.push(" ", color(33, "skipped " + expect + "tests: " + msg));
+                print(out.join(""));
+                while (expect--) testfuns.pop();
+        } else
         if (okng == "ng") {
+                testfuns.pop();
                 expect = (typeof expect == "function") ? uneval(expect).match(/[^{]+/)+"..." : uneval(expect);
                 result = (typeof result == "function") ? uneval(result).match(/[^{]+/)+"..." : uneval(result);
@@ -28 +33 @@
                 quit();
         } else {
+                testfuns.pop();
                 out.push(" ", color(32, "ok"));
                 print(out.join(""));
@@ -39 +45 @@
 function ok () {
         show.apply("ok", arguments);
+        return true;
 }
 
 function ng () {
         show.apply("ng", arguments);
+        return true;
+}
+
+function skip () {
+        show.apply("skip", arguments);
+        return true;
 }
 
@@ -51 +64 @@
                 show.apply("ng", arguments);
         }
+        return true;
 }
 

lang/javascript/jsdeferred/trunk/test.html

@@ -49 +49 @@
                                 background: #900;
                                 color: #fff;
+                                font-weight: bold;
+                        }
+
+                        tr.skip {
+                                color: #fff;
+                                background: #d2b301;
                                 font-weight: bold;
                         }