fixes to url tests to handle ordering of arguments and to fix horrid code in tests

[maypole.git] / lib / Maypole.pm

diff --git a/lib/Maypole.pm b/lib/Maypole.pm
index 19e9cecbce80d7c41edc83df14c9ff2c7bd57d40..0d0250dfcbde82a88953658dab393326a57504dc 100644 (file)
--- a/lib/Maypole.pm
+++ b/lib/Maypole.pm
@@ -12,7 +12,7 @@ use URI::QueryParam;
 use NEXT;
 use File::MMagic::XS qw(:compat);
 
-our $VERSION = '2.11';
+our $VERSION = '2.11_pre4';
 our $mmagic = File::MMagic::XS->new();
 
 # proposed privacy conventions:
@@ -658,7 +658,7 @@ sub __load_request_model
         $self->model_class( $mclass );
     }
     elsif ($self->debug) {
-        warn "\n***Warning:  No $mclass class appropriate  to set as request model : $@***\n"
+      warn "***Warning:  No $mclass class appropriate for model. @_"; 
     }
 }
 
@@ -983,13 +983,12 @@ properties. Calls C<preprocess_path> before parsing path and setting properties.
 sub parse_path 
 {
     my ($self) = @_;
-    
+
     # Previous versions unconditionally set table, action and args to whatever 
     # was in @pi (or else to defaults, if @pi is empty).
     # Adding preprocess_path(), and then setting table, action and args 
     # conditionally, broke lots of tests, hence this:
     $self->$_(undef) for qw/action table args/;
-    
     $self->preprocess_path;
     $self->path || $self->path('frontpage');