@@ -1,6 +1,7 @@ This file documents the revision history for Perl extension Mojo. 0.999903 2009-11-10 00:00:00 + - Added ladders to Mojolicious::Lite, they are like bridges but lite. - Added encoding support to renderer. (likhatskiy) 0.999902 2009-11-01 00:00:00 Changes @@ -152,9 +152,10 @@ sub render { sub template_name { my ($self, $options) = @_; - my $template = $options->{template} || ''; - my $format = $options->{format}; - my $handler = $options->{handler}; + # Template? + return unless my $template = $options->{template} || ''; + return unless my $format = $options->{format}; + return unless my $handler = $options->{handler}; return "$template.$format.$handler"; } lib/MojoX/Renderer.pm @@ -10,8 +10,9 @@ use base 'Mojolicious'; use File::Spec; use FindBin; -# Singleton +# Singletons my $APP; +my $ROUTES; # It's the future, my parents, my co-workers, my girlfriend, # I'll never see any of them ever again... YAHOOO! @@ -28,6 +29,9 @@ sub import { # Initialize app $APP = $class->new; + # Initialize routes + $ROUTES = $APP->routes; + # Route generator my $route = sub { my ($methods, @args) = @_; @@ -72,8 +76,14 @@ sub import { $defaults ||= {}; $defaults = {%$defaults, callback => $cb}; + # Create bridge + return $ROUTES = + $APP->routes->bridge($pattern, {@$constraints})->over($conditions) + ->to($defaults)->name($name) + if !ref $methods && $methods eq 'ladder'; + # Create route - $APP->routes->route($pattern, {@$constraints})->over($conditions) + $ROUTES->route($pattern, {@$constraints})->over($conditions) ->via($methods)->to($defaults)->name($name); }; @@ -82,10 +92,11 @@ sub import { no strict 'refs'; # Export - *{"${caller}::app"} = sub {$APP}; - *{"${caller}::any"} = sub { $route->(ref $_[0] ? shift : [], @_) }; - *{"${caller}::get"} = sub { $route->('get', @_) }; - *{"${caller}::post"} = sub { $route->('post', @_) }; + *{"${caller}::app"} = sub {$APP}; + *{"${caller}::any"} = sub { $route->(ref $_[0] ? shift : [], @_) }; + *{"${caller}::get"} = sub { $route->('get', @_) }; + *{"${caller}::ladder"} = sub { $route->('ladder', @_) }; + *{"${caller}::post"} = sub { $route->('post', @_) }; # Shagadelic! *{"${caller}::shagadelic"} = sub { lib/Mojolicious/Lite.pm @@ -28,8 +28,8 @@ sub new { my ($r, $c, $output, $options) = @_; # Template - my $t = $r->template_name($options); - my $path = $r->template_path($options); + return unless my $t = $r->template_name($options); + return unless my $path = $r->template_path($options); my $cache = $options->{cache} || $path; # Check cache lib/Mojolicious/Renderer.pm @@ -7,7 +7,7 @@ use warnings; use utf8; -use Test::More tests => 122; +use Test::More tests => 136; # Wait you're the only friend I have... # You really want a robot for a friend? @@ -138,6 +138,25 @@ get '/koi8-r' => sub { app->renderer->encoding(undef); }; +ladder sub { + my $self = shift; + return unless $self->req->headers->header('X-Bender'); + $self->res->headers->header('X-Ladder' => 23); + return 1; +}; + +# GET /with_ladder +get '/with_ladder' => sub { + my $self = shift; + $self->render_text('Ladders are cool!'); +}; + +# GET /with_ladder_too +get '/with_ladder_too' => sub { + my $self = shift; + $self->render_text('Ladders are cool too!'); +}; + # 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; @@ -485,6 +504,41 @@ $client->get( } )->process; +# GET /with_ladder +$client->get( + '/with_ladder' => ('X-Bender' => 'Rodriguez') => 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->headers->header('X-Ladder'), '23'); + is($tx->res->body, 'Ladders are cool!'); + } +)->process; + +# GET /with_ladder_too +$client->get( + '/with_ladder_too' => ('X-Bender' => 'Rodriguez') => 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->headers->header('X-Ladder'), '23'); + is($tx->res->body, 'Ladders are cool too!'); + } +)->process; + +# GET /with_ladder_too +$client->get( + '/with_ladder_too' => sub { + my ($self, $tx) = @_; + is($tx->res->code, 404); + is($tx->res->headers->server, 'Mojo (Perl)'); + is($tx->res->headers->header('X-Powered-By'), 'Mojo (Perl)'); + like($tx->res->body, qr/Oops!/); + } +)->process; + __DATA__ @@ outerlayout.html.ep Hello t/mojolicious/lite_app.t d7cfa81eb6f2fc0e4f2b123babb097da524ffcac Sebastian Riedel sri@labs.kraih.com http://github.com/kraih/mojo/commit/d8fb4f372d9e87fb8133722c925f9183600e66a6 d8fb4f372d9e87fb8133722c925f9183600e66a6 2009-11-11T04:15:31-08:00 2009-11-11T04:15:31-08:00 added ladders to Mojolicious::Lite, they are like bridges but lite a87cacbc0445d47df4c97ff235cb2b8be01db9be Sebastian Riedel sri@labs.kraih.com