@@ -21,6 +21,8 @@ This file documents the revision history for Perl extension Mojo. - Added support for MOJO_CHUNK_SIZE=1. (melo) - Added not_found.html.* templates. - Added input streaming support to Mojo::Content. + - Added client, pause, redirect_to and resume to + Mojolicious::Controller. - Updated Mojolicious lite_app generator to use .ep templates. - Fixed many bugs in the HTTP 1.1 state machine and added the ability to pause transactions. Changes @@ -42,7 +42,9 @@ sub new { $self->static->root($self->home->rel_dir('public')); # Hide our methods - $self->routes->hide(qw/render_inner render_partial render_text url_for/); + $self->routes->hide(qw/client pause redirect_to render_json/); + $self->routes->hide(qw/render_inner render_partial render_text resume/); + $self->routes->hide('url_for'); # Mode my $mode = $self->mode; lib/Mojolicious.pm @@ -7,8 +7,39 @@ use warnings; use base 'MojoX::Dispatcher::Routes::Controller'; +use Mojo::URL; + # Space: It seems to go on and on forever... # but then you get to the end and a gorilla starts throwing barrels at you. +sub client { shift->app->client } + +sub pause { shift->tx->pause } + +sub redirect_to { + my ($self, $target) = @_; + + # Prepare location + my $base = $self->req->url->base->clone; + my $location = Mojo::URL->new->base($base); + + # Path + if ($target =~ /^\//) { $location->path($target) } + + # URL + elsif ($target =~ /^\w+\:\/\//) { $location = $target } + + # Named + else { $location = $self->url_for($target) } + + # Code + $self->res->code(302); + + # Location header + $self->res->headers->location($location); + + return $self; +} + sub render { my $self = shift; @@ -67,6 +98,8 @@ sub render_text { return $self->render(@_); } +sub resume { shift->tx->resume } + sub url_for { my $self = shift; @@ -113,6 +146,20 @@ L<Mojolicious::Controller> inherits all methods from L<MojoX::Dispatcher::Routes::Controller> and implements the following new ones. +=head2 C<client> + + my $client = $c->client; + +=head2 C<pause> + + $c->pause; + +=head2 C<redirect_to> + + $c = $c->redirect_to('named'); + $c = $c->redirect_to('/path'); + $c = $c->redirect_to('http://127.0.0.1/foo/bar'); + =head2 C<render> $c->render; @@ -146,6 +193,10 @@ ones. $c->render_text('Hello World!'); $c->render_text('Hello World', layout => 'green'); +=head2 C<resume> + + $c->resume; + =head2 C<url_for> my $url = $c->url_for; lib/Mojolicious/Controller.pm @@ -7,7 +7,7 @@ use warnings; use utf8; -use Test::More tests => 98; +use Test::More tests => 117; # Wait you're the only friend I have... # You really want a robot for a friend? @@ -102,10 +102,39 @@ app->renderer->add_helper( # GET /eperror get '/eperror' => sub { shift->render(handler => 'ep') } => 'eperror'; +# GET /subrequest +get '/subrequest' => sub { + my $self = shift; + $self->pause; + $self->client->post( + '/template' => sub { + my ($client, $tx) = @_; + $self->resume; + $self->render_text($tx->res->body); + } + )->process; +}; + +# GET /redirect_url +get '/redirect_url' => sub { + shift->redirect_to('http://127.0.0.1/foo')->render_text('Redirecting!'); +}; + +# GET /redirect_path +get '/redirect_path' => sub { + shift->redirect_to('/foo/bar')->render_text('Redirecting!'); +}; + +# GET /redirect_named +get '/redirect_named' => sub { + shift->redirect_to('index')->render_text('Redirecting!'); +}; + # Oh Fry, I love you more than the moon, and the stars, # and the POETIC IMAGE NUMBER 137 NOT FOUND my $app = Mojolicious::Lite->new; my $client = Mojo::Client->new(app => $app); +$app->client($client); # GET /outerlayout $client->get( @@ -386,6 +415,53 @@ $client->get( )->process; $app->log->level($level); +# GET /subrequest +$client->get( + '/subrequest' => sub { + my ($self, $tx) = @_; + is($tx->res->code, 200); + is($tx->res->headers->server, 'Mojo (Perl)'); + is($tx->res->headers->header('X-Powered-By'), 'Mojo (Perl)'); + is($tx->res->body, 'Just works!'); + } +)->process; + +# GET /redirect_url +$client->get( + '/redirect_url' => sub { + my ($self, $tx) = @_; + is($tx->res->code, 302); + is($tx->res->headers->server, 'Mojo (Perl)'); + is($tx->res->headers->header('X-Powered-By'), 'Mojo (Perl)'); + is($tx->res->headers->location, 'http://127.0.0.1/foo'); + is($tx->res->body, 'Redirecting!'); + } +)->process; + +# GET /redirect_path +$client->get( + '/redirect_path' => sub { + my ($self, $tx) = @_; + is($tx->res->code, 302); + is($tx->res->headers->server, 'Mojo (Perl)'); + is($tx->res->headers->header('X-Powered-By'), 'Mojo (Perl)'); + is($tx->res->headers->location, '/foo/bar'); + is($tx->res->body, 'Redirecting!'); + } +)->process; + +# GET /redirect_named +$client->get( + '/redirect_named' => sub { + my ($self, $tx) = @_; + is($tx->res->code, 302); + is($tx->res->headers->server, 'Mojo (Perl)'); + is($tx->res->headers->header('X-Powered-By'), 'Mojo (Perl)'); + is($tx->res->headers->location, '/template'); + is($tx->res->body, 'Redirecting!'); + } +)->process; + __DATA__ @@ outerlayout.html.ep Hello t/mojolicious/lite_app.t 8f2fc4486b501451bfea284ccdb0b0631305eba0 Sebastian Riedel sri@labs.kraih.com http://github.com/kraih/mojo/commit/ddb9060611d8928b077c17927f4c2d0e995a87d3 ddb9060611d8928b077c17927f4c2d0e995a87d3 2009-11-07T11:39:42-08:00 2009-11-07T11:39:42-08:00 added redirect_to to Mojolicious::Controller 22534a715098dd99ecaa534c5f8a98cbc0c0e3d5 Sebastian Riedel sri@labs.kraih.com