failing test for RT#43840

[catagits/Catalyst-Action-REST.git] / lib / Catalyst / Action / Serialize / JSON.pm

diff --git a/lib/Catalyst/Action/Serialize/JSON.pm b/lib/Catalyst/Action/Serialize/JSON.pm
index 8a74a3e..9e34a26 100644 (file)
--- a/lib/Catalyst/Action/Serialize/JSON.pm
+++ b/lib/Catalyst/Action/Serialize/JSON.pm
@@ -1,6 +1,6 @@
 #
 # Catlyst::Action::Serialize::JSON.pm
-# Created by: Adam Jacob, Marchex, <adam@marchex.com>
+# Created by: Adam Jacob, Marchex, <adam@hjksolutions.com>
 # Created on: 10/12/2006 03:00:32 PM PDT
 #
 # $Id$
@@ -11,16 +11,20 @@ use strict;
 use warnings;
 
 use base 'Catalyst::Action';
-use JSON::Syck;
+use JSON qw(encode_json);
 
 sub execute {
     my $self = shift;
     my ( $controller, $c ) = @_;
 
-    my $stash_key = $controller->config->{'serialize'}->{'stash_key'} || 'rest';
+    my $stash_key = (
+            $controller->config->{'serialize'} ?
+                $controller->config->{'serialize'}->{'stash_key'} :
+                $controller->config->{'stash_key'} 
+        ) || 'rest';
     my $output;
     eval {
-        $output = JSON::Syck::Dump($c->stash->{$stash_key});
+        $output = encode_json( $c->stash->{$stash_key} );
     };
     if ($@) {
         return $@;