Added advanced attributes handling

diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm
index a79cfa2..efc7aa7 100644 (file)
--- a/lib/Catalyst/Base.pm
+++ b/lib/Catalyst/Base.pm
@@ -4,16 +4,20 @@ use strict;
 use base qw/Class::Data::Inheritable Class::Accessor::Fast/;
 use NEXT;
 
-__PACKAGE__->mk_classdata($_) for qw/_cache _config/;
+__PACKAGE__->mk_classdata($_) for qw/_attrcache _cache _config/;
 __PACKAGE__->_cache( [] );
+__PACKAGE__->_attrchache( {} );
 
 # note - see attributes(3pm)
 sub MODIFY_CODE_ATTRIBUTES {
     my ( $class, $code, @attrs ) = @_;
+    $class->_attrcache->{$code} = [@attrs];
     push @{ $class->_cache }, [ $code, [@attrs] ];
     return ();
 }
 
+sub FETCH_CODE_ATTTRIBUTES { $_[0]->_attrcache->{ $_[1] } || () }
+
 =head1 NAME
 
 Catalyst::Base - Catalyst Universal Base Class
@@ -95,7 +99,9 @@ sub config {
 
 =cut
 
-sub process { die ((ref $_[0] || $_[0])." did not override Catalyst::Base::process"); }
+sub process {
+    die( ( ref $_[0] || $_[0] ) . " did not override Catalyst::Base::process" );
+}
 
 =back
 

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 6764524..86eb91b 100644 (file)
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -2,6 +2,7 @@ package Catalyst::Engine;
 
 use strict;
 use base qw/Class::Data::Inheritable Class::Accessor::Fast/;
+use attributes ();
 use UNIVERSAL::require;
 use CGI::Cookie;
 use Data::Dumper;
@@ -668,6 +669,9 @@ sub stash {
     return $self->{stash};
 }
 
+# Takes a coderef and returns an arrayref containing attributes
+sub _get_attrs { attributes::get( $_[0] ) || [] }
+
 =back
 
 =head1 AUTHOR