From: John Napiorkowski <johnn@John-Napiorkowski-MacBook-Pro.local>
Date: Thu, 1 Jul 2010 17:09:24 +0000 (-0400)
Subject: more deeper scrubbing of the error output
X-Git-Tag: 0.23~3
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMooseX-Types-Structured.git;a=commitdiff_plain;h=fbe3dfe7ee2a5138dc79f590949b7b5a55dc3418

more deeper scrubbing of the error output
---

diff --git a/lib/MooseX/Meta/TypeConstraint/Structured.pm b/lib/MooseX/Meta/TypeConstraint/Structured.pm
index 25b8c87..6f4a6fe 100644
--- a/lib/MooseX/Meta/TypeConstraint/Structured.pm
+++ b/lib/MooseX/Meta/TypeConstraint/Structured.pm
@@ -65,6 +65,12 @@ Messing with validate so that we can support niced error messages.
 
 =cut
 
+sub _clean_message {
+    my $message = shift @_;
+    $message =~s/MooseX::Types::Structured:://g;
+    return $message;
+}
+
 override 'validate' => sub {
     my ($self, $value, $message_stack) = @_;
     unless ($message_stack) {
@@ -86,7 +92,7 @@ override 'validate' => sub {
                 return $self->get_message($args);
             } else {
                 my $message_str = $message_stack->as_string;
-                return $self->get_message("$args, Internal Validation Error is: $message_str");
+                return _clean_message($self->get_message("$args, Internal Validation Error is: $message_str"));
             }
         } else {
             return $self->get_message($args);
diff --git a/lib/MooseX/Types/Structured/MessageStack.pm b/lib/MooseX/Types/Structured/MessageStack.pm
index 399580d..38a8a34 100644
--- a/lib/MooseX/Types/Structured/MessageStack.pm
+++ b/lib/MooseX/Types/Structured/MessageStack.pm
@@ -27,15 +27,9 @@ has 'messages' => (
     },
 );
 
-sub _clean_message {
-    my $message = shift @_;
-    $message =~s/MooseX::Types::Structured:://g;
-    return $message;
-}
-
 sub as_string {
     my @messages = (shift)->all_messages;
-    my $message = join("", map { "\n". (" " x $_->{level}) ."[+] " . _clean_message($_->{message}) } reverse @messages);
+    my $message = join("", map { "\n". (" " x $_->{level}) ."[+] " . $_->{message} } reverse @messages);
     return $message;
 }