lib/Mojo/JSON.pm rfc3875.txt rfc4627.txt t/mojo/json.t @@ -1,6 +1,7 @@ This file documents the revision history for Perl extension Mojo. 0.991252 2009-09-01 00:00:00 + - Added native JSON support. - Fixed a design flaw in Mojo::Server::Daemon and made it about 20 times faster. - Fixed a similar design flaw in Mojo::Client. Changes @@ -8,6 +8,7 @@ use warnings; use base 'Mojo::Base'; use File::Spec; +use Mojo::JSON; use MojoX::Types; __PACKAGE__->attr(default_format => 'html'); @@ -19,6 +20,26 @@ __PACKAGE__->attr(types => sub { MojoX::Types->new }); # This is not how Xmas is supposed to be. # In my day Xmas was about bringing people together, not blowing them apart. +sub new { + my $self = shift->SUPER::new(@_); + + # JSON + $self->add_handler( + json => sub { + my ($r, $c, $output) = @_; + $$output = Mojo::JSON->new->encode(delete $c->stash->{json}); + } + ); + + # Text + $self->add_handler( + text => sub { + my ($r, $c, $output) = @_; + $$output = delete $c->stash->{text}; + } + ); +} + sub add_handler { my $self = shift; @@ -54,8 +75,15 @@ sub render { my $output; # Text - if (my $text = delete $c->stash->{text}) { - $output = $text; + if ($c->stash->{text}) { + $self->handler->{text}->($self, $c, \$output); + $c->stash->{inner_template} = $output if $c->stash->{layout}; + } + + # JSON + elsif ($c->stash->{json}) { + $self->handler->{json}->($self, $c, \$output); + $format = 'json'; $c->stash->{inner_template} = $output if $c->stash->{layout}; } @@ -197,6 +225,10 @@ L<MojoX::Types> implements the follwing attributes. L<MojoX::Types> inherits all methods from L<Mojo::Base> and implements the follwing the ones. +=head2 C<new> + + my $renderer = MojoX::Renderer->new; + =head2 C<add_handler> $renderer = $renderer->add_handler(epl => sub { ... }); lib/MojoX/Renderer.pm @@ -49,6 +49,12 @@ sub render { sub render_inner { delete shift->stash->{inner_template} } +sub render_json { + my $self = shift; + $self->stash->{json} = shift; + return $self->render(@_); +} + sub render_partial { my $self = shift; local $self->stash->{partial} = 1; @@ -125,6 +131,11 @@ ones. my $output = $c->render_inner; +=head2 C<render_json> + + $c->render_json({foo => 'bar'}); + $c->render_json([1, 2, -3]); + =head2 C<render_partial> my $output = $c->render_partial; lib/Mojolicious/Controller.pm @@ -7,7 +7,7 @@ use warnings; use utf8; -use Test::More tests => 64; +use Test::More tests => 72; # Wait you're the only friend I have... # You really want a robot for a friend? @@ -16,6 +16,7 @@ use Test::More tests => 64; # so if anyone asks you're my debugger. use Mojo::ByteStream 'b'; use Mojo::Client; +use Mojo::JSON; use Mojo::Transaction::Single; use Mojolicious::Lite; @@ -70,6 +71,9 @@ get '/firefox/:stuff' => (agent => qr/Firefox/) => sub { # POST /utf8 post '/utf8' => 'form'; +# GET /json +get '/json' => sub { shift->render_json({foo => [1, -2, 3, 'bar']}) }; + # 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; @@ -209,6 +213,19 @@ is($tx->res->body, b(<<EOF)->encode('utf8')->to_string); Вячеслав Тихановский EOF +# GET /json +$tx = Mojo::Transaction::Single->new_get('/json'); +$client->process_app($app, $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->content_type, 'application/json'); +my $hash = Mojo::JSON->new->decode($tx->res->body); +is($hash->{foo}->[0], 1); +is($hash->{foo}->[1], -2); +is($hash->{foo}->[2], 3); +is($hash->{foo}->[3], 'bar'); + __DATA__ @@ index.html.epl %= something() t/mojolicious/lite_app.t 4f1c085e36b55408d7ff8fd4e6e55668b102aff8 Sebastian Riedel sri@odyssey.local http://github.com/kraih/mojo/commit/2d652536bb8d1b5d3d5de2acdb8023b89b27c421 2d652536bb8d1b5d3d5de2acdb8023b89b27c421 2009-09-17T07:44:19-07:00 2009-09-17T07:44:19-07:00 added native JSON support bdfdc54d2fb1c6a2c1ed66b4f41894c6f8c74b38 Sebastian Riedel sri@odyssey.local