added $log->is_(debug|info|warn|error|fatal)

diff --git a/Build.PL b/Build.PL
index f0d8120..d9b798e 100644 (file)
--- a/Build.PL
+++ b/Build.PL
@@ -8,7 +8,7 @@ my $build = Module::Build->new(
     requires           => {
         'perl'                              => '5.8.1',
         'UNIVERSAL::require'                => 0,
-        'CGI'                               => 0,
+        'CGI'                               => '3.06',
         'Class::Accessor::Fast'             => 0,
         'Class::Data::Inheritable'          => 0,
         'File::Temp'                        => 0.14,

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 3e7cfbd..9c92866 100644 (file)
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -713,8 +713,9 @@ sub setup_components {
             $instance = $component->new( $context, $config );
         };
 
-        if ( $@ ) {
-            die qq/Couldn't instantiate component "$component", "$@"/;
+        if ( my $error = $@ ) {
+            chomp $error;
+            die qq/Couldn't instantiate component "$component", "$error"/;
         }
 
         return $instance;

diff --git a/lib/Catalyst/Log.pm b/lib/Catalyst/Log.pm
index f2a6aee..e1cbca9 100644 (file)
--- a/lib/Catalyst/Log.pm
+++ b/lib/Catalyst/Log.pm
@@ -4,7 +4,59 @@ use strict;
 use base 'Class::Accessor::Fast';
 use Data::Dumper;
 
-$Data::Dumper::Terse = 1;
+our @levels = qw[ debug info warn error fatal ];
+
+{
+    no strict 'refs';
+
+    for ( my $i = 0 ; $i < @levels ; $i++ ) {
+
+        my $name  = $levels[$i];
+        my $level = 1 << $i;
+
+        *{$name} = sub {
+            my $self = shift;
+
+            if ( $self->{level} & $level ) {
+                $self->_log( $name, @_ );
+            }
+        };
+
+        *{"is_$name"} = sub {
+            my $self = shift;
+
+            if (@_) {
+                if ( $_[0] ) {
+                    $self->{level} |= $level;
+                }
+                else {
+                    $self->{level} &= ~$level;
+                }
+            }
+            return $self->{level} & $level;
+        };
+    }
+
+    *new = sub { bless( { level => ( 1 << @levels ) - 1 }, shift ) }
+}
+
+sub _dump { 
+    my $self = shift;
+    local $Data::Dumper::Terse = 1;
+    $self->info( Dumper( $_[0] ) );
+}
+
+sub _log {
+    my $self    = shift;
+    my $level   = shift;
+    my $time    = localtime(time);
+    my $message = join( "\n", @_ );
+    printf( STDERR "[%s] [catalyst] [%s] %s\n", $time, $level, $message );
+}
+
+1;
+
+__END__
 
 =head1 NAME
 
@@ -13,10 +65,21 @@ Catalyst::Log - Catalyst Log Class
 =head1 SYNOPSIS
 
     $log = $c->log;
-    $log->debug(@message);
-    $log->error(@message);
-    $log->info(@message);
-    $log->warn(@message);
+    $log->debug($message);
+    $log->info($message);
+    $log->warn($message);
+    $log->error($message);
+    $log->fatal($message);
+    
+    $log->is_debug;   # true if dubug messages is enabled
+    $log->is_info;    # true if info messages is enabled
+    $log->is_warn;    # true if warn messages is enabled 
+    $log->is_error;   # true if error messages is enabled
+    $log->is_fatal;   # true if fatal messages is enabled
+
+    if ( $log->is_info ) {
+         # expensive debugging
+    }
 
 See L<Catalyst>.
 
@@ -36,54 +99,24 @@ Your logging object is expected to provide the interface described here.
 
 =over 4
 
-=item $log->debug(@message)
+=item $log->debug($message)
 
 Logs a debugging message.
 
-=cut
-
-sub debug { shift->_format( 'debug', @_ ) }
-
-=item $log->error(@message)
+=item $log->error($message)
 
 Logs an error message.
 
-=cut
-
-sub error { shift->_format( 'error', @_ ) }
-
-=item $log->info(@message)
+=item $log->info($message)
 
 Logs an informational message.
 
-=cut
-
-sub info { shift->_format( 'info', @_ ) }
-
-=item $log->warn(@message)
+=item $log->warn($message)
 
 Logs a warning message.
 
-=cut
-
-sub warn { shift->_format( 'warn', @_ ) }
-
-sub _format {
-    my $class   = shift;
-    my $level   = shift;
-    my $time    = localtime(time);
-    my $message = join( "\n", @_ );
-    printf( STDERR "[%s] [catalyst] [%s] %s\n", $time, $level, $message );
-}
-
 =back
 
-=cut
-
-# Private - Logs a Data::Dumper of reference.
-sub _dump { shift->_format( 'dump', Dumper( $_[0] ) ) }
-
-
 =head1 SEE ALSO
 
 L<Catalyst>.