[Catalyst-commits] r9348 - in Catalyst-Runtime/5.80/branches/register_actions: . lib/Catalyst

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2009-02-19 07:18:54 +0000 (Thu, 19 Feb 2009)
New Revision: 9348

Modified:
   Catalyst-Runtime/5.80/branches/register_actions/Makefile.PL
   Catalyst-Runtime/5.80/branches/register_actions/lib/Catalyst/Controller.pm
Log:
Use get_all_methods_with_attributes to get all possible actions.

The list returned by get_all_methods_with_attributes has the same order in
which the methods have been created. This fixes the last four failing tests.

Modified: Catalyst-Runtime/5.80/branches/register_actions/Makefile.PL
===================================================================
--- Catalyst-Runtime/5.80/branches/register_actions/Makefile.PL	2009-02-19 05:21:59 UTC (rev 9347)
+++ Catalyst-Runtime/5.80/branches/register_actions/Makefile.PL	2009-02-19 07:18:54 UTC (rev 9348)
@@ -7,7 +7,7 @@
 
 requires 'namespace::clean';
 requires 'Scope::Upper' => '0.06';
-requires 'MooseX::MethodAttributes::Inheritable';
+requires 'MooseX::MethodAttributes::Inheritable' => '0.03';
 requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00800';
 requires 'Moose' => '0.70';
 requires 'Carp';

Modified: Catalyst-Runtime/5.80/branches/register_actions/lib/Catalyst/Controller.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/register_actions/lib/Catalyst/Controller.pm	2009-02-19 05:21:59 UTC (rev 9347)
+++ Catalyst-Runtime/5.80/branches/register_actions/lib/Catalyst/Controller.pm	2009-02-19 07:18:54 UTC (rev 9348)
@@ -1,7 +1,7 @@
 package Catalyst::Controller;
 
 use Moose;
-use Moose::Util qw/find_meta does_role/;
+use Moose::Util qw/find_meta/;
 
 use namespace::clean -except => 'meta';
 
@@ -181,8 +181,7 @@
     #this is still not correct for some reason.
     my $namespace = $self->action_namespace($c);
     my $meta = find_meta($self);
-    my @methods = grep { does_role($_, 'MooseX::MethodAttributes::Role::Meta::Method') }
-            $meta->get_all_methods;
+    my @methods = $meta->get_all_methods_with_attributes;
 
     foreach my $method (@methods) {
         my $name = $method->name;