X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=1adf5576a326670f32394729986e12a5c4a64471;hb=8767c5a3e3e357113d0092cef50d81f358be8b92;hp=323ff5bd6f36db693a80efaa9834fd844de832dd;hpb=9fa3cc8bde162dc2ff77745b60c3a5a371360add;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 323ff5b..1adf557 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -16,11 +16,16 @@ use Path::Class; use Time::HiRes qw/gettimeofday tv_interval/; use URI; use Scalar::Util qw/weaken/; +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; @@ -41,7 +46,13 @@ require Module::Pluggable::Fast; our $CATALYST_SCRIPT_GEN = 10; __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'; @@ -219,6 +230,23 @@ sub component { Returns a hashref containing your applications settings. +=cut + +=item $c->controller($name) + +Get a L instance by name. + + $c->controller('Foo')->do_stuff; + +=cut + +sub controller { + my ( $c, $name ) = @_; + my $controller = $c->comp("Controller::$name"); + return $controller if $controller; + return $c->comp("C::$name"); +} + =item debug Overload to enable debug messages. @@ -257,6 +285,21 @@ from the function. sub forward { my $c = shift; $c->dispatcher->forward( $c, @_ ) } +=item $c->model($name) + +Get a L instance by name. + + $c->model('Foo')->do_stuff; + +=cut + +sub model { + my ( $c, $name ) = @_; + my $model = $c->comp("Model::$name"); + return $model if $model; + return $c->comp("M::$name"); +} + =item $c->namespace Accessor to the namespace of the current action @@ -380,8 +423,11 @@ sub setup { $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 } ); } @@ -557,6 +603,21 @@ sub stash { return $c->{stash}; } +=item $c->view($name) + +Get a L instance by name. + + $c->view('Foo')->do_stuff; + +=cut + +sub view { + my ( $c, $name ) = @_; + my $view = $c->comp("View::$name"); + return $view if $view; + return $c->comp("V::$name"); +} + =item $c->welcome_message Returns the Catalyst welcome HTML page. @@ -730,6 +791,10 @@ sub benchmark { Contains the components. +=item $c->context_class($class) + +Contains the context class. + =item $c->counter Returns a hashref containing coderefs and execution counts. @@ -747,6 +812,10 @@ Dispatch request to actions. 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 @@ -759,6 +828,10 @@ sub dump_these { [ 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. @@ -788,7 +861,7 @@ sub execute { $action = "-> $action" if $callsub =~ /forward$/; } - $c->{depth}++; + push( @{ $c->stack }, $code ); eval { if ( $c->debug ) { @@ -805,18 +878,16 @@ sub execute { $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; $error = qq/Caught exception "$error"/; } - - $c->log->error($error); $c->error($error); $c->state(0); } @@ -833,6 +904,10 @@ Finalize request. sub finalize { my $c = shift; + for my $error ( @{ $c->error } ) { + $c->log->error($error); + } + $c->finalize_uploads; # Error @@ -939,7 +1014,7 @@ Get an action in a given namespace. =cut -sub get_action { my $c = shift; $c->dispatcher->get_action( $c, @_ ) } +sub get_action { my $c = shift; $c->dispatcher->get_action(@_) } =item $c->get_actions( $action, $namespace ) @@ -1006,33 +1081,36 @@ into a Catalyst context . 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; @@ -1251,6 +1329,14 @@ Prepare the output for writing. 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 @@ -1299,7 +1385,7 @@ sub setup_components { my $callback = sub { my ( $component, $context ) = @_; - unless ( $component->isa('Catalyst::Base') ) { + unless ( $component->isa('Catalyst::Component') ) { return $component; } @@ -1371,7 +1457,7 @@ sub setup_dispatcher { } unless ($dispatcher) { - $dispatcher = 'Catalyst::Dispatcher'; + $dispatcher = $class->dispatcher_class; } $dispatcher->require; @@ -1460,7 +1546,7 @@ sub setup_engine { } unless ($engine) { - $engine = 'Catalyst::Engine::CGI'; + $engine = $class->engine_class; } $engine->require; @@ -1542,13 +1628,15 @@ sub setup_log { unless ( $class->log ) { $class->log( Catalyst::Log->new ); } - + my $app_flag = Catalyst::Utils::class2env($class) . '_DEBUG'; - if ( ( defined( $ENV{CATALYST_DEBUG} ) || - defined( $ENV{ $app_flag } ) ) ? - ( $ENV{CATALYST_DEBUG} || $ENV{ $app_flag } ) : - $debug ) { + if ( + ( defined( $ENV{CATALYST_DEBUG} ) || defined( $ENV{$app_flag} ) ) + ? ( $ENV{CATALYST_DEBUG} || $ENV{$app_flag} ) + : $debug + ) + { no strict 'refs'; *{"$class\::debug"} = sub { 1 }; $class->log->debug('Debug messages enabled'); @@ -1581,6 +1669,10 @@ sub setup_plugins { } } +=item $c->stack + +Contains the stack. + =item $c->write( $data ) Writes $data to the output stream. When using this method directly, you will @@ -1730,6 +1822,8 @@ Arthur Bergman Autrijus Tang +Brian Cassidy + Christian Hansen Christopher Hicks @@ -1764,6 +1858,8 @@ Robert Sedlacek Sam Vilain +Sascha Kiefer + Tatsuhiko Miyagawa Ulf Edvinsson