[Catalyst-commits] r13225 - in
Catalyst-Runtime/5.80/branches/forward-comp-obj: . lib
lib/Catalyst lib/Catalyst/Engine t/aggregate t/lib
t/lib/PluginTestApp/Controller t/lib/TestApp/Plugin
t0m at dev.catalyst.perl.org
t0m at dev.catalyst.perl.org
Sat May 8 15:25:28 GMT 2010
Author: t0m
Date: 2010-05-08 16:25:28 +0100 (Sat, 08 May 2010)
New Revision: 13225
Added:
Catalyst-Runtime/5.80/branches/forward-comp-obj/t/lib/TestApp/Plugin/ParameterizedRole.pm
Modified:
Catalyst-Runtime/5.80/branches/forward-comp-obj/
Catalyst-Runtime/5.80/branches/forward-comp-obj/Changes
Catalyst-Runtime/5.80/branches/forward-comp-obj/Makefile.PL
Catalyst-Runtime/5.80/branches/forward-comp-obj/lib/Catalyst.pm
Catalyst-Runtime/5.80/branches/forward-comp-obj/lib/Catalyst/Engine/CGI.pm
Catalyst-Runtime/5.80/branches/forward-comp-obj/lib/Catalyst/Runtime.pm
Catalyst-Runtime/5.80/branches/forward-comp-obj/t/aggregate/unit_core_engine_cgi-prepare_path.t
Catalyst-Runtime/5.80/branches/forward-comp-obj/t/aggregate/unit_core_path_to.t
Catalyst-Runtime/5.80/branches/forward-comp-obj/t/aggregate/unit_core_plugin.t
Catalyst-Runtime/5.80/branches/forward-comp-obj/t/lib/PluginTestApp.pm
Catalyst-Runtime/5.80/branches/forward-comp-obj/t/lib/PluginTestApp/Controller/Root.pm
Log:
r15483 at Unknown-00-26-08-e1-89-3f (orig r13190): rafl | 2010-04-28 23:54:04 +0100
Make sure path_to returns an instance of the right Path::Class class.
r15484 at Unknown-00-26-08-e1-89-3f (orig r13191): edenc | 2010-04-29 00:29:02 +0100
minor documentation fix for handle_request
r15489 at Unknown-00-26-08-e1-89-3f (orig r13193): rafl | 2010-05-03 00:16:25 +0100
Allow parameterized roles to be applied as plugins.
r15490 at Unknown-00-26-08-e1-89-3f (orig r13194): t0m | 2010-05-03 00:27:43 +0100
Back out crazy heuristics
r15492 at Unknown-00-26-08-e1-89-3f (orig r13196): rafl | 2010-05-03 00:44:30 +0100
Unbreak tests by actually adding the module they're supposed to test.
r15494 at Unknown-00-26-08-e1-89-3f (orig r13198): rafl | 2010-05-03 01:51:43 +0100
Remove useless conditional.
r15515 at Unknown-00-26-08-e1-89-3f (orig r13219): wreis | 2010-05-06 13:34:10 +0100
make uri_for a bit cleaner
r15516 at Unknown-00-26-08-e1-89-3f (orig r13220): wreis | 2010-05-06 14:30:19 +0100
minor fix for Changes file | add me as a contributor
r15517 at Unknown-00-26-08-e1-89-3f (orig r13221): rafl | 2010-05-07 22:11:10 +0100
Pass along options to load_class for plugins.
r15518 at Unknown-00-26-08-e1-89-3f (orig r13222): rafl | 2010-05-07 22:48:51 +0100
Changelogging.
r15519 at Unknown-00-26-08-e1-89-3f (orig r13223): rafl | 2010-05-07 23:06:26 +0100
Version 5.80023.
Property changes on: Catalyst-Runtime/5.80/branches/forward-comp-obj
___________________________________________________________________
Modified: 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/aggregate_more:11803
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/better_scripts:12074
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/disable_regex_fallback:11456
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/fix_path_info_decoding:12089
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/index_default_fuckage:10646
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/moose:7911
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/namespace_handling_refactor:10655
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/param_filtering:13012
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/uri_encode_captures_andor_args_take2:11811
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/uri_for_utf8:12834
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
6d45476b-5895-46b8-b13a-8b969fa34c98:/local/Catalyst-Runtime-better_scripts:11331
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/aggregate_more:11803
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/better_scripts:12074
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/disable_regex_fallback:11456
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/fix_path_info_decoding:12089
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/index_default_fuckage:10646
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/moose:7911
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/namespace_handling_refactor:10655
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/param_filtering:13012
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/uri_encode_captures_andor_args_take2:11811
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/uri_for_utf8:12834
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/trunk:13223
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
6d45476b-5895-46b8-b13a-8b969fa34c98:/local/Catalyst-Runtime-better_scripts:11331
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/forward-comp-obj/Changes
===================================================================
--- Catalyst-Runtime/5.80/branches/forward-comp-obj/Changes 2010-05-07 22:06:49 UTC (rev 13224)
+++ Catalyst-Runtime/5.80/branches/forward-comp-obj/Changes 2010-05-08 15:25:28 UTC (rev 13225)
@@ -1,9 +1,8 @@
# This file documents the revision history for Perl extension Catalyst.
+5.80023 2010-05-07 23:50:27
+
Bug fixes:
- - Additional fix for getting the base application path right when rewriting
- requests into an application sub path with mod_alias and mod_rewrite on
- Apache.
- Ensure to always cleanup temporary uploaded files in all cases, even
when exceptions occur during request processing, using HTTP::Body's
->cleanup feature. (RT#41442)
@@ -20,11 +19,18 @@
HttpOnly flag
- Allow the myapp_test.pl script to be given a list of paths which it
will retrieve all of. (RT#53653)
+ - Allow parameterized roles to be applied as plugins.
+ - Allow requiring minimum versions of plugins when loading them.
Documentation:
- The Catalyst::Test::get method is documented as returning the raw
response bytes without any character decoding (RT#53678)
+ Cleanups:
+ - Removal of $Catalyst::PRETTY_VERSION. Future releases will always have the
+ full and unmangled version number, including trailing zeroes, in
+ $Catalyst::VERSION.
+
5.80022 2010-03-28 19:43:01
New features:
@@ -55,7 +61,7 @@
5.80021 2010-03-03 23:02:01
Bug fixed:
- - $c->uri_for will now escape unsafe characterss in captures
+ - $c->uri_for will now escape unsafe characters in captures
($c->request->captures) and correctly encode utf8 charracters.
5.80020 2010-02-04 06:51:18
Modified: Catalyst-Runtime/5.80/branches/forward-comp-obj/Makefile.PL
===================================================================
--- Catalyst-Runtime/5.80/branches/forward-comp-obj/Makefile.PL 2010-05-07 22:06:49 UTC (rev 13224)
+++ Catalyst-Runtime/5.80/branches/forward-comp-obj/Makefile.PL 2010-05-08 15:25:28 UTC (rev 13225)
@@ -19,13 +19,14 @@
requires 'B::Hooks::EndOfScope' => '0.08';
requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00903';
requires 'Class::MOP' => '0.95';
-requires 'Moose' => '0.93';
+requires 'Moose' => '1.03';
requires 'MooseX::MethodAttributes::Inheritable' => '0.19';
requires 'MooseX::Role::WithOverloading' => '0.05';
requires 'Carp';
requires 'Class::C3::Adopt::NEXT' => '0.07';
requires 'CGI::Simple::Cookie' => '1.109';
requires 'Data::Dump';
+requires 'Data::OptList';
requires 'HTML::Entities';
requires 'HTTP::Body' => '1.06'; # ->cleanup(1)
requires 'HTTP::Headers' => '1.64';
Modified: Catalyst-Runtime/5.80/branches/forward-comp-obj/lib/Catalyst/Engine/CGI.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/forward-comp-obj/lib/Catalyst/Engine/CGI.pm 2010-05-07 22:06:49 UTC (rev 13224)
+++ Catalyst-Runtime/5.80/branches/forward-comp-obj/lib/Catalyst/Engine/CGI.pm 2010-05-08 15:25:28 UTC (rev 13225)
@@ -128,7 +128,6 @@
else {
$base_path = $script_name || '/';
}
-# $base_path .= '/' unless $base_path =~ m{/$};
# If we are running as a backend proxy, get the true hostname
PROXY_CHECK:
@@ -158,15 +157,20 @@
if (my $req_uri = $ENV{REQUEST_URI}) {
$req_uri =~ s/^\Q$base_path\E//;
$req_uri =~ s/\?.*$//;
- if ($req_uri && $req_uri ne '/') {
+ if ($req_uri) {
+ # Note that if REQUEST_URI doesn't start with a /, then the user
+ # is probably using mod_rewrite or something to rewrite requests
+ # into a sub-path of their application..
# This means that REQUEST_URI needs information from PATH_INFO
# prepending to it to be useful, otherwise the sub path which is
# being redirected to becomes the app base address which is
# incorrect.
- my ($match) = $req_uri =~ m{^(/?[^/]+)};
- my ($path_info_part) = $path_info =~ m|^(.*?\Q$match\E)|;
- substr($req_uri, 0, length($match), $path_info_part)
- if $path_info_part;
+ if (substr($req_uri, 0, 1) ne '/') {
+ my ($match) = $req_uri =~ m|^([^/]+)|;
+ my ($path_info_part) = $path_info =~ m|^(.*?\Q$match\E)|;
+ substr($req_uri, 0, length($match), $path_info_part)
+ if $path_info_part;
+ }
$path_info = $req_uri;
}
}
Modified: Catalyst-Runtime/5.80/branches/forward-comp-obj/lib/Catalyst/Runtime.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/forward-comp-obj/lib/Catalyst/Runtime.pm 2010-05-07 22:06:49 UTC (rev 13224)
+++ Catalyst-Runtime/5.80/branches/forward-comp-obj/lib/Catalyst/Runtime.pm 2010-05-08 15:25:28 UTC (rev 13225)
@@ -7,7 +7,7 @@
# Remember to update this in Catalyst as well!
-our $VERSION='5.80022';
+our $VERSION = '5.80023';
=head1 NAME
Modified: Catalyst-Runtime/5.80/branches/forward-comp-obj/lib/Catalyst.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/forward-comp-obj/lib/Catalyst.pm 2010-05-07 22:06:49 UTC (rev 13224)
+++ Catalyst-Runtime/5.80/branches/forward-comp-obj/lib/Catalyst.pm 2010-05-08 15:25:28 UTC (rev 13225)
@@ -14,6 +14,7 @@
use Catalyst::Response;
use Catalyst::Utils;
use Catalyst::Controller;
+use Data::OptList;
use Devel::InnerPackage ();
use File::stat;
use Module::Pluggable::Object ();
@@ -78,7 +79,7 @@
# Remember to update this in Catalyst::Runtime as well!
-our $VERSION = '5.80022';
+our $VERSION = '5.80023';
sub import {
my ( $class, @arguments ) = @_;
@@ -1279,13 +1280,11 @@
carp "uri_for called with undef argument" if grep { ! defined $_ } @args;
foreach my $arg (@args) {
utf8::encode($arg) if utf8::is_utf8($arg);
+ $arg =~ s/([^$URI::uric])/$URI::Escape::escapes{$1}/go;
}
- s/([^$URI::uric])/$URI::Escape::escapes{$1}/go for @args;
- if (blessed $path) { # Action object only.
- s|/|%2F|g for @args;
- }
if ( blessed($path) ) { # action object
+ s|/|%2F|g for @args;
my $captures = [ map { s|/|%2F|g; $_; }
( scalar @args && ref $args[0] eq 'ARRAY'
? @{ shift(@args) }
@@ -1306,8 +1305,6 @@
$path = '/' if $path eq '';
}
- undef($path) if (defined $path && $path eq '');
-
unshift(@args, $path);
unless (defined $path && $path =~ s!^/!!) { # in-place strip
@@ -1890,7 +1887,7 @@
sub get_actions { my $c = shift; $c->dispatcher->get_actions( $c, @_ ) }
-=head2 $c->handle_request( $class, @arguments )
+=head2 $app->handle_request( @arguments )
Called to handle each HTTP request.
@@ -2797,22 +2794,29 @@
my ( $class, $plugins ) = @_;
$class->_plugins( {} ) unless $class->_plugins;
- $plugins ||= [];
+ $plugins = Data::OptList::mkopt($plugins || []);
- my @plugins = Catalyst::Utils::resolve_namespace($class . '::Plugin', 'Catalyst::Plugin', @$plugins);
+ my @plugins = map {
+ [ Catalyst::Utils::resolve_namespace(
+ $class . '::Plugin',
+ 'Catalyst::Plugin', $_->[0]
+ ),
+ $_->[1],
+ ]
+ } @{ $plugins };
for my $plugin ( reverse @plugins ) {
- Class::MOP::load_class($plugin);
- my $meta = find_meta($plugin);
+ Class::MOP::load_class($plugin->[0], $plugin->[1]);
+ my $meta = find_meta($plugin->[0]);
next if $meta && $meta->isa('Moose::Meta::Role');
- $class->_register_plugin($plugin);
+ $class->_register_plugin($plugin->[0]);
}
my @roles =
- map { $_->name }
- grep { $_ && blessed($_) && $_->isa('Moose::Meta::Role') }
- map { find_meta($_) }
+ map { $_->[0]->name, $_->[1] }
+ grep { blessed($_->[0]) && $_->[0]->isa('Moose::Meta::Role') }
+ map { [find_meta($_->[0]), $_->[1]] }
@plugins;
Moose::Util::apply_all_roles(
@@ -3175,6 +3179,8 @@
willert: Sebastian Willert <willert at cpan.org>
+wreis: Wallace Reis <wallace at reis.org.br>
+
Yuval Kogman, C<nothingmuch at woobling.org>
=head1 LICENSE
Modified: Catalyst-Runtime/5.80/branches/forward-comp-obj/t/aggregate/unit_core_engine_cgi-prepare_path.t
===================================================================
--- Catalyst-Runtime/5.80/branches/forward-comp-obj/t/aggregate/unit_core_engine_cgi-prepare_path.t 2010-05-07 22:06:49 UTC (rev 13224)
+++ Catalyst-Runtime/5.80/branches/forward-comp-obj/t/aggregate/unit_core_engine_cgi-prepare_path.t 2010-05-08 15:25:28 UTC (rev 13225)
@@ -87,6 +87,7 @@
}
{
+ local $TODO = 'Another mod_rewrite case';
my $r = get_req (
PATH_INFO => '/auth/login',
SCRIPT_NAME => '/tx',
Modified: Catalyst-Runtime/5.80/branches/forward-comp-obj/t/aggregate/unit_core_path_to.t
===================================================================
--- Catalyst-Runtime/5.80/branches/forward-comp-obj/t/aggregate/unit_core_path_to.t 2010-05-07 22:06:49 UTC (rev 13224)
+++ Catalyst-Runtime/5.80/branches/forward-comp-obj/t/aggregate/unit_core_path_to.t 2010-05-08 15:25:28 UTC (rev 13225)
@@ -2,6 +2,9 @@
use warnings;
use Test::More;
+use FindBin;
+use Path::Class;
+use File::Basename;
my %non_unix = (
MacOS => 1,
@@ -16,17 +19,20 @@
my $os = $non_unix{$^O} ? $^O : 'Unix';
-if( $os ne 'Unix' ) {
+if ( $os ne 'Unix' ) {
plan skip_all => 'tests require Unix';
}
-else {
- plan tests => 3;
-}
use_ok('Catalyst');
my $context = 'Catalyst';
+$context->setup_home;
+my $base = dir($FindBin::Bin)->relative->stringify;
+
+isa_ok( Catalyst::path_to( $context, $base ), 'Path::Class::Dir' );
+isa_ok( Catalyst::path_to( $context, $base, basename $0 ), 'Path::Class::File' );
+
my $config = Catalyst->config;
$config->{home} = '/home/sri/my-app/';
@@ -37,3 +43,5 @@
is( Catalyst::path_to( $context, 'foo', 'bar' ),
'/Users/sri/myapp/foo/bar', 'deep Unix path' );
+
+done_testing;
Modified: Catalyst-Runtime/5.80/branches/forward-comp-obj/t/aggregate/unit_core_plugin.t
===================================================================
--- Catalyst-Runtime/5.80/branches/forward-comp-obj/t/aggregate/unit_core_plugin.t 2010-05-07 22:06:49 UTC (rev 13224)
+++ Catalyst-Runtime/5.80/branches/forward-comp-obj/t/aggregate/unit_core_plugin.t 2010-05-08 15:25:28 UTC (rev 13225)
@@ -3,7 +3,7 @@
use strict;
use warnings;
-use Test::More tests => 24;
+use Test::More;
use lib 't/lib';
@@ -61,3 +61,4 @@
is_deeply [ TestApp->registered_plugins ], \@expected,
'registered_plugins() should only report the plugins for the current class';
+done_testing;
Modified: Catalyst-Runtime/5.80/branches/forward-comp-obj/t/lib/PluginTestApp/Controller/Root.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/forward-comp-obj/t/lib/PluginTestApp/Controller/Root.pm 2010-05-07 22:06:49 UTC (rev 13224)
+++ Catalyst-Runtime/5.80/branches/forward-comp-obj/t/lib/PluginTestApp/Controller/Root.pm 2010-05-08 15:25:28 UTC (rev 13225)
@@ -34,6 +34,13 @@
ref($c)->plugin( faux => $faux_plugin );
isa_ok $c, 'Catalyst::Plugin::Test::Plugin';
+
+ # applied parameterized role
+ if (eval { require MooseX::Role::Parameterized; 1 }) {
+ can_ok $c, 'affe';
+ is $c->affe, 'birne', 'right method created by parameterized role';
+ }
+
isa_ok $c, 'TestApp::Plugin::FullyQualified';
ok !$c->isa($faux_plugin),
'... and it should not inherit from the instant plugin';
Modified: Catalyst-Runtime/5.80/branches/forward-comp-obj/t/lib/PluginTestApp.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/forward-comp-obj/t/lib/PluginTestApp.pm 2010-05-07 22:06:49 UTC (rev 13224)
+++ Catalyst-Runtime/5.80/branches/forward-comp-obj/t/lib/PluginTestApp.pm 2010-05-08 15:25:28 UTC (rev 13225)
@@ -1,10 +1,13 @@
package PluginTestApp;
use Test::More;
-use Catalyst qw(
- Test::Plugin
- +TestApp::Plugin::FullyQualified
- );
+use Catalyst (
+ 'Test::Plugin',
+ '+TestApp::Plugin::FullyQualified',
+ (eval { require MooseX::Role::Parameterized; 1 }
+ ? ('+TestApp::Plugin::ParameterizedRole' => { method_name => 'affe' })
+ : ()),
+);
sub _test_plugins {
my $c = shift;
Added: Catalyst-Runtime/5.80/branches/forward-comp-obj/t/lib/TestApp/Plugin/ParameterizedRole.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/forward-comp-obj/t/lib/TestApp/Plugin/ParameterizedRole.pm (rev 0)
+++ Catalyst-Runtime/5.80/branches/forward-comp-obj/t/lib/TestApp/Plugin/ParameterizedRole.pm 2010-05-08 15:25:28 UTC (rev 13225)
@@ -0,0 +1,18 @@
+package TestApp::Plugin::ParameterizedRole;
+
+use MooseX::Role::Parameterized;
+use namespace::autoclean;
+
+parameter method_name => (
+ isa => 'Str',
+ required => 1,
+);
+
+role {
+ my $p = shift;
+ my $method_name = $p->method_name;
+
+ method $method_name => sub { 'birne' };
+};
+
+1;
More information about the Catalyst-commits
mailing list