Bump MX::E::CAF dep, update TODO, chop out of date crap out of ROADMAP

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

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 26b5b75..8a1167f 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -8,6 +8,7 @@ use Moose;
 use Class::MOP::Object ();
 extends 'Catalyst::Component';
 use bytes;
+use B::Hooks::EndOfScope;
 use Catalyst::Exception;
 use Catalyst::Log;
 use Catalyst::Request;
@@ -34,7 +35,6 @@ use Carp qw/croak carp/;
 
 BEGIN { require 5.008001; }
 
-# FIXME lazy => 1 here makes C::P::Auth tests pass?!?
 has stack => (is => 'ro', default => sub { [] });
 has stash => (is => 'rw', default => sub { {} });
 has state => (is => 'rw', default => 0);
@@ -973,8 +973,8 @@ EOF
         my $engine     = $class->engine;
         my $home       = $class->config->{home};
 
-        $class->log->debug(qq/Loaded dispatcher "$dispatcher"/);
-        $class->log->debug(qq/Loaded engine "$engine"/);
+        $class->log->debug(sprintf(q/Loaded dispatcher "%s"/, blessed($dispatcher)));
+        $class->log->debug(sprintf(q/Loaded engine "%s"/, blessed($engine)));
 
         $home
           ? ( -d $home )
@@ -983,7 +983,7 @@ EOF
           : $class->log->debug(q/Couldn't find home/);
     }
 
-    # Call plugins setup
+    # Call plugins setup, this is stupid and evil.
     {
         no warnings qw/redefine/;
         local *setup = sub { };
@@ -1018,6 +1018,17 @@ EOF
     }
     $class->log->_flush() if $class->log->can('_flush');
 
+    # Make sure that the application class becomes immutable at this point, 
+    # which ensures that it gets an inlined constructor. This means that it 
+    # works even if the user has added a plugin which contains a new method.
+    # Note however that we have to do the work on scope end, so that method
+    # modifiers work correctly in MyApp (as you have to call setup _before_ 
+    # applying modifiers).
+    on_scope_end {
+        my $meta = $class->Moose::Object::meta();
+        $meta->make_immutable unless $meta->is_immutable;
+    };
+
     $class->setup_finished(1);
 }
 
@@ -1736,9 +1747,7 @@ Prepares message body.
 sub prepare_body {
     my $c = shift;
 
-    #Moose TODO: what is  _body ??
-    # Do we run for the first time?
-    return if defined $c->request->{_body};
+    return if $c->request->_has_body;
 
     # Initialize on-demand data
     $c->engine->prepare_body( $c, @_ );