X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FAction%2FDeserialize%2FYAML.pm;h=8fc0cdd3d8e1e6a2c9167e92a382d02921d1e246;hb=f5aa7d458e3df74ac047c538fe1754192c0e944c;hp=b9728300989b5f3da22decbba5482671c7b2b61d;hpb=eccb21379de1fbdc65740e0cb4158d3b4d055cab;p=catagits%2FCatalyst-Action-REST.git

diff --git a/lib/Catalyst/Action/Deserialize/YAML.pm b/lib/Catalyst/Action/Deserialize/YAML.pm
index b972830..8fc0cdd 100644
--- a/lib/Catalyst/Action/Deserialize/YAML.pm
+++ b/lib/Catalyst/Action/Deserialize/YAML.pm
@@ -1,16 +1,10 @@
-#
-# Catlyst::Action::Deserialize::YAML.pm
-# Created by: Adam Jacob, Marchex, <adam@marchex.com>
-# Created on: 10/12/2006 03:00:32 PM PDT
-#
-# $Id$
-
 package Catalyst::Action::Deserialize::YAML;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
+use Scalar::Util qw(openhandle);
 
-use base 'Catalyst::Action';
+extends 'Catalyst::Action';
 use YAML::Syck;
 
 sub execute {
@@ -19,12 +13,34 @@ sub execute {
 
     my $body = $c->request->body;
     if ($body) {
-        my $rdata = LoadFile( $c->request->body );
+
+        my $rbody = '';
+
+        if(openhandle $body) {
+            seek($body, 0, 0); # in case something has already read from it
+            while ( defined( my $line = <$body> ) ) {
+                $rbody .= $line;
+            }
+        } else {
+            $rbody = $body;
+        }
+
+        my $rdata;
+        eval {
+            $rdata = Load( $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;
 }
 
+__PACKAGE__->meta->make_immutable;
+
 1;