X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=26047c3e2b088a66aefc58a4b000441809b022a6;hp=d2051837233552ff3dde813a852242c426cc0bb7;hb=c679d24243fa5c592d42afa6c6628c1182944bac;hpb=23f9d93414eadb11350029f13b51841d8309363b

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index d205183..26047c3 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -5,9 +5,9 @@ use base 'Class::Data::Inheritable';
 use UNIVERSAL::require;
 use Catalyst::Log;
 
-__PACKAGE__->mk_classdata($_) for qw/_config log/;
+__PACKAGE__->mk_classdata($_) for qw/_config engine log/;
 
-our $VERSION = '4.28';
+our $VERSION = '5.00';
 our @ISA;
 
 =head1 NAME
@@ -70,7 +70,7 @@ The key concept of Catalyst is DRY (Don't Repeat Yourself).
 See L<Catalyst::Manual> for more documentation.
 
 Catalyst plugins can be loaded by naming them as arguments to the "use Catalyst" statement.
-Omit the C<Catalyst::Plugin::> prefix from the plugin name, 
+Omit the C<Catalyst::Plugin::> prefix from the plugin name,
 so C<Catalyst::Plugin::My::Module> becomes C<My::Module>.
 
     use Catalyst 'My::Module';
@@ -141,23 +141,31 @@ sub import {
     my ( $self, @options ) = @_;
     my $caller = caller(0);
 
-    # Class
-    {
+    unless ( $caller->isa($self) ) {
         no strict 'refs';
-        *{"$caller\::handler"} =
-          sub { Catalyst::Engine::handler( $caller, @_ ) };
         push @{"$caller\::ISA"}, $self;
     }
-    $self->log( Catalyst::Log->new );
+
+    unless ( $caller->log ) {
+        $caller->log( Catalyst::Log->new );
+    }
+
+    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 = $ENV{MOD_PERL}
+      ? 'Catalyst::Engine::Apache'
+      : 'Catalyst::Engine::CGI';
+
     foreach (@options) {
         if (/^\-Debug$/) {
-            no warnings;
+            next if $caller->debug;
             no strict 'refs';
-            *{"$self\::debug"} = sub { 1 };
+            *{"$caller\::debug"} = sub { 1 };
             $caller->log->debug('Debug messages enabled');
         }
         elsif (/^-Engine=(.*)$/) { $engine = "Catalyst::Engine::$1" }
@@ -188,9 +196,26 @@ sub import {
         no strict 'refs';
         push @{"$caller\::ISA"}, $engine;
     }
+    $caller->engine($engine);
     $caller->log->debug(qq/Loaded engine "$engine"/) if $caller->debug;
 }
 
+=item $c->engine
+
+Contains the engine class.
+
+=item $c->log
+
+Contains the logging object.  Unless it is already set Catalyst sets this up with a
+C<Catalyst::Log> object.  To use your own log class:
+
+    $c->log( MyLogger->new );
+    $c->log->info("now logging with my own logger!");
+
+Your log class should implement the methods described in the C<Catalyst::Log>
+man page.
+
+
 =back
 
 =head1 SUPPORT
@@ -203,7 +228,7 @@ Mailing-Lists:
 
     http://lists.rawmode.org/mailman/listinfo/catalyst
     http://lists.rawmode.org/mailman/listinfo/catalyst-dev
-    
+
 =head1 SEE ALSO
 
 L<Catalyst::Manual>, L<Catalyst::Test>, L<Catalyst::Request>,
@@ -215,9 +240,10 @@ Sebastian Riedel, C<sri@oook.de>
 
 =head1 THANK YOU
 
-Andrew Ruthven, Christian Hansen, Christopher Hicks, Danijel Milicevic,
-David Naughton, Gary Ashton Jones, Jesse Sheidlower, Johan Lindstrom,
-Marcus Ramberg, Tatsuhiko Miyagawa and all the others who've helped.
+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.
 
 =head1 LICENSE