This is 1.3

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

diff --git a/Changes b/Changes
index 1c94374b347492b6e176f784ae1606d7ba088c3d..df7728dbe18a3df357b9105de377f708686780a7 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,9 @@
 Revision history for Perl extension Maypole 
 
+1.3   Fri Mar 26 19:16:33 GMT 2004
+    - Fix serious order/CDBI::Page interaction bug.
+    - Die if model/view class can't be compiled.
+
 1.2   Thu Mar 25 12:35:21 GMT 2004
     - Ensure safety when dereferencing any ->objects
     - Support for the "frontpage" template

diff --git a/META.yml b/META.yml
index c36f04ea7f051f43d7a939149032e29de2072685..9b542086750c5d12eb648a17977ccf533e9ad401 100644 (file)
--- a/META.yml
+++ b/META.yml
@@ -1,7 +1,7 @@
 # http://module-build.sourceforge.net/META-spec.html
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         Maypole
-version:      1.2
+version:      1.3
 version_from: lib/Maypole.pm
 installdirs:  site
 requires:

diff --git a/lib/Maypole.pm b/lib/Maypole.pm
index 0fd95be4cf1947c267338da401cca6f5fa99dd98..20a3c0e02f14c8593e824fdd9c59ce310a3a9320 100644 (file)
--- a/lib/Maypole.pm
+++ b/lib/Maypole.pm
@@ -4,7 +4,7 @@ use attributes ();
 use UNIVERSAL::require;
 use strict;
 use warnings;
-our $VERSION = "1.2";
+our $VERSION = "1.3";
 __PACKAGE__->mk_classdata($_) for qw( config init_done view_object );
 __PACKAGE__->mk_accessors ( qw( ar params query objects model_class
 args action template ));
@@ -28,6 +28,7 @@ sub setup {
     my $config = $calling_class->config;
     $config->{model} ||= "Maypole::Model::CDBI";
     $config->{model}->require;
+    die "Couldn't load the model class $config->{model}: $@" if $@;
     $config->{model}->setup_database($config, $calling_class, @_);
     for my $subclass (@{$config->{classes}}) {
         no strict 'refs';
@@ -42,6 +43,7 @@ sub init {
     my $config = $class->config;
     $config->{view}  ||= "Maypole::View::TT";
     $config->{view}->require;
+    die "Couldn't load the view class $config->{view}: $@" if $@;
     $config->{display_tables} ||= [ @{$class->config->{tables}} ];
     $class->view_object($class->config->{view}->new);
     $class->init_done(1);