use base 'Catalyst::Base';
use UNIVERSAL::require;
use Catalyst::Log;
+use Text::ASCIITable;
+our $CATALYST_SCRIPT_GEN = 2;
-__PACKAGE__->mk_classdata($_) for qw/engine log/;
+__PACKAGE__->mk_classdata($_) for qw/dispatcher engine log/;
-our $VERSION = '5.00';
+our $VERSION = '5.03';
our @ISA;
=head1 NAME
sub index : Path('/index.html') {
my ( $self, $c ) = @_;
$c->res->output('Hello');
- $c->forward('_foo');
+ $c->forward('foo');
}
- sub product : Regex('/^product[_]*(\d*).html$/') {
+ sub product : Regex('^product[_]*(\d*).html$') {
my ( $self, $c ) = @_;
$c->stash->{template} = 'product.tt';
$c->stash->{product} = $c->req->snippets->[0];
my ( $self, @options ) = @_;
my $caller = caller(0);
+ # Prepare inheritance
unless ( $caller->isa($self) ) {
no strict 'refs';
push @{"$caller\::ISA"}, $self;
}
if ( $caller->engine ) {
- return; # Catalyst is allready initialized
+ return; # Catalyst is already initialized
}
unless ( $caller->log ) {
$caller->log( Catalyst::Log->new );
}
+ # Debug?
if ( $ENV{CATALYST_DEBUG} || $ENV{ uc($caller) . '_DEBUG' } ) {
no strict 'refs';
*{"$caller\::debug"} = sub { 1 };
$caller->log->debug('Debug messages enabled');
}
- my $engine ='Catalyst::Engine::CGI';
+ my $engine = 'Catalyst::Engine::CGI';
+ my $dispatcher = 'Catalyst::Dispatcher';
+ # Detect mod_perl
if ( $ENV{MOD_PERL} ) {
require mod_perl;
- if ( $mod_perl::VERSION >= 1.99 ) {
- $engine ='Catalyst::Engine::Apache::MP2';
+ if ( $ENV{MOD_PERL_API_VERSION} == 2 ) {
+ $engine = 'Catalyst::Engine::Apache::MP20';
+ }
+ elsif ( $mod_perl::VERSION >= 1.99 ) {
+ $engine = 'Catalyst::Engine::Apache::MP19';
}
else {
- $engine ='Catalyst::Engine::Apache::MP1';
+ $engine = 'Catalyst::Engine::Apache::MP13';
}
}
+ $caller->log->info( "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_SCRIPT_GEN )
+ );
+
+ # Process options
my @plugins;
foreach (@options) {
+
if (/^\-Debug$/) {
next if $caller->debug;
no strict 'refs';
*{"$caller\::debug"} = sub { 1 };
$caller->log->debug('Debug messages enabled');
}
+
+ elsif (/^-Dispatcher=(.*)$/) {
+ $dispatcher = "Catalyst::Dispatcher::$1";
+ }
+
elsif (/^-Engine=(.*)$/) { $engine = "Catalyst::Engine::$1" }
elsif (/^-.*$/) { $caller->log->error(qq/Unknown flag "$_"/) }
+
else {
my $plugin = "Catalyst::Plugin::$_";
$plugin->require;
-
- if ($@) {
- $caller->log->error(qq/Couldn't load plugin "$plugin", "$@"/);
- }
+
+ if ($@) { die qq/Couldn't load plugin "$plugin", "$@"/ }
else {
- push @plugins, " $plugin";
+ push @plugins, $plugin;
no strict 'refs';
push @{"$caller\::ISA"}, $plugin;
}
}
+
}
- $caller->log->debug( 'Loaded plugins', @plugins )
+
+ # Plugin table
+ my $t = Text::ASCIITable->new( { hide_HeadRow => 1, hide_HeadLine => 1 } );
+ $t->setCols('Class');
+ $t->setColWidth( 'Class', 75, 1 );
+ $t->addRow($_) for @plugins;
+ $caller->log->debug( 'Loaded plugins', $t->draw )
if ( @plugins && $caller->debug );
+ # Dispatcher
+ $dispatcher = "Catalyst::Dispatcher::$ENV{CATALYST_DISPATCHER}"
+ if $ENV{CATALYST_DISPATCHER};
+
+ $dispatcher->require;
+ die qq/Couldn't load dispatcher "$dispatcher", "$@"/ if $@;
+ {
+ no strict 'refs';
+ push @{"$caller\::ISA"}, $dispatcher;
+ }
+ $caller->dispatcher($dispatcher);
+ $caller->log->debug(qq/Loaded dispatcher "$dispatcher"/) if $caller->debug;
+
# Engine
$engine = "Catalyst::Engine::$ENV{CATALYST_ENGINE}"
if $ENV{CATALYST_ENGINE};
=back
+=head1 LIMITATIONS
+
+FCGI and mod_perl2 support are considered experimental and may contain bugs.
+
+You may encounter problems accessing the built in test server on public ip
+addresses on the internet, thats because of a bug in HTTP::Daemon.
+
=head1 SUPPORT
IRC:
http://lists.rawmode.org/mailman/listinfo/catalyst
http://lists.rawmode.org/mailman/listinfo/catalyst-dev
+Web:
+
+ http://catalyst.perl.org
+
=head1 SEE ALSO
-L<Catalyst::Manual>, L<Catalyst::Test>, L<Catalyst::Request>,
-L<Catalyst::Response>, L<Catalyst::Engine>
+=over 4
+
+=item L<Catalyst::Manual> - The Catalyst Manual
+
+=item L<Catalyst::Engine> - Core Engine
+
+=item L<Catalyst::Log> - The Log Class.
+
+=item L<Catalyst::Request> - The Request Object
+
+=item L<Catalyst::Response> - The Response Object
+
+=item L<Catalyst::Test> - The test suite.
+
+=back
=head1 AUTHOR
=head1 THANK YOU
-Andrew Ford, Andrew Ruthven, Christian Hansen, Christopher Hicks,
-Dan Sully, Danijel Milicevic, David Naughton, Gary Ashton Jones,
-Jesse Sheidlower, Johan Lindstrom, Marcus Ramberg, Tatsuhiko Miyagawa
-and all the others who've helped.
+Andy Grundman, Andrew Ford, Andrew Ruthven, Autrijus Tang, Christian Hansen,
+Christopher Hicks, Dan Sully, Danijel Milicevic, David Naughton,
+Gary Ashton Jones, Jesse Sheidlower, Johan Lindstrom, Marcus Ramberg,
+Tatsuhiko Miyagawa and all the others who've helped.
=head1 LICENSE