Config parameter handling for Maypole::Model::CDBI

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

diff --git a/Changes b/Changes
index ff7b9beb1298de8a737bc336c87145f6b262cf9a..2d0b1a33812b36a20736b75114a28eeb31bb8b0e 100644 (file)
--- a/Changes
+++ b/Changes
@@ -19,7 +19,7 @@ Revision history for Perl extension Maypole
 1.5   Mon Jun 21 14:36:54 BST 2004
     - CLI mode correctly uses Constants module
     - Template footers as well as headers (Markus Ramberg)
-    - Fix problems on failed object create (Jesse Shiedlower)
+    - Fix problems on failed object create (Jesse Sheidlower)
     - Fix related() to deal with latest version of Class::DBI (Markus)
     - Add sample CSS to distribution
     - Maypole::Model::CDBI::Plain, for those who already have a CDBI set

diff --git a/TODO b/TODO
index 3444d0ccbdba16badba95f071b70bb0defe77174..941c95778fb0751a24b4f870b66a365b21d04ff9 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,2 +1,3 @@
-See http://wiki.simon-cozens.org/?MaypoleToDo
-
+* Tests
+* Better Documentation and more complex examples
+* Make templates XHTML compliant

diff --git a/lib/Maypole.pm b/lib/Maypole.pm
index e3a92524a8f4a2d52bf458b0dc3c48f183f8b2d6..e80490141760cfc16844b28e6943cc17d5d8f212 100644 (file)
--- a/lib/Maypole.pm
+++ b/lib/Maypole.pm
@@ -67,7 +67,7 @@ sub handler_guts {
     unless ($applicable == OK) {
         # It's just a plain template
         delete $r->{model_class};
-        $r->{path} =~ s{/}{}; # De-absolutify
+        $r->{path} =~ s{/$}{}; # De-absolutify
         $r->template($r->{path});
     }
     # We authenticate every request, needed for proper session management
@@ -283,7 +283,7 @@ Simon Cozens, C<simon@cpan.org>
 
 =head1 THANK YOU
 
-Jesse Scheildlower, Jody Belka, Markus Ramberg, Mickael Joanne, Simon Flack and all the others who've helped.
+Jesse Scheidlower, Jody Belka, Markus Ramberg, Mickael Joanne, Simon Flack and all the others who've helped.
 
 =head1 LICENSE
 

diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm
index 825d7522c09e854532bbd2972b6aa59be2e906e5..2a79850805008930c4f461e734c5bcb5a15d0161 100644 (file)
--- a/lib/Maypole/Model/CDBI.pm
+++ b/lib/Maypole/Model/CDBI.pm
@@ -132,6 +132,10 @@ sub list :Exported {
 
 sub setup_database {
     my ($self, $config, $namespace, $dsn, $u, $p, $opts) = @_;
+    $dsn  ||= $config->{dsn};
+    $u    ||= $config->{user};
+    $p    ||= $config->{pass};
+    $opts ||= $config->{opts};
     $config->{dsn} = $dsn;
     $config->{loader} = Class::DBI::Loader->new(
         namespace => $namespace,