X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FAttrContainer.pm;h=443b4162098a2679b86509ee759242d59f214b19;hb=b354201608d428db344c63dd35de096a62a7a9d3;hp=c7eb129355c370f1c962b2905fae048350889f0c;hpb=ba599d1c7a0c3219cd3825264c44d22362ed179a;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/AttrContainer.pm b/lib/Catalyst/AttrContainer.pm
index c7eb129..443b416 100644
--- a/lib/Catalyst/AttrContainer.pm
+++ b/lib/Catalyst/AttrContainer.pm
@@ -1,20 +1,20 @@
 package Catalyst::AttrContainer;
 
-use strict;
-use base qw/Class::Data::Inheritable Class::Accessor::Fast/;
-
+use Moose;
 use Catalyst::Exception;
-use NEXT;
+with 'Catalyst::ClassData';
+
+no Moose;
 
-__PACKAGE__->mk_classdata($_) for qw/_attr_cache _action_cache/;
-__PACKAGE__->_attr_cache( {} );
-__PACKAGE__->_action_cache( [] );
+__PACKAGE__->mk_classdata(_attr_cache => {} );
+__PACKAGE__->mk_classdata( _action_cache => [] );
 
 # note - see attributes(3pm)
 sub MODIFY_CODE_ATTRIBUTES {
     my ( $class, $code, @attrs ) = @_;
-    $class->_attr_cache->{$code} = [@attrs];
-    push @{ $class->_action_cache }, [ $code, [@attrs] ];
+    $class->_attr_cache( { %{ $class->_attr_cache }, $code => [@attrs] } );
+    $class->_action_cache(
+        [ @{ $class->_action_cache }, [ $code, [@attrs] ] ] );
     return ();
 }
 
@@ -22,30 +22,33 @@ sub FETCH_CODE_ATTRIBUTES { $_[0]->_attr_cache->{ $_[1] } || () }
 
 =head1 NAME
 
-Catalyst::AttrContainer
+Catalyst::AttrContainer - Handles code attribute storage and caching
 
 =head1 SYNOPSIS
 
 =head1 DESCRIPTION
 
+This class sets up the code attribute cache.  It's a base class for 
+L<Catalyst::Controller>.
+
 =head1 METHODS
 
-=over 4
+=head2 FETCH_CODE_ATTRIBUTES
 
-=item FETCH_CODE_ATTRIBUTES
+Attribute function. See attributes(3pm)
 
-=item MODIFY_CODE_ATTRIBUTES
+=head2 MODIFY_CODE_ATTRIBUTES
 
-=back
+Attribute function. See attributes(3pm)
 
 =head1 SEE ALSO
 
+L<Catalyst::Dispatcher>
 L<Catalyst>.
 
-=head1 AUTHOR
+=head1 AUTHORS
 
-Sebastian Riedel, C<sri@cpan.org>
-Marcus Ramberg, C<mramberg@cpan.org>
+Catalyst Contributors, see Catalyst.pm
 
 =head1 COPYRIGHT