- Added *_class methods to Catalyst

[catagits/Catalyst-Runtime.git] / lib / Catalyst.pm

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 323ff5b..89a77b2 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -16,11 +16,14 @@ use Path::Class;
 use Time::HiRes qw/gettimeofday tv_interval/;
 use URI;
 use Scalar::Util qw/weaken/;
+use attributes;
 
 __PACKAGE__->mk_accessors(
     qw/counter depth request response state action namespace/
 );
 
+attributes->import( __PACKAGE__, \&namespace, 'lvalue' );
+
 # Laziness++
 *comp = \&component;
 *req  = \&request;
@@ -41,7 +44,28 @@ require Module::Pluggable::Fast;
 our $CATALYST_SCRIPT_GEN = 10;
 
 __PACKAGE__->mk_classdata($_)
-  for qw/components arguments dispatcher engine log/;
+  for qw/components arguments dispatcher engine log _dispatcher_class
+    _engine_class _context_class _request_class _response_class/;
+
+sub dispatcher_class {
+    return $_[0]->_dispatcher_class(@_[1..$#_]) || 'Catalyst::Dispatcher';
+}
+
+sub engine_class {
+    return $_[0]->_engine_class(@_[1..$#_]) || 'Catalyst::Engine::CGI';
+}
+
+sub context_class {
+    return $_[0]->_context_class(@_[1..$#_]) || ref $_[0] || $_[0];
+}
+
+sub request_class {
+    return $_[0]->_request_class(@_[1..$#_]) || 'Catalyst::Request';
+}
+
+sub response_class {
+    return $_[0]->_response_class(@_[1..$#_]) || 'Catalyst::Response';
+}
 
 our $VERSION = '5.49_03';
 
@@ -219,6 +243,23 @@ sub component {
 
 Returns a hashref containing your applications settings.
 
+=cut
+
+=item $c->controller($name)
+
+Get a L<Catalyst::Controller> instance by name.
+
+    $c->controller('Foo')->do_stuff;
+
+=cut
+
+sub controller {
+    my ( $c, $name ) = @_;
+    my $controller = $c->comp("Controller::$name");
+    return $controller if $controller;
+    return $c->comp("C::$name");
+}
+
 =item debug
 
 Overload to enable debug messages.
@@ -257,6 +298,21 @@ from the function.
 
 sub forward { my $c = shift; $c->dispatcher->forward( $c, @_ ) }
 
+=item $c->model($name)
+
+Get a L<Catalyst::Model> instance by name.
+
+    $c->model('Foo')->do_stuff;
+
+=cut
+
+sub model {
+    my ( $c, $name ) = @_;
+    my $model = $c->comp("Model::$name");
+    return $model if $model;
+    return $c->comp("M::$name");
+}
+
 =item $c->namespace
 
 Accessor to the namespace of the current action
@@ -380,8 +436,11 @@ sub setup {
     $class->setup_components;
 
     if ( $class->debug ) {
-        my $t = Text::SimpleTable->new(76);
-        $t->row($_) for sort keys %{ $class->components };
+        my $t = Text::SimpleTable->new( [ 65, 'Class' ], [ 8, 'Type' ] );
+        for my $comp ( sort keys %{ $class->components } ) {
+            my $type = ref $class->components->{$comp} ? 'instance' : 'class';
+            $t->row( $comp, $type );
+        }
         $class->log->debug( "Loaded components:\n" . $t->draw )
           if ( keys %{ $class->components } );
     }
@@ -557,6 +616,21 @@ sub stash {
     return $c->{stash};
 }
 
+=item $c->view($name)
+
+Get a L<Catalyst::View> instance by name.
+
+    $c->view('Foo')->do_stuff;
+
+=cut
+
+sub view {
+    my ( $c, $name ) = @_;
+    my $view = $c->comp("View::$name");
+    return $view if $view;
+    return $c->comp("V::$name");
+}
+
 =item $c->welcome_message
 
 Returns the Catalyst welcome HTML page.
@@ -815,8 +889,6 @@ sub execute {
                 chomp $error;
                 $error = qq/Caught exception "$error"/;
             }
-
-            $c->log->error($error);
             $c->error($error);
             $c->state(0);
         }
@@ -833,6 +905,10 @@ Finalize request.
 sub finalize {
     my $c = shift;
 
+    for my $error ( @{ $c->error } ) {
+        $c->log->error($error);
+    }
+
     $c->finalize_uploads;
 
     # Error
@@ -939,7 +1015,7 @@ Get an action in a given namespace.
 
 =cut
 
-sub get_action { my $c = shift; $c->dispatcher->get_action( $c, @_ ) }
+sub get_action { my $c = shift; $c->dispatcher->get_action(@_) }
 
 =item $c->get_actions( $action, $namespace )
 
@@ -1006,10 +1082,10 @@ into a Catalyst context .
 sub prepare {
     my ( $class, @arguments ) = @_;
 
-    my $c = bless {
+    my $c = $class->context_class->new({
         counter => {},
         depth   => 0,
-        request => Catalyst::Request->new(
+        request => $class->request_class->new(
             {
                 arguments        => [],
                 body_parameters  => {},
@@ -1022,7 +1098,7 @@ sub prepare {
                 uploads          => {}
             }
         ),
-        response => Catalyst::Response->new(
+        response => $class->response_class->new(
             {
                 body    => '',
                 cookies => {},
@@ -1032,7 +1108,7 @@ sub prepare {
         ),
         stash => {},
         state => 0
-    }, $class;
+    });
 
     # For on-demand data
     $c->request->{_context}  = $c;
@@ -1299,7 +1375,7 @@ sub setup_components {
     my $callback = sub {
         my ( $component, $context ) = @_;
 
-        unless ( $component->isa('Catalyst::Base') ) {
+        unless ( $component->isa('Catalyst::Component') ) {
             return $component;
         }
 
@@ -1371,7 +1447,7 @@ sub setup_dispatcher {
     }
 
     unless ($dispatcher) {
-        $dispatcher = 'Catalyst::Dispatcher';
+        $dispatcher = $class->dispatcher_class;
     }
 
     $dispatcher->require;
@@ -1460,7 +1536,7 @@ sub setup_engine {
     }
 
     unless ($engine) {
-        $engine = 'Catalyst::Engine::CGI';
+        $engine = $class->engine_class;
     }
 
     $engine->require;
@@ -1542,13 +1618,15 @@ sub setup_log {
     unless ( $class->log ) {
         $class->log( Catalyst::Log->new );
     }
-    
+
     my $app_flag = Catalyst::Utils::class2env($class) . '_DEBUG';
 
-     if ( ( defined( $ENV{CATALYST_DEBUG} ) || 
-            defined( $ENV{ $app_flag } ) )  ? 
-         (  $ENV{CATALYST_DEBUG} || $ENV{ $app_flag } ) :
-         $debug ) {
+    if (
+          ( defined( $ENV{CATALYST_DEBUG} ) || defined( $ENV{$app_flag} ) )
+        ? ( $ENV{CATALYST_DEBUG} || $ENV{$app_flag} )
+        : $debug
+      )
+    {
         no strict 'refs';
         *{"$class\::debug"} = sub { 1 };
         $class->log->debug('Debug messages enabled');
@@ -1730,6 +1808,8 @@ Arthur Bergman
 
 Autrijus Tang
 
+Brian Cassidy
+
 Christian Hansen
 
 Christopher Hicks
@@ -1764,6 +1844,8 @@ Robert Sedlacek
 
 Sam Vilain
 
+Sascha Kiefer
+
 Tatsuhiko Miyagawa
 
 Ulf Edvinsson