use a little less code

mojolicious · Jan 10, 2016 · 78d2ecd · 78d2ecd
1 parent aa7c750
commit 78d2ecd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,5 @@
 
-6.40  2016-01-09
+6.40  2016-01-10
   - Removed upgrade event from Mojo::Transaction::HTTP.
   - Replaced deprecated proxy method in Mojo::Message::Request with an
     attribute.

diff --git a/lib/Mojo/Transaction.pm b/lib/Mojo/Transaction.pm
@@ -56,19 +56,15 @@ sub remote_address {
     : $self->original_remote_address;
 }
 
-sub resume       { shift->_state(qw(write resume)) }
-sub server_close { shift->_state(qw(finished finish)) }
+sub resume       { shift->_state('write')->emit('resume') }
+sub server_close { shift->_state('finished')->emit('finish') }
 
 sub server_read  { croak 'Method "server_read" not implemented by subclass' }
 sub server_write { croak 'Method "server_write" not implemented by subclass' }
 
 sub success { $_[0]->error ? undef : $_[0]->res }
 
-sub _state {
-  my ($self, $state, $event) = @_;
-  $self->{state} = $state;
-  return $self->emit($event);
-}
+sub _state { $_[0]{state} = $_[1] and return $_[0] }
 
 1;
 

diff --git a/lib/Mojo/Transaction/WebSocket.pm b/lib/Mojo/Transaction/WebSocket.pm
@@ -221,13 +221,10 @@ sub resume { $_[0]->handshake->resume and return $_[0] }
 
 sub send {
   my ($self, $msg, $cb) = @_;
-
   $self->once(drain => $cb) if $cb;
   if   (ref $msg eq 'ARRAY') { $self->{write} .= $self->build_frame(@$msg) }
   else                       { $self->{write} .= $self->build_message($msg) }
-  $self->{state} = 'write';
-
-  return $self->emit('resume');
+  return $self->SUPER::resume;
 }
 
 sub server_close {