X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=9c928660d1bc67ab655b3fd53869804951491592;hb=aea15dfa439e94a91a8c08bcf6ad53913730abd2;hp=b0b84d961181be13b2ffc9fca1c0500bb16b4e64;hpb=66294129a6520edc031aa7a43fc9bdfce669af15;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index b0b84d9..9c92866 100644
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -13,6 +13,7 @@ use Text::ASCIITable;
 use Catalyst::Request;
 use Catalyst::Request::Upload;
 use Catalyst::Response;
+use Catalyst::Utils;
 
 require Module::Pluggable::Fast;
 
@@ -162,12 +163,11 @@ sub execute {
     eval {
         if ( $c->debug )
         {
-            my ( $elapsed, @state ) =
-              $c->benchmark( $code, $class, $c, @{ $c->req->args } );
+            my ( $elapsed, @state ) = $c->benchmark( $code, $class, $c, @{ $c->req->args } );
             push @{ $c->{stats} }, [ $action, sprintf( '%fs', $elapsed ) ];
             $c->state(@state);
         }
-        else { $c->state( &$code( $class, $c, @{ $c->req->args } ) ) }
+        else { $c->state( &$code( $class, $c, @{ $c->req->args } ) || 0 ) }
     };
 
     if ( my $error = $@ ) {
@@ -219,6 +219,10 @@ sub finalize {
     return $status;
 }
 
+=item $c->finalize_output
+
+<obsolete>, see finalize_body
+
 =item $c->finalize_body
 
 Finalize body.
@@ -463,10 +467,9 @@ sub prepare {
 
     my $method   = $c->req->method   || '';
     my $path     = $c->req->path     || '';
-    my $hostname = $c->req->hostname || '';
     my $address  = $c->req->address  || '';
 
-    $c->log->debug(qq/"$method" request for "$path" from $hostname($address)/)
+    $c->log->debug(qq/"$method" request for "$path" from $address/)
       if $c->debug;
 
     if ( $c->request->method eq 'POST' and $c->request->content_length ) {
@@ -657,7 +660,28 @@ Setup.
 
 sub setup {
     my $self = shift;
+
+    # Initialize our data structure
+    $self->components( {} );    
+
     $self->setup_components;
+
+    if ( $self->debug ) {
+        my $t = Text::ASCIITable->new;
+        $t->setOptions( 'hide_HeadRow', 1 );
+        $t->setOptions( 'hide_HeadLine', 1 );
+        $t->setCols('Class');
+        $t->setColWidth( 'Class', 75, 1 );
+        $t->addRow($_) for sort keys %{ $self->components };
+        $self->log->debug( 'Loaded components', $t->draw )
+          if ( @{ $t->{tbl_rows} } );
+    }
+    
+    # Add our self to components, since we are also a component
+    $self->components->{ $self } = $self;
+
+    $self->setup_actions;
+
     if ( $self->debug ) {
         my $name = $self->config->{name} || 'Application';
         $self->log->info("$name powered by Catalyst $Catalyst::VERSION");
@@ -673,38 +697,50 @@ Setup components.
 sub setup_components {
     my $self = shift;
     
-    # Components
-    my $class = ref $self || $self;
-    eval <<"";
-        package $class;
-        import Module::Pluggable::Fast
-          name   => '_components',
-          search => [
-            '$class\::Controller', '$class\::C',
-            '$class\::Model',      '$class\::M',
-            '$class\::View',       '$class\::V'
-          ];
+    my $callback = sub {
+        my ( $component, $context ) = @_;
+
+        unless ( $component->isa('Catalyst::Base') ) {
+            return $component;
+        }
+
+        my $suffix = Catalyst::Utils::class2classsuffix($component);
+        my $config = $self->config->{$suffix} || {};
+
+        my $instance;
+
+        eval { 
+            $instance = $component->new( $context, $config );
+        };
+
+        if ( my $error = $@ ) {
+            chomp $error;
+            die qq/Couldn't instantiate component "$component", "$error"/;
+        }
+
+        return $instance;
+    };
+
+    eval {
+        Module::Pluggable::Fast->import(
+            name     => '_components',
+            search   => [
+                "$self\::Controller", "$self\::C",
+                "$self\::Model",      "$self\::M",
+                "$self\::View",       "$self\::V"
+            ],
+            callback => $callback
+        );
+    };
 
     if ( my $error = $@ ) {
         chomp $error;
         die qq/Couldn't load components "$error"/;
     }
 
-    $self->components( {} );
-    my @comps;
-    for my $comp ( $self->_components($self) ) {
-        $self->components->{ ref $comp } = $comp;
-        push @comps, $comp;
+    for my $component ( $self->_components($self) ) {
+        $self->components->{ ref $component || $component } = $component;
     }
-
-    my $t = Text::ASCIITable->new( { hide_HeadRow => 1, hide_HeadLine => 1 } );
-    $t->setCols('Class');
-    $t->setColWidth( 'Class', 75, 1 );
-    $t->addRow($_) for sort keys %{ $self->components };
-    $self->log->debug( 'Loaded components', $t->draw )
-      if ( @{ $t->{tbl_rows} } && $self->debug );
-
-    $self->setup_actions( [ $self, @comps ] );
 }
 
 =item $c->state