X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FApache%2FMVC.pm;h=c9db3ae415008cf9dcf1613abdf95d90fe766515;hb=ce6a4c9c85fd9ea388abc677089564bc46e687be;hp=f567badb87ceaf00c650ca6f10b9b8d99b2d8074;hpb=feefb416b3c1aafdea07aa47378d007ee760e9f9;p=maypole.git

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index f567bad..c9db3ae 100644
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -2,15 +2,26 @@ package Apache::MVC;
 use base qw(Class::Accessor Class::Data::Inheritable);
 use attributes ();
 use Class::DBI::Loader;
+use UNIVERSAL::require;
+use Apache::Constants ":common";
 use strict;
 use warnings;
-our $VERSION = "1.0";
-
+our $VERSION = "0.1";
 __PACKAGE__->mk_classdata($_) for qw( _config init_done view_object );
-__PACKAGE__->mk_accessors ( qw( config ar params objects model_class args ));
+__PACKAGE__->mk_accessors ( qw( config ar params objects model_class
+args action template ));
 __PACKAGE__->config({});
 __PACKAGE__->init_done(0);
 
+
+sub import {
+    my $real = shift;
+    if ($real ne "Apache::MVC") {
+        no strict 'refs';
+        *{$real."::handler"} = sub { Apache::MVC::handler($real, @_) };
+    }
+}
+
 # This is really dirty.
 sub config {
     my $self = shift;
@@ -21,25 +32,31 @@ sub config {
 sub set_database {
     my ($calling_class, $dsn) = @_;
     $calling_class = ref $calling_class if ref $calling_class;
-    $calling_class->config->{dsn} = $dsn;
-    $calling_class->config->{loader} = Class::DBI::Loader->new(
+    my $config = $calling_class->config;
+    $config->{model} ||= "Apache::MVC::Model::CDBI";
+    $config->{model}->require;
+    $config->{dsn} = $dsn;
+    $config->{loader} = Class::DBI::Loader->new(
         namespace => $calling_class,
         dsn => $dsn
     ); 
+    $config->{classes} = [ $config->{loader}->classes ];
+    for my $subclass (@{$config->{classes}}) {
+        no strict 'refs';
+        unshift @{$subclass."::ISA"}, $config->{model};
+        $config->{model}->adopt($subclass)
+           if $config->{model}->can("adopt");
+    }
 }
 
 sub init {
     my $class = shift;
     my $config = $class->config;
-    $config->{model} ||= "Apache::MVC::Model::CDBI";
     $config->{view}  ||= "Apache::MVC::View::TT";
-    $config->{classes} = [ $class->config->{loader}->classes ];
+    $config->{view}->require;
     $config->{display_tables} ||= [ $class->config->{loader}->tables ];
-    for my $class (@{$config->{classes}}) {
-        no strict 'refs';
-        push @{$class."::ISA"}, $class->config->{model};
-    }
     $class->view_object($class->config->{view}->new);
+    $class->init_done(1);
 
 }
 
@@ -50,19 +67,30 @@ sub class_of {
 
 sub handler {
     # See Apache::MVC::Workflow before trying to understand this.
-    my $class = (caller(0))[0];
+    my $class = shift;
     $class->init unless $class->init_done;
     my $r = bless { config => $class->config }, $class;
     $r->get_request();
     $r->parse_location();
+
+    warn "Parsed location\n";
     $r->model_class($r->class_of($r->{table}));
     my $status = $r->is_applicable;
-    return $status unless $status == 200;
-    $status = $r->call_authenticate;
-    return $status unless $status == 200;
-    $r->find_objects();
-    $r->additional_data();
-    $r->class->process($r);
+    if ($status == OK) { 
+        $status = $r->call_authenticate;
+        return $status unless $status == OK;
+        $r->additional_data();
+    
+        $r->model_class->process($r);
+    } else { 
+        warn "Plain template $r->{path}";
+        # Otherwise, it's just a plain template.
+        delete $r->{model_class};
+        $r->{path} =~ s{/}{}; # De-absolutify
+        $r->template($r->{path});
+        warn $r->template;
+    }
+    return $r->view_object->process($r);
 }
 
 sub get_request {
@@ -73,36 +101,95 @@ sub get_request {
 
 sub parse_location {
     my $self = shift;
-    my @pi = split /\//, $self->{ar}->uri();
+    $self->{path} = $self->{ar}->uri;
+    my $loc = $self->{ar}->location;
+    $self->{path} =~ s/^$loc//; # I shouldn't need to do this?
+    warn "Path is $self->{path}";
+    my @pi = split /\//, $self->{path};
     shift @pi while @pi and !$pi[0];
     $self->{table} = shift @pi;
     $self->{action} = shift @pi;
     $self->{args} = \@pi;
+
+    $self->{params} = { $self->{ar}->content };
 }
 
 sub is_applicable {
     my $self = shift;
-    require Apache::Constants;
-    Apache::Constants->import(":common");
     my $config = $self->config;
-    my %ok = map {$_ => 1} @{$config->{displaying_tables}};
-    return DECLINED() unless exists $ok{$self->{table}};
+    $config->{ok_tables} = {map {$_ => 1} @{$config->{display_tables}}};
+    warn "We don't have that table ($self->{table})"
+        unless $config->{ok_tables}{$self->{table}};
+    return DECLINED() unless exists $config->{ok_tables}{$self->{table}};
 
     # Does the action method exist?
     my $cv = $self->model_class->can($self->{action});
+    warn "We don't have that action ($self->{action})" unless $cv;
     return DECLINED() unless $cv;
 
     # Is it exported?
     $self->{method_attribs} = join " ", attributes::get($cv);
+    do { warn "$self->{action} not exported";
     return DECLINED() 
-     unless $self->{method_attribs} =~ /\b(Exported|Class|Single|Multiple)\b/i;
+     } unless $self->{method_attribs} =~ /\bExported\b/i;
     return OK();
 }
 
-sub find_objects {
-    # First, how many arguments are we?
+sub call_authenticate {
+    my $self = shift;
+    return $self->model_class->authenticate($self) if 
+        $self->model_class->can("authenticate");
+    return $self->authenticate();
 }
 
-sub authenticate { return 200 }
+sub additional_data {}
+
+sub authenticate { return OK }
 
 1;
+
+=head1 NAME
+
+Apache::MVC - Web front end to a data source
+
+=head1 SYNOPSIS
+
+    package BeerDB;
+    use base 'Apache::MVC';
+    sub handler { Apache::MVC::handler("BeerDB", @_) }
+    BeerDB->set_database("dbi:mysql:beerdb");
+    BeerDB->config->{uri_base} = "http://your.site/";
+    BeerDB->config->{display_tables} = [qw[beer brewery pub style]];
+    # Now set up your database:
+    # has-a relationships
+    # untaint columns
+
+    1;
+
+=haed1 DESCRIPTION
+
+A large number of web programming tasks follow the same sort of pattern:
+we have some data in a datasource, typically a relational database. We
+have a bunch of templates provided by web designers. We have a number of
+things we want to be able to do with the database - create, add, edit,
+delete records, view records, run searches, and so on. We have a web
+server which provides input from the user about what to do. Something in
+the middle takes the input, grabs the relevant rows from the database,
+performs the action, constructs a page, and spits it out.
+
+This module aims to be the most generic and extensible "something in the
+middle".
+
+An example would help explain this best. You need to add a product
+catalogue to a company's web site. Users need to list the products in
+various categories, view a page on each product with its photo and
+pricing information and so on, and there needs to be a back-end where
+sales staff can add new lines, change prices, and delete out of date
+records. So, you set up the database, provide some default templates
+for the designers to customize, and then write an Apache handler like
+this:
+
+    package MyCorp::ProductDatabase;
+    use base 'Apache::MVC';
+    __PACKAGE__->set_database("dbi:mysql:products");
+