$Data::Dumper::Terse = 1;
__PACKAGE__->mk_classdata('components');
-__PACKAGE__->mk_accessors(qw/request response state/);
+__PACKAGE__->mk_accessors(qw/counter request response state/);
*comp = \&component;
*req = \&request;
*finalize_output = \&finalize_body;
# For statistics
-our $COUNT = 1;
-our $START = time;
+our $COUNT = 1;
+our $START = time;
+our $RECURSION = 1000;
=head1 NAME
sub component {
my $c = shift;
- if ( @_ ) {
+ if (@_) {
my $name = shift;
return sort keys %{ $c->components };
}
+=item $c->counter
+
+Returns a hashref containing coderefs and execution counts.
+(Needed for deep recursion detection)
+
=item $c->error
=item $c->error($error, ...)
$c->state(0);
my $callsub = ( caller(1) )[3];
+ my $action = '';
+ if ( $c->debug ) {
+ $action = $c->actions->{reverse}->{"$code"};
+ $action = "/$action" unless $action =~ /\-\>/;
+ $c->counter->{"$code"}++;
+
+ if ( $c->counter->{"$code"} > $RECURSION ) {
+ my $error = qq/Deep recursion detected in "$action"/;
+ $c->log->error($error);
+ $c->error($error);
+ $c->state(0);
+ return $c->state;
+ }
+
+ $action = "-> $action" if $callsub =~ /forward$/;
+ }
+
eval {
if ( $c->debug )
{
- my $action = $c->actions->{reverse}->{"$code"};
- $action = "/$action" unless $action =~ /\-\>/;
- $action = "-> $action" if $callsub =~ /forward$/;
my ( $elapsed, @state ) =
$c->benchmark( $code, $class, $c, @{ $c->req->args } );
push @{ $c->{stats} }, [ $action, sprintf( '%fs', $elapsed ) ];
my $elapsed;
( $elapsed, $status ) = $class->benchmark($handler);
$elapsed = sprintf '%f', $elapsed;
- my $av = sprintf '%.3f', ( $elapsed == 0 ? '??' : (1 / $elapsed) );
+ my $av = sprintf '%.3f',
+ ( $elapsed == 0 ? '??' : ( 1 / $elapsed ) );
my $t = Text::ASCIITable->new;
$t->setCols( 'Action', 'Time' );
$t->setColWidth( 'Action', 64, 1 );
my ( $class, $engine ) = @_;
my $c = bless {
+ counter => {},
request => Catalyst::Request->new(
{
arguments => [],
die qq/Couldn't load components "$error"/;
}
- $self->components( {} );
-
- for my $component ( $self->_components ) {
- $self->components->{$component} = $component;
- }
+ return $self->_components;
}
=item $c->run
sub setup {
my $self = shift;
- $self->retrieve_components;
$self->setup_components;
if ( $self->debug ) {
my $name = $self->config->{name} || 'Application';
sub setup_components {
my $self = shift;
- my @components;
- for my $component ( keys %{ $self->components } ) {
-
- unless ( UNIVERSAL::isa( $component, 'Catalyst::Base' ) ) {
- next;
- }
-
- my $instance;
-
- eval { $instance = $component->new($self) };
-
- if ( $@ ) {
- die( qq/Couldn't instantiate "$component", "$@"/ );
- }
+ # Components
+ my $class = ref $self || $self;
+ eval <<"";
+ package $class;
+ import Module::Pluggable::Fast
+ name => '_components',
+ search => [
+ '$class\::Controller', '$class\::C',
+ '$class\::Model', '$class\::M',
+ '$class\::View', '$class\::V'
+ ];
- $self->components->{$component} = $instance;
+ if ( my $error = $@ ) {
+ chomp $error;
+ die qq/Couldn't load components "$error"/;
+ }
- push @components, $component;
+ $self->components( {} );
+ my @comps;
+ for my $comp ( $self->_components($self) ) {
+ $self->components->{ ref $comp } = $comp;
+ push @comps, $comp;
}
-
+
my $t = Text::ASCIITable->new( { hide_HeadRow => 1, hide_HeadLine => 1 } );
$t->setCols('Class');
$t->setColWidth( 'Class', 75, 1 );
$self->log->debug( 'Loaded components', $t->draw )
if ( @{ $t->{tbl_rows} } && $self->debug );
- $self->setup_actions( [ $self, @components ] );
+ $self->setup_actions( [ $self, @comps ] );
}
=item $c->state
sub stash {
my $self = shift;
- if ( @_ ) {
+ if (@_) {
my $stash = @_ > 1 ? {@_} : $_[0];
while ( my ( $key, $val ) = each %$stash ) {
$self->{stash}->{$key} = $val;