X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FApplication.pm;h=18cd589fccf03e0f62f15c21047e2cbd5db76bda;hb=d2c852208417c014caec0436a677fcadccc197d8;hp=b6789a835c229cf3db7f501ff5626570532d3bf9;hpb=096873aa586d1f883c262261ee7c67239c071fc0;p=maypole.git

diff --git a/lib/Maypole/Application.pm b/lib/Maypole/Application.pm
index b6789a8..18cd589 100644
--- a/lib/Maypole/Application.pm
+++ b/lib/Maypole/Application.pm
@@ -2,40 +2,103 @@ package Maypole::Application;
 
 use strict;
 use warnings;
+use UNIVERSAL::require;
+use Maypole;
+use Maypole::Config;
 
 our @ISA;
+our $VERSION = '2.07';
 
 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);
+    my $caller = caller(0);
+    no strict 'refs';
+    push @{"${caller}::ISA"}, $self;
+    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;
 
 =head1 NAME
 
-Maypole::Application - all in wonder front-end
+Maypole::Application - Universal Maypole Frontend
 
 =head1 SYNOPSIS
 
-    use base 'Maypole::Application';
+    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
 
-The all in wonder front-end.
+This is a universal frontend for mod_perl1, mod_perl2 and CGI.
+
+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;
+
+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);
+
+is equivalent to
+
+    use Maypole::Application;
+    sub debug { 1 }
 
 =head1 AUTHOR
 
@@ -45,3 +108,5 @@ Idea by Marcus Ramberg, C<marcus@thefeed.no>
 =head1 LICENSE
 
 You may distribute this code under the same terms as Perl itself.
+
+=cut