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

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2010-05-07 22:11:10 +0100 (Fri, 07 May 2010)
New Revision: 13221

Modified:
   Catalyst-Runtime/5.80/trunk/Makefile.PL
   Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm
Log:
Pass along options to load_class for plugins.

Modified: Catalyst-Runtime/5.80/trunk/Makefile.PL
===================================================================
--- Catalyst-Runtime/5.80/trunk/Makefile.PL	2010-05-06 13:30:19 UTC (rev 13220)
+++ Catalyst-Runtime/5.80/trunk/Makefile.PL	2010-05-07 21:11:10 UTC (rev 13221)
@@ -19,7 +19,7 @@
 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';

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm	2010-05-06 13:30:19 UTC (rev 13220)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm	2010-05-07 21:11:10 UTC (rev 13221)
@@ -2779,7 +2779,6 @@
         my ( $proto, $plugin, $instant ) = @_;
         my $class = ref $proto || $proto;
 
-        # FIXME: also pass along plugin options as soon as the mop has it
         Class::MOP::load_class( $plugin );
         $class->log->warn( "$plugin inherits from 'Catalyst::Component' - this is decated and will not work in 5.81" )
             if $plugin->isa( 'Catalyst::Component' );
@@ -2807,8 +2806,7 @@
          } @{ $plugins };
 
         for my $plugin ( reverse @plugins ) {
-            # pass along $plugin->[1] as well once cmop supports it
-            Class::MOP::load_class($plugin->[0]);
+            Class::MOP::load_class($plugin->[0], $plugin->[1]);
             my $meta = find_meta($plugin->[0]);
             next if $meta && $meta->isa('Moose::Meta::Role');