X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FApplication.pm;h=c10221a8784bbf36be6cae136b523cd1f81ec23f;hb=f9a6b47b3b916585d710eac141003fb8261d9c3c;hp=130eea09563a329c73e93ed3387235dfe70cb956;hpb=c1780c9782e9f1b5a80c5a82764992718143aeb1;p=maypole.git

diff --git a/lib/Maypole/Application.pm b/lib/Maypole/Application.pm
index 130eea0..c10221a 100644
--- a/lib/Maypole/Application.pm
+++ b/lib/Maypole/Application.pm
@@ -2,24 +2,48 @@ package Maypole::Application;
 
 use strict;
 use warnings;
+use UNIVERSAL::require;
+use Maypole;
+use Maypole::Config;
 
 our @ISA;
+our $VERSION = '2.05';
 
 sub import {
     my ( $self, @plugins ) = @_;
     my $caller = caller(0);
     no strict 'refs';
     push @{"${caller}::ISA"}, $self;
-    "Maypole::$_"->require && unshift @ISA, "Maypole::$_" foreach (@plugins);
+    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->config(Maypole::Config->new);
+    $caller->setup() if $autosetup;
 }
 
 if ( $ENV{MOD_PERL} ) {
-    require Apache::MVC;
-    push @ISA, qw(Apache::MVC);
+    Apache::MVC->require or die "Loading Apache frontend failed: $@";
+    push @ISA, 'Apache::MVC';
 }
 else {
-    require CGI::Maypole;
-    push @ISA, qw(CGI::Maypole);
+    CGI::Maypole->require or die "Loading CGI frontend failed: $@";
+    push @ISA, 'CGI::Maypole';
 }
 
 1;
@@ -32,15 +56,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>