async-rails 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0e7b0d13a37da98039e8da88e88f0e257e3e8f9
-  data.tar.gz: 2e09d2e96d2ea2731bd2e59c300be4a9eb3291b0
+  metadata.gz: bf7ed9ac6955d573c6be07f818c207a752b12942
+  data.tar.gz: a1d2ff576984764147b7567aa7b665c63f054346
 SHA512:
-  metadata.gz: 47b7cde97618644cf4efc612fa62a25f0b6f8b98d60a80620f5a149f625d6ae14e36df6a05b348892c949a33a80efd6eec6afb1aa901c7d60c7fcadfb71fd435
-  data.tar.gz: 991eefa9d4bd8581e02a136bea290d4dfb2c439e4bb587d010ab76181dcf981edf480bb772e7f972b3b7fee07259dbd1a7b9cc41ba33a4bc11f8da7edd923347
+  metadata.gz: 88acfee5cf852aa961b9980053efb67884f716ef9dc497fd67c75457e2feaebafb98de36414fb06608e6cecf7867330876cafcdc968694a3ed4ae7af337896a5
+  data.tar.gz: 209c1e3c6c4724f2d39b1c47410e30edea7fe0c4a62a598d92aea1546b11d4477aeb29b2eba86a10e2e6c768e85a436de506ee21d972f5aeb95e2d899d68d05d

data/lib/async-rails/version.rb

@@ -1,5 +1,5 @@
 module Async
   module Rails
-    VERSION = "0.2.6"
+    VERSION = "0.2.7"
   end
 end

data/vendor/assets/javascripts/async.js

@@ -75,11 +75,11 @@
     //// nextTick implementation with browser-compatible fallback ////
     if (typeof process === 'undefined' || !(process.nextTick)) {
         if (typeof setImmediate === 'function') {
-            async.nextTick = function (fn) {
-                setImmediate(fn);
-            };
+            async.setImmediate = setImmediate;
+            async.nextTick = setImmediate;
         }
         else {
+            async.setImmediate = async.nextTick;
             async.nextTick = function (fn) {
                 setTimeout(fn, 0);
             };
@@ -87,6 +87,12 @@
     }
     else {
         async.nextTick = process.nextTick;
+        if (typeof setImmediate !== 'undefined') {
+            async.setImmediate = setImmediate;
+        }
+        else {
+            async.setImmediate = async.nextTick;
+        }
     }
 
     async.each = function (arr, iterator, callback) {
@@ -119,7 +125,6 @@
         }
         var completed = 0;
         var iterate = function () {
-            var sync = true;
             iterator(arr[completed], function (err) {
                 if (err) {
                     callback(err);
@@ -131,16 +136,10 @@
                         callback(null);
                     }
                     else {
-                        if (sync) {
-                            async.nextTick(iterate);
-                        }
-                        else {
-                            iterate();
-                        }
+                        iterate();
                     }
                 }
             });
-            sync = false;
         };
         iterate();
     };
@@ -441,7 +440,7 @@
                 }
                 else {
                     results[k] = args;
-                    async.nextTick(taskComplete);
+                    async.setImmediate(taskComplete);
                 }
             };
             var requires = task.slice(0, Math.abs(task.length - 1)) || [];
@@ -467,6 +466,10 @@
 
     async.waterfall = function (tasks, callback) {
         callback = callback || function () {};
+        if (tasks.constructor !== Array) {
+          var err = new Error('First argument to waterfall must be an array of functions');
+          return callback(err);
+        }
         if (!tasks.length) {
             return callback();
         }
@@ -485,7 +488,7 @@
                     else {
                         args.push(callback);
                     }
-                    async.nextTick(function () {
+                    async.setImmediate(function () {
                         iterator.apply(null, args);
                     });
                 }
@@ -607,21 +610,12 @@
 
     async.whilst = function (test, iterator, callback) {
         if (test()) {
-            var sync = true;
             iterator(function (err) {
                 if (err) {
                     return callback(err);
                 }
-                if (sync) {
-                    async.nextTick(function () {
-                        async.whilst(test, iterator, callback);
-                    });
-                }
-                else {
-                    async.whilst(test, iterator, callback);
-                }
+                async.whilst(test, iterator, callback);
             });
-            sync = false;
         }
         else {
             callback();
@@ -629,45 +623,27 @@
     };
 
     async.doWhilst = function (iterator, test, callback) {
-        var sync = true;
         iterator(function (err) {
             if (err) {
                 return callback(err);
             }
             if (test()) {
-                if (sync) {
-                    async.nextTick(function () {
-                        async.doWhilst(iterator, test, callback);
-                    });
-                }
-                else {
-                    async.doWhilst(iterator, test, callback);
-                }
+                async.doWhilst(iterator, test, callback);
             }
             else {
                 callback();
             }
         });
-        sync = false;
     };
 
     async.until = function (test, iterator, callback) {
         if (!test()) {
-            var sync = true;
             iterator(function (err) {
                 if (err) {
                     return callback(err);
                 }
-                if (sync) {
-                    async.nextTick(function () {
-                        async.until(test, iterator, callback);
-                    });
-                }
-                else {
-                    async.until(test, iterator, callback);
-                }
+                async.until(test, iterator, callback);
             });
-            sync = false;
         }
         else {
             callback();
@@ -675,26 +651,17 @@
     };
 
     async.doUntil = function (iterator, test, callback) {
-        var sync = true;
         iterator(function (err) {
             if (err) {
                 return callback(err);
             }
             if (!test()) {
-                if (sync) {
-                    async.nextTick(function () {
-                        async.doUntil(iterator, test, callback);
-                    });
-                }
-                else {
-                    async.doUntil(iterator, test, callback);
-                }
+                async.doUntil(iterator, test, callback);
             }
             else {
                 callback();
             }
         });
-        sync = false;
     };
 
     async.queue = function (worker, concurrency) {
@@ -720,7 +687,7 @@
               if (q.saturated && q.tasks.length === concurrency) {
                   q.saturated();
               }
-              async.nextTick(q.process);
+              async.setImmediate(q.process);
           });
         }
 
@@ -744,7 +711,6 @@
                         q.empty();
                     }
                     workers += 1;
-                    var sync = true;
                     var next = function () {
                         workers -= 1;
                         if (task.callback) {
@@ -755,19 +721,8 @@
                         }
                         q.process();
                     };
-                    var cb = only_once(function () {
-                        var cbArgs = arguments;
-
-                        if (sync) {
-                            async.nextTick(function () {
-                                next.apply(null, cbArgs);
-                            });
-                        } else {
-                            next.apply(null, arguments);
-                        }
-                    });
+                    var cb = only_once(next);
                     worker(task.data, cb);
-                    sync = false;
                 }
             },
             length: function () {
@@ -803,7 +758,7 @@
                         cargo.saturated();
                     }
                 });
-                async.nextTick(cargo.process);
+                async.setImmediate(cargo.process);
             },
             process: function process() {
                 if (working) return;
@@ -945,24 +900,39 @@
         };
     };
 
-    async.applyEach = function (fns /*args...*/) {
+    var _applyEach = function (eachfn, fns /*args...*/) {
         var go = function () {
             var that = this;
             var args = Array.prototype.slice.call(arguments);
             var callback = args.pop();
-            return async.each(fns, function (fn, cb) {
+            return eachfn(fns, function (fn, cb) {
                 fn.apply(that, args.concat([cb]));
             },
             callback);
         };
-        if (arguments.length > 1) {
-            var args = Array.prototype.slice.call(arguments, 1);
+        if (arguments.length > 2) {
+            var args = Array.prototype.slice.call(arguments, 2);
             return go.apply(this, args);
         }
         else {
             return go;
         }
     };
+    async.applyEach = doParallel(_applyEach);
+    async.applyEachSeries = doSeries(_applyEach);
+
+    async.forever = function (fn, callback) {
+        function next(err) {
+            if (err) {
+                if (callback) {
+                    return callback(err);
+                }
+                throw err;
+            }
+            fn(next);
+        }
+        next();
+    };
 
     // AMD / RequireJS
     if (typeof define !== 'undefined' && define.amd) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Jason Chen