X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FAction%2FDeserialize%2FXML%2FSimple.pm;h=7c3d7082b6aa9e4ba77ee9db47ff2504ad8c046b;hb=7566d72f425ab3a870f1d6c8945c43f4edeedf2a;hp=6e97d723989e5746b06ccc95038a447d3d58ebbb;hpb=e601addaf89882fccbc824c1a53328f0d049b32b;p=catagits%2FCatalyst-Action-REST.git

diff --git a/lib/Catalyst/Action/Deserialize/XML/Simple.pm b/lib/Catalyst/Action/Deserialize/XML/Simple.pm
index 6e97d72..7c3d708 100644
--- a/lib/Catalyst/Action/Deserialize/XML/Simple.pm
+++ b/lib/Catalyst/Action/Deserialize/XML/Simple.pm
@@ -1,16 +1,13 @@
-#
-# Catlyst::Action::Deserialize::XML::Simple.pm
-# Created by: Adam Jacob, Marchex, <adam@marchex.com>
-# Created on: 10/12/2006 03:00:32 PM PDT
-#
-# $Id$
-
 package Catalyst::Action::Deserialize::XML::Simple;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
+use Scalar::Util qw(openhandle);
+
+extends 'Catalyst::Action';
 
-use base 'Catalyst::Action';
+our $VERSION = '1.13';
+$VERSION = eval $VERSION;
 
 sub execute {
     my $self = shift;
@@ -20,7 +17,8 @@ sub execute {
         require XML::Simple;
     };
     if ($@) {
-        $c->log->debug("Could not load XML::Simple, refusing to deserialize: $@");
+        $c->log->debug("Could not load XML::Simple, refusing to deserialize: $@")
+            if $c->debug;
         return 0;
     }
 
@@ -29,7 +27,10 @@ sub execute {
         my $xs = XML::Simple->new('ForceArray' => 0,);
         my $rdata;
         eval {
-            $rdata = $xs->XMLin( "$body" );
+            if(openhandle $body){ # make sure we rewind the file handle
+                seek($body, 0, 0); # in case something has already read from it
+            }
+            $rdata = $xs->XMLin( $body );
         };
         if ($@) {
             return $@;
@@ -41,9 +42,12 @@ sub execute {
         }
     } 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;