X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FAction%2FDeserialize%2FYAML.pm;h=f70f1d576bf2e9b33fdc7c586e64c6406b8dae3d;hb=5cb0b36f518a1f5e9c2225eec3187416319e8eec;hp=af9f2fd5888d657ccdf559365ce680c5b58f210f;hpb=a042dad01479cdd9e5e2c6e8581d2cdd0f604fa7;p=catagits%2FCatalyst-Action-REST.git diff --git a/lib/Catalyst/Action/Deserialize/YAML.pm b/lib/Catalyst/Action/Deserialize/YAML.pm index af9f2fd..f70f1d5 100644 --- a/lib/Catalyst/Action/Deserialize/YAML.pm +++ b/lib/Catalyst/Action/Deserialize/YAML.pm @@ -2,11 +2,12 @@ package Catalyst::Action::Deserialize::YAML; use Moose; use namespace::autoclean; +use Scalar::Util qw(openhandle); extends 'Catalyst::Action'; use YAML::Syck; -our $VERSION = '0.83'; +our $VERSION = '1.11'; $VERSION = eval $VERSION; sub execute { @@ -15,10 +16,21 @@ sub execute { 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 { - my $body = $c->request->body; - $rdata = LoadFile( "$body" ); + $rdata = Load( $rbody ); }; if ($@) { return $@; @@ -32,4 +44,6 @@ sub execute { return 1; } +__PACKAGE__->meta->make_immutable; + 1;