X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FAction%2FDeserialize%2FJSON.pm;h=8c3ed08e68c29fe056a33eecb409cf1df6c4995e;hb=ad46030d0708d0bd6a5ae048efa956eed0105874;hp=560bf24313d6e4b1df73dbf5d27cbb3fef7be774;hpb=e601addaf89882fccbc824c1a53328f0d049b32b;p=catagits%2FCatalyst-Action-REST.git

diff --git a/lib/Catalyst/Action/Deserialize/JSON.pm b/lib/Catalyst/Action/Deserialize/JSON.pm
index 560bf24..8c3ed08 100644
--- a/lib/Catalyst/Action/Deserialize/JSON.pm
+++ b/lib/Catalyst/Action/Deserialize/JSON.pm
@@ -1,39 +1,43 @@
-#
-# Catlyst::Action::Deserialize::JSON.pm
-# Created by: Adam Jacob, Marchex, <adam@marchex.com>
-# Created on: 10/12/2006 03:00:32 PM PDT
-#
-# $Id$
-
 package Catalyst::Action::Deserialize::JSON;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
+
+extends 'Catalyst::Action';
+use JSON;
 
-use base 'Catalyst::Action';
-use JSON::Syck;
+our $VERSION = '0.86';
+$VERSION = eval $VERSION;
 
 sub execute {
     my $self = shift;
     my ( $controller, $c, $test ) = @_;
 
     my $body = $c->request->body;
+    my $rbody;
+
     if ($body) {
-        my $rdata;
-        my $rbody;
         while (my $line = <$body>) {
             $rbody .= $line;
         }
-        eval {
-            $rdata = JSON::Syck::Load( $rbody );
-        };
+    }
+
+    if ( $rbody ) {
+        my $json = JSON->new->utf8;
+        if (my $options = $controller->{json_options}) {
+            foreach my $opt (keys %$options) {
+                $json->$opt( $options->{$opt} );
+            }
+        }
+        my $rdata = eval { $json->decode( $rbody ) };
         if ($@) {
             return $@;
         }
         $c->request->data($rdata);
     } 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;
 }