X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FAction%2FDeserialize%2FData%2FSerializer.pm;h=6904a845cf0574dbe5733f4cfbc5d4f01d7e2dd7;hb=351f252f57354a5a0c50e3c931b0addd4f1988ff;hp=928eeb4ae3986a0cfd9353887ac31ef7dd165609;hpb=a9e5f3d2aa58a89ffd70ec22a5485fdbd4b7a3d6;p=catagits%2FCatalyst-Action-REST.git diff --git a/lib/Catalyst/Action/Deserialize/Data/Serializer.pm b/lib/Catalyst/Action/Deserialize/Data/Serializer.pm index 928eeb4..6904a84 100644 --- a/lib/Catalyst/Action/Deserialize/Data/Serializer.pm +++ b/lib/Catalyst/Action/Deserialize/Data/Serializer.pm @@ -6,10 +6,11 @@ use namespace::autoclean; extends 'Catalyst::Action'; use Data::Serializer; use Safe; +use Scalar::Util qw(openhandle); my $compartment = Safe->new; $compartment->permit_only( qw(padany null lineseq const pushmark list anonhash anonlist refgen leaveeval undef) ); -our $VERSION = '0.88'; +our $VERSION = '0.98'; $VERSION = eval $VERSION; sub execute { @@ -29,14 +30,17 @@ sub execute { } my $body = $c->request->body; if ($body) { - my $rbody; - if ( -f $c->request->body ) { - open( BODY, "<", $c->request->body ); - while ( my $line = ) { + my $rbody = ''; + + if(openhandle $body) { + seek($body, 0, 0); # in case something has already read from it + while ( defined( my $line = <$body> ) ) { $rbody .= $line; } - close(BODY); + } else { + $rbody = $body; } + my $rdata; if ( $serializer eq "Data::Dumper" ) { # Taken from Data::Serialize::Data::Dumper::deserialize, but run within a Safe compartment @@ -61,4 +65,6 @@ sub execute { return 1; } +__PACKAGE__->meta->make_immutable; + 1;