X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FAction%2FDeserialize%2FJSON.pm;h=fecc7bca61636979c9cadca37b0d795ea24c1303;hb=f789417d081b4d519ded07eec046c0b01661e25d;hp=f9a8ce890f186db6acb9769c86683d3796bf0b1e;hpb=48ff1e96cc8ba24cd9e7bea3a2cfc145e827dd52;p=catagits%2FCatalyst-Action-REST.git

diff --git a/lib/Catalyst/Action/Deserialize/JSON.pm b/lib/Catalyst/Action/Deserialize/JSON.pm
index f9a8ce8..fecc7bc 100644
--- a/lib/Catalyst/Action/Deserialize/JSON.pm
+++ b/lib/Catalyst/Action/Deserialize/JSON.pm
@@ -2,23 +2,26 @@ package Catalyst::Action::Deserialize::JSON;
 
 use Moose;
 use namespace::autoclean;
+use Scalar::Util qw(openhandle);
 
 extends 'Catalyst::Action';
-use JSON;
-
-our $VERSION = '0.90';
-$VERSION = eval $VERSION;
+use JSON::MaybeXS qw(JSON);
 
 sub execute {
     my $self = shift;
     my ( $controller, $c, $test ) = @_;
 
-    my $body = $c->request->body;
     my $rbody;
 
-    if ($body) {
-        while (my $line = <$body>) {
-            $rbody .= $line;
+    # could be a string or a FH
+    if ( my $body = $c->request->body ) {
+        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;
         }
     }