fixed small inconsistencies

mojolicious · Apr 5, 2012 · 149210c · 149210c
1 parent 11f089d
commit 149210c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/lib/Mojo/UserAgent.pm b/lib/Mojo/UserAgent.pm
@@ -33,7 +33,8 @@ has transactor => sub { Mojo::UserAgent::Transactor->new };
   for my $name (qw/DELETE GET HEAD OPTIONS PATCH POST PUT/) {
     *{__PACKAGE__ . '::' . lc($name)} = sub {
       my $self = shift;
-      $self->start($self->build_tx($name, @_));
+      my $cb = (ref $_[-1] eq 'CODE') ? pop : undef;
+      $self->start($self->build_tx($name, @_), $cb);
     };
   }
 }
@@ -88,7 +89,8 @@ sub need_proxy {
 
 sub post_form {
   my $self = shift;
-  $self->start($self->build_form_tx(@_));
+  my $cb = (ref $_[-1] eq 'CODE') ? pop : undef;
+  $self->start($self->build_form_tx(@_), $cb);
 }
 
 sub start {
@@ -125,7 +127,8 @@ sub start {
 
 sub websocket {
   my $self = shift;
-  $self->start($self->build_websocket_tx(@_));
+  my $cb = (ref $_[-1] eq 'CODE') ? pop : undef;
+  $self->start($self->build_websocket_tx(@_), $cb);
 }
 
 sub _cache {
@@ -228,7 +231,7 @@ sub _connect_proxy {
 
   # Start CONNECT request
   return unless my $new = $self->transactor->proxy_connect($old);
-  $self->_start(
+  return $self->_start(
     $new => sub {
       my ($self, $tx) = @_;
 
@@ -272,8 +275,6 @@ sub _connect_proxy {
       $self->_start($old, $cb);
     }
   );
-
-  return 1;
 }
 
 sub _connected {

diff --git a/lib/Mojo/UserAgent/Transactor.pm b/lib/Mojo/UserAgent/Transactor.pm
@@ -15,9 +15,6 @@ use Mojo::Util qw/encode url_escape/;
 sub form {
   my ($self, $url) = (shift, shift);
 
-  # Callback
-  my $cb = pop @_ if (ref $_[-1] || '') eq 'CODE';
-
   # Form
   my $encoding = shift;
   my $form = ref $encoding ? $encoding : shift;
@@ -77,7 +74,7 @@ sub form {
     $req->body($p->to_string);
   }
 
-  return wantarray ? ($tx, $cb) : $tx;
+  return $tx;
 }
 
 # "This kid's a wonder!
@@ -165,25 +162,22 @@ sub tx {
   $url = "http://$url" unless $url =~ m#^/|\://#;
   ref $url ? $req->url($url) : $req->url->parse($url);
 
-  # Callback
-  my $cb = pop @_ if (ref $_[-1] || '') eq 'CODE';
-
   # Body
   $req->body(pop @_)
     if @_ & 1 == 1 && ref $_[0] ne 'HASH' || ref $_[-2] eq 'HASH';
 
   # Headers
   $req->headers->from_hash(ref $_[0] eq 'HASH' ? $_[0] : {@_});
 
-  return wantarray ? ($tx, $cb) : $tx;
+  return $tx;
 }
 
 # "She found my one weakness... that I'm weak!"
 sub websocket {
   my $self = shift;
 
   # New WebSocket
-  my ($tx, $cb) = $self->tx(GET => @_);
+  my $tx  = $self->tx(GET => @_);
   my $req = $tx->req;
   my $abs = $req->url->to_abs;
   if (my $scheme = $abs->scheme) {
@@ -194,7 +188,7 @@ sub websocket {
   Mojo::Transaction::WebSocket->new(handshake => $tx, masked => 1)
     ->client_handshake;
 
-  return wantarray ? ($tx, $cb) : $tx;
+  return $tx;
 }
 
 sub _multipart {