[Catalyst-commits] r10360 - in
Catalyst-Runtime/5.80/branches/component-tweaks: . lib t
t/aggregate t/lib t/lib/Catalyst/Plugin/Test
caelum at dev.catalyst.perl.org
caelum at dev.catalyst.perl.org
Fri May 29 11:34:29 GMT 2009
Author: caelum
Date: 2009-05-29 11:34:29 +0000 (Fri, 29 May 2009)
New Revision: 10360
Added:
Catalyst-Runtime/5.80/branches/component-tweaks/t/lib/Catalyst/Plugin/Test/MangleDollarUnderScore.pm
Modified:
Catalyst-Runtime/5.80/branches/component-tweaks/
Catalyst-Runtime/5.80/branches/component-tweaks/Changes
Catalyst-Runtime/5.80/branches/component-tweaks/Makefile.PL
Catalyst-Runtime/5.80/branches/component-tweaks/lib/Catalyst.pm
Catalyst-Runtime/5.80/branches/component-tweaks/t/aggregate/live_plugin_loaded.t
Catalyst-Runtime/5.80/branches/component-tweaks/t/lib/TestApp.pm
Catalyst-Runtime/5.80/branches/component-tweaks/t/unit_core_plugin.t
Log:
r5269 at hlagh (orig r10343): t0m | 2009-05-28 06:16:46 -0700
Require new MX::MethodAttributes. Mark retardo plugin as always being retardo
r5270 at hlagh (orig r10347): t0m | 2009-05-28 11:08:34 -0700
Still borked in 0.2
r5271 at hlagh (orig r10348): t0m | 2009-05-28 17:09:11 -0700
Epic fail plugin breaks everything which loads TestApp
r5272 at hlagh (orig r10349): t0m | 2009-05-28 17:12:52 -0700
And trivial fix by not using up
r5273 at hlagh (orig r10350): arcanez | 2009-05-28 17:42:33 -0700
why have two loops
add Catalyst::Plugin::MangleDollarUnderScore to plugin tests
r5274 at hlagh (orig r10351): arcanez | 2009-05-28 18:12:43 -0700
put Catalyst::Plugin::Test::MangleDollarUnderScore into a better namespace
r5276 at hlagh (orig r10357): t0m | 2009-05-29 02:31:32 -0700
Add Test::Exception in test_requires to Makefile.PL
Property changes on: Catalyst-Runtime/5.80/branches/component-tweaks
___________________________________________________________________
Name: svk:merge
- 1c72fc7c-9ce4-42af-bf25-3bfe470ff1e8:/local/Catalyst/trunk/Catalyst-Runtime:9763
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.70/branches/compres:7999
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.70/branches/context_go:8001
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.70/trunk:8533
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/Catalyst-Test-Updates:8363
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/add_captures_to_visit:9546
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/moose:7911
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-ChildOf:4443
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-Runtime-jrockway:5857
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-component-setup:4320
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-docs:4325
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/current/Catalyst-Runtime:5142
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst:4483
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst-Runtime:6165
8a9521aa-ff93-41d6-9f87-b05cafcdab40:/local/cat/Catalyst-Runtime/5.80/trunk:8157
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/Catalyst-Runtime:8339
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/Catalyst-Runtime-jrockway:8342
e56d974f-7718-0410-8b1c-b347a71765b2:/local/Catalyst-Runtime:6511
e56d974f-7718-0410-8b1c-b347a71765b2:/local/Catalyst-Runtime-current:10442
+ 1c72fc7c-9ce4-42af-bf25-3bfe470ff1e8:/local/Catalyst/trunk/Catalyst-Runtime:9763
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.70/branches/compres:7999
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.70/branches/context_go:8001
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.70/trunk:8533
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/Catalyst-Test-Updates:8363
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/add_captures_to_visit:9546
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/moose:7911
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/trunk:10357
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-ChildOf:4443
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-Runtime-jrockway:5857
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-component-setup:4320
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-docs:4325
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/current/Catalyst-Runtime:5142
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst:4483
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst-Runtime:6165
8a9521aa-ff93-41d6-9f87-b05cafcdab40:/local/cat/Catalyst-Runtime/5.80/trunk:8157
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/Catalyst-Runtime:8339
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/Catalyst-Runtime-jrockway:8342
e56d974f-7718-0410-8b1c-b347a71765b2:/local/Catalyst-Runtime:6511
e56d974f-7718-0410-8b1c-b347a71765b2:/local/Catalyst-Runtime-current:10442
Modified: Catalyst-Runtime/5.80/branches/component-tweaks/Changes
===================================================================
--- Catalyst-Runtime/5.80/branches/component-tweaks/Changes 2009-05-29 11:33:19 UTC (rev 10359)
+++ Catalyst-Runtime/5.80/branches/component-tweaks/Changes 2009-05-29 11:34:29 UTC (rev 10360)
@@ -12,9 +12,14 @@
to make $c->engine->env work in all cases (kmx)
- Also fix $c->engine->env in Catalyst::Test tests (kmx)
- Tests for this (t0m)
+ - Fix Catalyst failing to start if any plugin changed $_ whilst
+ loading (t0m)
+ - Tests for this
- New features:
+ New features:
- Add $c->req->remote_user to disambiguate from $c->req->user (dwc)
+ - Require MooseX::MethodAttributes 0.12 so that action methods
+ (with attributes) can be used in / composed from Moose roles.
5.80004 2009-05-18 17:03:23
- Rename the actions attribute in Catalyt::Controller to
Modified: Catalyst-Runtime/5.80/branches/component-tweaks/Makefile.PL
===================================================================
--- Catalyst-Runtime/5.80/branches/component-tweaks/Makefile.PL 2009-05-29 11:33:19 UTC (rev 10359)
+++ Catalyst-Runtime/5.80/branches/component-tweaks/Makefile.PL 2009-05-29 11:34:29 UTC (rev 10360)
@@ -10,7 +10,7 @@
requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00801';
requires 'Class::MOP' => '0.83';
requires 'Moose' => '0.78';
-requires 'MooseX::MethodAttributes::Inheritable' => '0.10';
+requires 'MooseX::MethodAttributes::Inheritable' => '0.12';
requires 'Carp';
requires 'Class::C3::Adopt::NEXT' => '0.07';
requires 'CGI::Simple::Cookie';
@@ -41,6 +41,7 @@
test_requires 'Test::MockObject' => '1.07'; # Newish (hah, 2006!) version to
# hopefully avoid broken distro
# packages (RT#46104)
+test_requires 'Test::Exception';
# aggregate tests if AGGREGATE_TESTS is set and a recent Test::Aggregate is available
if ($ENV{AGGREGATE_TESTS} && can_use('Test::Aggregate', '0.34_01')) {
@@ -108,6 +109,9 @@
# NOTE - This is the version number of the _incompatible_ code,
# not the version number of the fixed version.
my %conflicts = (
+ 'Catalyst::Plugin::ENV' => '9999', # This plugin is just stupid, full stop
+ # should have been a core fix.
+ 'Catalyst::Plugin::Unicode::Encoding' => '0.2',
'Catalyst::Authentication::Credential::HTTP' => '1.009',
'Catalyst::Plugin::Session::Store::File' => '0.16',
'Catalyst::Plugin::Session' => '0.21',
Modified: Catalyst-Runtime/5.80/branches/component-tweaks/lib/Catalyst.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/component-tweaks/lib/Catalyst.pm 2009-05-29 11:33:19 UTC (rev 10359)
+++ Catalyst-Runtime/5.80/branches/component-tweaks/lib/Catalyst.pm 2009-05-29 11:34:29 UTC (rev 10360)
@@ -2505,9 +2505,8 @@
my @plugins = map { s/\A\+// ? $_ : "Catalyst::Plugin::$_" } @$plugins;
- Class::MOP::load_class($_) for @plugins;
-
for my $plugin ( reverse @plugins ) {
+ Class::MOP::load_class($plugin);
my $meta = find_meta($plugin);
next if $meta && $meta->isa('Moose::Meta::Role');
Modified: Catalyst-Runtime/5.80/branches/component-tweaks/t/aggregate/live_plugin_loaded.t
===================================================================
--- Catalyst-Runtime/5.80/branches/component-tweaks/t/aggregate/live_plugin_loaded.t 2009-05-29 11:33:19 UTC (rev 10359)
+++ Catalyst-Runtime/5.80/branches/component-tweaks/t/aggregate/live_plugin_loaded.t 2009-05-29 11:34:29 UTC (rev 10360)
@@ -13,6 +13,7 @@
Catalyst::Plugin::Test::Errors
Catalyst::Plugin::Test::Headers
Catalyst::Plugin::Test::Inline
+ Catalyst::Plugin::Test::MangleDollarUnderScore
Catalyst::Plugin::Test::Plugin
TestApp::Plugin::AddDispatchTypes
TestApp::Plugin::FullyQualified
Added: Catalyst-Runtime/5.80/branches/component-tweaks/t/lib/Catalyst/Plugin/Test/MangleDollarUnderScore.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/component-tweaks/t/lib/Catalyst/Plugin/Test/MangleDollarUnderScore.pm (rev 0)
+++ Catalyst-Runtime/5.80/branches/component-tweaks/t/lib/Catalyst/Plugin/Test/MangleDollarUnderScore.pm 2009-05-29 11:34:29 UTC (rev 10360)
@@ -0,0 +1,16 @@
+package Catalyst::Plugin::Test::MangleDollarUnderScore;
+use strict;
+use warnings;
+
+our $VERSION = 0.1; # Make is_class_loaded happy
+
+# Class::MOP::load_class($_) can hurt you real hard.
+BEGIN { $_ = q{
+mst sayeth, Class::MOP::load_class($_) will ruin your life
+rafl spokeh "i ♥ my $_"',
+and verrily forsooth, t0m made tests
+and yea, there was fail' }; }
+
+1;
+__END__
+
Property changes on: Catalyst-Runtime/5.80/branches/component-tweaks/t/lib/Catalyst/Plugin/Test/MangleDollarUnderScore.pm
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: Catalyst-Runtime/5.80/branches/component-tweaks/t/lib/TestApp.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/component-tweaks/t/lib/TestApp.pm 2009-05-29 11:33:19 UTC (rev 10359)
+++ Catalyst-Runtime/5.80/branches/component-tweaks/t/lib/TestApp.pm 2009-05-29 11:34:29 UTC (rev 10360)
@@ -2,6 +2,7 @@
use strict;
use Catalyst qw/
+ Test::MangleDollarUnderScore
Test::Errors
Test::Headers
Test::Plugin
Modified: Catalyst-Runtime/5.80/branches/component-tweaks/t/unit_core_plugin.t
===================================================================
--- Catalyst-Runtime/5.80/branches/component-tweaks/t/unit_core_plugin.t 2009-05-29 11:33:19 UTC (rev 10359)
+++ Catalyst-Runtime/5.80/branches/component-tweaks/t/unit_core_plugin.t 2009-05-29 11:34:29 UTC (rev 10360)
@@ -45,6 +45,7 @@
Catalyst::Plugin::Test::Errors
Catalyst::Plugin::Test::Headers
Catalyst::Plugin::Test::Inline
+ Catalyst::Plugin::Test::MangleDollarUnderScore
Catalyst::Plugin::Test::Plugin
TestApp::Plugin::AddDispatchTypes
TestApp::Plugin::FullyQualified
More information about the Catalyst-commits
mailing list