package Catalyst::Action::Serialize::JSONP;
-use base 'Catalyst::Action::Serialize::JSON';
+use Moose;
+use namespace::autoclean;
-sub execute {
+extends 'Catalyst::Action::Serialize::JSON';
+
+our $VERSION = '0.84';
+$VERSION = eval $VERSION;
+
+after 'execute' => sub {
my $self = shift;
my ($controller, $c) = @_;
my $callback_key = (
$controller->{'serialize'} ?
$controller->{'serialize'}->{'callback_key'} :
- $controller->{'callback_key'}
+ $controller->{'callback_key'}
) || 'callback';
- if ($c->req->param($callback_key)) {
- $self->{_jsonp_callback} = $c->req->param($callback_key);
- $c->res->content_type('text/javascript');
- }
- $self->next::method($controller, $c);
-}
-
-sub serialize {
- my $self = shift;
- my $json = $self->next::method(@_);
- if ($self->{_jsonp_callback}) {
- $json = $self->{_jsonp_callback}.'('.$json.');';
+ my $callback_value = $c->req->param($callback_key);
+ if ($callback_value) {
+ if ($callback_value =~ /^\w+$/) {
+ $c->res->content_type('text/javascript');
+ $c->res->output($callback_value.'('.$c->res->output().');');
+ } else {
+ warn 'Callback: '.$callback_value.' will not generate valid Javascript. Falling back to JSON output';
+ }
}
- return $json;
-}
+};
1;