async-rails 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cea5f2910562d097102fd9945aa7eb2246cdb7de
-  data.tar.gz: c99ba64dd344ad7dff32effba4b6c5ee1e687602
+  metadata.gz: '08e5cb75601fccd33a0d462ab6785d14db141f29'
+  data.tar.gz: eaf38a840d3aceb791c3b932c45a3c402853c00a
 SHA512:
-  metadata.gz: 140ee493acbb4b0f3731e63ed3740ac7001c3c31af33101878dd92265cac774b9e24175ae6e2591cd1a9eeb453251db2c755517d76c6d13d4cf2f8ee16b0e340
-  data.tar.gz: 73373fc59cd003760869e372a20ebce34a1d8fcbbbe29243b5696349b1c628d5cf59063d5aac022a72711babcd208a96a7f4747c67e2ea60365896813c2611b8
+  metadata.gz: 0207565ddaee5781e7de430a6c4263a469ee1416b5d450ee6f7d3d9bb5ee9af964e9d191512cfe4c43d794e8f549762d720448f1336eae2c6b80858124582173
+  data.tar.gz: 95bcac0ca71e890834604b876128d160ae1e879665253e66b0fb91ba21f77cf4415e3872689aa90e50f6416ef005a92d0df0394e7c74200e2304b4b9828257d8

data/lib/async-rails/version.rb

@@ -1,5 +1,5 @@
 module Async
   module Rails
-    VERSION = "2.4.0"
+    VERSION = "2.4.1"
   end
 end

data/vendor/assets/javascripts/async.js

@@ -4868,34 +4868,33 @@ function sortBy (coll, iteratee, callback) {
  * });
  */
 function timeout(asyncFn, milliseconds, info) {
-    var originalCallback, timer;
-    var timedOut = false;
-
-    function injectedCallback() {
-        if (!timedOut) {
-            originalCallback.apply(null, arguments);
-            clearTimeout(timer);
-        }
-    }
+    var fn = wrapAsync(asyncFn);
 
-    function timeoutCallback() {
-        var name = asyncFn.name || 'anonymous';
-        var error  = new Error('Callback function "' + name + '" timed out.');
-        error.code = 'ETIMEDOUT';
-        if (info) {
-            error.info = info;
+    return initialParams(function (args, callback) {
+        var timedOut = false;
+        var timer;
+
+        function timeoutCallback() {
+            var name = asyncFn.name || 'anonymous';
+            var error  = new Error('Callback function "' + name + '" timed out.');
+            error.code = 'ETIMEDOUT';
+            if (info) {
+                error.info = info;
+            }
+            timedOut = true;
+            callback(error);
         }
-        timedOut = true;
-        originalCallback(error);
-    }
 
-    var fn = wrapAsync(asyncFn);
+        args.push(function () {
+            if (!timedOut) {
+                callback.apply(null, arguments);
+                clearTimeout(timer);
+            }
+        });
 
-    return initialParams(function (args, origCallback) {
-        originalCallback = origCallback;
         // setup timer and call original function
         timer = setTimeout(timeoutCallback, milliseconds);
-        fn.apply(null, args.concat(injectedCallback));
+        fn.apply(null, args);
     });
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-rails
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Jason Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties