X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Action-REST.git;a=blobdiff_plain;f=lib%2FCatalyst%2FAction%2FDeserialize%2FData%2FSerializer.pm;h=b91a6b5ae3e53eb08f1b17a779d08ce156edcbf7;hp=ef435740c9295153fe43f3680924c24f60393a12;hb=3bb36dcaabf34fef5c15b1bb74c5eb198a7f5168;hpb=eccb21379de1fbdc65740e0cb4158d3b4d055cab

diff --git a/lib/Catalyst/Action/Deserialize/Data/Serializer.pm b/lib/Catalyst/Action/Deserialize/Data/Serializer.pm
index ef43574..b91a6b5 100644
--- a/lib/Catalyst/Action/Deserialize/Data/Serializer.pm
+++ b/lib/Catalyst/Action/Deserialize/Data/Serializer.pm
@@ -1,22 +1,29 @@
-#
-# Catalyst::Action::Deserialize::Data::Serializer.pm
-# Created by: Adam Jacob, Marchex, <adam@marchex.com>
-# Created on: 10/12/2006 03:00:32 PM PDT
-#
-# $Id$
-
 package Catalyst::Action::Deserialize::Data::Serializer;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
-use base 'Catalyst::Action';
+extends 'Catalyst::Action';
 use Data::Serializer;
 
+our $VERSION = '0.82';
+$VERSION = eval $VERSION;
+
 sub execute {
     my $self = shift;
     my ( $controller, $c, $serializer ) = @_;
 
+    my $sp = $serializer;
+    $sp =~ s/::/\//g;
+    $sp .= ".pm";
+    eval {
+        require $sp
+    };
+    if ($@) {
+        $c->log->debug("Could not load $serializer, refusing to serialize: $@")
+            if $c->debug;
+        return 0;
+    }
     my $body = $c->request->body;
     if ($body) {
         my $rbody;
@@ -28,12 +35,20 @@ sub execute {
             close(BODY);
         }
         my $dso = Data::Serializer->new( serializer => $serializer );
-        my $rdata = $dso->raw_deserialize($rbody);
+        my $rdata;
+        eval {
+            $rdata = $dso->raw_deserialize($rbody);
+        };
+        if ($@) {
+            return $@;
+        }
         $c->request->data($rdata);
     } else {
         $c->log->debug(
-            'I would have deserialized, but there was nothing in the body!');
+            'I would have deserialized, but there was nothing in the body!')
+                if $c->debug;
     }
+    return 1;
 }
 
 1;