[Catalyst-commits] r11336 - in Catalyst-Runtime/5.80/trunk: . lib/Catalyst

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-09-07 20:33:31 +0000 (Mon, 07 Sep 2009)
New Revision: 11336

Modified:
   Catalyst-Runtime/5.80/trunk/Changes
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/Controller.pm
Log:
Fix duplicate results from get_action_methods. Q. Why didn't I just do that first time round? A: Am idiot.

Modified: Catalyst-Runtime/5.80/trunk/Changes
===================================================================
--- Catalyst-Runtime/5.80/trunk/Changes	2009-09-07 20:25:53 UTC (rev 11335)
+++ Catalyst-Runtime/5.80/trunk/Changes	2009-09-07 20:33:31 UTC (rev 11336)
@@ -5,6 +5,10 @@
      - Fix t/optional_http-server-restart.t test.
      - Fix duplicate components being loaded at setup time, each component is
        now loaded at most once + tests.
+     - Fix backward compatibility - hash key configured actions are stored in
+       is returned to 'actions'.
+     - Fix get_action_methods returning duplicate methods when a method is both
+       decorated with method attributes and set as an action in config.
 
   Refactoring / cleanups:
      - Reduce minimum supported perl version from 5.8.6 to 5.8.4 as there are

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Controller.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Controller.pm	2009-09-07 20:25:53 UTC (rev 11335)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Controller.pm	2009-09-07 20:33:31 UTC (rev 11336)
@@ -2,7 +2,7 @@
 
 use Moose;
 use Moose::Util qw/find_meta/;
-
+use List::MoreUtils qw/uniq/;
 use namespace::clean -except => 'meta';
 
 BEGIN { extends qw/Catalyst::Component MooseX::MethodAttributes::Inheritable/; }
@@ -200,7 +200,7 @@
                   . ( ref $self ) )
           } keys %{ $self->_controller_actions }
     ) if ( ref $self );
-    return @methods;
+    return uniq @methods;
 }