async-limiter 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 974ccf48a69e44da7a7ae3d5908d68376ba026cfe8f72430aeda1fdb8b95966e
-  data.tar.gz: bf910237393a4fcd04e91fa1160d1d4d44993f5de73bc1c8e86b31ba6c98db7b
+  metadata.gz: 0f0332a099a13957c6de625c09512af704eeaa2c513b5460bcf213315e21e120
+  data.tar.gz: 6c3b884613ff5128c7443bd376ba6885c6d6b408c2be8e5e87a669ae1b232f5e
 SHA512:
-  metadata.gz: e1bf656e0d8f82bf460f64d657ad17ab9fedda4f06b335036448312e81c30e3cb9c438642aef86a704c25401563361a39f5b7258eb8ec7123bc10f719459db90
-  data.tar.gz: a367575c970cf6e40723f53bbc776cf70fe88488d36dddb755b21c625dcc133ad84c812fbc8aa54ee0cdc202ddc50f96cc76a75c8e78f4ad18017459f2b5ed4a
+  metadata.gz: 87d13bfea8dabd356cf7662dc79011c0e78584fb5f0e917a79669fecc1c1c23851978508eb431cf7dcac55edcabcfc781ddefbc3cc2ea85cf37b0edeffa23757
+  data.tar.gz: 50789debe4ebef773acbacf47c76ae799ac418fe0ea69695a250fed60027fdc119c0c6c895b205a70edb3c950571a9fc07ea11ba1a0691f50b62f6141d6bd5cb

data/lib/async/limiter/concurrent.rb

@@ -21,8 +21,8 @@ module Async
         limit_blocking?
       end
 
-      def async(parent: (@parent || Task.current), **options)
-        acquire
+      def async(*queue_args, parent: (@parent || Task.current), **options)
+        acquire(*queue_args)
         parent.async(**options) do |task|
           yield task
         ensure
@@ -30,9 +30,21 @@ module Async
         end
       end
 
-      def acquire
-        wait
+      def sync(*queue_args, &block)
+        acquire(*queue_args, &block)
+      end
+
+      def acquire(*queue_args)
+        wait(*queue_args)
         @count += 1
+
+        return unless block_given?
+
+        begin
+          yield
+        ensure
+          release
+        end
       end
 
       def release
@@ -53,11 +65,11 @@ module Async
         @count >= @limit
       end
 
-      def wait
+      def wait(*queue_args)
         fiber = Fiber.current
 
         if blocking?
-          @waiting << fiber
+          @waiting.push(fiber, *queue_args) # queue_args used for custom queues
           Task.yield while blocking?
         end
       rescue Exception # rubocop:disable Lint/RescueException

data/lib/async/limiter/unlimited.rb

@@ -27,8 +27,20 @@ module Async
         end
       end
 
+      def sync(*queue_args, &block)
+        acquire(*queue_args, &block)
+      end
+
       def acquire
         @count += 1
+
+        return unless block_given?
+
+        begin
+          yield
+        ensure
+          release
+        end
       end
 
       def release

data/lib/async/limiter/version.rb

@@ -1,5 +1,5 @@
 module Async
   module Limiter
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

data/lib/async/limiter/window.rb

@@ -47,8 +47,8 @@ module Async
         limit_blocking? || window_blocking? || window_frame_blocking?
       end
 
-      def async(parent: (@parent || Task.current), **options)
-        acquire
+      def async(*queue_args, parent: (@parent || Task.current), **options)
+        acquire(*queue_args)
         parent.async(**options) do |task|
           yield task
         ensure
@@ -56,8 +56,12 @@ module Async
         end
       end
 
-      def acquire
-        wait
+      def sync(*queue_args, &block)
+        acquire(*queue_args, &block)
+      end
+
+      def acquire(*queue_args)
+        wait(*queue_args)
         @count += 1
 
         current_time = Clock.now
@@ -145,13 +149,13 @@ module Async
         @window_frame_start_time + window_frame <= Clock.now
       end
 
-      def wait
+      def wait(*queue_args)
         fiber = Fiber.current
 
         # @waiting.any? check prevents fibers resumed via scheduler from
         # slipping in operations before other waiting fibers get resumed.
         if blocking? || @waiting.any?
-          @waiting << fiber
+          @waiting.push(fiber, *queue_args) # queue_args used for custom queues
           schedule if schedule?
           loop do
             Task.yield # run this line at least once

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-limiter
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Bruno Sutic