Zero search fix and sweet new templates, wheee...

[maypole.git] / lib / Maypole / Application.pm

diff --git a/lib/Maypole/Application.pm b/lib/Maypole/Application.pm
index 2727c9a062a7f5d5cc74319c7fa925feadf087fc..4e8b624bf180303ada4ef2c7c2938c2473344f79 100644 (file)
--- a/lib/Maypole/Application.pm
+++ b/lib/Maypole/Application.pm
@@ -3,35 +3,44 @@ package Maypole::Application;
 use strict;
 use warnings;
 
+our @ISA;
+
+sub import {
+    my ( $self, @plugins ) = @_;
+    return unless $plugins[0];
+    my $caller = caller(0);
+    no strict 'refs';
+    push @{"${caller}::ISA"}, $self;
+    "Maypole::$_"->require && unshift @ISA, "Maypole::$_" foreach (@plugins);
+}
+
 if ( $ENV{MOD_PERL} ) {
-    require mod_perl;
-    if ( $mod_perl::VERSION >= 1.99 ) {
-        require Apache2::MVC;
-        our @ISA = qw(Apache2::MVC);
-    }
-    else {
-        require Apache::MVC;
-        our @ISA = qw(Apache::MVC);
-    }
+    require Apache::MVC;
+    push @ISA, qw(Apache::MVC);
 }
 else {
     require CGI::Maypole;
-    our @ISA = qw(CGI::Maypole);
+    push @ISA, qw(CGI::Maypole);
 }
 
 1;
 
 =head1 NAME
 
-Maypole::Application - all in wonder front-end
+Maypole::Application - Maypole Universal Frontend
 
 =head1 SYNOPSIS
 
-    use base 'Maypole::Application';
+    use Maypole::Application;
 
 =head1 DESCRIPTION
 
-The all in wonder front-end.
+This is a universal frontend for mod_perl1, mod_perl2 and CGI.
+
+You can omit the Maypole:: prefix from plugins.
+So Maypole::Config::YAML becomes Config::YAML.
+
+    use Maypole::Application qw(Config::YAML);
 
 =head1 AUTHOR