[Catalyst-commits] r10052 - in trunk/Catalyst-Controller-FormBuilder: . lib/Catalyst/Controller lib/Catalyst/Controller/FormBuilder t/lib/TestApp/Component t/lib/TestApp/Component/HTML

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-05-08 14:13:37 +0000 (Fri, 08 May 2009)
New Revision: 10052

Modified:
   trunk/Catalyst-Controller-FormBuilder/Changes
   trunk/Catalyst-Controller-FormBuilder/Makefile.PL
   trunk/Catalyst-Controller-FormBuilder/lib/Catalyst/Controller/FormBuilder.pm
   trunk/Catalyst-Controller-FormBuilder/lib/Catalyst/Controller/FormBuilder/Action.pm
   trunk/Catalyst-Controller-FormBuilder/t/lib/TestApp/Component/HTML/Template.pm
   trunk/Catalyst-Controller-FormBuilder/t/lib/TestApp/Component/Mason.pm
   trunk/Catalyst-Controller-FormBuilder/t/lib/TestApp/Component/TT.pm
Log:
Commit change from NEXT to MRO::Compat from Chisel Wright

Modified: trunk/Catalyst-Controller-FormBuilder/Changes
===================================================================
--- trunk/Catalyst-Controller-FormBuilder/Changes	2009-05-07 23:08:19 UTC (rev 10051)
+++ trunk/Catalyst-Controller-FormBuilder/Changes	2009-05-08 14:13:37 UTC (rev 10052)
@@ -1,3 +1,6 @@
+    Change from NEXT to MRO::Compat. Remove unneeded Class::Accessor::Fast
+    base classes (Chisel Wright)
+
 0.04
     Memory Leak Fix - Matt S Trout
 

Modified: trunk/Catalyst-Controller-FormBuilder/Makefile.PL
===================================================================
--- trunk/Catalyst-Controller-FormBuilder/Makefile.PL	2009-05-07 23:08:19 UTC (rev 10051)
+++ trunk/Catalyst-Controller-FormBuilder/Makefile.PL	2009-05-08 14:13:37 UTC (rev 10052)
@@ -7,7 +7,7 @@
 
 requires 'CGI::FormBuilder'               => '3.02';
 requires 'Catalyst::Runtime'              => '5.7';
-requires 'Class::Accessor::Fast'          => '0.25';
+requires 'MRO::Compat'                    => '0.09';
 requires 'Test::WWW::Mechanize::Catalyst' => '0.37';
 requires 'Tie::IxHash'                    => '1.21';
 requires 'Class::Data::Inheritable'       => '0.04';

Modified: trunk/Catalyst-Controller-FormBuilder/lib/Catalyst/Controller/FormBuilder/Action.pm
===================================================================
--- trunk/Catalyst-Controller-FormBuilder/lib/Catalyst/Controller/FormBuilder/Action.pm	2009-05-07 23:08:19 UTC (rev 10051)
+++ trunk/Catalyst-Controller-FormBuilder/lib/Catalyst/Controller/FormBuilder/Action.pm	2009-05-08 14:13:37 UTC (rev 10052)
@@ -5,10 +5,10 @@
 use CGI::FormBuilder::Source::File;
 use File::Spec;
 use Class::Inspector;
-use NEXT;
+use MRO::Compat;
 use Scalar::Util ();
 
-use base qw/Catalyst::Action Class::Accessor::Fast Class::Data::Inheritable/;
+use base qw/Catalyst::Action Class::Data::Inheritable/;
 
 __PACKAGE__->mk_classdata(qw/_source_class/);
 __PACKAGE__->mk_accessors(qw/_attr_params _source_type/);
@@ -126,7 +126,7 @@
     my $self = shift;
     my ( $controller, $c ) = @_;
 
-    return $self->NEXT::execute(@_)
+    return $self->maybe::next::method(@_)
       unless exists $self->attributes->{ActionClass}
       && $self->attributes->{ActionClass}[0] eq
       $controller->_fb_setup->{action};
@@ -134,7 +134,7 @@
     my $form = $self->_setup_form(@_);
     Scalar::Util::weaken($form->{c});
     $controller->_formbuilder($form);
-    $self->NEXT::execute(@_);
+    $self->maybe::next::method(@_);
     $controller->_formbuilder($form);   # keep the same form in case of forwards
 
     $self->setup_template_vars( @_ );

Modified: trunk/Catalyst-Controller-FormBuilder/lib/Catalyst/Controller/FormBuilder.pm
===================================================================
--- trunk/Catalyst-Controller-FormBuilder/lib/Catalyst/Controller/FormBuilder.pm	2009-05-07 23:08:19 UTC (rev 10051)
+++ trunk/Catalyst-Controller-FormBuilder/lib/Catalyst/Controller/FormBuilder.pm	2009-05-08 14:13:37 UTC (rev 10052)
@@ -1,7 +1,7 @@
 package Catalyst::Controller::FormBuilder;
 
 use strict;
-use base qw/Catalyst::Controller Class::Accessor::Fast/;
+use base qw/Catalyst::Controller/;
 
 our $VERSION = "0.04";
 

Modified: trunk/Catalyst-Controller-FormBuilder/t/lib/TestApp/Component/HTML/Template.pm
===================================================================
--- trunk/Catalyst-Controller-FormBuilder/t/lib/TestApp/Component/HTML/Template.pm	2009-05-07 23:08:19 UTC (rev 10051)
+++ trunk/Catalyst-Controller-FormBuilder/t/lib/TestApp/Component/HTML/Template.pm	2009-05-08 14:13:37 UTC (rev 10052)
@@ -3,8 +3,11 @@
 use strict;
 use base 'Catalyst::View::HTML::Template';
 
+use MRO::Compat;
+
 sub new {
     my $self = shift;
+
     $self->config(
         {
             die_on_bad_params => 0,
@@ -13,7 +16,8 @@
             ],
         },
     );
-    return $self->NEXT::new(@_);
+    
+    return $self = $self->maybe::next::method(@_)
 }
 
 1;

Modified: trunk/Catalyst-Controller-FormBuilder/t/lib/TestApp/Component/Mason.pm
===================================================================
--- trunk/Catalyst-Controller-FormBuilder/t/lib/TestApp/Component/Mason.pm	2009-05-07 23:08:19 UTC (rev 10051)
+++ trunk/Catalyst-Controller-FormBuilder/t/lib/TestApp/Component/Mason.pm	2009-05-08 14:13:37 UTC (rev 10052)
@@ -3,13 +3,15 @@
 use strict;
 use base 'Catalyst::View::Mason';
 
+use MRO::Compat;
+
 sub new {
     my $self = shift;
 
     my $comp_root = TestApp->path_to( 'root', 'src', 'mason' );
     $self->config->{comp_root} = "$comp_root";
 
-    return $self->NEXT::new(@_);
+    return $self = $self->maybe::next::method(@_)
 }
 
 1;

Modified: trunk/Catalyst-Controller-FormBuilder/t/lib/TestApp/Component/TT.pm
===================================================================
--- trunk/Catalyst-Controller-FormBuilder/t/lib/TestApp/Component/TT.pm	2009-05-07 23:08:19 UTC (rev 10051)
+++ trunk/Catalyst-Controller-FormBuilder/t/lib/TestApp/Component/TT.pm	2009-05-08 14:13:37 UTC (rev 10052)
@@ -3,6 +3,8 @@
 use strict;
 use base 'Catalyst::View::TT';
 
+use MRO::Compat;
+
 sub new {
     my $self = shift;
     $self->config(
@@ -16,7 +18,8 @@
             TIMER              => 0,
         }
     );
-    return $self->NEXT::new(@_);
+    
+    return $self = $self->maybe::next::method(@_)
 }
 
 1;