[Catalyst-commits] r12635 - in Catalyst-Runtime/5.80/branches/psgi/lib: . Catalyst

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2010-01-14 03:49:27 +0000 (Thu, 14 Jan 2010)
New Revision: 12635

Modified:
   Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst.pm
   Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Engine.pm
   Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Test.pm
Log:
Make build_psgi_app public and add MyApp->psgi_app.

Modified: Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Engine.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Engine.pm	2010-01-14 02:26:03 UTC (rev 12634)
+++ Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Engine.pm	2010-01-14 03:49:27 UTC (rev 12635)
@@ -752,10 +752,10 @@
 sub run {
     my ($self, $app, $server, @args) = @_;
     # FIXME - Do something sensible with the options we're passed
-    $server->run($self->_build_psgi_app($app, @args));
+    $server->run($self->build_psgi_app($app, @args));
 }
 
-sub _build_psgi_app {
+sub build_psgi_app {
     my ($self, $app, @args) = @_;
 
     my $psgi_app = sub {

Modified: Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Test.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Test.pm	2010-01-14 02:26:03 UTC (rev 12634)
+++ Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Test.pm	2010-01-14 03:49:27 UTC (rev 12635)
@@ -27,7 +27,7 @@
         }
         $class->import;
 
-        my $app = $class->engine->_build_psgi_app($class);
+        my $app = $class->psgi_app;
 
         $request = sub { local_request( $app, @_ ) };
     }

Modified: Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst.pm	2010-01-14 02:26:03 UTC (rev 12634)
+++ Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst.pm	2010-01-14 03:49:27 UTC (rev 12635)
@@ -69,7 +69,7 @@
 __PACKAGE__->mk_classdata($_)
   for qw/components arguments dispatcher engine log dispatcher_class
   engine_class context_class request_class response_class stats_class
-  setup_finished/;
+  setup_finished psgi_app/;
 
 __PACKAGE__->dispatcher_class('Catalyst::Dispatcher');
 __PACKAGE__->engine_class('Catalyst::Engine');
@@ -2399,8 +2399,8 @@
         );
     }
 
-    # engine instance
     $class->engine( $engine->new );
+    $class->psgi_app( $class->engine->build_psgi_app($class) );
 }
 
 =head2 $c->setup_home