ione 1.1.3.pre0 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 683f88dbcc94dbca64fc620cbad845bfb7eb359e
-  data.tar.gz: eda5367f48dda6be7a53664dc219b39e71797634
+  metadata.gz: 7d699b8de5df4bf4aa1f1033562686f1ee419bca
+  data.tar.gz: 550b2de454ca6a4971690b75d7cd6a8c6e0f460d
 SHA512:
-  metadata.gz: bdadd53947a7b24140b2d2a2dba5615a4251576af3114e6da458ec9c4d47b0be578d93d1f13f2bff774d49fbb85668430312d4fd4c0e4a211969b82ca24c38c9
-  data.tar.gz: d4d1dd59ae9d4300483c0b9e65084d905f80911d126ba1984f89537e4f53e2bfc7468c6bd7c45dc7fb4ef9c564046e654103e09367ce9349a5156835361deb19
+  metadata.gz: 007316cffbaeb575aad0ee56c17dec8ac5caf817df6b875e8747eacae4063d2d4c67424271ab0c4916a6d23badd4e338fe8bd12574189510a79f2214d07c186c
+  data.tar.gz: a11900b252d0c3ee6a5d24aeff26a6206dd0d04604b49740192549fb6b5bfde5ce79bd76ea8297be5b0c0a34e45c60ce9b03d03260e8d526707fef90735cca2a

data/lib/ione/io/io_reactor.rb

@@ -195,6 +195,15 @@ module Ione
         @io_loop.schedule_timer(timeout)
       end
 
+      # Cancels a previously scheduled timer.
+      #
+      # The timer will fail with a {Ione::CancelledError}.
+      #
+      # @param timer_future [Ione::Future] the future returned by {#schedule_timer}
+      def cancel_timer(timer_future)
+        @io_loop.cancel_timer(timer_future)
+      end
+
       def to_s
         @io_loop.to_s
       end
@@ -283,6 +292,16 @@ module Ione
         @lock.unlock
       end
 
+      def cancel_timer(timer_future)
+        @lock.lock
+        timer_pair = @timers.find { |pair| (p = pair[1]) && p.future == timer_future }
+        @timers = @timers.reject { |pair| pair[1].nil? || pair == timer_pair }
+        timer_pair && timer_pair[1].fail(CancelledError.new)
+        nil
+      ensure
+        @lock.unlock
+      end
+
       def close_sockets
         @sockets.each do |s|
           begin

data/lib/ione/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Ione
-  VERSION = '1.1.3.pre0'.freeze
+  VERSION = '1.1.3'.freeze
 end

data/spec/ione/io/io_reactor_spec.rb

@@ -223,6 +223,59 @@ module Ione
         end
       end
 
+      describe '#cancel_timer' do
+        before do
+          reactor.start.value
+        end
+
+        after do
+          reactor.stop.value
+        end
+
+        it 'fails the timer future' do
+          clock.stub(:now).and_return(1)
+          f = reactor.schedule_timer(0.1)
+          reactor.cancel_timer(f)
+          await { f.failed? }
+        end
+
+        it 'does not trigger the timer future when it expires' do
+          clock.stub(:now).and_return(1)
+          f = reactor.schedule_timer(0.1)
+          reactor.cancel_timer(f)
+          clock.stub(:now).and_return(1.1)
+          await { f.failed? }
+        end
+
+        it 'fails the future with a CancelledError' do
+          clock.stub(:now).and_return(1)
+          f = reactor.schedule_timer(0.1)
+          reactor.cancel_timer(f)
+          await { f.failed? }
+          expect { f.value }.to raise_error(CancelledError)
+        end
+
+        it 'does nothing when the timer has already expired' do
+          clock.stub(:now).and_return(1)
+          f = reactor.schedule_timer(0.1)
+          clock.stub(:now).and_return(1.1)
+          await { f.resolved? }
+          reactor.cancel_timer(f)
+        end
+
+        it 'does nothing when given a future that is not a timer' do
+          reactor.cancel_timer(Ione::Promise.new.future)
+        end
+
+        it 'does nothing when given something that is not a future' do
+          reactor.cancel_timer(:foobar)
+        end
+
+        it 'does nothing when given nil' do
+          reactor.cancel_timer(nil)
+        end
+      end
+
       describe '#to_s' do
         context 'returns a string that' do
           it 'includes the class name' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ione
 version: !ruby/object:Gem::Version
-  version: 1.1.3.pre0
+  version: 1.1.3
 platform: ruby
 authors:
 - Theo Hultberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-06-21 00:00:00.000000000 Z
 dependencies: []
 description: Reactive programming framework for Ruby, painless evented IO, futures
   and an efficient byte buffer
@@ -56,9 +56,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.1