X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FApplication.pm;h=cd4318f9c48f786f1490225eccea642064d6553a;hb=8a708de9eef22c6e47ce80a2abb2c450c56ec576;hp=df66285c75572249e9df5733496a8f8e61e190c1;hpb=767c12f0b134e503bdcd3c5e58464454f63192b0;p=maypole.git

diff --git a/lib/Maypole/Application.pm b/lib/Maypole/Application.pm
index df66285..cd4318f 100644
--- a/lib/Maypole/Application.pm
+++ b/lib/Maypole/Application.pm
@@ -4,59 +4,68 @@ 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 $frontend = 'Apache::MVC' if $ENV{MOD_PERL};
+    
+    my $masonx;
+    if ( grep { /^MasonX$/ } @plugins )
+    {
+        $masonx++;
+        @plugins = grep { ! /^MasonX$/ } @plugins;
+        $frontend = 'MasonX::Maypole';
+    }
+    
+    $frontend ||= 'CGI::Maypole';
+    
+    $frontend->require or die "Loading $frontend frontend failed: $@";
+    push @ISA, $frontend;
+
+    my $autosetup=0;
+    my @plugin_modules;
+    {
+        foreach (@plugins) {
+            if    (/^\-Setup$/) { $autosetup++; }
+            elsif (/^\-Debug(\d*)$/) {
+                my $d = $1 || 1;
+                no strict 'refs';
+                *{"$caller\::debug"} = sub { $d };
+                warn "Debugging (level $d) enabled for $caller";
+            }
+            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::$_";
+		    unshift @ISA, "Maypole::Plugin::$_";
+                    warn "Loaded plugin: $plugin for $caller"
+                        if $caller->can('debug') && $caller->debug;
+                } else {
+                    die qq(Loading plugin "$plugin" for $caller failed: )
+                        . $UNIVERSAL::require::ERROR;
+                }
             }
         }
     }
-}
-
-if ( $ENV{MOD_PERL} ) {
-    Apache::MVC->require or die "Loading Apache frontend failed: $@";
-    push @ISA, 'Apache::MVC';
-}
-else {
-    CGI::Maypole->require or die "Loading CGI frontend failed: $@";
-    push @ISA, 'CGI::Maypole';
+    no strict 'refs';
+    push @{"${caller}::ISA"}, @plugin_modules, $class;
+    $caller->config(Maypole::Config->new);
+    $caller->config->masonx({}) if $masonx;
+    $caller->setup() if $autosetup;
 }
 
 1;
 
 =head1 NAME
 
-Maypole::Application - Maypole Universal Frontend
+Maypole::Application - Universal Maypole Frontend
 
 =head1 SYNOPSIS
 
@@ -68,9 +77,11 @@ Maypole::Application - Maypole Universal Frontend
 
     use Maypole::Application qw(Config::YAML Loader -Setup -Debug);
 
+    use Maypole::Application qw(-Debug2 MasonX AutoUntaint);
+
 =head1 DESCRIPTION
 
-This is a universal frontend for mod_perl1, mod_perl2 and CGI.
+This is a universal frontend for mod_perl1, mod_perl2, HTML::Mason and CGI.
 
 You can omit the Maypole::Plugin:: prefix from plugins.
 So Maypole::Plugin::Config::YAML becomes Config::YAML.
@@ -93,6 +104,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);
@@ -102,6 +117,8 @@ is equivalent to
     use Maypole::Application;
     sub debug { 1 }
 
+You can specify a higher debug level by saying C<-Debug2> etc. 
+
 =head1 AUTHOR
 
 Sebastian Riedel, C<sri@oook.de>
@@ -110,3 +127,5 @@ Idea by Marcus Ramberg, C<marcus@thefeed.no>
 =head1 LICENSE
 
 You may distribute this code under the same terms as Perl itself.
+
+=cut