X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FAction%2FDeserialize%2FJSON.pm;h=d792daa694d39d8453d2d3e9d5e649bd1d289ba0;hb=2474828604a779657c1bfa42b1875951ccd43383;hp=82002df29bba8912092053fe36b118a558924107;hpb=be3c588afb1dd6d6c8e6171c01c3d38afa75d6d5;p=catagits%2FCatalyst-Action-REST.git

diff --git a/lib/Catalyst/Action/Deserialize/JSON.pm b/lib/Catalyst/Action/Deserialize/JSON.pm
index 82002df..d792daa 100644
--- a/lib/Catalyst/Action/Deserialize/JSON.pm
+++ b/lib/Catalyst/Action/Deserialize/JSON.pm
@@ -1,17 +1,13 @@
-#
-# Catlyst::Action::Deserialize::JSON.pm
-# Created by: Adam Jacob, Marchex, <adam@hjksolutions.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.88';
+$VERSION = eval $VERSION;
 
 sub execute {
     my $self = shift;
@@ -27,7 +23,13 @@ sub execute {
     }
 
     if ( $rbody ) {
-        my $rdata = eval { JSON::Syck::Load( $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 $@;
         }
@@ -40,4 +42,6 @@ sub execute {
     return 1;
 }
 
+__PACKAGE__->meta->make_immutable;
+
 1;