async-limiter 1.3.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f0332a099a13957c6de625c09512af704eeaa2c513b5460bcf213315e21e120
-  data.tar.gz: 6c3b884613ff5128c7443bd376ba6885c6d6b408c2be8e5e87a669ae1b232f5e
+  metadata.gz: 180ea4ebb784a29df337fe94e8190358482658fd07547ccaeaddc0974b271696
+  data.tar.gz: b02a1c5978f4b14e103852bbaa3685d8e1258b6d0190d1bb1e3c157a18b786e9
 SHA512:
-  metadata.gz: 87d13bfea8dabd356cf7662dc79011c0e78584fb5f0e917a79669fecc1c1c23851978508eb431cf7dcac55edcabcfc781ddefbc3cc2ea85cf37b0edeffa23757
-  data.tar.gz: 50789debe4ebef773acbacf47c76ae799ac418fe0ea69695a250fed60027fdc119c0c6c895b205a70edb3c950571a9fc07ea11ba1a0691f50b62f6141d6bd5cb
+  metadata.gz: e0cd30fb437861e2077f1d15bd39a2bd9314ac64a7d48d2d303302a2c13c875cae02f042ad0d93531bf125475b62c1cc1b2e532279b044623f0b7b8765732bbb
+  data.tar.gz: abd67afa695c11d045f176cf5371046238050f951626cc5bc2f2b10a484ff567cd63e26ceb8b9896fb052b55682081d9bc421e9d6e489cdbc34c68fee38bc922

data/lib/async/limiter/concurrent.rb

@@ -30,8 +30,10 @@ module Async
         end
       end
 
-      def sync(*queue_args, &block)
-        acquire(*queue_args, &block)
+      def sync(*queue_args)
+        acquire(*queue_args) do
+          yield(@parent || Task.current)
+        end
       end
 
       def acquire(*queue_args)

data/lib/async/limiter/unlimited.rb

@@ -27,8 +27,10 @@ module Async
         end
       end
 
-      def sync(*queue_args, &block)
-        acquire(*queue_args, &block)
+      def sync(*queue_args)
+        acquire(*queue_args) do
+          yield(@parent || Task.current)
+        end
       end
 
       def acquire

data/lib/async/limiter/version.rb

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

data/lib/async/limiter/window.rb

@@ -25,7 +25,7 @@ module Async
         @lock = lock
 
         @waiting = queue
-        @scheduler_task = nil
+        @scheduler = nil
 
         @window_frame_start_time = NULL_TIME
         @window_start_time = NULL_TIME
@@ -56,8 +56,10 @@ module Async
         end
       end
 
-      def sync(*queue_args, &block)
-        acquire(*queue_args, &block)
+      def sync(*queue_args)
+        acquire(*queue_args) do
+          yield Task.current
+        end
       end
 
       def acquire(*queue_args)
@@ -168,34 +170,38 @@ module Async
       end
 
       def schedule?
-        @scheduler_task.nil? &&
+        @scheduler.nil? &&
           @waiting.any? &&
           !limit_blocking?
       end
 
       # Schedule resuming waiting tasks.
       def schedule(parent: @parent || Task.current)
-        @scheduler_task ||=
-          parent.async { |task|
-            while @waiting.any? && !limit_blocking?
-              delay = [next_acquire_time - Async::Clock.now, 0].max
-              task.sleep(delay) if delay.positive?
-              resume_waiting
-            end
+        return @scheduler if @scheduler
+
+        parent.async(transient: true) do |task|
+          @scheduler = task
+          task.annotate("scheduling tasks for #{self.class}.")
 
-            @scheduler_task = nil
-          }
+          while @waiting.any? && !limit_blocking?
+            delay = [next_acquire_time - Clock.now, 0].max
+            task.sleep(delay) if delay.positive?
+            resume_waiting
+          end
+        ensure
+          @scheduler = nil
+        end
       end
 
       def reschedule?
-        @scheduler_task &&
+        @scheduler &&
           @waiting.any? &&
           !limit_blocking?
       end
 
       def reschedule
-        @scheduler_task.stop
-        @scheduler_task = nil
+        @scheduler.stop
+        @scheduler = nil
 
         schedule
       end

data/lib/async/limiter/window/continuous.rb

@@ -4,14 +4,15 @@ module Async
   module Limiter
     class Window
       class Continuous < Window
-        def initialize(limit = 1, window: 1, parent: nil, lock: true)
+        def initialize(limit = 1, window: 1, parent: nil, lock: true, queue: [])
           super(
             limit,
             type: :sliding, # type doesn't matter, but sliding is less work
             burstable: false,
             window: window,
             parent: parent,
-            lock: lock
+            lock: lock,
+            queue: queue
           )
         end
       end

data/lib/async/limiter/window/fixed.rb

@@ -4,14 +4,15 @@ module Async
   module Limiter
     class Window
       class Fixed < Window
-        def initialize(limit = 1, window: 1, parent: nil, lock: true)
+        def initialize(limit = 1, window: 1, parent: nil, lock: true, queue: [])
           super(
             limit,
             type: :fixed,
             burstable: true,
             window: window,
             parent: parent,
-            lock: lock
+            lock: lock,
+            queue: queue
           )
         end
       end

data/lib/async/limiter/window/sliding.rb

@@ -4,14 +4,15 @@ module Async
   module Limiter
     class Window
       class Sliding < Window
-        def initialize(limit = 1, window: 1, parent: nil, lock: true)
+        def initialize(limit = 1, window: 1, parent: nil, lock: true, queue: [])
           super(
             limit,
             type: :sliding,
             burstable: true,
             window: window,
             parent: parent,
-            lock: lock
+            lock: lock,
+            queue: queue
           )
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-limiter
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Bruno Sutic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-11 00:00:00.000000000 Z
+date: 2021-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.26'
+        version: '1.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.26'
+        version: '1.27'
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.43'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.43'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
 description:
 email: code@brunosutic.com
 executables: []
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.1
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Async limiters