still failing some tests. waiting for suggestions on whether to fix old CDIretardedness

[catagits/Catalyst-Runtime.git] / lib / Catalyst / AttrContainer.pm

diff --git a/lib/Catalyst/AttrContainer.pm b/lib/Catalyst/AttrContainer.pm
index c7eb129..060ee59 100644 (file)
--- a/lib/Catalyst/AttrContainer.pm
+++ b/lib/Catalyst/AttrContainer.pm
@@ -1,10 +1,12 @@
 package Catalyst::AttrContainer;
 
-use strict;
-use base qw/Class::Data::Inheritable Class::Accessor::Fast/;
-
+use Moose;
 use Catalyst::Exception;
-use NEXT;
+
+with 'Catalyst::ClassData';
+use Scalar::Util 'blessed';
+
+no Moose;
 
 __PACKAGE__->mk_classdata($_) for qw/_attr_cache _action_cache/;
 __PACKAGE__->_attr_cache( {} );
@@ -13,8 +15,9 @@ __PACKAGE__->_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 ();
 }
 
@@ -28,18 +31,22 @@ Catalyst::AttrContainer
 
 =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