slightly better method names

mojolicious · Jan 10, 2016 · ad4fecd · ad4fecd
1 parent 7ea4766
commit ad4fecd
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 32 deletions.
diff --git a/lib/Mojo/Channel/HTTP.pm b/lib/Mojo/Channel/HTTP.pm
@@ -1,7 +1,7 @@
 package Mojo::Channel::HTTP;
 use Mojo::Base 'Mojo::Channel';
 
-sub close { shift->{tx}->closed }
+sub close { shift->{tx}->delivered }
 
 sub is_server {undef}
 

diff --git a/lib/Mojo/Channel/WebSocket.pm b/lib/Mojo/Channel/WebSocket.pm
@@ -3,7 +3,7 @@ use Mojo::Base 'Mojo::Channel';
 
 use Mojo::WebSocket 'parse_frame';
 
-sub close { shift->{tx}->closed }
+sub close { shift->{tx}->delivered }
 
 sub read {
   my ($self, $chunk) = @_;

diff --git a/lib/Mojo/Server/CGI.pm b/lib/Mojo/Server/CGI.pm
@@ -38,7 +38,7 @@ sub run {
   return undef unless $tx->is_empty || _write($res, 'get_body_chunk');
 
   # Finish transaction
-  $tx->closed;
+  $tx->delivered;
 
   return $res->code;
 }

diff --git a/lib/Mojo/Server/Daemon.pm b/lib/Mojo/Server/Daemon.pm
@@ -107,7 +107,7 @@ sub _close {
   my ($self, $id) = @_;
 
   # Finish gracefully
-  if (my $tx = $self->{connections}{$id}{tx}) { $tx->closed }
+  if (my $tx = $self->{connections}{$id}{tx}) { $tx->delivered }
 
   delete $self->{connections}{$id};
 }
@@ -121,7 +121,7 @@ sub _finish {
   return $self->_remove($id) if $tx->is_websocket;
 
   # Finish transaction
-  delete($c->{tx})->closed;
+  delete($c->{tx})->delivered;
 
   # Upgrade connection to WebSocket
   if (my $ws = $tx->next) {
@@ -132,11 +132,11 @@ sub _finish {
         = Mojo::Channel::WebSocket->new(tls => $c->{tls}, tx => $ws);
       weaken $self;
       $ws->on(resume => sub { $self->_write($id) });
-      $ws->opened;
+      $ws->established;
     }
 
     # Failed upgrade
-    else { $ws->closed }
+    else { $ws->delivered }
   }
 
   # Close connection if necessary

diff --git a/lib/Mojo/Server/PSGI.pm b/lib/Mojo/Server/PSGI.pm
@@ -44,7 +44,7 @@ package Mojo::Server::PSGI::_IO;
 use Mojo::Base -base;
 
 # Finish transaction
-sub close { shift->{tx}->closed }
+sub close { shift->{tx}->delivered }
 
 sub getline {
   my $self = shift;

diff --git a/lib/Mojo/Transaction.pm b/lib/Mojo/Transaction.pm
@@ -10,14 +10,14 @@ has [
 has req => sub { Mojo::Message::Request->new };
 has res => sub { Mojo::Message::Response->new };
 
-sub closed { shift->_state(qw(finished finish)) }
-
 sub connection {
   my $self = shift;
   return $self->emit(connection => $self->{connection} = shift) if @_;
   return $self->{connection};
 }
 
+sub delivered { shift->_state(qw(finished finish)) }
+
 sub error { $_[0]->req->error || $_[0]->res->error }
 
 sub is_finished { (shift->{state} // '') eq 'finished' }
@@ -156,20 +156,20 @@ HTTP response, defaults to a L<Mojo::Message::Response> object.
 L<Mojo::Transaction> inherits all methods from L<Mojo::EventEmitter> and
 implements the following new ones.
 
-=head2 closed
-
-  $tx->closed;
-
-Low-level signal that the underlying connection is finished with this
-transaction.
-
 =head2 connection
 
   my $id = $tx->connection;
   $tx    = $tx->connection($id);
 
 Connection identifier.
 
+=head2 delivered
+
+  $tx->delivered;
+
+Low-level signal that the underlying connection is finished with this
+transaction.
+
 =head2 error
 
   my $err = $tx->error;

diff --git a/lib/Mojo/Transaction/WebSocket.pm b/lib/Mojo/Transaction/WebSocket.pm
@@ -48,13 +48,15 @@ sub build_message {
   return build_frame $self->masked, @$frame;
 }
 
-sub closed {
+sub connection { shift->handshake->connection }
+
+sub delivered {
   my $self = shift;
   $self->{state} = 'finished';
   return $self->emit(finish => $self->{close} ? (@{$self->{close}}) : 1006);
 }
 
-sub connection { shift->handshake->connection }
+sub established { shift->{open}++ }
 
 sub finish {
   my $self = shift;
@@ -86,8 +88,6 @@ sub new {
   return $self;
 }
 
-sub opened { shift->{open}++ }
-
 sub protocol { shift->res->headers->sec_websocket_protocol }
 
 sub remote_address { shift->handshake->remote_address }
@@ -363,18 +363,24 @@ and implements the following new ones.
 
 Build WebSocket message.
 
-=head2 closed
+=head2 connection
+
+  my $id = $ws->connection;
+
+Connection identifier.
+
+=head2 delivered
 
-  $ws->closed;
+  $ws->delivered;
 
 Low-level signal that the underlying connection is finished with this
 transaction.
 
-=head2 connection
+=head2 established
 
-  my $id = $ws->connection;
+  $ws->established;
 
-Connection identifier.
+Low-level signal that the underlying connection has been established.
 
 =head2 finish
 
@@ -436,12 +442,6 @@ Construct a new L<Mojo::Transaction::WebSocket> object and subscribe to
 L</"frame"> event with default message parser, which also handles C<PING> and
 C<CLOSE> frames automatically.
 
-=head2 opened
-
-  $ws->opened;
-
-Low-level signal that the underlying connection has been established.
-
 =head2 protocol
 
   my $proto = $ws->protocol;