X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FAction%2FSerialize%2FData%2FSerializer.pm;h=ca42ce762d8ff2d7e7626a9259f51f85067d1590;hb=930013e6f19b25a090c3f8839495ad8d9b15ff6d;hp=0b0fb4b83c21a22a59145099d9a8ce3547f80ade;hpb=7ad87df957f65463dba321ebe616e2581b7ff58f;p=catagits%2FCatalyst-Action-REST.git

diff --git a/lib/Catalyst/Action/Serialize/Data/Serializer.pm b/lib/Catalyst/Action/Serialize/Data/Serializer.pm
index 0b0fb4b..ca42ce7 100644
--- a/lib/Catalyst/Action/Serialize/Data/Serializer.pm
+++ b/lib/Catalyst/Action/Serialize/Data/Serializer.pm
@@ -1,25 +1,40 @@
-#
-# Catalyst::Action::Serialize::Data::Serializer
-# Created by: Adam Jacob, Marchex, <adam@marchex.com>
-#
-# $Id$
-
 package Catalyst::Action::Serialize::Data::Serializer;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
-use base 'Catalyst::Action';
+extends 'Catalyst::Action';
 use Data::Serializer;
 
 sub execute {
     my $self = shift;
     my ( $controller, $c, $serializer ) = @_;
 
-    my $stash_key = $controller->serialize->{'stash_key'} || 'rest';
-    my $dso = Data::Serializer->new(serializer => $serializer);
-    $c->response->output( $dso->raw_serialize( $c->stash->{$stash_key} ) );
+    my $stash_key = (
+            $controller->{'serialize'} ?
+                $controller->{'serialize'}->{'stash_key'} :
+                $controller->{'stash_key'} 
+        ) || 'rest';
+    my $sp = $serializer;
+    $sp =~ s/::/\//g;
+    $sp .= ".pm";
+    eval {
+        require $sp
+    };
+    if ($@) {
+        $c->log->info("Could not load $serializer, refusing to serialize: $@");
+        return 0;
+    }
+    my $dso = Data::Serializer->new( serializer => $serializer );
+    my $data;
+    eval {
+       $data = $dso->raw_serialize($c->stash->{$stash_key});
+    };
+    if ($@) {
+        return $@;
+    } 
+    $c->response->output( $data );
     return 1;
-};
+}
 
 1;