[Catalyst-commits] r12841 - in trunk/Catalyst-Model-CDBI: . lib/Catalyst/Helper/Model lib/Catalyst/Model

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2010-02-09 02:35:15 +0000 (Tue, 09 Feb 2010)
New Revision: 12841

Modified:
   trunk/Catalyst-Model-CDBI/Changes
   trunk/Catalyst-Model-CDBI/Makefile.PL
   trunk/Catalyst-Model-CDBI/lib/Catalyst/Helper/Model/CDBI.pm
   trunk/Catalyst-Model-CDBI/lib/Catalyst/Model/CDBI.pm
Log:
Deprecate and also fix outstanding C3 bug and other trivial bits

Modified: trunk/Catalyst-Model-CDBI/Changes
===================================================================
--- trunk/Catalyst-Model-CDBI/Changes	2010-02-09 00:17:42 UTC (rev 12840)
+++ trunk/Catalyst-Model-CDBI/Changes	2010-02-09 02:35:15 UTC (rev 12841)
@@ -1,6 +1,10 @@
 Revision history for Perl extension Catalyst::Model::CDBI.
-0.12
+0.12  Tue Jan 09 02:36:00
     - Work around MRO problems in CDBI by massaging CDBI::__::Base's ISA
+    - Switch from NEXT to MRO::Compat
+    - Switch from Catalyst::Base to Catalyst::Component
+    - Fix RT#18197
+    - Add deprecation notice.
 
 0.11  Wed Nov 23 09:46:00 2005
     - Throw an exception during startup if there is an error loading

Modified: trunk/Catalyst-Model-CDBI/Makefile.PL
===================================================================
--- trunk/Catalyst-Model-CDBI/Makefile.PL	2010-02-09 00:17:42 UTC (rev 12840)
+++ trunk/Catalyst-Model-CDBI/Makefile.PL	2010-02-09 02:35:15 UTC (rev 12841)
@@ -5,6 +5,7 @@
     AUTHOR    => 'Sebastian Riedel (sri at oook.de)',
     PREREQ_PM => {
         Catalyst           => '4.00',
+        MRO::Compat        => 0,
         Class::DBI         => 0,
         Class::DBI::Loader => 0.20
     },

Modified: trunk/Catalyst-Model-CDBI/lib/Catalyst/Helper/Model/CDBI.pm
===================================================================
--- trunk/Catalyst-Model-CDBI/lib/Catalyst/Helper/Model/CDBI.pm	2010-02-09 00:17:42 UTC (rev 12840)
+++ trunk/Catalyst-Model-CDBI/lib/Catalyst/Helper/Model/CDBI.pm	2010-02-09 02:35:15 UTC (rev 12841)
@@ -2,6 +2,7 @@
 
 use strict;
 use Class::DBI::Loader;
+use Class::DBI;
 use File::Spec;
 
 =head1 NAME

Modified: trunk/Catalyst-Model-CDBI/lib/Catalyst/Model/CDBI.pm
===================================================================
--- trunk/Catalyst-Model-CDBI/lib/Catalyst/Model/CDBI.pm	2010-02-09 00:17:42 UTC (rev 12840)
+++ trunk/Catalyst-Model-CDBI/lib/Catalyst/Model/CDBI.pm	2010-02-09 02:35:15 UTC (rev 12841)
@@ -8,10 +8,8 @@
 }
 
 use strict;
-# XXX: this should be migrated to Catalyst::Component
-use base qw/Catalyst::Base Class::DBI/;
-# XXX: this should be migrated away from using NEXT in favour of mro
-use NEXT;
+use base qw/Catalyst::Component Class::DBI/;
+use MRO::Compat;
 use Class::DBI::Loader;
 
 our $VERSION = '0.12';
@@ -20,7 +18,7 @@
 
 =head1 NAME
 
-Catalyst::Model::CDBI - CDBI Model Class
+Catalyst::Model::CDBI - [DEPRECATED] CDBI Model Class
 
 =head1 SYNOPSIS
 
@@ -51,8 +49,13 @@
 =head1 DESCRIPTION
 
 This is the C<Class::DBI> model class. It's built on top of 
-C<Class::DBI::Loader>.
+C<Class::DBI::Loader>. C<Class::DBI> is generally not used for new
+applications, with C<DBIx::Class> being preferred instead. As such
+this model is deprecated and (mostly) unmaintained.
 
+It is preserved here for older applications which still need it for
+backwards compatibility.
+
 =head2 new
 
 Initializes Class::DBI::Loader and loads classes using the class
@@ -62,7 +65,7 @@
 
 sub new {
     my $class = shift;
-    my $self  = $class->NEXT::new( @_ );
+    my $self  = $class->next::method( @_ );
     my $c     = shift;
     $self->{namespace}               ||= ref $self;
     $self->{additional_base_classes} ||= ();