-#
-# 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;
+use Scalar::Util qw(openhandle);
+
+extends 'Catalyst::Action';
+use JSON;
-use base 'Catalyst::Action';
-use JSON::Syck;
+our $VERSION = '1.01';
+$VERSION = eval $VERSION;
sub execute {
my $self = shift;
my ( $controller, $c, $test ) = @_;
- my $body = $c->request->body;
- if ($body) {
- my $rdata;
- my $rbody;
- while (my $line = <$body>) {
- $rbody .= $line;
+ my $rbody;
+
+ # 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;
}
- 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;
}
+__PACKAGE__->meta->make_immutable;
+
1;