deprecated various on_* methods

mojolicious · Oct 12, 2011 · 666111f · 666111f
1 parent 1159ceb
commit 666111f
Show file tree

Hide file tree

Showing 22 changed files with 186 additions and 202 deletions.
diff --git a/lib/Mojo/Content.pm b/lib/Mojo/Content.pm
@@ -155,8 +155,13 @@ sub leftovers {
   return $self->{buffer};
 }
 
-sub on_body { shift->on(body => shift) }
-sub on_read { shift->on(read => shift) }
+# DEPRECATED in Smiling Face With Sunglasses!
+sub on_read {
+  warn <<EOF;
+Mojo::Content->on_read is DEPRECATED in favor of using Mojo::Content->on!!!
+EOF
+  shift->on(read => shift);
+}
 
 sub parse {
   my $self = shift;
@@ -585,24 +590,6 @@ Check if body parsing started yet.
 
 Remove leftover data from content parser.
 
-=head2 C<on_body>
-
-  $content->on_body(sub {...});
-
-Register C<body> event.
-Note that this method is EXPERIMENTAL and might change without warning!
-
-=head2 C<on_read>
-
-  $content->on_read(sub {...});
-
-Register C<read> event.
-
-  $content->on_read(sub {
-    my ($content, $chunk) = @_;
-    say $chunk;
-  });
-
 =head2 C<parse>
 
   $content = $content->parse("Content-Length: 12\r\n\r\nHello World!");

diff --git a/lib/Mojo/Message.pm b/lib/Mojo/Message.pm
@@ -52,7 +52,7 @@ sub body {
   # Callback
   if (ref $new eq 'CODE') {
     weaken $self;
-    return $content->on_read(sub { $self->$new(pop) });
+    return $content->on(read => sub { $self->$new(pop) });
   }
 
   # Set text content
@@ -307,8 +307,22 @@ sub leftovers { shift->content->leftovers }
 
 sub max_line_size { shift->headers->max_line_size(@_) }
 
-sub on_finish   { shift->on(finish   => shift) }
-sub on_progress { shift->on(progress => shift) }
+# DEPRECATED in Smiling Face With Sunglasses!
+sub on_finish {
+  warn <<EOF;
+Mojo::Message->on_finish is DEPRECATED in favor of using Mojo::Message->on!!!
+EOF
+  shift->on(finish => shift);
+}
+
+# DEPRECATED in Smiling Face With Sunglasses!
+sub on_progress {
+  warn <<EOF;
+Mojo::Message->on_progress is DEPRECATED in favor of using
+Mojo::Message->on!!!
+EOF
+  shift->on(progress => shift);
+}
 
 sub param {
   my $self = shift;
@@ -775,28 +789,6 @@ Remove leftover data from message parser.
 Maximum line size in bytes.
 Note that this method is EXPERIMENTAL and might change without warning!
 
-=head2 C<on_finish>
-
-  $message->on_finish(sub {...});
-
-Register C<finish> event.
-
-  $message->on_finish(sub {
-    my $self = shift;
-    say 'Finihsed!';
-  });
-
-=head2 C<on_progress>
-
-  $message->on_progress(sub {...});
-
-Register C<progress> event.
-
-  $message->on_progress(sub {
-    my $self = shift;
-    say 'Progress!';
-  });
-
 =head2 C<param>
 
   my $param  = $message->param('foo');

diff --git a/lib/Mojo/Server.pm b/lib/Mojo/Server.pm
@@ -17,7 +17,7 @@ has app_class =>
 
 sub new {
   my $self = shift->SUPER::new(@_);
-  $self->on_request(sub { shift->app->handler(shift) });
+  $self->on(request => sub { shift->app->handler(shift) });
   return $self;
 }
 
@@ -53,7 +53,13 @@ EOF
   return $app;
 }
 
-sub on_request { shift->on(request => shift) }
+# DEPRECATED in Smiling Face With Sunglasses!
+sub on_request {
+  warn <<EOF;
+Mojo::Server->on_request is DEPRECATED in favor of using Mojo::Server->on!!!
+EOF
+  shift->on(request => shift);
+}
 
 # "Are you saying you're never going to eat any animal again? What about
 #  bacon?
@@ -147,12 +153,6 @@ Note that this method is EXPERIMENTAL and might change without warning!
 
   say Mojo::Server->new->load_app('./myapp.pl')->home;
 
-=head2 C<on_request>
-
-  $server->on_request(sub {...});
-
-Register C<request> event.
-
 =head2 C<run>
 
   $server->run;

diff --git a/lib/Mojo/Server/CGI.pm b/lib/Mojo/Server/CGI.pm
@@ -110,7 +110,7 @@ Mojo::Server::CGI - CGI server
 
   my $cgi = Mojo::Server::CGI->new;
   $cgi->unsubscribe_all('request')
-  $cgi->on_request(sub {
+  $cgi->on(request => sub {
     my ($self, $tx) = @_;
 
     # Request

diff --git a/lib/Mojo/Server/Daemon.pm b/lib/Mojo/Server/Daemon.pm
@@ -108,16 +108,16 @@ sub _build_tx {
 
   # Handle
   weaken $self;
-  $tx->on_request(
-    sub {
+  $tx->on(
+    request => sub {
       my $tx = pop;
       $self->emit(request => $tx);
-      $tx->on_resume(sub { $self->_write($id) });
+      $tx->on(resume => sub { $self->_write($id) });
     }
   );
 
   # Upgrade
-  $tx->on_upgrade(sub { $self->_upgrade($id, pop) });
+  $tx->on(upgrade => sub { $self->_upgrade($id, pop) });
 
   # New request on the connection
   $c->{requests} ||= 0;
@@ -180,7 +180,7 @@ sub _finish {
 
       # Resume
       weaken $self;
-      $ws->on_resume(sub { $self->_write($id) });
+      $ws->on(resume => sub { $self->_write($id) });
     }
 
     # Failed upgrade

diff --git a/lib/Mojo/Server/PSGI.pm b/lib/Mojo/Server/PSGI.pm
@@ -90,7 +90,7 @@ Mojo::Server::PSGI - PSGI server
 
   my $psgi = Mojo::Server::PSGI->new;
   $psgi->unsubscribe_all('request');
-  $psgi->on_request(sub {
+  $psgi->on(request => sub {
     my ($self, $tx) = @_;
 
     # Request

diff --git a/lib/Mojo/Transaction.pm b/lib/Mojo/Transaction.pm
@@ -38,8 +38,23 @@ sub is_writing {
   return;
 }
 
-sub on_finish { shift->on(finish => shift) }
-sub on_resume { shift->on(resume => shift) }
+# DEPRECATED in Smiling Face With Sunglasses!
+sub on_finish {
+  warn <<EOF;
+Mojo::Transaction->on_finish is DEPRECATED in favor of using
+Mojo::Transaction->on!!!
+EOF
+  shift->on(finish => shift);
+}
+
+# DEPRECATED in Smiling Face With Sunglasses!
+sub on_resume {
+  warn <<EOF;
+Mojo::Transaction->on_resume is DEPRECATED in favor of using
+Mojo::Transaction->on!!!
+EOF
+  shift->on(resume => shift);
+}
 
 sub remote_address {
   my ($self, $address) = @_;
@@ -247,22 +262,6 @@ False.
 
 Check if transaction is writing.
 
-=head2 C<on_finish>
-
-  $tx->on_finish(sub {...});
-
-Register C<finish> event.
-
-  $tx->on_finish(sub {
-    my $self = shift;
-  });
-
-=head2 C<on_resume>
-
-  $tx->on_resume(sub {...});
-
-Register C<resume> event.
-
 =head2 C<req>
 
   my $req = $tx->req;

diff --git a/lib/Mojo/Transaction/HTTP.pm b/lib/Mojo/Transaction/HTTP.pm
@@ -173,8 +173,23 @@ sub keep_alive {
   return $self->{keep_alive};
 }
 
-sub on_request { shift->on(request => shift) }
-sub on_upgrade { shift->on(upgrade => shift) }
+# DEPRECATED in Smiling Face With Sunglasses!
+sub on_request {
+  warn <<EOF;
+Mojo::Transaction::HTTP->on_request is DEPRECATED in favor of using
+Mojo::Transaction::HTTP->on!!!
+EOF
+  shift->on(request => shift);
+}
+
+# DEPRECATED in Smiling Face With Sunglasses!
+sub on_upgrade {
+  warn <<EOF;
+Mojo::Transaction::HTTP->on_upgrade is DEPRECATED in favor of using
+Mojo::Transaction::HTTP->on!!!
+EOF
+  shift->on(upgrade => shift);
+}
 
 sub server_leftovers {
   my $self = shift;
@@ -458,18 +473,6 @@ Write client data.
 
 Connection can be kept alive.
 
-=head2 C<on_request>
-
-  $tx->on_request(sub {...});
-
-Register C<request> event.
-
-=head2 C<on_upgrade>
-
-  $tx->on_upgrade(sub {...});
-
-Register C<upgrade> event.
-
 =head2 C<server_leftovers>
 
   my $leftovers = $tx->server_leftovers;

diff --git a/lib/Mojo/Transaction/WebSocket.pm b/lib/Mojo/Transaction/WebSocket.pm
@@ -131,7 +131,14 @@ sub is_websocket {1}
 sub local_address { shift->handshake->local_address }
 sub local_port    { shift->handshake->local_port }
 
-sub on_message { shift->on(message => shift) }
+# DEPRECATED in Smiling Face With Sunglasses!
+sub on_message {
+  warn <<EOF;
+Mojo::Transaction::WebSocket->on_message is DEPRECATED in favor of using
+Mojo::Transaction::WebSocket->on!!!
+EOF
+  shift->on(message => shift);
+}
 
 sub parse_frame {
   my ($self, $buffer) = @_;
@@ -471,16 +478,6 @@ The local address of this WebSocket.
 
 The local port of this WebSocket.
 
-=head2 C<on_message>
-
-  $ws->on_message(sub {...});
-
-Register C<message> event.
-
-  $ws->on_message(sub {
-    my ($self, $message) = @_;
-  });
-
 =head2 C<parse_frame>
 
   my $frame = $ws->parse_frame(\$bytes);