X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=829f72beaef894bf0f0d9682eaa69798658c84a8;hb=42a57832aea5e5c4684d534aa7d133c15aac4b42;hp=90d158af0d91d153a8bb5af8d6e7deada777bc50;hpb=32e4cad6b4d17819d58bf80f4ef473231d70df7b;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 90d158a..829f72b 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -4,8 +4,10 @@ use strict; use base 'Catalyst::Base'; use UNIVERSAL::require; use Catalyst::Log; +use Catalyst::Helper; +use Text::ASCIITable; -__PACKAGE__->mk_classdata($_) for qw/engine log/; +__PACKAGE__->mk_classdata($_) for qw/dispatcher engine log/; our $VERSION = '5.00'; our @ISA; @@ -125,57 +127,88 @@ sub import { 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'); } - # Options - my $engine = - $ENV{MOD_PERL} - ? 'Catalyst::Engine::Apache' - : '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::MP19'; + } + else { + $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::Helper::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 caller should be our application class - eval "package $caller; require $plugin"; - if ($@) { - $caller->log->error(qq/Couldn't load plugin "$plugin", "$@"/); - } + $plugin->require; + + 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 ); # Engine @@ -190,6 +223,20 @@ sub import { } $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; + } + $caller->dispatcher($dispatcher); + $caller->log->debug(qq/Loaded dispatcher "$dispatcher"/) if $caller->debug; + } =item $c->engine @@ -210,6 +257,13 @@ man page. =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: @@ -223,8 +277,21 @@ Mailing-Lists: =head1 SEE ALSO -L, L, L, -L, L +=over 4 + +=item L - The Catalyst Manual + +=item L - Core Engine + +=item L - The Log Class. + +=item L - The Request Object + +=item L - The Response Object + +=item L - The test suite. + +=back =head1 AUTHOR