X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FApplication.pm;h=584b0e4e2f40790ee1d5fd81e22cbb49ba28def6;hb=a6edcc4c9b9950ee248e8e10839c86c8e31a129d;hp=a39c4a1fa5830efdd90570fd86eb5261dbf04b12;hpb=5f175450fcaf2b71f910742abc16ede9bfdc7103;p=maypole.git

diff --git a/lib/Maypole/Application.pm b/lib/Maypole/Application.pm
index a39c4a1..584b0e4 100644
--- a/lib/Maypole/Application.pm
+++ b/lib/Maypole/Application.pm
@@ -2,6 +2,8 @@ package Maypole::Application;
 
 use strict;
 use warnings;
+use UNIVERSAL::require;
+use Maypole;
 
 our @ISA;
 
@@ -10,19 +12,34 @@ sub import {
     my $caller = caller(0);
     no strict 'refs';
     push @{"${caller}::ISA"}, $self;
-    foreach (@plugins) {
-        "Maypole::$_"->require or warn qq(Loading plugin "Maypole::$_" failed);
-        unshift @ISA, "Maypole::$_";
+    my $autosetup=0;
+    foreach (sort @plugins) {
+        if    (/^\-Setup$/) { $autosetup++; }
+        elsif (/^\-Debug$/) {
+            *{"$caller\::debug"} = sub { 1 };
+            warn "Debugging enabled";
+        }
+        elsif (/^-.*$/) { warn "Unknown flag: $_" }
+        else {
+            # The plugin caller should be our application class
+            eval "package $caller; require Maypole::Plugin::$_";
+            if ($@) { warn qq(Loading plugin "Maypole::Plugin::$_" failed: $@) }
+            else {
+                warn "Loaded plugin: Maypole::Plugin::$_" if $caller->debug;
+                unshift @ISA, "Maypole::Plugin::$_";
+            }
+        }
     }
+    $caller->setup() if $autosetup;
 }
 
 if ( $ENV{MOD_PERL} ) {
-    require Apache::MVC or die 'Loading Apache frontend failed';
-    push @ISA, qw(Apache::MVC);
+    Apache::MVC->require or die "Loading Apache frontend failed: $@";
+    push @ISA, 'Apache::MVC';
 }
 else {
-    require CGI::Maypole or die 'Loading CGI frontend failed';
-    push @ISA, qw(CGI::Maypole);
+    CGI::Maypole->require or die "Loading CGI frontend failed: $@";
+    push @ISA, 'CGI::Maypole';
 }
 
 1;
@@ -35,15 +52,46 @@ Maypole::Application - Maypole Universal Frontend
 
     use Maypole::Application;
 
+    use Maypole::Application qw(Config::YAML);
+
+    use Maypole::Application qw(-Debug Config::YAML -Setup);
+
+    use Maypole::Application qw(Config::YAML Loader -Setup -Debug);
+
 =head1 DESCRIPTION
 
 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.
+You can omit the Maypole::Plugin:: prefix from plugins.
+So Maypole::Plugin::Config::YAML becomes Config::YAML.
 
     use Maypole::Application qw(Config::YAML);
 
+You can also set special flags like -Setup and -Debug.
+
+    use Maypole::Application qw(-Debug Config::YAML -Setup);
+
+The position of plugins and flags in the chain is important,
+because they are loaded/executed in the same order they appear.
+
+=head2 -Setup
+
+    use Maypole::Application qw(-Setup);
+
+is equivalent to
+
+    use Maypole::Application;
+    MyApp->setup;
+
+=head2 -Debug
+
+    use Maypole::Application qw(-Debug);
+
+is equivalent to
+
+    use Maypole::Application;
+    sub debug { 1 }
+
 =head1 AUTHOR
 
 Sebastian Riedel, C<sri@oook.de>