delayer 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40812fa4ace5f5b6bf079c393927bc028e466720edbd9b7e5bbd09b224fe9fb5
-  data.tar.gz: a07eca82e3a3bdb77ca4fbd6dc957d871ee9da591436ebedf14a88c46cfaf924
+  metadata.gz: 8e740459b8f4d9abb415778feffba4e4a80c506df2ccd393e443cd5aecf28d1d
+  data.tar.gz: 0fd9a1f1c7d3dad89a77712df97bf069d524ba7db66fc2e1158e8c6846643eee
 SHA512:
-  metadata.gz: de7563e47139c0d59ab569114fc6f03234bab94fbdc8af27ba6dc3d0bea3aa87e04f64aebb5d97ac0f0019c3dab2499e772a43934ce2c1faa168da454cf10692
-  data.tar.gz: 370139c813d0f04d00ef1c5a5c69b034a033bdb7a70999a5c1d38c0c536064d037312025a0dd5bd88c843325c3819a95a3ca1c97ca685e4ee08f90123568c701
+  metadata.gz: efd0f011041ddc6124f86ff2cd18466e8fe52e317ed7dbe3b54210d613115db513a5d57e5566d619c836c63fc96a478567c60838750b44e2845bf3c085abb7cc
+  data.tar.gz: 1adbcf303d86d6179d4a554a6d4c09c1f5dc9006d56bcce890028c4498498268aa6a1396d2576255972f3f4f329dae8234770256098b7a8406dbde9b3a2cf9f5

data/lib/delayer/error.rb

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 module Delayer
   class Error < ::StandardError; end

data/lib/delayer/extend.rb

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 module Delayer
   attr_reader :priority
@@ -19,10 +19,10 @@ module Delayer
     end
   end
 
-  def initialize(priority = self.class.instance_eval{ @default_priority }, *args)
+  def initialize(priority = self.class.instance_eval { @default_priority }, *_args, &proc)
     self.class.validate_priority priority
     @priority = priority
-    @procedure = Procedure.new(self, &Proc.new)
+    @procedure = Procedure.new(self, &proc)
   end
 
   # Cancel this job
@@ -57,16 +57,16 @@ module Delayer
     # ==== Return
     # self
     def run(current_expire = @expire)
-      if 0 == current_expire
-        run_once while not empty?
+      if current_expire == 0
+        run_once until empty?
       else
         @end_time = Time.new.to_f + @expire
-        run_once while not(empty?) and @end_time >= Time.new.to_f
+        run_once while !empty? && (@end_time >= Time.new.to_f)
         @end_time = nil
       end
       if @remain_hook
         @remain_received = !empty?
-        @remain_hook.call if @remain_received  
+        @remain_hook.call if @remain_received
       end
     rescue Exception => e
       @exception = e
@@ -74,7 +74,7 @@ module Delayer
     end
 
     def expire?
-      if defined?(@end_time) and @end_time
+      if defined?(@end_time) && @end_time
         @end_time < Time.new.to_f
       else
         false
@@ -88,7 +88,7 @@ module Delayer
       if @bucket.first
         @busy = true
         procedure = forward
-        procedure = forward while @bucket.first and procedure.canceled?
+        procedure = forward while @bucket.first && procedure.canceled?
         procedure.run unless procedure.canceled?
       end
     ensure
@@ -97,7 +97,7 @@ module Delayer
 
     # Return if some jobs processing now.
     # ==== Args
-    # [args] 
+    # [args]
     # ==== Return
     # true if Delayer processing job
     def busy?
@@ -137,10 +137,8 @@ module Delayer
           procedure.next = @bucket.first
           @bucket.priority_of[priority] = @bucket.first = procedure
         end
-        if @bucket.last
-          @bucket.last = @bucket.priority_of[priority]
-        end
-        if @remain_hook and not @remain_received
+        @bucket.last = @bucket.priority_of[priority] if @bucket.last
+        if @remain_hook && !@remain_received
           @remain_received = true
           @remain_hook.call
         end
@@ -148,8 +146,8 @@ module Delayer
       self
     end
 
-    def register_remain_hook
-      @remain_hook = Proc.new
+    def register_remain_hook(&proc)
+      @remain_hook = proc
     end
 
     def get_prev_point(priority)
@@ -157,7 +155,7 @@ module Delayer
         @bucket.priority_of[priority]
       else
         next_index = @priorities.index(priority) - 1
-        get_prev_point @priorities[next_index] if 0 <= next_index
+        get_prev_point @priorities[next_index] if next_index >= 0
       end
     end
 
@@ -180,8 +178,9 @@ module Delayer
     # [Delayer::NoLowerLevelError] stash_enter!が呼ばれていない時
     # [Delayer::RemainJobsError] ジョブが残っているのにこのメソッドを呼んだ時
     def stash_exit!
-      raise Delayer::NoLowerLevelError, 'stash_exit! called in level 0.' if !@bucket.stashed
-      raise Delayer::RemainJobsError, 'Current level has remain jobs. It must be empty current level jobs in call this method.' if !self.empty?
+      raise Delayer::NoLowerLevelError, 'stash_exit! called in level 0.' unless @bucket.stashed
+      raise Delayer::RemainJobsError, 'Current level has remain jobs. It must be empty current level jobs in call this method.' unless empty?
+
       @bucket = @bucket.stashed
     end
 

data/lib/delayer/procedure.rb

@@ -1,11 +1,12 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 module Delayer
   class Procedure
     attr_reader :state, :delayer
     attr_accessor :next
     def initialize(delayer, &proc)
-      @delayer, @proc = delayer, proc
+      @delayer = delayer
+      @proc = proc
       @state = :stop
       @next = nil
       @delayer.class.register(self)
@@ -17,9 +18,10 @@ module Delayer
     # ==== Return
     # node
     def run
-      unless :stop == @state
-        raise Delayer::StateError(@state), "call twice Delayer::Procedure"
+      unless @state == :stop
+        raise Delayer::StateError(@state), 'call twice Delayer::Procedure'
       end
+
       @state = :run
       @proc.call
       @state = :done
@@ -32,9 +34,10 @@ module Delayer
     # ==== Return
     # self
     def cancel
-      unless :stop == @state
-        raise Delayer::StateError(@state), "cannot cancel Delayer::Procedure"
+      unless @state == :stop
+        raise Delayer::StateError(@state), 'cannot cancel Delayer::Procedure'
       end
+
       @state = :cancel
       self
     end
@@ -43,7 +46,7 @@ module Delayer
     # ==== Return
     # true if canceled this task
     def canceled?
-      :cancel == @state
+      @state == :cancel
     end
 
     # insert node between self and self.next

data/lib/delayer/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayer
-  VERSION = "1.0.0"
+  VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Toshiaki Asai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-01 00:00:00.000000000 Z
+date: 2019-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Delay the processing