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

diff --git a/lib/Catalyst/Action/Deserialize/JSON.pm b/lib/Catalyst/Action/Deserialize/JSON.pm
index c786860..f9a8ce8 100644
--- a/lib/Catalyst/Action/Deserialize/JSON.pm
+++ b/lib/Catalyst/Action/Deserialize/JSON.pm
@@ -4,9 +4,9 @@ use Moose;
 use namespace::autoclean;
 
 extends 'Catalyst::Action';
-use JSON qw( decode_json );
+use JSON;
 
-our $VERSION = '0.84';
+our $VERSION = '0.90';
 $VERSION = eval $VERSION;
 
 sub execute {
@@ -23,7 +23,13 @@ sub execute {
     }
 
     if ( $rbody ) {
-        my $rdata = eval { decode_json( $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 $@;
         }
@@ -36,4 +42,6 @@ sub execute {
     return 1;
 }
 
+__PACKAGE__->meta->make_immutable;
+
 1;