Ordering should not matter for parameters to ::Application.

Warn if setting up CDBI without DSN.

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@280 48953598-375a-da11-a14b-00016c27c3ee

diff --git a/lib/Maypole/Application.pm b/lib/Maypole/Application.pm
index fcbb13cadbae123204652dbb24b3a22770ff1e63..584b0e4e2f40790ee1d5fd81e22cbb49ba28def6 100644 (file)
--- a/lib/Maypole/Application.pm
+++ b/lib/Maypole/Application.pm
@@ -12,15 +12,15 @@ sub import {
     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: $@) }
@@ -30,6 +30,7 @@ sub import {
             }
         }
     }
+    $caller->setup() if $autosetup;
 }
 
 if ( $ENV{MOD_PERL} ) {

diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm
index b4208e1029d577ef49ea8f7bf3390efa450959da..618076f3502741dc2c6e2654803e1baeb33ece23 100644 (file)
--- a/lib/Maypole/Model/CDBI.pm
+++ b/lib/Maypole/Model/CDBI.pm
@@ -212,6 +212,7 @@ sub setup_database {
     $p    ||= $config->pass;
     $opts ||= $config->opts;
     $config->dsn($dsn);
+    warn "No DSN set in config" unless $dsn;
     $config->loader || $config->loader(
         Class::DBI::Loader->new(
             namespace => $namespace,