X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FAction%2FSerialize%2FJSONP.pm;h=44946d307681700bb7d5942f92a4c7747caa75a8;hb=62d47dd140603ca63359a463c854fb761be33bea;hp=5cae844adefa07f105e5a493e6628c6c84ce0fc4;hpb=aeb7a0aed21222c37b22173e0ed000f9cb217b6f;p=catagits%2FCatalyst-Action-REST.git

diff --git a/lib/Catalyst/Action/Serialize/JSONP.pm b/lib/Catalyst/Action/Serialize/JSONP.pm
index 5cae844..44946d3 100644
--- a/lib/Catalyst/Action/Serialize/JSONP.pm
+++ b/lib/Catalyst/Action/Serialize/JSONP.pm
@@ -1,11 +1,10 @@
 package Catalyst::Action::Serialize::JSONP;
-use strict;
-use warnings;
-use MRO::Compat;
+use Moose;
+use namespace::autoclean;
 
-use base 'Catalyst::Action::Serialize::JSON';
+extends 'Catalyst::Action::Serialize::JSON';
 
-sub execute {
+after 'execute' => sub { 
   my $self = shift;
   my ($controller, $c) = @_;
 
@@ -15,20 +14,15 @@ sub execute {
       $controller->{'callback_key'} 
     ) || 'callback';
 
-  if ($c->req->param($callback_key)) {
-    $self->{_jsonp_callback} = $c->req->param($callback_key);
-    $c->res->content_type('text/javascript');
+  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';
+    }
   }
-  $self->next::method($controller, $c);
-}
-
-sub serialize {
-  my $self = shift;
-  my $json = $self->next::method(@_);
-  if ($self->{_jsonp_callback}) {
-    $json = $self->{_jsonp_callback}.'('.$json.');';
-  }
-  return $json;
-}
+};
 
 1;