removed experimental status from Mojo::IOLoop::Delay and removed defe…

…r method from Mojo::IOLoop
mojolicious · Jan 12, 2012 · e1ff24c · e1ff24c
1 parent 8858c83
commit e1ff24c
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 22 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,8 @@
 This file documents the revision history for Perl extension Mojolicious.
 
 2.44    2012-01-12 00:00:00
+        - Removed experimental status from Mojo::IOLoop::Delay.
+        - Removed defer method from Mojo::IOLoop.
         - Improved syntax highlighting in perldoc browser slightly.
         - Improved Mojo::Base tests.
         - Improved documentation.

diff --git a/lib/Mojo/IOLoop.pm b/lib/Mojo/IOLoop.pm
@@ -138,8 +138,6 @@ EOF
 # DEPRECATED in Leaf Fluttering In Wind!
 *connection_timeout = \&timeout;
 
-sub defer { shift->timer(0 => @_) }
-
 sub delay {
   my ($self, $cb) = @_;
   $self = $self->singleton unless ref $self;
@@ -622,22 +620,14 @@ might change without warning!
     ...
   });
 
-=head2 C<defer>
-
-  Mojo::IOLoop->defer(sub {...});
-  $loop->defer(sub {...});
-
-Invoke callback on next reactor tick. Note that this method is EXPERIMENTAL
-and might change without warning!
-
 =head2 C<delay>
 
   my $delay = Mojo::IOLoop->delay;
   my $delay = $loop->delay;
   my $delay = $loop->delay(sub {...});
 
-Get L<Mojo::IOLoop::Delay> object to synchronize events. Note that this
-method is EXPERIMENTAL and might change without warning!
+Get L<Mojo::IOLoop::Delay> object to synchronize events and subscribe to
+C<finish> event if optional callback is provided.
 
   # Synchronize multiple events
   my $delay = Mojo::IOLoop->delay(sub { say 'BOOM!' });

diff --git a/lib/Mojo/IOLoop/Delay.pm b/lib/Mojo/IOLoop/Delay.pm
@@ -54,8 +54,7 @@ Mojo::IOLoop::Delay - Synchronize events
 
 =head1 DESCRIPTION
 
-L<Mojo::IOLoop::Delay> synchronizes events for L<Mojo::IOLoop>. Note that
-this module is EXPERIMENTAL and might change without warning!
+L<Mojo::IOLoop::Delay> synchronizes events for L<Mojo::IOLoop>.
 
 =head1 EVENTS
 

diff --git a/t/mojo/delay.t b/t/mojo/delay.t
@@ -19,7 +19,7 @@ my $delay = Mojo::IOLoop::Delay->new;
 my @results;
 for my $i (0, 0) {
   $delay->begin;
-  Mojo::IOLoop->defer(sub { push @results, $i; $delay->end });
+  Mojo::IOLoop->timer(0 => sub { push @results, $i; $delay->end });
 }
 $delay->wait;
 is_deeply \@results, [0, 0], 'right results';
@@ -30,7 +30,7 @@ my $finished;
 $delay->on(finish => sub { shift; $finished = [@_, 'works!'] });
 for my $i (0, 0) {
   $delay->begin;
-  Mojo::IOLoop->defer(sub { $delay->end($i) });
+  Mojo::IOLoop->timer(0 => sub { $delay->end($i) });
 }
 @results = $delay->wait;
 is_deeply $finished, [0, 0, 'works!'], 'right results';
@@ -40,7 +40,7 @@ is_deeply \@results, [0, 0], 'right results';
 $delay = Mojo::IOLoop::Delay->new;
 for my $i (3, 3) {
   $delay->begin;
-  Mojo::IOLoop->defer(sub { $delay->end($i) });
+  Mojo::IOLoop->timer(0 => sub { $delay->end($i) });
 }
 is $delay->wait, 3, 'right results';
 
@@ -49,7 +49,7 @@ $finished = undef;
 $delay = Mojo::IOLoop->delay(sub { shift; $finished = [@_, 'too!'] });
 for my $i (1, 1) {
   my $cb = $delay->begin;
-  Mojo::IOLoop->defer(sub { $delay->$cb($i) });
+  Mojo::IOLoop->timer(0 => sub { $delay->$cb($i) });
 }
 @results = $delay->wait;
 is_deeply $finished, [1, 1, 'too!'], 'right results';

diff --git a/t/mojo/ioloop.t b/t/mojo/ioloop.t
@@ -34,8 +34,8 @@ is ref $loop->iowatcher, 'MyWatcher', 'right class';
 
 # Double start
 my $err;
-Mojo::IOLoop->defer(
-  sub {
+Mojo::IOLoop->timer(
+  0 => sub {
     eval { Mojo::IOLoop->start };
     $err = $@;
     Mojo::IOLoop->stop;

diff --git a/t/mojolicious/lite_app.t b/t/mojolicious/lite_app.t
@@ -461,8 +461,8 @@ get '/redirect_no_render' => sub {
 # GET /redirect_callback
 get '/redirect_callback' => sub {
   my $self = shift;
-  Mojo::IOLoop->defer(
-    sub {
+  Mojo::IOLoop->timer(
+    0 => sub {
       $self->res->code(301);
       $self->res->body('Whatever!');
       $self->redirect_to('http://127.0.0.1/foo');