2.09 - maintain the order that plugins are loaded, add tests for Maypole::Application...

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

diff --git a/lib/Maypole/Application.pm b/lib/Maypole/Application.pm
index df66285c75572249e9df5733496a8f8e61e190c1..4f61f42742810235743822e7b795d8293393764e 100644 (file)
--- a/lib/Maypole/Application.pm
+++ b/lib/Maypole/Application.pm
@@ -4,43 +4,43 @@ use strict;
 use warnings;
 use UNIVERSAL::require;
 use Maypole;
-
-# funny little gimmick ;)
-my $banner = <<'';
- __  __                         _
-|  \/  | __ _ _   _ _ __   ___ | | ___
-| |\/| |/ _` | | | | '_ \ / _ \| |/ _ \
-| |  | | (_| | |_| | |_) | (_) | |  __/
-|_|  |_|\__,_|\__, | .__/ \___/|_|\___|
-              |___/|_| -= VERSION =-
-
-$banner =~ s/VERSION/$Maypole::VERSION/;
-warn $banner;
+use Maypole::Config;
 
 our @ISA;
+our $VERSION = '2.09';
 
 sub import {
-    my ( $self, @plugins ) = @_;
+    my ( $class, @plugins ) = @_;
     my $caller = caller(0);
-    no strict 'refs';
-    push @{"${caller}::ISA"}, $self;
-    foreach (@plugins) {
-        if    (/^\-Setup$/) { $caller->setup }
-        elsif (/^\-Debug$/) {
-            *{"$caller\::debug"} = sub { 1 };
-            warn "Debugging enabled";
-        }
-        else {
 
-            # The plugin caller should be our application class
-            eval "package $caller; require Maypole::Plugin::$_";
-            if ($@) { warn qq(Loading plugin "Maypole::Plugin::$_" failed: $@) }
+    my $autosetup=0;
+    my @plugin_modules;
+    {
+        foreach (@plugins) {
+            if    (/^\-Setup$/) { $autosetup++; }
+            elsif (/^\-Debug$/) {
+                no strict 'refs';
+                *{"$caller\::debug"} = sub { 1 };
+                warn "Debugging enabled";
+            }
+            elsif (/^-.*$/) { warn "Unknown flag: $_" }
             else {
-                warn "Loaded plugin: Maypole::Plugin::$_" if $caller->debug;
-                unshift @ISA, "Maypole::Plugin::$_";
+                my $plugin = "Maypole::Plugin::$_";
+                if ($plugin->require) {
+                    push @plugin_modules, "Maypole::Plugin::$_";
+                    warn "Loaded plugin: $plugin"
+                        if $caller->can('debug') && $caller->debug;
+                } else {
+                    warn qq(Loading plugin "$plugin" failed: )
+                        . $UNIVERSAL::require::ERROR;
+                }
             }
         }
     }
+    no strict 'refs';
+    push @{"${caller}::ISA"}, @plugin_modules, $class;
+    $caller->config(Maypole::Config->new);
+    $caller->setup() if $autosetup;
 }
 
 if ( $ENV{MOD_PERL} ) {
@@ -56,7 +56,7 @@ else {
 
 =head1 NAME
 
-Maypole::Application - Maypole Universal Frontend
+Maypole::Application - Universal Maypole Frontend
 
 =head1 SYNOPSIS
 
@@ -93,6 +93,10 @@ is equivalent to
     use Maypole::Application;
     MyApp->setup;
 
+Note that no options are passed to C<setup()>. You must ensure that the
+required model config parameters are set in C<MyApp-E<gt>config>. See
+L<Maypole::Config> for more information.
+
 =head2 -Debug
 
     use Maypole::Application qw(-Debug);
@@ -110,3 +114,5 @@ Idea by Marcus Ramberg, C<marcus@thefeed.no>
 =head1 LICENSE
 
 You may distribute this code under the same terms as Perl itself.
+
+=cut