X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FActionRole%2FConsumesContent.pm;h=4d15ac2b6dbce93c1a0525aa4e869fd33e8ec4a6;hp=0766925ac738464aa2b3140f5b61ec9a892c5c83;hb=e72a3cd6e12d8b9594dcfdddf13c1fbabdffb900;hpb=4737c6c79a0541ace83084612a05ea915cc40335 diff --git a/lib/Catalyst/ActionRole/ConsumesContent.pm b/lib/Catalyst/ActionRole/ConsumesContent.pm index 0766925..4d15ac2 100644 --- a/lib/Catalyst/ActionRole/ConsumesContent.pm +++ b/lib/Catalyst/ActionRole/ConsumesContent.pm @@ -9,7 +9,6 @@ has allowed_content_types => ( required=>1, lazy=>1, isa=>'ArrayRef', - auto_deref=>1, builder=>'_build_allowed_content_types'); has normalized => ( @@ -36,14 +35,16 @@ sub _build_normalized { sub _build_allowed_content_types { my $self = shift; - my @proto = split ',', @{$self->attributes->{Consumes}}; - return map { + my @proto = map {split ',', $_ } @{$self->attributes->{Consumes}}; + my @converted = map { if(my $normalized = $self->normalized->{$_}) { ref $normalized ? @$normalized : ($normalized); } else { $_; } } @proto; + + return \@converted; } around ['match','match_captures'] => sub { @@ -57,10 +58,18 @@ around ['match','match_captures'] => sub { sub can_consume { my ($self, $request_content_type) = @_; my @matches = grep { lc($_) eq lc($request_content_type) } - $self->allowed_content_types; + @{$self->allowed_content_types}; return @matches ? 1:0; } +around 'list_extra_info' => sub { + my ($orig, $self, @args) = @_; + return { + %{ $self->$orig(@args) }, + CONSUMES => $self->allowed_content_types, + }; +}; + 1; =head1 NAME