[Catalyst-commits] r11612 - in trunk/Catalyst-Plugin-Authorization-ACL: . lib/Catalyst/Plugin/Authorization lib/Catalyst/Plugin/Authorization/ACL

[caelum at dev.catalyst.perl.org]

Author: caelum
Date: 2009-10-18 05:59:17 +0000 (Sun, 18 Oct 2009)
New Revision: 11612

Modified:
   trunk/Catalyst-Plugin-Authorization-ACL/Changes
   trunk/Catalyst-Plugin-Authorization-ACL/lib/Catalyst/Plugin/Authorization/ACL.pm
   trunk/Catalyst-Plugin-Authorization-ACL/lib/Catalyst/Plugin/Authorization/ACL/Engine.pm
Log:
apply RT#50604, release

Modified: trunk/Catalyst-Plugin-Authorization-ACL/Changes
===================================================================
--- trunk/Catalyst-Plugin-Authorization-ACL/Changes	2009-10-18 05:48:33 UTC (rev 11611)
+++ trunk/Catalyst-Plugin-Authorization-ACL/Changes	2009-10-18 05:59:17 UTC (rev 11612)
@@ -1,5 +1,8 @@
 Revision history for Perl extension Catalyst::Plugin::Authorization::ACL
 
+0.15  2009-10-18 05:56:51
+        - apply fix from RT#50604 (filter undef actions when building tree)
+
 0.14  2009-09-30 22:20:41
         - add 'deny_access_unless_any' and 'allow_access_if_any' as shortcuts
         for any role in a list

Modified: trunk/Catalyst-Plugin-Authorization-ACL/lib/Catalyst/Plugin/Authorization/ACL/Engine.pm
===================================================================
--- trunk/Catalyst-Plugin-Authorization-ACL/lib/Catalyst/Plugin/Authorization/ACL/Engine.pm	2009-10-18 05:48:33 UTC (rev 11611)
+++ trunk/Catalyst-Plugin-Authorization-ACL/lib/Catalyst/Plugin/Authorization/ACL/Engine.pm	2009-10-18 05:59:17 UTC (rev 11612)
@@ -31,7 +31,7 @@
     my $root = Tree::Simple->new('/', Tree::Simple->ROOT);
     my $app  = $self->app;
 
-    my @actions = map {
+    my @actions = grep defined, map {
         my $controller = $_;
         map $controller->action_for($_->name), $controller->get_action_methods
     } grep $_->isa('Catalyst::Controller'), values %{ $app->components };

Modified: trunk/Catalyst-Plugin-Authorization-ACL/lib/Catalyst/Plugin/Authorization/ACL.pm
===================================================================
--- trunk/Catalyst-Plugin-Authorization-ACL/lib/Catalyst/Plugin/Authorization/ACL.pm	2009-10-18 05:48:33 UTC (rev 11611)
+++ trunk/Catalyst-Plugin-Authorization-ACL/lib/Catalyst/Plugin/Authorization/ACL.pm	2009-10-18 05:59:17 UTC (rev 11612)
@@ -12,7 +12,7 @@
 
 __PACKAGE__->mk_classdata("_acl_engine");
 
-our $VERSION = '0.14';
+our $VERSION = '0.15';
 
 my $FORCE_ALLOW = bless {}, __PACKAGE__ . "::Exception";