[Catalyst-commits] r14094 - in
Catalyst-Plugin-Unicode-Encoding/branches/decoding_callback:
lib/Catalyst/Plugin/Unicode t/lib
wreis at dev.catalyst.perl.org
wreis at dev.catalyst.perl.org
Wed Sep 7 18:27:53 GMT 2011
Author: wreis
Date: 2011-09-07 18:27:53 +0000 (Wed, 07 Sep 2011)
New Revision: 14094
Modified:
Catalyst-Plugin-Unicode-Encoding/branches/decoding_callback/lib/Catalyst/Plugin/Unicode/Encoding.pm
Catalyst-Plugin-Unicode-Encoding/branches/decoding_callback/t/lib/TestApp.pm
Log:
Change the API to have only one exception handler method
Modified: Catalyst-Plugin-Unicode-Encoding/branches/decoding_callback/lib/Catalyst/Plugin/Unicode/Encoding.pm
===================================================================
--- Catalyst-Plugin-Unicode-Encoding/branches/decoding_callback/lib/Catalyst/Plugin/Unicode/Encoding.pm 2011-09-06 13:16:20 UTC (rev 14093)
+++ Catalyst-Plugin-Unicode-Encoding/branches/decoding_callback/lib/Catalyst/Plugin/Unicode/Encoding.pm 2011-09-07 18:27:53 UTC (rev 14094)
@@ -105,7 +105,7 @@
$_->{filename} = try {
$enc->decode( $_->{filename}, $CHECK )
} catch {
- $c->_handle_unicode_encoding_exception({
+ $c->handle_unicode_encoding_exception({
param_value => $_->{filename},
error_msg => $_,
encoding_step => 'uploads',
@@ -146,7 +146,7 @@
$value
: $enc->decode( $value, $CHECK );
} catch {
- $self->_handle_unicode_encoding_exception({
+ $self->handle_unicode_encoding_exception({
param_value => $value,
error_msg => $_,
encoding_step => 'params',
@@ -154,13 +154,13 @@
};
}
-sub _handle_unicode_encoding_exception {
+sub handle_unicode_encoding_exception {
my ( $self, $exception_ctx ) = @_;
my ( $param_value, $error_msg, $encoding_step )
= @$exception_ctx{qw(param_value error_msg encoding_step)};
my $fallback_action_map = {
- params => $self->can('handle_unicode_encoding_params_exception'),
- uploads => $self->can('handle_unicode_encoding_uploads_exception'),
+ params => sub { die pop },
+ uploads => sub { shift; return shift }
};
if ( my $do_action = $fallback_action_map->{$encoding_step} ) {
@@ -171,10 +171,6 @@
}
}
-sub handle_unicode_encoding_params_exception { die pop }
-
-sub handle_unicode_encoding_uploads_exception { shift; return shift }
-
1;
__END__
@@ -229,14 +225,10 @@
Setups C<< $c->encoding >> with encoding specified in C<< $c->config->{encoding} >>.
-=item handle_unicode_encoding_params_exception
+=item handle_unicode_encoding_exception
-Callback method used for failed decoding process for params, args and captures.
+Callback method used for failed decoding process.
-=item handle_unicode_encoding_uploads_exception
-
-Callback method used for failed decoding process for uploads.
-
=back
=head1 SEE ALSO
Modified: Catalyst-Plugin-Unicode-Encoding/branches/decoding_callback/t/lib/TestApp.pm
===================================================================
--- Catalyst-Plugin-Unicode-Encoding/branches/decoding_callback/t/lib/TestApp.pm 2011-09-06 13:16:20 UTC (rev 14093)
+++ Catalyst-Plugin-Unicode-Encoding/branches/decoding_callback/t/lib/TestApp.pm 2011-09-07 18:27:53 UTC (rev 14094)
@@ -12,7 +12,7 @@
__PACKAGE__->setup;
-sub handle_unicode_encoding_params_exception {
+sub handle_unicode_encoding_exception {
my ( $self, $param_value, $error_msg ) = @_;
return $param_value;
}
More information about the Catalyst-commits
mailing list