X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FException.pm;h=b5b5bc330fdf39f292492100e04f7f44a381df6b;hb=ccf2a6da7ec998260d1e6737badd4faf661b0ad6;hp=ade1a46b8e7abb4c7df94a38ce032c7862a125a9;hpb=ebfde331f96f61128105df0b2c4904cc0d5593e5;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Exception.pm b/lib/Catalyst/Exception.pm
index ade1a46..b5b5bc3 100644
--- a/lib/Catalyst/Exception.pm
+++ b/lib/Catalyst/Exception.pm
@@ -1,17 +1,12 @@
 package Catalyst::Exception;
 
-use strict;
-use vars qw[@ISA $CATALYST_EXCEPTION_CLASS];
-use UNIVERSAL::require;
-
-BEGIN {
-    push( @ISA, $CATALYST_EXCEPTION_CLASS || 'Catalyst::Exception::Base' );
-}
+# XXX: See bottom of file for Exception implementation
 
 package Catalyst::Exception::Base;
 
-use strict;
-use Carp ();
+use Moose;
+use Carp;
+use namespace::clean -except => 'meta';
 
 =head1 NAME
 
@@ -29,41 +24,70 @@ This is the Catalyst Exception class.
 
 =head1 METHODS
 
-=over 4
+=head2 throw( $message )
 
-=item throw( $message )
+=head2 throw( message => $message )
 
-=item throw( message => $message )
-
-=item throw( error => $error )
+=head2 throw( error => $error )
 
 Throws a fatal exception.
 
 =cut
 
+has message => (
+    is  => 'ro',
+    isa => 'Str',
+);
+
+use overload
+    q{""}    => \&as_string,
+    fallback => 1;
+
+sub as_string {
+    my ($self) = @_;
+    return $self->message;
+}
+
 sub throw {
     my $class  = shift;
     my %params = @_ == 1 ? ( error => $_[0] ) : @_;
 
-    my $message = $params{message} || $params{error} || $! || '';
+    $params{message} = $params{message} || $params{error} || $! || '';
+    my $error = $class->new(%params);
 
     local $Carp::CarpLevel = 1;
 
-    Carp::croak($message);
+    croak($error);
 }
 
-=back
+=head2 meta
+
+Provided by Moose
 
-=head1 AUTHOR
+=head1 AUTHORS
 
-Sebastian Riedel, C<sri@cpan.org>
-Christian Hansen, C<ch@ngmedia.com>
+Catalyst Contributors, see Catalyst.pm
 
 =head1 COPYRIGHT
 
-This program is free software, you can redistribute it and/or modify
+This library is free software. You can redistribute it and/or modify
 it under the same terms as Perl itself.
 
 =cut
 
+Catalyst::Exception::Base->meta->make_immutable;
+
+package Catalyst::Exception;
+
+use Moose;
+use namespace::clean -except => 'meta';
+
+use vars qw[$CATALYST_EXCEPTION_CLASS];
+
+BEGIN {
+    extends($CATALYST_EXCEPTION_CLASS || 'Catalyst::Exception::Base');
+}
+
+__PACKAGE__->meta->make_immutable;
+
 1;