timers 1.0.0.pre → 1.0.0.pre2

data/lib/timers.rb

@@ -3,9 +3,9 @@ require 'timers/version'
 
 # Low precision timers implemented in pure Ruby
 class Timers
-  extend  Forwardable
   include Enumerable
-  def_delegators :@timers, :add, :delete, :each, :empty?
+  extend  Forwardable
+  def_delegators :@timers, :delete, :each, :empty?
 
   def initialize
     @timers = SortedSet.new
@@ -34,18 +34,22 @@ class Timers
   end
 
   # Fire all timers that are ready
-  def fire
+  def fire(now = Time.now)
     return if @timers.empty?
 
-    time = Time.now + 0.001
+    time = now + 0.001
     while not empty? and time >= @timers.first.time
       timer = @timers.first
       @timers.delete timer
-      timer.call
+      timer.fire(now)
     end
   end
 
-  alias_method :insert, :add
+  def add(timer)
+    raise TypeError, "not a Timers::Timer" unless timer.is_a? Timers::Timer
+    @timers.add(timer)
+  end
+
   alias_method :cancel, :delete
 
   # An individual timer set to fire a given proc at a given time
@@ -56,6 +60,7 @@ class Timers
     def initialize(timers, interval, recurring = false, &block)
       @timers, @interval, @recurring = timers, interval, recurring
       @block = block
+      @time  = nil
 
       reset
     end
@@ -70,15 +75,15 @@ class Timers
     end
 
     # Reset this timer
-    def reset
-      @timers.cancel self if defined?(@time)
-      @time = Time.now + @interval
-      @timers.insert self
+    def reset(now = Time.now)
+      @timers.cancel self if @time
+      @time = now + @interval
+      @timers.add self
     end
 
     # Fire the block
-    def fire
-      reset if recurring
+    def fire(now = Time.now)
+      reset(now) if recurring
       @block.call
     end
     alias_method :call, :fire

data/lib/timers/version.rb

@@ -1,3 +1,3 @@
 class Timers
-  VERSION = "1.0.0.pre"
+  VERSION = "1.0.0.pre2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timers
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre
+  version: 1.0.0.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70102019350080 !ruby/object:Gem::Requirement
+  requirement: &70365568382460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70102019350080
+  version_requirements: *70365568382460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70102019349180 !ruby/object:Gem::Requirement
+  requirement: &70365568381660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70102019349180
+  version_requirements: *70365568381660
 description: Pure Ruby one-shot and periodic timers
 email:
 - tony.arcieri@gmail.com