changed error code constant, and related test

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

diff --git a/META.yml b/META.yml
index 3ffa96db9944f4888e6ecedcab5135a43a01c986..f1692a3089fe5c3eec0bf844a78697de3e286d47 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:      2.11_pre1
+version:      2.11_pre2
 version_from: lib/Maypole.pm
 installdirs:  site
 requires:
@@ -11,7 +11,6 @@ requires:
     CGI::Untaint::email:           0
     Class::DBI:                    0.96
     Class::DBI::AbstractSearch:    0
-    Class::DBI::AsForm:            2.2
     Class::DBI::FromCGI:           0.94
     Class::DBI::Loader:            0.02
     Class::DBI::Loader::Relationship: 0

diff --git a/lib/Maypole.pm b/lib/Maypole.pm
index ab05605105bdde76df8a486519ae46e8099b15e7..b1e066d648ce778c0c78eb51c781e474c3e33762 100644 (file)
--- a/lib/Maypole.pm
+++ b/lib/Maypole.pm
@@ -453,20 +453,14 @@ sub handler : method  {
   $self->status(Maypole::Constants::OK()); # set the default
   $self->__call_hook('start_request_hook');
   return $self->status unless $self->status == Maypole::Constants::OK();
-    
   die "status undefined after start_request_hook()" unless defined
     $self->status;
-    
   $self->get_session;
   $self->get_user;
-    
   my $status = $self->handler_guts;
-
   return $status unless $status == OK;
-
   # TODO: require send_output to return a status code
   $self->send_output;
-
   return $status;
 }
 

diff --git a/lib/Maypole/Constants.pm b/lib/Maypole/Constants.pm
index 09e7d4b3fa1f1fcc1a91b1c94d61a4e9a92a245f..cee418f6ba583a3f2eab545514ec97af6b40dc58 100644 (file)
--- a/lib/Maypole/Constants.pm
+++ b/lib/Maypole/Constants.pm
@@ -3,7 +3,7 @@ use strict;
 use base 'Exporter';
 use constant OK       => 0;
 use constant DECLINED => -1;
-use constant ERROR    => -1;
+use constant ERROR    => 500;
 our @EXPORT = qw(OK DECLINED ERROR);
 our $VERSION = "1." . sprintf "%04d", q$Rev$ =~ /: (\d+)/;
 

diff --git a/t/constants.t b/t/constants.t
index 89759c73e49f18a9f3507183c3b086c10aadf65c..1e70cd4bcf1d3a04b752ac0ca8312022fc476c29 100755 (executable)
--- a/t/constants.t
+++ b/t/constants.t
@@ -8,6 +8,6 @@ ok($Maypole::Constants::VERSION, 'defines $VERSION');
 is(\&OK, \&Maypole::Constants::OK, 'exports OK');
 is(OK(), 0, 'OK correctly defined');
 is(\&ERROR, \&Maypole::Constants::ERROR, 'exports ERROR');
-is(ERROR(), -1, 'ERROR correctly defined');
+is(ERROR(), 500, 'ERROR correctly defined');
 is(\&DECLINED, \&Maypole::Constants::DECLINED, 'exports DECLINED');
 is(DECLINED(), -1, 'DECLINED correctly defined');