redesigned Mojo::IOWatcher api

mojolicious · Feb 4, 2012 · e292cc7 · e292cc7
1 parent 5dd09f8
commit e292cc7
Show file tree

Hide file tree

Showing 17 changed files with 124 additions and 213 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,6 @@
 This file documents the revision history for Perl extension Mojolicious.
 
-2.47    2012-02-04 00:00:00
+2.47    2012-02-05 00:00:00
         - Deprecated Mojo::Server::Daemon->prepare_ioloop in favor of
           Mojo::Server::Daemon->start.
         - Deprecated Mojo::Headers->x_forwarded_for.
@@ -11,6 +11,10 @@ This file documents the revision history for Perl extension Mojolicious.
         - Added lock_timeout parameter to Hypnotoad.
         - Removed experimental status from JSON Pointer support.
         - Removed Cygwin exception from Hypnotoad.
+        - Replaced drop_handle and drop_timer methods in Mojo::IOWatcher with
+          drop method.
+        - Renamed change and watch methods in Mojo::IOWatcher to watch and
+          io.
         - Renamed resume and pause methods in Mojo::IOLoop::Server to start
           and stop.
         - Renamed resume and pause methods in Mojo::IOLoop::Stream to start

diff --git a/lib/Mojo/Content.pm b/lib/Mojo/Content.pm
@@ -121,14 +121,6 @@ sub header_size { length shift->build_headers }
 
 sub is_chunked { (shift->headers->transfer_encoding || '') =~ /chunked/i }
 
-# DEPRECATED in Leaf Fluttering In Wind!
-sub is_done {
-  warn <<EOF;
-Mojo::Content->is_done is DEPRECATED in favor of Mojo::Content->is_finished!
-EOF
-  shift->is_finished;
-}
-
 sub is_dynamic {
   my $self = shift;
   return $self->{dynamic} && !defined $self->headers->content_length;

diff --git a/lib/Mojo/DOM.pm b/lib/Mojo/DOM.pm
@@ -33,17 +33,7 @@ sub DESTROY { }
 sub new {
   my $class = shift;
   my $self = bless [Mojo::DOM::HTML->new], ref $class || $class;
-
-  # DEPRECATED in Leaf Fluttering In Wind!
-  my $input;
-  $input = shift if @_ % 2;
-  warn "Mojo::DOM->new with arguments is DEPRECATED!\n" if @_;
-  my %attrs = (@_);
-  exists($attrs{$_}) and $self->$_($attrs{$_}) for qw/tree charset xml/;
-
-  # Parse right away
-  $self->parse($input) if defined $input;
-
+  $self->parse(@_) if @_;
   return $self;
 }
 

diff --git a/lib/Mojo/Headers.pm b/lib/Mojo/Headers.pm
@@ -88,14 +88,6 @@ sub header {
   return @$headers;
 }
 
-# DEPRECATED in Leaf Fluttering In Wind!
-sub is_done {
-  warn <<EOF;
-Mojo::Headers->is_done is DEPRECATED in favor of Mojo::Headers->is_finished!
-EOF
-  shift->is_finished;
-}
-
 sub is_finished { (shift->{state} || '') eq 'finished' }
 
 sub is_limit_exceeded { shift->{limit} }

diff --git a/lib/Mojo/IOLoop.pm b/lib/Mojo/IOLoop.pm
@@ -389,7 +389,7 @@ sub _drop {
 
   # Timer
   return unless my $watcher = $self->iowatcher;
-  return if $watcher->drop_timer($id);
+  return if $watcher->drop($id);
 
   # Listen socket
   if (delete $self->{servers}->{$id}) { delete $self->{listening} }

diff --git a/lib/Mojo/IOLoop/Client.pm b/lib/Mojo/IOLoop/Client.pm
@@ -42,8 +42,8 @@ sub connect {
 sub _cleanup {
   my $self = shift;
   return unless my $watcher = $self->{iowatcher};
-  $watcher->drop_timer($self->{timer})   if $self->{timer};
-  $watcher->drop_handle($self->{handle}) if $self->{handle};
+  $watcher->drop($self->{timer})  if $self->{timer};
+  $watcher->drop($self->{handle}) if $self->{handle};
 }
 
 sub _connect {
@@ -108,11 +108,7 @@ sub _connect {
 
   # Start writing right away
   $self->{handle} = $handle;
-  $watcher->watch(
-    $handle,
-    sub { $self->_connecting },
-    sub { $self->_connecting }
-  );
+  $watcher->io($handle => sub { $self->_connecting });
 }
 
 # "Have you ever seen that Blue Man Group? Total ripoff of the Smurfs.
@@ -125,8 +121,8 @@ sub _connecting {
   my $watcher = $self->iowatcher;
   if ($self->{tls} && !$handle->connect_SSL) {
     my $err = $IO::Socket::SSL::SSL_ERROR;
-    if    ($err == TLS_READ)  { $watcher->change($handle, 1, 0) }
-    elsif ($err == TLS_WRITE) { $watcher->change($handle, 1, 1) }
+    if    ($err == TLS_READ)  { $watcher->watch($handle, 1, 0) }
+    elsif ($err == TLS_WRITE) { $watcher->watch($handle, 1, 1) }
     return;
   }
 

diff --git a/lib/Mojo/IOLoop/Server.pm b/lib/Mojo/IOLoop/Server.pm
@@ -82,7 +82,7 @@ sub DESTROY {
   if (my $key  = $self->{key})  { unlink $key  if -w $key }
   return unless my $watcher = $self->{iowatcher};
   $self->stop if $self->{handle};
-  $watcher->drop_handle($_) for values %{$self->{handles}};
+  $watcher->drop($_) for values %{$self->{handles}};
 }
 
 # "And I gave that man directions, even though I didn't know the way,
@@ -168,13 +168,13 @@ sub generate_port {
 sub start {
   my $self = shift;
   weaken $self;
-  $self->iowatcher->watch($self->{handle},
-    sub { $self->_accept for 1 .. $self->accepts });
+  $self->iowatcher->io(
+    $self->{handle} => sub { $self->_accept for 1 .. $self->accepts });
 }
 
 sub stop {
   my $self = shift;
-  $self->iowatcher->drop_handle($self->{handle});
+  $self->iowatcher->drop($self->{handle});
 }
 
 sub _accept {
@@ -192,15 +192,11 @@ sub _accept {
   weaken $self;
   $tls->{SSL_error_trap} = sub {
     return unless my $handle = delete $self->{handles}->{shift()};
-    $self->iowatcher->drop_handle($handle);
+    $self->iowatcher->drop($handle);
     close $handle;
   };
   $handle = IO::Socket::SSL->start_SSL($handle, %$tls);
-  $self->iowatcher->watch(
-    $handle,
-    sub { $self->_tls($handle) },
-    sub { $self->_tls($handle) }
-  );
+  $self->iowatcher->io($handle => sub { $self->_tls($handle) });
   $self->{handles}->{$handle} = $handle;
 }
 
@@ -245,15 +241,15 @@ sub _tls {
 
   # Accepted
   if ($handle->accept_SSL) {
-    $self->iowatcher->drop_handle($handle);
+    $self->iowatcher->drop($handle);
     delete $self->{handles}->{$handle};
     return $self->emit_safe(accept => $handle);
   }
 
   # Switch between reading and writing
   my $err = $IO::Socket::SSL::SSL_ERROR;
-  if    ($err == TLS_READ)  { $self->iowatcher->change($handle, 1, 0) }
-  elsif ($err == TLS_WRITE) { $self->iowatcher->change($handle, 1, 1) }
+  if    ($err == TLS_READ)  { $self->iowatcher->watch($handle, 1, 0) }
+  elsif ($err == TLS_WRITE) { $self->iowatcher->watch($handle, 1, 1) }
 }
 
 1;

diff --git a/lib/Mojo/IOLoop/Stream.pm b/lib/Mojo/IOLoop/Stream.pm
@@ -26,9 +26,9 @@ sub close {
 
   # Cleanup
   return unless my $watcher = $self->{iowatcher};
-  $watcher->drop_timer(delete $self->{timer}) if $self->{timer};
+  $watcher->drop(delete $self->{timer}) if $self->{timer};
   return unless my $handle = delete $self->{handle};
-  $watcher->drop_handle($handle);
+  $watcher->drop($handle);
 
   # Close
   close $handle;
@@ -62,28 +62,26 @@ sub start {
   );
 
   # Start streaming
-  return $watcher->watch(
-    $self->{handle},
-    sub { $self->_read },
-    sub { $self->_write }
-  ) unless $self->{streaming}++;
+  my $handle = $self->{handle};
+  return $watcher->io($handle => sub { pop() ? $self->_write : $self->_read })
+    unless $self->{streaming}++;
 
   # Resume streaming
   return unless delete $self->{paused};
-  $self->iowatcher->change($self->{handle}, 1, $self->is_writing);
+  $watcher->watch($handle, 1, $self->is_writing);
 }
 
 sub stop {
   my $self = shift;
   return if $self->{paused}++;
-  $self->iowatcher->change($self->{handle}, 0, $self->is_writing);
+  $self->iowatcher->watch($self->{handle}, 0, $self->is_writing);
 }
 
 # "No children have ever meddled with the Republican Party and lived to tell
 #  about it."
 sub steal_handle {
   my $self = shift;
-  $self->iowatcher->drop_handle($self->{handle});
+  $self->iowatcher->drop($self->{handle});
   return delete $self->{handle};
 }
 
@@ -98,7 +96,7 @@ sub write {
   else     { return unless length $self->{buffer} }
 
   # Start writing
-  $self->iowatcher->change($self->{handle}, !$self->{paused}, 1)
+  $self->iowatcher->watch($self->{handle}, !$self->{paused}, 1)
     if $self->{handle};
 }
 
@@ -162,7 +160,7 @@ sub _write {
 
   # Stop writing
   return if $self->is_writing;
-  $self->iowatcher->change($handle, !$self->{paused}, 0);
+  $self->iowatcher->watch($handle, !$self->{paused}, 0);
 }
 
 1;