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 3117824..060ee59 100644 (file)
--- a/lib/Catalyst/AttrContainer.pm
+++ b/lib/Catalyst/AttrContainer.pm
@@ -1,36 +1,21 @@
 package Catalyst::AttrContainer;
 
 use Moose;
-#use MooseX::ClassAttribute;
 use Catalyst::Exception;
-use Class::Data::Inheritable;
-{
-  my $mk_classdata =  Class::Data::Inheritable->can('mk_classdata');
-  __PACKAGE__->meta->add_method(mk_classdata => $mk_classdata);
-}
 
-__PACKAGE__->mk_classdata(_attr_cache   => {});
-__PACKAGE__->mk_classdata(_action_cache => []);
-
-# class_has _attr_cache   => (
-#                             is => 'rw',
-#                             isa => 'HashRef',
-#                             required => 1,
-#                             default => sub{{}}
-#                            );
-# class_has _action_cache => (
-#                             is => 'rw',
-#                             isa => 'ArrayRef',
-#                             required => 1,
-#                             default => sub{ [] }
-#                           );
+with 'Catalyst::ClassData';
+use Scalar::Util 'blessed';
+
+no Moose;
+
+__PACKAGE__->mk_classdata($_) for qw/_attr_cache _action_cache/;
+__PACKAGE__->_attr_cache( {} );
+__PACKAGE__->_action_cache( [] );
 
 # note - see attributes(3pm)
 sub MODIFY_CODE_ATTRIBUTES {
     my ( $class, $code, @attrs ) = @_;
-    #can't the below just be $class->_attr_cache->{$code} = \@attrs; ?
     $class->_attr_cache( { %{ $class->_attr_cache }, $code => [@attrs] } );
-    #why can't this just be push @{$class->_action_cache}, [$code, \@attrs] ?
     $class->_action_cache(
         [ @{ $class->_action_cache }, [ $code, [@attrs] ] ] );
     return ();
@@ -46,7 +31,7 @@ Catalyst::AttrContainer
 
 =head1 DESCRIPTION
 
-This class sets up the code attribute cache.  It's a base class for
+This class sets up the code attribute cache.  It's a base class for 
 L<Catalyst::Controller>.
 
 =head1 METHODS