package Catalyst::Exception;
-use strict;
-use vars qw[@ISA $CATALYST_EXCEPTION_CLASS];
-
-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
=cut
-sub throw {
- my $class = shift;
- my %params = @_ == 1 ? ( error => $_[0] ) : @_;
+has message => (
+ is => 'ro',
+ isa => 'Str',
+ default => sub { $! || '' },
+);
+
+use overload
+ q{""} => \&as_string,
+ fallback => 1;
- my $message = $params{message} || $params{error} || $! || '';
+sub as_string {
+ my ($self) = @_;
+ return $self->message;
+}
+around BUILDARGS => sub {
+ my ($next, $class, @args) = @_;
+ if (@args == 1 && !ref $args[0]) {
+ @args = (message => $args[0]);
+ }
+
+ my $args = $class->$next(@args);
+ $args->{message} ||= $args->{error}
+ if exists $args->{error};
+
+ return $args;
+};
+
+sub throw {
+ my $class = shift;
+ my $error = $class->new(@_);
local $Carp::CarpLevel = 1;
+ croak $error;
+}
- Carp::croak($message);
+sub rethrow {
+ my ($self) = @_;
+ croak $self;
}
-=head1 AUTHOR
+=head2 meta
-Sebastian Riedel, C<sri@cpan.org>
-Christian Hansen, C<ch@ngmedia.com>
+Provided by Moose
+
+=head1 AUTHORS
+
+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;