committing broken version. rolling back in a min. just making sure this gets saved...

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

diff --git a/lib/Catalyst/AttrContainer.pm b/lib/Catalyst/AttrContainer.pm
index 23ca0a1..3117824 100644 (file)
--- a/lib/Catalyst/AttrContainer.pm
+++ b/lib/Catalyst/AttrContainer.pm
@@ -1,20 +1,38 @@
 package Catalyst::AttrContainer;
 
-use strict;
-use base qw/Class::Data::Inheritable Class::Accessor::Fast/;
-
+use Moose;
+#use MooseX::ClassAttribute;
 use Catalyst::Exception;
-use NEXT;
+use Class::Data::Inheritable;
+{
+  my $mk_classdata =  Class::Data::Inheritable->can('mk_classdata');
+  __PACKAGE__->meta->add_method(mk_classdata => $mk_classdata);
+}
 
-__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 => []);
+
+# class_has _attr_cache   => (
+#                             is => 'rw',
+#                             isa => 'HashRef',
+#                             required => 1,
+#                             default => sub{{}}
+#                            );
+# class_has _action_cache => (
+#                             is => 'rw',
+#                             isa => 'ArrayRef',
+#                             required => 1,
+#                             default => sub{ [] }
+#                           );
 
 # note - see attributes(3pm)
 sub MODIFY_CODE_ATTRIBUTES {
     my ( $class, $code, @attrs ) = @_;
-    $class->_attr_cache({ %{$class->_attr_cache}, $code => [@attrs] });
-    $class->_action_cache([ @{$class->_action_cache}, [ $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 ();
 }
 
@@ -28,18 +46,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