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' );
+sub depth { scalar @{ shift->stack || [] }; }
+
# Laziness++
*comp = \&component;
*req = \&request;
our $CATALYST_SCRIPT_GEN = 10;
__PACKAGE__->mk_classdata($_)
- for qw/components arguments dispatcher engine log _dispatcher_class
- _engine_class _context_class _request_class _response_class/;
-
-sub dispatcher_class {
- return $_[0]->_dispatcher_class(@_[1..$#_]) || 'Catalyst::Dispatcher';
-}
-
-sub engine_class {
- return $_[0]->_engine_class(@_[1..$#_]) || 'Catalyst::Engine::CGI';
-}
+ for qw/components arguments dispatcher engine log dispatcher_class
+ engine_class context_class request_class response_class/;
-sub context_class {
- return $_[0]->_context_class(@_[1..$#_]) || ref $_[0] || $_[0];
-}
+__PACKAGE__->dispatcher_class('Catalyst::Dispatcher');
+__PACKAGE__->engine_class('Catalyst::Engine::CGI');
+__PACKAGE__->request_class('Catalyst::Request');
+__PACKAGE__->response_class('Catalyst::Response');
-sub request_class {
- return $_[0]->_request_class(@_[1..$#_]) || 'Catalyst::Request';
-}
-
-sub response_class {
- return $_[0]->_response_class(@_[1..$#_]) || 'Catalyst::Response';
-}
-
-our $VERSION = '5.49_03';
+our $VERSION = '5.49_04';
sub import {
my ( $class, @arguments ) = @_;
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;
sub prepare {
my ( $class, @arguments ) = @_;
- my $c = $class->context_class->new({
- counter => {},
- depth => 0,
- 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
- });
+ $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
}
}
+=item $c->stack
+
+Contains the stack.
+
=item $c->write( $data )
Writes $data to the output stream. When using this method directly, you will