use Catalyst::Request::REST;
use Catalyst::Utils ();
-our $VERSION = '1.00';
-$VERSION = eval $VERSION;
-
after BUILDARGS => sub {
my $class = shift;
my $config = shift;
my $sclass = $search_path . "::";
my $sarg;
my $map;
+ my $compliance_mode;
+ my $default;
my $config;
$config = $controller;
}
$map = $config->{'map'};
+ $default = $config->{'default'} if $config->{'default'};
+
+ # If we're in RFC 7231 compliance mode we need to determine if we're
+ # serializing or deserializing, then set the request object to
+ # look at the appropriate set of supported content types.
+ $compliance_mode = $config->{'compliance_mode'};
+ if($compliance_mode) {
+ my $serialize_mode = (split '::', $search_path)[-1];
+ if($serialize_mode eq 'Deserialize') {
+ # Tell the request object to only look at the Content-Type header
+ $c->request->set_content_type_only();
+
+ # If we're in compliance mode and doing deserializing we want
+ # to use the allowed content types for deserializing, not the
+ # serializer map
+ $map = $config->{'deserialize_map'};
+ $default = $config->{'deserialize_default'} if $config->{'deserialize_default'};
+ } elsif($serialize_mode eq 'Serialize') {
+ # Tell the request object to only look at the Accept header
+ $c->request->set_accept_only();
+ }
+ }
# pick preferred content type
my @accepted_types; # priority order, best first
# 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'};
+ push @accepted_types, $default if $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)
+ return $self->unsupported_media_type($c, $content_type)
if not $content_type;
# carp about old text/x-json
$sclass .= $mc;
#}
if ( !grep( /^$sclass$/, @{ $self->_serialize_plugins } ) ) {
- return $self->_unsupported_media_type($c, $content_type);
+ return $self->unsupported_media_type($c, $content_type);
}
} else {
- return $self->_unsupported_media_type($c, $content_type);
+ return $self->unsupported_media_type($c, $content_type);
}
unless ( exists( $self->_loaded_plugins->{$sclass} ) ) {
my $load_class = $sclass;
if ($@) {
$c->log->error(
"Error loading $sclass for " . $content_type . ": $!" );
- return $self->_unsupported_media_type($c, $content_type);
+ return $self->unsupported_media_type($c, $content_type);
} else {
$self->_loaded_plugins->{$sclass} = 1;
}
}
if ($search_path eq "Catalyst::Action::Serialize") {
- if ($content_type) {
- $c->response->header( 'Vary' => 'Content-Type' );
- } elsif ($c->request->accept_only) {
- $c->response->header( 'Vary' => 'Accept' );
+ unless( $c->response->header( 'Vary' ) ) {
+ if ($content_type) {
+ $c->response->header( 'Vary' => 'Content-Type' );
+ } elsif ($c->request->accept_only) {
+ $c->response->header( 'Vary' => 'Accept' );
+ }
}
$c->response->content_type($content_type);
}
return $sclass, $sarg, $content_type;
}
-sub _unsupported_media_type {
+sub unsupported_media_type {
my ( $self, $c, $content_type ) = @_;
$c->res->content_type('text/plain');
$c->res->status(415);
return undef;
}
-sub _serialize_bad_request {
+sub serialize_bad_request {
my ( $self, $c, $content_type, $error ) = @_;
$c->res->content_type('text/plain');
$c->res->status(400);