use attributes;
__PACKAGE__->mk_accessors(
- qw/counter depth request response state action namespace/
+ qw/counter request response state action stack namespace/
);
-attributes->import(__PACKAGE__, \&namespace, 'lvalue');
+attributes->import( __PACKAGE__, \&namespace, 'lvalue' );
+
+sub depth { scalar @{ shift->stack || [] }; }
# Laziness++
*comp = \&component;
require Module::Pluggable::Fast;
# Helper script generation
-our $CATALYST_SCRIPT_GEN = 10;
+our $CATALYST_SCRIPT_GEN = 11;
__PACKAGE__->mk_classdata($_)
- for qw/components arguments dispatcher engine log/;
+ for qw/components arguments dispatcher engine log dispatcher_class
+ engine_class context_class request_class response_class/;
+
+__PACKAGE__->dispatcher_class('Catalyst::Dispatcher');
+__PACKAGE__->engine_class('Catalyst::Engine::CGI');
+__PACKAGE__->request_class('Catalyst::Request');
+__PACKAGE__->response_class('Catalyst::Response');
-our $VERSION = '5.49_03';
+our $VERSION = '5.49_04';
sub import {
my ( $class, @arguments ) = @_;
}
}
- $class->log->warn( "You are running an old helper script! "
- . "Please update your scripts by regenerating the "
- . "application and copying over the new scripts." )
- if ( $ENV{CATALYST_SCRIPT_GEN}
- && ( $ENV{CATALYST_SCRIPT_GEN} < $Catalyst::CATALYST_SCRIPT_GEN ) );
+ $class->log->warn(
+ <<"EOF") if ( $ENV{CATALYST_SCRIPT_GEN} && ( $ENV{CATALYST_SCRIPT_GEN} < $Catalyst::CATALYST_SCRIPT_GEN ) );
+You are running an old script!
+
+ Please update by running:
+ catalyst.pl -nonew -scripts $class
+EOF
if ( $class->debug ) {
$class->setup_components;
if ( $class->debug ) {
- my $t = Text::SimpleTable->new(76);
- $t->row($_) for sort keys %{ $class->components };
+ my $t = Text::SimpleTable->new( [ 65, 'Class' ], [ 8, 'Type' ] );
+ for my $comp ( sort keys %{ $class->components } ) {
+ my $type = ref $class->components->{$comp} ? 'instance' : 'class';
+ $t->row( $comp, $type );
+ }
$class->log->debug( "Loaded components:\n" . $t->draw )
if ( keys %{ $class->components } );
}
Contains the components.
+=item $c->context_class($class)
+
+Contains the context class.
+
=item $c->counter
Returns a hashref containing coderefs and execution counts.
sub dispatch { my $c = shift; $c->dispatcher->dispatch( $c, @_ ) }
+=item $c->dispatcher_class($class)
+
+Contains the dispatcher class.
+
=item dump_these
Returns a list of 2-element array references (name, structure) pairs that will
[ Request => $c->req ], [ Response => $c->res ], [ Stash => $c->stash ],;
}
+=item $c->engine_class($class)
+
+Contains the engine class.
+
=item $c->execute($class, $coderef)
Execute a coderef in given class and catch exceptions.
my ( $c, $class, $code ) = @_;
$class = $c->components->{$class} || $class;
$c->state(0);
- my $callsub = ( caller(1) )[3];
+
+ my $callsub =
+ ( caller(0) )[0]->isa('Catalyst::Action')
+ ? ( caller(2) )[3]
+ : ( caller(1) )[3];
my $action = '';
if ( $c->debug ) {
$action = "-> $action" if $callsub =~ /forward$/;
}
- $c->{depth}++;
+ push( @{ $c->stack }, $code );
eval {
if ( $c->debug )
{
$c->state( &$code( $class, $c, @{ $c->req->args } ) || 0 );
}
};
- $c->{depth}--;
+ pop( @{ $c->stack } );
if ( my $error = $@ ) {
- if ( $error eq $DETACH ) { die $DETACH if $c->{depth} > 1 }
+ if ( $error eq $DETACH ) { die $DETACH if $c->depth > 1 }
else {
unless ( ref $error ) {
chomp $error;
=cut
-sub get_action { my $c = shift; $c->dispatcher->get_action( @_ ) }
+sub get_action { my $c = shift; $c->dispatcher->get_action(@_) }
=item $c->get_actions( $action, $namespace )
sub prepare {
my ( $class, @arguments ) = @_;
- my $c = bless {
- counter => {},
- depth => 0,
- request => Catalyst::Request->new(
- {
- arguments => [],
- body_parameters => {},
- cookies => {},
- headers => HTTP::Headers->new,
- parameters => {},
- query_parameters => {},
- secure => 0,
- snippets => [],
- uploads => {}
- }
- ),
- response => Catalyst::Response->new(
- {
- body => '',
- cookies => {},
- headers => HTTP::Headers->new(),
- status => 200
- }
- ),
- stash => {},
- state => 0
- }, $class;
+ $class->context_class( ref $class || $class ) unless $class->context_class;
+ my $c = $class->context_class->new(
+ {
+ counter => {},
+ stack => [],
+ request => $class->request_class->new(
+ {
+ arguments => [],
+ body_parameters => {},
+ cookies => {},
+ headers => HTTP::Headers->new,
+ parameters => {},
+ query_parameters => {},
+ secure => 0,
+ snippets => [],
+ uploads => {}
+ }
+ ),
+ response => $class->response_class->new(
+ {
+ body => '',
+ cookies => {},
+ headers => HTTP::Headers->new(),
+ status => 200
+ }
+ ),
+ stash => {},
+ state => 0
+ }
+ );
# For on-demand data
$c->request->{_context} = $c;
sub prepare_write { my $c = shift; $c->engine->prepare_write( $c, @_ ) }
+=item $c->request_class($class)
+
+Contains the request class.
+
+=item $c->response_class($class)
+
+Contains the response class.
+
=item $c->read( [$maxlength] )
Read a chunk of data from the request body. This method is designed to be
return $component;
}
- my $suffix = Catalyst::Utils::class2classsuffix($class);
+ my $suffix = Catalyst::Utils::class2classsuffix($component);
my $config = $class->config->{$suffix} || {};
my $instance;
}
unless ($dispatcher) {
- $dispatcher = 'Catalyst::Dispatcher';
+ $dispatcher = $class->dispatcher_class;
}
$dispatcher->require;
}
unless ($engine) {
- $engine = 'Catalyst::Engine::CGI';
+ $engine = $class->engine_class;
}
$engine->require;
}
}
+=item $c->stack
+
+Contains the stack.
+
=item $c->write( $data )
Writes $data to the output stream. When using this method directly, you will
projects / catagits/Catalyst-Runtime.git / blobdiff