X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FAction%2FDeserialize%2FData%2FSerializer.pm;h=a87a015c3eef36ec07ac38ee64a03b0fe2cd006a;hb=b92bf58fe4cdfa6705991f7eab327387e02ec191;hp=cbe1236208423ba142f9d11cde19b2a5abbc70a3;hpb=be3c588afb1dd6d6c8e6171c01c3d38afa75d6d5;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 cbe1236..a87a015 100644 --- a/lib/Catalyst/Action/Deserialize/Data/Serializer.pm +++ b/lib/Catalyst/Action/Deserialize/Data/Serializer.pm @@ -1,58 +1,19 @@ -# -# Catalyst::Action::Deserialize::Data::Serializer.pm -# Created by: Adam Jacob, Marchex, -# Created on: 10/12/2006 03:00:32 PM PDT -# -# $Id$ - package Catalyst::Action::Deserialize::Data::Serializer; - -use strict; -use warnings; - -use base 'Catalyst::Action'; +use Moose; +extends 'Catalyst::Action'; +with 'Catalyst::ActionRole::DeserializeFormat'; use Data::Serializer; +use namespace::clean -except => 'meta'; -sub execute { - my $self = shift; - my ( $controller, $c, $serializer ) = @_; - - my $sp = $serializer; - $sp =~ s/::/\//g; - $sp .= ".pm"; - eval { - require $sp - }; - if ($@) { - $c->log->debug("Could not load $serializer, refusing to serialize: $@") - if $c->debug; - return 0; - } - my $body = $c->request->body; - if ($body) { - my $rbody; - if ( -f $c->request->body ) { - open( BODY, "<", $c->request->body ); - while ( my $line = ) { - $rbody .= $line; - } - close(BODY); - } - my $dso = Data::Serializer->new( serializer => $serializer ); - my $rdata; - eval { - $rdata = $dso->raw_deserialize($rbody); - }; - if ($@) { - return $@; - } - $c->request->data($rdata); - } else { - $c->log->debug( - 'I would have deserialized, but there was nothing in the body!') - if $c->debug; - } - return 1; +sub deserialize { + my ($self, $content, $c, $serializer) = @_; + unless (eval "use $serializer; 1") { + $c->log->debug("Could not load $serializer, refusing to serialize: $@") + if $c->debug; + return 0; + } + my $d = Data::Serializer->new(serializer => $serializer); + return $d->raw_deserialize($content); } 1;