[Catalyst-commits] r11775 - in Catalyst-Runtime/5.80/branches/basic-app-ctx-separation/lib: . Catalyst

[zby at dev.catalyst.perl.org]

Author: zby
Date: 2009-11-06 15:26:13 +0000 (Fri, 06 Nov 2009)
New Revision: 11775

Modified:
   Catalyst-Runtime/5.80/branches/basic-app-ctx-separation/lib/Catalyst.pm
   Catalyst-Runtime/5.80/branches/basic-app-ctx-separation/lib/Catalyst/Context.pm
Log:
minor fixes

Modified: Catalyst-Runtime/5.80/branches/basic-app-ctx-separation/lib/Catalyst/Context.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/basic-app-ctx-separation/lib/Catalyst/Context.pm	2009-11-06 14:08:35 UTC (rev 11774)
+++ Catalyst-Runtime/5.80/branches/basic-app-ctx-separation/lib/Catalyst/Context.pm	2009-11-06 15:26:13 UTC (rev 11775)
@@ -2,8 +2,6 @@
 
 use Moose;
 
-BEGIN { require 5.008004; }
-
 has action => (is => 'rw');
 has counter => (is => 'rw', default => sub { {} });
 has namespace => (is => 'rw');
@@ -16,17 +14,6 @@
 has state => (is => 'rw', default => 0);
 has stats => (is => 'rw');
 
-# Remember to update this in Catalyst::Runtime as well!
-
-our $VERSION = '5.80013';
-
-{
-    my $dev_version = $VERSION =~ /_\d{2}$/;
-    *_IS_DEVELOPMENT_VERSION = sub () { $dev_version };
-}
-
-$VERSION = eval $VERSION;
-
 no Moose;
 
 __PACKAGE__->meta->make_immutable;

Modified: Catalyst-Runtime/5.80/branches/basic-app-ctx-separation/lib/Catalyst.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/basic-app-ctx-separation/lib/Catalyst.pm	2009-11-06 14:08:35 UTC (rev 11774)
+++ Catalyst-Runtime/5.80/branches/basic-app-ctx-separation/lib/Catalyst.pm	2009-11-06 15:26:13 UTC (rev 11775)
@@ -37,7 +37,7 @@
 
 has 'context' => (
     isa       => 'Catalyst::Context',
-    is        => 'rw',
+    is        => 'ro',
     handles   => [
         qw/ action counter namespace request response stack stash state stats /,
     ],
@@ -70,6 +70,7 @@
   engine_class context_class request_class response_class stats_class
   setup_finished/;
 
+__PACKAGE__->context_class('Catalyst::Context');
 __PACKAGE__->dispatcher_class('Catalyst::Dispatcher');
 __PACKAGE__->engine_class('Catalyst::Engine::CGI');
 __PACKAGE__->request_class('Catalyst::Request');
@@ -1885,8 +1886,7 @@
     # into the application.
     $class->context_class( ref $class || $class ) unless $class->context_class;
 
-    my $context = Catalyst::Context->new();
-    my $c = $class->context_class->new({ context => $context });
+    my $c = $class->new({ context => $class->context_class->new() });
 
     # For on-demand data
     $c->request->_context($c);