X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FAction%2FDeserialize%2FYAML.pm;h=d95bc0f12e8e998934699033569c3415afefe13a;hb=351f252f57354a5a0c50e3c931b0addd4f1988ff;hp=56ecb52740e17c1512a3a4896c3a74b321ea0bfd;hpb=256c894fcf95e1a0716676afb8f5732854734672;p=catagits%2FCatalyst-Action-REST.git

diff --git a/lib/Catalyst/Action/Deserialize/YAML.pm b/lib/Catalyst/Action/Deserialize/YAML.pm
index 56ecb52..d95bc0f 100644
--- a/lib/Catalyst/Action/Deserialize/YAML.pm
+++ b/lib/Catalyst/Action/Deserialize/YAML.pm
@@ -1,32 +1,49 @@
-#
-# 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;
-use Catalyst::Request::REST;
+
+our $VERSION = '0.98';
+$VERSION = eval $VERSION;
 
 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 $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);
-        $self->NEXT::execute( @_, );
     } else {
-        $self->NEXT::execute( @_ );
+        $c->log->debug(
+            'I would have deserialized, but there was nothing in the body!')
+            if $c->debug;
     }
-};
+    return 1;
+}
+
+__PACKAGE__->meta->make_immutable;
 
 1;