X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FApplication.pm;h=3336c1f73cd7d1da68d9fbbb1c6677856e41b302;hb=5ca6a1765a44c39b23e7bab0e2ba636dbc6b57a8;hp=e0c08fff70e6604f060c4d7f7b8b19ff1761eb0c;hpb=3d3d38f2f6639c90c98c72dc0167a82d52ce9ec4;p=maypole.git

diff --git a/lib/Maypole/Application.pm b/lib/Maypole/Application.pm
index e0c08ff..3336c1f 100644
--- a/lib/Maypole/Application.pm
+++ b/lib/Maypole/Application.pm
@@ -3,31 +3,38 @@ package Maypole::Application;
 use strict;
 use warnings;
 use UNIVERSAL::require;
+use Maypole;
+use Maypole::Config;
 
 our @ISA;
+our $VERSION = '2.08';
 
 sub import {
     my ( $self, @plugins ) = @_;
     my $caller = caller(0);
     no strict 'refs';
     push @{"${caller}::ISA"}, $self;
-    foreach (@plugins) {
-        if    (/^\-Setup$/) { $caller->setup }
+    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::$_";
+                push @{"${caller}::ISA"}, "Maypole::Plugin::$_";
             }
         }
     }
+
+    $caller->config(Maypole::Config->new);
+    $caller->setup() if $autosetup;
 }
 
 if ( $ENV{MOD_PERL} ) {
@@ -43,12 +50,18 @@ else {
 
 =head1 NAME
 
-Maypole::Application - Maypole Universal Frontend
+Maypole::Application - Universal Maypole Frontend
 
 =head1 SYNOPSIS
 
     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.
@@ -74,6 +87,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);
@@ -91,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