use Catalyst::Request;
use Catalyst::Request::Upload;
use Catalyst::Response;
+use Catalyst::Utils;
require Module::Pluggable::Fast;
$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, ...)
$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 } );
+ my ( $elapsed, @state ) = $c->benchmark( $code, $class, $c, @{ $c->req->args } );
push @{ $c->{stats} }, [ $action, sprintf( '%fs', $elapsed ) ];
$c->state(@state);
}
- else { $c->state( &$code( $class, $c, @{ $c->req->args } ) ) }
+ else { $c->state( &$code( $class, $c, @{ $c->req->args } ) || 0 ) }
};
if ( my $error = $@ ) {
=item $c->finalize_output
-alias to finalize_body
+<obsolete>, see finalize_body
=item $c->finalize_body
sub finalize_headers { }
-=item $c->handler( $class, $engine )
+=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', ( $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 );
return $status;
}
-=item $c->prepare($engine)
+=item $c->prepare(@arguments)
Turns the engine-specific request( Apache, CGI ... )
into a Catalyst context .
=cut
sub prepare {
- my ( $class, $engine ) = @_;
+ my ( $class, @arguments ) = @_;
my $c = bless {
+ counter => {},
request => Catalyst::Request->new(
{
arguments => [],
),
response => Catalyst::Response->new(
{
- body => undef,
+ body => '',
cookies => {},
headers => HTTP::Headers->new,
- status => 200
+ status => 200
}
),
stash => {},
$c->res->headers->header( 'X-Catalyst' => $Catalyst::VERSION );
}
- $c->prepare_request($engine);
+ $c->prepare_request(@arguments);
$c->prepare_connection;
$c->prepare_headers;
$c->prepare_cookies;
my $method = $c->req->method || '';
my $path = $c->req->path || '';
- my $hostname = $c->req->hostname || '';
my $address = $c->req->address || '';
- $c->log->debug(qq/"$method" request for "$path" from $hostname($address)/)
+ $c->log->debug(qq/"$method" request for "$path" from $address/)
if $c->debug;
if ( $c->request->method eq 'POST' and $c->request->content_length ) {
sub setup {
my $self = shift;
+
+ # Initialize our data structure
+ $self->components( {} );
+
$self->setup_components;
+
+ if ( $self->debug ) {
+ my $t = Text::ASCIITable->new;
+ $t->setOptions( 'hide_HeadRow', 1 );
+ $t->setOptions( 'hide_HeadLine', 1 );
+ $t->setCols('Class');
+ $t->setColWidth( 'Class', 75, 1 );
+ $t->addRow($_) for sort keys %{ $self->components };
+ $self->log->debug( 'Loaded components', $t->draw )
+ if ( @{ $t->{tbl_rows} } );
+ }
+
+ # Add our self to components, since we are also a component
+ $self->components->{ $self } = $self;
+
+ $self->setup_actions;
+
if ( $self->debug ) {
my $name = $self->config->{name} || 'Application';
$self->log->info("$name powered by Catalyst $Catalyst::VERSION");
sub setup_components {
my $self = shift;
+
+ my $callback = sub {
+ my ( $component, $context ) = @_;
+
+ unless ( $component->isa('Catalyst::Base') ) {
+ return $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'
- ];
+ my $suffix = Catalyst::Utils::class2classsuffix($component);
+ my $config = $self->config->{$suffix} || {};
+
+ my $instance;
+
+ eval {
+ $instance = $component->new( $context, $config );
+ };
+
+ if ( my $error = $@ ) {
+ chomp $error;
+ die qq/Couldn't instantiate component "$component", "$error"/;
+ }
+
+ return $instance;
+ };
+
+ eval {
+ Module::Pluggable::Fast->import(
+ name => '_components',
+ search => [
+ "$self\::Controller", "$self\::C",
+ "$self\::Model", "$self\::M",
+ "$self\::View", "$self\::V"
+ ],
+ callback => $callback
+ );
+ };
if ( my $error = $@ ) {
chomp $error;
die qq/Couldn't load components "$error"/;
}
- $self->components( {} );
- my @comps;
- for my $comp ( $self->_components($self) ) {
- $self->components->{ ref $comp } = $comp;
- push @comps, $comp;
+ for my $component ( $self->_components($self) ) {
+ $self->components->{ ref $component || $component } = $component;
}
-
- 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 };
- $self->log->debug( 'Loaded components', $t->draw )
- if ( @{ $t->{tbl_rows} } && $self->debug );
-
- $self->setup_actions( [ $self, @comps ] );
}
=item $c->state
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;
}
projects / catagits/Catalyst-Runtime.git / blobdiff