r49@latte: adam | 2006-12-03 12:30:40 -0800

[catagits/Catalyst-Action-REST.git] / lib / Catalyst / Action / Deserialize / YAML.pm

diff --git a/lib/Catalyst/Action/Deserialize/YAML.pm b/lib/Catalyst/Action/Deserialize/YAML.pm
index 56ecb52..84630f4 100644 (file)
--- a/lib/Catalyst/Action/Deserialize/YAML.pm
+++ b/lib/Catalyst/Action/Deserialize/YAML.pm
@@ -12,21 +12,26 @@ use warnings;
 
 use base 'Catalyst::Action';
 use YAML::Syck;
-use Catalyst::Request::REST;
 
 sub execute {
     my $self = shift;
     my ( $controller, $c, $test ) = @_;
-   
-    my $nreq = bless($c->request, 'Catalyst::Request::REST');
-    $c->request($nreq);
-    if ($c->request->method eq "POST" || $c->request->method eq "PUT") {
-        my $rdata = LoadFile($c->request->body);
+
+    my $body = $c->request->body;
+    if ($body) {
+        my $rdata;
+        eval {
+            $rdata = LoadFile( $c->request->body );
+        };
+        if ($@) {
+            return $@;
+        }
         $c->request->data($rdata);
-        $self->NEXT::execute( @_, );
     } else {
-        $self->NEXT::execute( @_ );
+        $c->log->debug(
+            'I would have deserialized, but there was nothing in the body!');
     }
-};
+    return 1;
+}
 
 1;