Cherry pick everything bar the use parent change from 25d49c2, fixing RT#46680

[catagits/Catalyst-Action-Serialize-Data-Serializer.git] / lib / Catalyst / Action / Deserialize / Data / Serializer.pm

diff --git a/lib/Catalyst/Action/Deserialize/Data/Serializer.pm b/lib/Catalyst/Action/Deserialize/Data/Serializer.pm
index ef43574..911fb31 100644 (file)
--- a/lib/Catalyst/Action/Deserialize/Data/Serializer.pm
+++ b/lib/Catalyst/Action/Deserialize/Data/Serializer.pm
@@ -1,10 +1,3 @@
-#
-# 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;
@@ -17,6 +10,17 @@ 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 +32,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;