#
# Catlyst::Action::SerializeBase.pm
-# Created by: Adam Jacob, Marchex, <adam@marchex.com>
+# Created by: Adam Jacob, Marchex, <adam@hjksolutions.com>
#
# $Id$
use Module::Pluggable::Object;
use Data::Dump qw(dump);
use Catalyst::Request::REST;
-
-Catalyst->request_class('Catalyst::Request::REST')
- unless Catalyst->request_class->isa('Catalyst::Request::REST');
+use Catalyst::Utils ();
+
+sub new {
+ my $class = shift;
+ my $config = shift;
+ Catalyst::Request::REST->_insert_self_into(
+ Catalyst::Utils::class2appclass($config->{class})
+ );
+ return $class->SUPER::new($config, @_);
+}
__PACKAGE__->mk_accessors(qw(_serialize_plugins _loaded_plugins));
$self->_serialize_plugins( \@plugins );
}
- my $content_type = $c->request->preferred_content_type;
-
# Finally, we load the class. If you have a default serializer,
# and we still don't have a content-type that exists in the map,
# we'll use it.
my $config;
- if ( exists $controller->config->{'serialize'} ) {
+ if ( exists $controller->{'serialize'} ) {
$c->log->info("Using deprecated configuration for Catalyst::Action::REST!");
$c->log->info("Please see perldoc Catalyst::Action::REST for the update guide");
- $config = $controller->config->{'serialize'};
+ $config = $controller->{'serialize'};
} else {
- $config = $controller->config;
+ $config = $controller;
}
$map = $config->{'map'};
- # If we don't have a handler for our preferred content type, try
- # the default
- if ( ! exists $map->{$content_type} ) {
- if( exists $config->{'default'} ) {
- $content_type = $config->{'default'} ;
- } else {
- return $self->_unsupported_media_type($c, $content_type);
- }
+
+ # pick preferred content type
+ my @accepted_types; # priority order, best first
+ # give top priority to content type specified by stash, if any
+ my $content_type_stash_key = $config->{content_type_stash_key};
+ if ($content_type_stash_key
+ and my $stashed = $c->stash->{$content_type_stash_key}
+ ) {
+ # convert to array if not already a ref
+ $stashed = [ $stashed ] if not ref $stashed;
+ push @accepted_types, @$stashed;
+ }
+ # then content types requested by caller
+ push @accepted_types, @{ $c->request->accepted_content_types };
+ # then the default
+ push @accepted_types, $config->{'default'} if $config->{'default'};
+ # pick the best match that we have a serializer mapping for
+ my ($content_type) = grep { $map->{$_} } @accepted_types;
+
+ return $self->_unsupported_media_type($c, $content_type)
+ if not $content_type;
+
+ # carp about old text/x-json
+ if ($content_type eq 'text/x-json') {
+ $c->log->info('Using deprecated text/x-json content-type.');
+ $c->log->info('Use application/json instead!');
}
if ( exists( $map->{$content_type} ) ) {
eval { require $load_class; };
if ($@) {
$c->log->error(
- "Error loading $sclass for " . $content_type . ": $!" )
- if $c->log->is_debug;
+ "Error loading $sclass for " . $content_type . ": $!" );
return $self->_unsupported_media_type($c, $content_type);
} else {
$self->_loaded_plugins->{$sclass} = 1;