[Catalyst-commits] r7769 - in Catalyst-Runtime/5.80/branches/moose:
. lib lib/Catalyst lib/Catalyst/DispatchType
lib/Catalyst/Engine lib/Catalyst/Engine/HTTP lib/Catalyst/Request t
groditi at dev.catalyst.perl.org
groditi at dev.catalyst.perl.org
Wed May 21 16:23:24 BST 2008
Author: groditi
Date: 2008-05-21 16:23:23 +0100 (Wed, 21 May 2008)
New Revision: 7769
Modified:
Catalyst-Runtime/5.80/branches/moose/Makefile.PL
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst.pm
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Action.pm
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/ActionChain.pm
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/ActionContainer.pm
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Base.pm
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Component.pm
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Controller.pm
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/DispatchType.pm
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/DispatchType/Chained.pm
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/DispatchType/Default.pm
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/DispatchType/Index.pm
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/DispatchType/Path.pm
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/DispatchType/Regex.pm
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Dispatcher.pm
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Engine.pm
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Engine/CGI.pm
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Engine/FastCGI.pm
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Engine/HTTP.pm
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Engine/HTTP/Restarter.pm
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Log.pm
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Model.pm
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Request.pm
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Request/Upload.pm
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Response.pm
Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/View.pm
Catalyst-Runtime/5.80/branches/moose/t/unit_controller_namespace.t
Log:
mro compat stuff
Modified: Catalyst-Runtime/5.80/branches/moose/Makefile.PL
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/Makefile.PL 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/Makefile.PL 2008-05-21 15:23:23 UTC (rev 7769)
@@ -32,8 +32,8 @@
requires 'Tree::Simple::Visitor::FindByPath';
requires 'URI' => '1.35';
requires 'Text::Balanced'; # core in 5.8.x but mentioned for completeness
+requires 'MRO::Compat';
-
if (-e 'inc/.author') {
build_requires 'Test::Perl::Critic';
build_requires 'Test::Pod' => 1.14;
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Action.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Action.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Action.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -17,7 +17,8 @@
=cut
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
use Moose;
has class => (is => 'rw');
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/ActionChain.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/ActionChain.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/ActionChain.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -1,6 +1,7 @@
package Catalyst::ActionChain;
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
use Moose;
extends qw(Catalyst::Action);
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/ActionContainer.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/ActionContainer.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/ActionContainer.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -15,7 +15,8 @@
=cut
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
use Moose;
has part => (is => 'rw', required => 1, lazy => 1, default => sub { {} });
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Base.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Base.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Base.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -1,6 +1,7 @@
package Catalyst::Base;
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
use Moose;
BEGIN{ extends qw/Catalyst::Controller/ };
no Moose;
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Component.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Component.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Component.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -1,6 +1,7 @@
package Catalyst::Component;
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
use Moose;
use MooseX::Adopt::Class::Accessor::Fast;
use Catalyst::Utils;
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Controller.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Controller.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Controller.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -1,7 +1,8 @@
package Catalyst::Controller;
#switch to BEGIN { extends qw/ ... /; } ?
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
use base qw/Catalyst::Component Catalyst::AttrContainer/;
use Moose;
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/DispatchType/Chained.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/DispatchType/Chained.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/DispatchType/Chained.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -1,6 +1,7 @@
package Catalyst::DispatchType::Chained;
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
use Moose;
extends 'Catalyst::DispatchType';
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/DispatchType/Default.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/DispatchType/Default.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/DispatchType/Default.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -1,6 +1,7 @@
package Catalyst::DispatchType::Default;
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
use Moose;
extends 'Catalyst::DispatchType';
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/DispatchType/Index.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/DispatchType/Index.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/DispatchType/Index.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -1,6 +1,7 @@
package Catalyst::DispatchType::Index;
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
use Moose;
extends 'Catalyst::DispatchType';
no Moose;
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/DispatchType/Path.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/DispatchType/Path.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/DispatchType/Path.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -1,6 +1,7 @@
package Catalyst::DispatchType::Path;
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
use Moose;
extends 'Catalyst::DispatchType';
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/DispatchType/Regex.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/DispatchType/Regex.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/DispatchType/Regex.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -1,6 +1,7 @@
package Catalyst::DispatchType::Regex;
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
use Moose;
extends 'Catalyst::DispatchType::Path';
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/DispatchType.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/DispatchType.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/DispatchType.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -1,6 +1,7 @@
package Catalyst::DispatchType;
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
use Moose; # using it to add Moose::Object to @ISA ...
no Moose;
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Dispatcher.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Dispatcher.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Dispatcher.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -1,5 +1,7 @@
package Catalyst::Dispatcher;
+use MRO::Compat;
+use mro 'c3';
use Moose;
use Class::MOP;
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Engine/CGI.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Engine/CGI.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Engine/CGI.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -1,6 +1,7 @@
package Catalyst::Engine::CGI;
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
use Moose;
extends 'Catalyst::Engine';
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Engine/FastCGI.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Engine/FastCGI.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Engine/FastCGI.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -1,6 +1,7 @@
package Catalyst::Engine::FastCGI;
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
use Moose;
extends 'Catalyst::Engine::CGI';
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Engine/HTTP/Restarter.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Engine/HTTP/Restarter.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Engine/HTTP/Restarter.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -1,6 +1,7 @@
package Catalyst::Engine::HTTP::Restarter;
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
use Moose;
extends 'Catalyst::Engine::HTTP';
no Moose;
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Engine/HTTP.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Engine/HTTP.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Engine/HTTP.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -1,6 +1,7 @@
package Catalyst::Engine::HTTP;
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
use Moose;
extends 'Catalyst::Engine::CGI';
no Moose;
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Engine.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Engine.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Engine.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -1,6 +1,7 @@
package Catalyst::Engine;
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
use Moose;
with 'MooseX::Emulate::Class::Accessor::Fast';
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Log.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Log.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Log.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -1,6 +1,7 @@
package Catalyst::Log;
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
use Moose;
use Data::Dump;
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Model.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Model.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Model.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -1,5 +1,7 @@
package Catalyst::Model;
+use MRO::Compat;
+use mro 'c3';
use Moose;
extends qw/Catalyst::Component/;
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Request/Upload.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Request/Upload.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Request/Upload.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -1,6 +1,7 @@
package Catalyst::Request::Upload;
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
use Moose;
use Catalyst::Exception;
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Request.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Request.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Request.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -1,6 +1,7 @@
package Catalyst::Request;
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
use IO::Socket qw[AF_INET inet_aton];
use Carp;
use utf8;
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Response.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Response.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/Response.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -1,6 +1,7 @@
package Catalyst::Response;
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
use Moose;
use HTTP::Headers;
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/View.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/View.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst/View.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -1,5 +1,7 @@
package Catalyst::View;
+use MRO::Compat;
+use mro 'c3';
use Moose;
extends qw/Catalyst::Component/;
Modified: Catalyst-Runtime/5.80/branches/moose/lib/Catalyst.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/lib/Catalyst.pm 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/lib/Catalyst.pm 2008-05-21 15:23:23 UTC (rev 7769)
@@ -1,6 +1,7 @@
package Catalyst;
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
use Moose;
extends 'Catalyst::Component';
use bytes;
@@ -813,7 +814,7 @@
sub setup {
my ( $class, @arguments ) = @_;
-
+ Class::C3::initialize;
$class->log->warn("Running setup twice is not a good idea.")
if ( $class->setup_finished );
@@ -933,6 +934,7 @@
$class->log->_flush() if $class->log->can('_flush');
$class->setup_finished(1);
+ Class::C3::initialize;
}
=head2 $c->uri_for( $path, @args?, \%query_values? )
Modified: Catalyst-Runtime/5.80/branches/moose/t/unit_controller_namespace.t
===================================================================
--- Catalyst-Runtime/5.80/branches/moose/t/unit_controller_namespace.t 2008-05-21 15:15:35 UTC (rev 7768)
+++ Catalyst-Runtime/5.80/branches/moose/t/unit_controller_namespace.t 2008-05-21 15:23:23 UTC (rev 7769)
@@ -19,6 +19,6 @@
sub config { {} };
}
-is(MyApp::Controller::Foo->COMPONENT->action_namespace('Stub'), 'foo');
+is(MyApp::Controller::Foo->COMPONENT('MyApp')->action_namespace('Stub'), 'foo');
-is(MyApp::Controller::Root->COMPONENT->action_namespace('Stub'), '');
+is(MyApp::Controller::Root->COMPONENT('MyApp')->action_namespace('Stub'), '');
More information about the Catalyst-commits
mailing list