X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FModel%2FBase.pm;h=6e60aea7f9c3f4505b93263eaa31fcef4dc240d2;hb=8237e83ed726d86f1ef754e51077eb2aff0cd4ed;hp=908a2fca294a926e2f412c5daee3d2345479c9d7;hpb=d09e000fc977211b8bd1a77285a952421b60aa7a;p=maypole.git

diff --git a/lib/Maypole/Model/Base.pm b/lib/Maypole/Model/Base.pm
index 908a2fc..6e60aea 100644
--- a/lib/Maypole/Model/Base.pm
+++ b/lib/Maypole/Model/Base.pm
@@ -1,4 +1,4 @@
-package Apache::MVC::Model::Base;
+package Maypole::Model::Base;
 our %remember;
 sub MODIFY_CODE_ATTRIBUTES { $remember{$_[1]} = $_[2]; () }
 
@@ -8,14 +8,26 @@ sub edit :Exported { }
 
 sub process {
     my ($class, $r) = @_;
-    $r->template( my $method = $r->action );
-    $r->objects([ $class->retrieve(shift @{$r->{args}}) ]);
-    $class->$method($r);
+    my $method = $r->action;
+    return if $r->{template}; # Authentication has set this, we're done.
+
+    $r->{template} = $method;
+    $r->objects([]);
+    my $obj = $class->retrieve( $r->{args}->[0] );
+    if ($obj) {
+        $r->objects([ $obj ]);
+        shift @{$r->{args}};
+    }
+    $class->$method($r, $obj, @{$r->{args}});
+}
+
+sub display_columns { 
+    sort shift->columns;
 }
 
 =head1 NAME
 
-Apache::MVC::Model::Base - Base class for model classes
+Maypole::Model::Base - Base class for model classes
 
 =head1 DESCRIPTION
 
@@ -34,6 +46,25 @@ errors. A hash of errors will be passed to the template.
 
 sub do_edit { die "This is an abstract method" }
 
+=head2 setup_database
+
+    $model->setup_database($config, $namespace, @data)
+
+Uses the user-defined data in C<@data> to specify a database- for
+example, by passing in a DSN. The model class should open the database,
+and create a class for each table in the database. These classes will
+then be C<adopt>ed. It should also populate C<< $config->{tables} >> and
+C<< $config->{classes} >> with the names of the classes and tables
+respectively. The classes should be placed under the specified
+namespace. For instance, C<beer> should be mapped to the class
+C<BeerDB::Beer>.
+
+=head2 class_of
+
+    $model->class_of($r, $table)
+
+This maps between a table name and its associated class.
+
 =head2 retrieve
 
 This turns an ID into an object of the appropriate class.
@@ -51,7 +82,9 @@ beers, so C<BeerDB::Brewery> needs to return C<beers>.
 
 =head2 columns
 
-This is a list of the columns in a table.
+This is a list of all the columns in a table. You may also override
+C<display_columns>, which is the list of columns you want to view, in
+the right order.
 
 =head2 table
 
@@ -71,11 +104,13 @@ similar.
 
 =cut
 
+sub class_of       { die "This is an abstract method" }
+sub setup_database { die "This is an abstract method" }
 sub list :Exported { die "This is an abstract method" };
 
 =pod
 
-Also, see the exported commands in C<Apache::MVC::Model::CDBI>.
+Also, see the exported commands in C<Maypole::Model::CDBI>.
 
 =head1 Other overrides
 
@@ -88,7 +123,10 @@ Return a hash mapping column names with human-readable equivalents.
 
 =cut
 
-sub column_names { my $class = shift; map { $_ => ucfirst $_ } $class->columns }
+sub column_names { my $class = shift; map { 
+        my $col = $_;
+        $col =~ s/_+(\w)?/ \U$1/g;
+        $_ => ucfirst $col } $class->columns }
 
 =head2 description