timers 4.2.1 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 327fbcdf5ce2ea7d16dc2d5605046c64bdaccc917d4cab8bd5765d0817883f7d
-  data.tar.gz: dcf2c56295c5ee1d2c5160c9a45189ae98efa54bcdced8dc69c86b211769db89
+  metadata.gz: ccf7aa14dc18086e3a47fb44eb3a12569ba6752e6f7d22aecf7486684a594331
+  data.tar.gz: 0c37cdab96fc3ae8a1fbd0deb07b69800260b32118c7d1b37d2a4114258c32e8
 SHA512:
-  metadata.gz: b067c4a96490380d699e47d3712e74a6c723921c0931f9a877a9c4ab924e50187e61427bf39e88f887d487efeac6fa5fe493712852e0306531241a9130020840
-  data.tar.gz: efdcc4c8b6e6079327977b7bfdca001e30835e87bac0fb2597a5612a62e4c493cc09574c9be9eaf5220275f7569235e177ede23e2d3e40da4dddc481dc456cf8
+  metadata.gz: dcb1826464d594d78d0a67bf18f89bb3137ffdbdcb36306176bbaa961aab387b93442c4827f5a8e331b90de056dbc9f9f63dbdeb22671dcdd35203741f415967
+  data.tar.gz: 43dcaccab4fab882ca498ec196f08d47beb2636044b62103640406e5a0411d1eb6d837363eae50266c11642a59880179eca6a9f4053aefab1b4daf11a28319bd

data/lib/timers/events.rb

@@ -32,10 +32,14 @@ module Timers
 				@callback.nil?
 			end
 
-			def >(other)
+			def > other
 				@time > other.to_f
 			end
 
+			def >= other
+				@time >= other.to_f
+			end
+
 			def to_f
 				@time
 			end
@@ -50,27 +54,22 @@ module Timers
 			# A sequence of handles, maintained in sorted order, future to present.
 			# @sequence.last is the next event to be fired.
 			@sequence = []
+			@queue = []
 		end
 
 		# Add an event at the given time.
 		def schedule(time, callback)
 			handle = Handle.new(time.to_f, callback)
-
-			index = bisect_left(@sequence, handle)
-
-			if current_handle = @sequence[index] and current_handle.cancelled?
-				# puts "Replacing handle at index: #{index} due to cancellation in array containing #{@sequence.size} item(s)."
-				@sequence[index] = handle
-			else
-				# puts "Inserting handle at index: #{index} in array containing #{@sequence.size} item(s)."
-				@sequence.insert(index, handle)
-			end
-
-			handle
+			
+			@queue << handle
+			
+			return handle
 		end
 
 		# Returns the first non-cancelled handle.
 		def first
+			merge!
+			
 			while (handle = @sequence.last)
 				return handle unless handle.cancelled?
 				@sequence.pop
@@ -79,33 +78,44 @@ module Timers
 
 		# Returns the number of pending (possibly cancelled) events.
 		def size
-			@sequence.size
+			@sequence.size + @queue.size
 		end
 
 		# Fire all handles for which Handle#time is less than the given time.
 		def fire(time)
-			pop(time).reverse_each do |handle|
+			merge!
+			
+			while handle = @sequence.last and handle.time <= time
+				@sequence.pop
 				handle.fire(time)
 			end
 		end
 
 		private
 
-		# Efficiently take k handles for which Handle#time is less than the given
-		# time.
-		def pop(time)
-			index = bisect_left(@sequence, time)
-
-			@sequence.pop(@sequence.size - index)
+		def merge!
+			while handle = @queue.pop
+				next if handle.cancelled?
+				
+				index = bisect_right(@sequence, handle)
+				
+				if current_handle = @sequence[index] and current_handle.cancelled?
+					# puts "Replacing handle at index: #{index} due to cancellation in array containing #{@sequence.size} item(s)."
+					@sequence[index] = handle
+				else
+					# puts "Inserting handle at index: #{index} in array containing #{@sequence.size} item(s)."
+					@sequence.insert(index, handle)
+				end
+			end
 		end
 
-		# Return the left-most index where to insert item e, in a list a, assuming
+		# Return the right-most index where to insert item e, in a list a, assuming
 		# a is sorted in descending order.
-		def bisect_left(a, e, l = 0, u = a.length)
+		def bisect_right(a, e, l = 0, u = a.length)
 			while l < u
 				m = l + (u - l).div(2)
 
-				if a[m] > e
+				if a[m] >= e
 					l = m + 1
 				else
 					u = m

data/lib/timers/group.rb

@@ -81,7 +81,7 @@ module Timers
 					sleep interval
 				end
 			end
-
+			
 			fire
 		end
 

data/lib/timers/timer.rb

@@ -101,7 +101,7 @@ module Timers
 				@offset = offset
 			end
 
-			@block.call(offset)
+			@block.call(offset, self)
 
 			cancel unless recurring
 		end

data/lib/timers/version.rb

@@ -6,5 +6,5 @@
 #
 
 module Timers
-	VERSION = "4.2.1"
+	VERSION = "4.3.0"
 end

data/spec/spec_helper.rb

@@ -25,8 +25,10 @@ if ENV['COVERAGE'] || ENV['TRAVIS']
 	end
 end
 
-require "bundler/setup"
-require "timers"
+require 'bundler/setup'
+Bundler.require(:test)
+
+require 'timers'
 
 RSpec.configure do |config|
 	# Enable flags like --only-failures and --next-failure

data/spec/timers/performance_spec.rb

@@ -6,7 +6,6 @@
 #
 
 require "spec_helper"
-require "ruby-prof" unless RUBY_PLATFORM =~ /java|rbx/
 
 # Event based timers:
 

data/spec/timers/strict_spec.rb

@@ -24,18 +24,16 @@ RSpec.describe Timers::Group do
 		expect(fired - start_offset).to be_within(quantum).of(iterations * quantum)
 	end
 
-	it "should only fire once" do
-		fired = :not_fired_yet
+	it "should only fire 0-interval timer once per iteration" do
 		count = 0
-
+		
 		start_offset = subject.current_offset
-		Timers::Timer.new(subject, 0, :strict, start_offset) do |offset|
-			fired = offset
+		Timers::Timer.new(subject, 0, :strict, start_offset) do |offset, timer|
 			count += 1
 		end
-
+		
 		subject.wait
-
+		
 		expect(count).to be == 1
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timers
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.3.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-20 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler