$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
=cut
sub component {
- my ( $c, $name ) = @_;
+ my $c = shift;
- if ( my $component = $c->components->{$name} ) {
- return $component;
- }
+ if (@_) {
- else {
- for my $component ( keys %{ $c->components } ) {
- return $c->components->{$component} if $component =~ /$name/i;
+ my $name = shift;
+
+ if ( my $component = $c->components->{$name} ) {
+ return $component;
+ }
+
+ else {
+ for my $component ( keys %{ $c->components } ) {
+ return $c->components->{$component} if $component =~ /$name/i;
+ }
}
}
+ 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, ...)
sub execute {
my ( $c, $class, $code ) = @_;
- $class = $c->comp($class) || $class;
+ $class = $c->components->{$class} || $class;
$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 ) ];
return $status;
}
+=item $c->finalize_output
+
+<obsolete>, see finalize_body
+
=item $c->finalize_body
Finalize body.
sub finalize_headers { }
-=item $c->handler( $class, $r )
+=item $c->handler( $class, @arguments )
Handles the request.
=cut
sub handler {
- my ( $class, $engine ) = @_;
+ my ( $class, @arguments ) = @_;
# Always expect worst case!
my $status = -1;
my @stats = ();
my $handler = sub {
- my $c = $class->prepare($engine);
+ my $c = $class->prepare(@arguments);
$c->{stats} = \@stats;
$c->dispatch;
return $c->finalize;
my $elapsed;
( $elapsed, $status ) = $class->benchmark($handler);
$elapsed = sprintf '%f', $elapsed;
- my $av = sprintf '%.3f', 1 / $elapsed;
+ my $av = sprintf '%.3f',
+ ( $elapsed == 0 ? '??' : ( 1 / $elapsed ) );
my $t = Text::ASCIITable->new;
$t->setCols( 'Action', 'Time' );
$t->setColWidth( 'Action', 64, 1 );
return $status;
}
-=item $c->prepare($r)
+=item $c->prepare(@arguments)
Turns the engine-specific request( Apache, CGI ... )
into a Catalyst context .
=cut
sub prepare {
- my ( $class, $r ) = @_;
+ my ( $class, @arguments ) = @_;
my $c = bless {
+ counter => {},
request => Catalyst::Request->new(
{
arguments => [],
cookies => {},
headers => HTTP::Headers->new,
parameters => {},
+ secure => 0,
snippets => [],
uploads => {}
}
),
response => Catalyst::Response->new(
- { cookies => {}, headers => HTTP::Headers->new, status => 200 }
+ {
+ body => '',
+ cookies => {},
+ headers => HTTP::Headers->new,
+ status => 200
+ }
),
stash => {},
state => 0
$c->res->headers->header( 'X-Catalyst' => $Catalyst::VERSION );
}
- $c->prepare_request($r);
- $c->prepare_path;
+ $c->prepare_request(@arguments);
+ $c->prepare_connection;
$c->prepare_headers;
$c->prepare_cookies;
- $c->prepare_connection;
+ $c->prepare_path;
$c->prepare_action;
my $method = $c->req->method || '';
$t->setCols( 'Key', 'Value' );
$t->setColWidth( 'Key', 37, 1 );
$t->setColWidth( 'Value', 36, 1 );
- for my $key ( keys %{ $c->req->params } ) {
- my $value = $c->req->params->{$key} || '';
+ for my $key ( sort keys %{ $c->req->params } ) {
+ my $param = $c->req->params->{$key};
+ my $value = defined($param) ? $param : '';
$t->addRow( $key, $value );
}
$c->log->debug( 'Parameters are', $t->draw );
sub setup_components {
my $self = shift;
-
+
# Components
my $class = ref $self || $self;
eval <<"";
my $t = Text::ASCIITable->new( { hide_HeadRow => 1, hide_HeadLine => 1 } );
$t->setCols('Class');
$t->setColWidth( 'Class', 75, 1 );
- $t->addRow($_) for keys %{ $self->components };
+ $t->addRow($_) for sort keys %{ $self->components };
$self->log->debug( 'Loaded components', $t->draw )
if ( @{ $t->{tbl_rows} } && $self->debug );
sub stash {
my $self = shift;
- if ( $_[0] ) {
- my $stash = $_[1] ? {@_} : $_[0];
+ if (@_) {
+ my $stash = @_ > 1 ? {@_} : $_[0];
while ( my ( $key, $val ) = each %$stash ) {
$self->{stash}->{$key} = $val;
}