delayer 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f45ebc21cd1a3e765702c2bc30e1a6244fbc0ab5b6568dd7152ea4f3c7bdc993
-  data.tar.gz: 70386ae1784b5bcc7ce417e02879dd12723a61f3b8e6100dd281093d50787d47
+  metadata.gz: b2630bd1444004b5d79a42afc7e6c0a456eaa615c2d98ff7403f36a035951c9d
+  data.tar.gz: 97a1594619a9352dee6298fb4a13d0684b8e75b2cd2e0fa973dac3ae8641ee11
 SHA512:
-  metadata.gz: f451adec9a6f7eb037c15ce348d3dd897e0f68bb8c496c00435cd4d09c9757794c725eb1964b9694bc355ecc85f3e0ae2899a94e06a83b2a54cd03819ae130f7
-  data.tar.gz: 0a430ec5704743c416a1d5cf900378062ec5bbe22dcac0458e69c0b9cf28fb0eed2c903849c18830250e341484a9ed54da2ea80286cb54744cd7c61977b28009
+  metadata.gz: e96977c14039b5dcae415c6525a9e8839b13de2922b495a402f3678046be8f0e29cc9ad59cf122210afa5fbc67a1422a90c773c839ecd062e380821f70ef36cc
+  data.tar.gz: d625b3e90a7288a3dac9e8d020e99e1ab7f707bcdbee9298ff3674c4f25ab56a4d45c91a9348d6bac1df632bfd50b39734e57ab92a670a3c44eccfd1bd52b936

data/README.md

@@ -1,7 +1,5 @@
 # Delayer
 
-[![toshia](https://circleci.com/gh/toshia/delayer.svg?style=svg)](https://circleci.com/gh/toshia/delayer)
-
 Delay Any task. Similar priority-queue.
 
 ## Installation

data/lib/delayer.rb

@@ -3,6 +3,7 @@ require "delayer/version"
 require "delayer/error"
 require "delayer/extend"
 require "delayer/procedure"
+require "delayer/delayed_procedure"
 require "monitor"
 
 module Delayer
@@ -32,12 +33,8 @@ module Delayer
       end
     end
 
-    def method_missing(*args, **kwrest, &proc)
-      if kwrest.empty?
-        (@default ||= generate_class).__send__(*args, &proc)
-      else
-        (@default ||= generate_class).__send__(*args, **kwrest, &proc)
-      end
+    def method_missing(*args, &proc)
+      (@default ||= generate_class).__send__(*args, &proc)
     end
   end
 end

data/lib/delayer/delayed_procedure.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+module Delayer
+  class DelayedProcedure
+    include Comparable
+
+    attr_reader :state, :delayer, :reserve_at, :right
+
+    def initialize(delayer, delay:, &proc)
+      @delayer = delayer
+      @proc = proc
+      @reserve_at = Process.clock_gettime(Process::CLOCK_MONOTONIC) + delay
+      @left = @right = @cancel = nil
+      @size = 1
+      @delayer.class.reserve(self)
+    end
+
+    def size
+      @size
+    end
+
+    def add(other)
+      return self unless other
+      if self >= other
+        other.add(self)
+      else
+        @left, *children, @right = [@left, @right, other].compact.sort
+        child = children.first
+        if child
+          if @right.right
+            @left = @left.add(child)
+          else
+            @right = @right.add(child)
+          end
+        end
+        @size += 1
+        self
+      end
+    end
+
+    def next
+      @left&.add(@right).tap do
+        @left = @right = nil
+        freeze
+      end
+    end
+
+    def register
+      if !canceled?
+        @procedure = Procedure.new(@delayer, &@proc)
+      end
+    end
+
+    def <=>(other)
+      @reserve_at <=> other.reserve_at
+    end
+
+    # Cancel this job
+    # ==== Exception
+    # Delayer::TooLate :: if already called run()
+    # ==== Return
+    # self
+    def cancel
+      if @procedure
+        @procedure.cancel
+      else
+        @cancel = true
+      end
+    end
+
+    # Return true if canceled this task
+    # ==== Return
+    # true if canceled this task
+    def canceled?
+      if @procedure
+        @procedure.canceled?
+      else
+        @cancel
+      end
+    end
+  end
+end

data/lib/delayer/extend.rb

@@ -19,10 +19,14 @@ module Delayer
     end
   end
 
-  def initialize(priority = self.class.instance_eval { @default_priority }, *_args, &proc)
+  def initialize(priority = self.class.instance_eval { @default_priority }, *_args, delay: 0, &proc)
     self.class.validate_priority priority
     @priority = priority
-    @procedure = Procedure.new(self, &proc)
+    if delay == 0
+      @procedure = Procedure.new(self, &proc)
+    else
+      @procedure = DelayedProcedure.new(self, delay: delay, &proc)
+   end
   end
 
   # Cancel this job
@@ -57,11 +61,16 @@ module Delayer
     # ==== Return
     # self
     def run(current_expire = @expire)
+      start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      while @reserve&.reserve_at&.<=(start_time)
+        @reserve.register
+        @reserve = @reserve.next
+      end
       if current_expire == 0
         run_once until empty?
       else
-        @end_time = Time.new.to_f + @expire
-        run_once while !empty? && (@end_time >= Time.new.to_f)
+        @end_time = start_time + @expire
+        run_once while !empty? && (@end_time >= Process.clock_gettime(Process::CLOCK_MONOTONIC))
         @end_time = nil
       end
       if @remain_hook
@@ -146,6 +155,25 @@ module Delayer
       self
     end
 
+    # Register reserved job.
+    # It does not execute immediately.
+    # it calls register() in _procedure.reserve_at_.
+    # ==== Args
+    # [procedure] job(Delayer::DelayedProcedure)
+    # ==== Return
+    # self
+    def reserve(procedure)
+      priority = procedure.delayer.priority
+      lock.synchronize do
+        if @reserve
+          @reserve = @reserve.add(procedure)
+        else
+          @reserve = procedure
+        end
+      end
+      self
+    end
+
     def register_remain_hook(&proc)
       @remain_hook = proc
     end

data/lib/delayer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Delayer
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

data/test/test_delayer.rb

@@ -353,4 +353,102 @@ class TestDelayer < Test::Unit::TestCase
     end
   end
 
+  def test_timer
+    delayer = Delayer.generate_class expire: 0.01
+    a = []
+    delayer.new(delay: 0.01) { a << 0 }
+    delayer.new { a << 1 }
+
+    delayer.run
+
+    delayer.new { a << 2 }
+    sleep 0.1
+
+    delayer.run
+
+    delayer.new { a << 3 }
+
+    delayer.run
+
+    assert_equal([1, 2, 0, 3], a)
+  end
+
+  def test_plural_timer
+    delayer = Delayer.generate_class expire: 0.01
+    a = []
+    delayer.new(delay: 0.01) { a << 0 }
+    delayer.new(delay: 0.11) { a << 1 }
+    delayer.new { a << 2 }
+
+    delayer.run
+
+    delayer.new { a << 3 }
+    sleep 0.1
+
+    delayer.run
+    sleep 0.1
+
+    delayer.new { a << 4 }
+
+    delayer.run
+
+    assert_equal([2, 3, 0, 4, 1], a)
+  end
+
+  def test_many_timer
+    delayer = Delayer.generate_class expire: 0.01
+    a = []
+    (0..10).to_a.shuffle.each do |i|
+      delayer.new(delay: i / 100.0) { a << i }
+    end
+
+    sleep 0.1
+
+    delayer.run
+
+    assert_equal((0..10).to_a, a)
+  end
+
+  def test_cancel_timer
+    delayer = Delayer.generate_class
+    a = 0
+    delayer.new(delay: 0.01) { a += 1 }
+    d = delayer.new(delay: 0.01) { a += 2 }
+    delayer.new(delay: 0.01) { a += 4 }
+
+    assert_equal(0, a)
+    d.cancel
+    sleep 0.1
+    delayer.run
+    assert_equal(5, a)
+  end
+
+  def test_cancel_timer_after_expire
+    delayer = Delayer.generate_class
+    a = 0
+    delayer.new(delay: 0.01) { a += 1 }
+    d = delayer.new(delay: 0.01) { a += 2 }
+    delayer.new{ d.cancel }
+    delayer.new(delay: 0.01) { a += 4 }
+
+    assert_equal(0, a)
+    sleep 0.1
+    delayer.run
+    assert_equal(5, a)
+  end
+
+  def test_reserve_new_timer_after_cancel
+    delayer = Delayer.generate_class
+    a = 0
+    delayer.new(delay: 0.01) { a += 1 }
+    d = delayer.new(delay: 0.02) { a += 2 }
+    d.cancel
+    delayer.new(delay: 0.03) { a += 4 }
+
+    assert_equal(0, a)
+    sleep 0.1
+    delayer.run
+    assert_equal(5, a)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayer
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Toshiaki Asai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-12 00:00:00.000000000 Z
+date: 2020-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,7 +65,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
@@ -73,6 +72,7 @@ files:
 - Rakefile
 - delayer.gemspec
 - lib/delayer.rb
+- lib/delayer/delayed_procedure.rb
 - lib/delayer/error.rb
 - lib/delayer/extend.rb
 - lib/delayer/procedure.rb
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Delay the processing

data/.circleci/config.yml

@@ -1,40 +0,0 @@
-version: '2.1'
-
-executors:
-  ruby:
-    parameters:
-      tag:
-        type: string
-    docker:
-      - image: circleci/ruby:<< parameters.tag >>
-
-jobs:
-  build:
-    parameters:
-       ruby-version:
-         type: string
-    executor:
-      name: ruby
-      tag: << parameters.ruby-version >>
-    steps:
-    - checkout
-    - run:
-        name: Which bundler?
-        command: bundle -v
-    - run:
-        command: bundle install --path vendor/bundle
-    - run:
-        name: test
-        command: bundle exec rake test
-workflows:
-  build:
-    jobs:
-      - build:
-          name: 'ruby-2.5'
-          ruby-version: '2.5.7'
-      - build:
-          name: 'ruby-2.6'
-          ruby-version: '2.6.5'
-      - build:
-          name: 'ruby-2.7'
-          ruby-version: '2.7.0'