use base 'Catalyst::Base';
use UNIVERSAL::require;
use Catalyst::Log;
-use Catalyst::Helper;
+use Catalyst::Utils;
use Text::ASCIITable;
+use Path::Class;
+our $CATALYST_SCRIPT_GEN = 4;
__PACKAGE__->mk_classdata($_) for qw/dispatcher engine log/;
-our $VERSION = '5.00';
+our $VERSION = '5.20';
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];
require mod_perl;
- if ( $mod_perl::VERSION >= 1.99 ) {
+ if ( $ENV{MOD_PERL_API_VERSION} == 2 ) {
+ $engine = 'Catalyst::Engine::Apache::MP20';
+ }
+ elsif ( $mod_perl::VERSION >= 1.99 ) {
$engine = 'Catalyst::Engine::Apache::MP19';
}
else {
}
}
- $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::Helper::CATALYST_SCRIPT_GEN )) ;
+ $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 );
+ # Dispatcher
+ $dispatcher = "Catalyst::Dispatcher::$ENV{CATALYST_DISPATCHER}"
+ if $ENV{CATALYST_DISPATCHER};
+ my $appdis = $ENV{ uc($caller) . '_DISPATCHER' };
+ $dispatcher = "Catalyst::Dispatcher::$appdis" if $appdis;
+
+ $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};
+ my $appeng = $ENV{ uc($caller) . '_ENGINE' };
+ $engine = "Catalyst::Engine::$appeng" if $appeng;
$engine->require;
die qq/Couldn't load engine "$engine", "$@"/ if $@;
$caller->engine($engine);
$caller->log->debug(qq/Loaded engine "$engine"/) if $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;
+ # Find home
+ my $home = Catalyst::Utils::home($caller);
+ if ( $caller->debug ) {
+ $home
+ ? ( -d $home )
+ ? $caller->log->debug(qq/Found home "$home"/)
+ : $caller->log->debug(qq/Home "$home" doesn't exist/)
+ : $caller->log->debug(q/Couldn't find home/);
}
- $caller->dispatcher($dispatcher);
- $caller->log->debug(qq/Loaded dispatcher "$dispatcher"/) if $caller->debug;
-
+ $caller->config->{home} = $home || '';
+ $caller->config->{root} = defined $home ? dir($home)->subdir('root') : '';
}
=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
-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.
+mod_perl2 support is considered experimental and may contain bugs.
=head1 SUPPORT
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
+Andy Grundman, Andrew Ford, Andrew Ruthven, Autrijus Tang, Christian Hansen,
+Christopher Hicks, Dan Sully, Danijel Milicevic, David Naughton,
+Gary Ashton Jones, Geoff Richards, Jesse Sheidlower, Jody Belka,
+Johan Lindstrom, Leon Brocard, Marcus Ramberg, Tatsuhiko Miyagawa
and all the others who've helped.
=head1 LICENSE