use UNIVERSAL::require;
use Catalyst::Log;
use Text::ASCIITable;
+our $CATALYST_SCRIPT_GEN = 2;
__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];
}
if ( $caller->engine ) {
- return; # Catalyst is allready initialized
+ return; # Catalyst is already initialized
}
unless ( $caller->log ) {
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) {
$caller->log->debug( 'Loaded plugins', $t->draw )
if ( @plugins && $caller->debug );
- # Engine
- $engine = "Catalyst::Engine::$ENV{CATALYST_ENGINE}"
- if $ENV{CATALYST_ENGINE};
-
- $engine->require;
- die qq/Couldn't load engine "$engine", "$@"/ if $@;
- {
- no strict 'refs';
- push @{"$caller\::ISA"}, $engine;
- }
- $caller->engine($engine);
- $caller->log->debug(qq/Loaded engine "$engine"/) if $caller->debug;
-
# Dispatcher
$dispatcher = "Catalyst::Dispatcher::$ENV{CATALYST_DISPATCHER}"
if $ENV{CATALYST_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};
+
+ $engine->require;
+ die qq/Couldn't load engine "$engine", "$@"/ if $@;
+ {
+ no strict 'refs';
+ push @{"$caller\::ISA"}, $engine;
+ }
+ $caller->engine($engine);
+ $caller->log->debug(qq/Loaded engine "$engine"/) if $caller->debug;
}
=item $c->engine
Your log class should implement the methods described in the C<Catalyst::Log>
man page.
+=item $c->plugin( $name, $class, @args )
+
+Instant plugins for Catalyst.
+Classdata accessor/mutator will be created, class loaded and instantiated.
+
+ MyApp->plugin( 'prototype', 'HTML::Prototype' );
+
+ $c->prototype->define_javascript_functions;
+
+=cut
+
+sub plugin {
+ my ( $class, $name, $plugin, @args ) = @_;
+ $plugin->require;
+ my $error = $UNIVERSAL::require::ERROR;
+ die qq/Couldn't load instant plugin "$plugin", "$error"/ if $error;
+ eval { $plugin->import };
+ $class->mk_classdata($name);
+ my $obj;
+ eval { $obj = $plugin->new(@args) };
+ die qq/Couldn't instantiate instant plugin "$plugin", "$@"/ if $@;
+ $class->$name($obj);
+ $class->log->debug(qq/Initialized instant plugin "$plugin" as "$name"/)
+ if $class->debug;
+}
=back
+=head1 LIMITATIONS
+
+mod_perl2 support are considered experimental and may contain bugs.
+
=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
=over 4
=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