removed C3 and no longer require it

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@563 48953598-375a-da11-a14b-00016c27c3ee

diff --git a/Changes b/Changes
index 155c8423c7865e2c5bb50d05d86275df39175000..71b8f4d8aefb2f0f2e58e75eaf6b2c9fd0e6124a 100644 (file)
--- a/Changes
+++ b/Changes
@@ -5,7 +5,6 @@ For information about current developments and future releases, see:
 2.12  October 2006
    Fixed some db_colinfo test bugs
    Fixed typo in edit form template
-   Now uses Class::C3 in all Classes to simplify inheritence
    Inheritence simpler and nicer and less hacked
    add_model_superclass method moves @ISA munging into the model
    new Class::DBI::DFV based model
@@ -28,6 +27,9 @@ For information about current developments and future releases, see:
    change to view::base to only call display_columns,  stringify_columns, to_cgi if model class can
    changed template path to only look for custom, factory, etc on first/only path provided
 
+2.111 Mon 30 April 2007
+   - forked - see 2.111 changelog
+
 2.11 Mon 31 July 2006
 
 SVN revision 519

diff --git a/Makefile.PL b/Makefile.PL
index 6d6cdfb978f65228c2592657989adc99d76a8c40..935c677a0410d2c81b1ad0bd46b23786bcfa8832 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -31,7 +31,6 @@ WriteMakefile(
         Digest::MD5                     => 0,
        File::MMagic::XS                 => 0.08,
        Class::DBI::Plugin::Type         => 0,
-       Class::C3                        => 0.14,
     },    # e.g., Module::Name => 1.1
     (
         $] >= 5.005

diff --git a/lib/Maypole.pm b/lib/Maypole.pm
index 596479e21ec8f2b57cbe4dd20dc1957c2385ad18..1ac5ff4a01b7ecb289b0b8a3dc5b5e7e72cd7455 100644 (file)
--- a/lib/Maypole.pm
+++ b/lib/Maypole.pm
@@ -1,5 +1,4 @@
 package Maypole;
-use Class::C3;
 use base qw(Class::Accessor::Fast Class::Data::Inheritable);
 use UNIVERSAL::require;
 use strict;
@@ -1294,9 +1293,9 @@ sub param
        $self->params->{$key} = $new_val;
     }
     
-    return ref $val ? @$val : ($val) if wantarray;
+    return (ref $val eq 'ARRAY') ? @$val : ($val) if wantarray;
         
-    return ref $val ? $val->[0] : $val;
+    return (ref $val eq 'ARRAY') ? $val->[0] : $val;
 }
 
 

diff --git a/lib/Maypole/Manual/Inheritance.pod b/lib/Maypole/Manual/Inheritance.pod
index 76d76115626194e1f271cecb134edb02e33d1896..950283deb960c2610032c34d5e2112425af1bd98 100644 (file)
--- a/lib/Maypole/Manual/Inheritance.pod
+++ b/lib/Maypole/Manual/Inheritance.pod
@@ -78,8 +78,8 @@ a set of auto-generated model classes, and a view class:
 \r
 =head2 Ouch, that's a lot of inheritence!\r
 \r
-Yes, that's a lot of inheritence, fortunately as of 2.12 Maypole uses\r
-L<Class::C3> to ensure sane method resolution.\r
+Yes, that's a lot of inheritence, at some point in the future - probably Maypole 3.x we\r
+will move to Class::C3\r
 \r
 =head2 What about Maypole::Application - loading plugins\r
 \r
@@ -235,8 +235,6 @@ The resulting model looks like this:
 \r
 =head3 Features\r
 \r
-*REWRITE BASED ON C3 and push instead of shift*\r
-\r
 1. Non-Maypole applications using the Offline model are completely isolated from\r
 the Maypole application, and need not know it exists at all.\r
 \r

diff --git a/lib/Maypole/Model/Base.pm b/lib/Maypole/Model/Base.pm
index d8592bc67455f33851e7bb7b68f693f0ac36335b..307d48b55795adea2321ed194dd4afeef10647b2 100644 (file)
--- a/lib/Maypole/Model/Base.pm
+++ b/lib/Maypole/Model/Base.pm
@@ -1,6 +1,5 @@
 package Maypole::Model::Base;
 use strict;
-use Class::C3;
 
 use Maypole::Constants;
 use attributes ();

diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm
index cc78879df3a2ac73316381147882fc458d0de11b..b3223c4d7887c0235324e4971e01045cdd658b65 100644 (file)
--- a/lib/Maypole/Model/CDBI.pm
+++ b/lib/Maypole/Model/CDBI.pm
@@ -24,7 +24,6 @@ will instead use Class::DBI classes provided.
 =cut
 
 use base qw(Maypole::Model::CDBI::Base);
-use Class::C3;
 use Data::Dumper;
 use Class::DBI::Loader;
 use attributes ();

diff --git a/lib/Maypole/Model/CDBI/AsForm.pm b/lib/Maypole/Model/CDBI/AsForm.pm
index cad330c1193ac5961aebd9055780d1edeffc6e62..d76ecb42da5bcca50de5497b3231e169d54f2fad 100644 (file)
--- a/lib/Maypole/Model/CDBI/AsForm.pm
+++ b/lib/Maypole/Model/CDBI/AsForm.pm
@@ -1,6 +1,4 @@
 package Maypole::Model::CDBI::AsForm;
-
-use Class::C3;
 use strict;
 
 use warnings;

diff --git a/lib/Maypole/Model/CDBI/Base.pm b/lib/Maypole/Model/CDBI/Base.pm
index 6ecc213ac15419d09ba16f028b2a12c69812561d..d933c5bb1006b4d25f5fe8ab24fb2a799c8d9dc2 100644 (file)
--- a/lib/Maypole/Model/CDBI/Base.pm
+++ b/lib/Maypole/Model/CDBI/Base.pm
@@ -1,6 +1,5 @@
 package Maypole::Model::CDBI::Base;
 use strict;
-use Class::C3;
 
 =head1 NAME
 

diff --git a/lib/Maypole/Model/CDBI/DFV.pm b/lib/Maypole/Model/CDBI/DFV.pm
index ca3609c193578760322f983fc1eb0840426332ca..5aa0e9ab85cc37aa592800a620449a3c0ff73c16 100644 (file)
--- a/lib/Maypole/Model/CDBI/DFV.pm
+++ b/lib/Maypole/Model/CDBI/DFV.pm
@@ -35,7 +35,6 @@ of CGI::Untaint. For teh win!!
 
 =cut
 
-use Class::C3;
 use Data::FormValidator;
 use Data::Dumper;
 

diff --git a/lib/Maypole/Model/CDBI/Plain.pm b/lib/Maypole/Model/CDBI/Plain.pm
index 0ca9bc972931e6277f1ca08a4540336c6615644d..4398fac9a92f41ba7eb221f2a920d93d845cad14 100644 (file)
--- a/lib/Maypole/Model/CDBI/Plain.pm
+++ b/lib/Maypole/Model/CDBI/Plain.pm
@@ -34,7 +34,6 @@ tables and set up the inheritance relationships as normal.
 
 =cut
 
-use Class::C3;
 use Maypole::Config;
 use base 'Maypole::Model::CDBI::Base';
 

diff --git a/lib/Maypole/View/Base.pm b/lib/Maypole/View/Base.pm
index 81e50446693305c9491e603fe0d46f20e7b11867..9863e155475581355431b4d2636f781a77984a89 100644 (file)
--- a/lib/Maypole/View/Base.pm
+++ b/lib/Maypole/View/Base.pm
@@ -1,5 +1,4 @@
 package Maypole::View::Base;
-use Class::C3;
 use File::Spec;
 use UNIVERSAL::moniker;
 use strict;

diff --git a/lib/Maypole/View/TT.pm b/lib/Maypole/View/TT.pm
index d2da45a59d0b643e4ec4f2c322af717b595140e3..6a3bfe6297471bf8a509f5e3d0b2a84a02d741a8 100644 (file)
--- a/lib/Maypole/View/TT.pm
+++ b/lib/Maypole/View/TT.pm
@@ -1,5 +1,4 @@
 package Maypole::View::TT;
-use Class::C3;
 use base 'Maypole::View::Base';
 use Maypole::Constants;
 use Template;

diff --git a/lib/Maypole/templates/factory/macros b/lib/Maypole/templates/factory/macros
index ce9d0e1d3e837944885b63541dc829d834b1c676..d2192bdad1557b2e11d8bb1e94e756a761275626 100644 (file)
--- a/lib/Maypole/templates/factory/macros
+++ b/lib/Maypole/templates/factory/macros
@@ -14,7 +14,7 @@ catenating the base URL, table, command, and any arguments.
 [%
 MACRO link(table, command, additional, label) BLOCK;
     SET lnk = base _ "/" _ table _ "/" _ command _ "/" _ additional;
-    lnk = lnk | uri | html;
+    lnk = lnk | uri ;
     '<a href="' _ lnk _ '">';
     label | html;
     "</a>";