separate request/response possible content-typees

[catagits/Catalyst-Action-REST.git] / lib / Catalyst / TraitFor / Request / REST.pm

diff --git a/lib/Catalyst/TraitFor/Request/REST.pm b/lib/Catalyst/TraitFor/Request/REST.pm
index 36be057..1d35710 100644 (file)
--- a/lib/Catalyst/TraitFor/Request/REST.pm
+++ b/lib/Catalyst/TraitFor/Request/REST.pm
@@ -3,18 +3,67 @@ use Moose::Role;
 use HTTP::Headers::Util qw(split_header_words);
 use namespace::autoclean;
 
-has [qw/ data accept_only /] => ( is => 'rw' );
-
-sub accepted_content_types {
-    my $self = shift;
+our $VERSION = '0.90';
+$VERSION = eval $VERSION;
 
-    return $self->{content_types} if $self->{content_types};
+has [qw/ data accept_only /] => ( is => 'rw' );
 
-    my %types;
+has accepted_content_types => (
+    is       => 'ro',
+    isa      => 'ArrayRef',
+    lazy     => 1,
+    builder  => '_build_accepted_content_types',
+    init_arg => undef,
+);
+
+has preferred_content_type => (
+    is       => 'ro',
+    isa      => 'Str',
+    lazy     => 1,
+    builder  => '_build_preferred_content_type',
+    init_arg => undef,
+);
+
+has accepted_response_content_types => (
+    is       => 'ro',
+    isa      => 'ArrayRef',
+    lazy     => 1,
+    builder  => '_build_accepted_response_content_types',
+    init_arg => undef,
+);
+
+has preferred_response_content_type => (
+    is       => 'ro',
+    isa      => 'Str',
+    lazy     => 1,
+    builder  => '_build_preferred_response_content_type',
+    init_arg => undef,
+);
+
+sub _accepted_types_sort {
+    my ($self, %types) = @_;
+    [ sort { $types{$b} <=> $types{$a} } keys %types ];
+}
 
+sub _build_accepted_content_types {
+    my $self = shift;
+    my %types = $self->_accepted_response_content_types_inner;
     # First, we use the content type in the HTTP Request.  It wins all.
     $types{ $self->content_type } = 3
         if $self->content_type;
+    $self->_accepted_types_sort(%types);
+}
+
+sub _build_accepted_response_content_types {
+    my $self = shift;
+    my %types = $self->_accepted_response_content_types_inner;
+    $self->_accepted_types_sort(%types);
+}
+
+sub _accepted_response_content_types_inner {
+    my $self = shift;
+
+    my %types;
 
     if ($self->method eq "GET" && $self->param('content-type')) {
         $types{ $self->param('content-type') } = 2;
@@ -49,11 +98,12 @@ sub accepted_content_types {
         }
     }
 
-    return $self->{content_types} =
-        [ sort { $types{$b} <=> $types{$a} } keys %types ];
+    %types;
 }
 
-sub preferred_content_type { $_[0]->accepted_content_types->[0] }
+sub _build_preferred_content_type { $_[0]->accepted_content_types->[0] }
+
+sub _build_preferred_response_content_type { $_[0]->accepted_response_content_types->[0] }
 
 sub accepts {
     my $self = shift;
@@ -80,7 +130,7 @@ Catalyst::TraitFor::Request::REST - A role to apply to Catalyst::Request giving
 =head1 DESCRIPTION
 
 This is a L<Moose::Role> applied to L<Catalyst::Request> that adds a few
-methods to the request object to faciliate writing REST-y code.
+methods to the request object to facilitate writing REST-y code.
 Currently, these methods are all related to the content types accepted by
 the client.