@@ -104,28 +104,7 @@ prepare_message sub new { my $package = shift; - my %options = Params::Validate::validate( - @_, - { - servers => { - type => Params::Validate::ARRAYREF, - optional => 0, - }, - worker => { - type => Params::Validate::SCALAR, - optional => 0, - }, - method => { - type => Params::Validate::SCALAR, - regex => qr/^(do|do_high|do_low|do_background|do_high_background|do_low_background)$/, - default => 'do_background', - }, - prepare_message => { - type => Params::Validate::CODEREF, - optional => 1, - }, - } - ); + my %options = $package->_validate(@_); my $self = bless \%options, $package; @@ -207,6 +186,32 @@ sub _raise_error { return undef; } +sub _validate { + my $self = shift; + return Params::Validate::validate( + @_, + { + servers => { + type => Params::Validate::ARRAYREF, + optional => 0, + }, + worker => { + type => Params::Validate::SCALAR, + optional => 0, + }, + method => { + type => Params::Validate::SCALAR, + regex => qr/^(do|do_high|do_low|do_background|do_high_background|do_low_background)$/, + default => 'do_background', + }, + prepare_message => { + type => Params::Validate::CODEREF, + optional => 1, + }, + } + ); +} + =head1 AUTHOR Johannes Plunien E<lt>plu@cpan.orgE<gt> lib/Log/Handler/Output/Gearman.pm @@ -8,7 +8,7 @@ eval { my $logger = Log::Handler::Output::Gearman->new(); }; like( $@, - qr/Mandatory parameters 'worker', 'servers' missing in call to Log::Handler::Output::Gearman::new/, + qr/Mandatory parameters 'worker', 'servers' missing in call to Log::Handler::Output::Gearman::.*/, 'Mandatory parameters missing' ); @@ -16,7 +16,7 @@ eval { my $logger = Log::Handler::Output::Gearman->new( method => 'invalid' ); } like( $@, - qr/The 'method' parameter \("invalid"\) to Log::Handler::Output::Gearman::new did not pass regex check/, + qr/The 'method' parameter \("invalid"\) to Log::Handler::Output::Gearman::.*? did not pass regex check/, 'Invalid Gearman::XS::Client method' ); @@ -24,7 +24,7 @@ eval { my $logger = Log::Handler::Output::Gearman->new( servers => 'invalid' ); like( $@, -qr/The 'servers' parameter \("invalid"\) to Log::Handler::Output::Gearman::new was a 'scalar', which is not one of the allowed types: arrayref/, +qr/The 'servers' parameter \("invalid"\) to Log::Handler::Output::Gearman::.*? was a 'scalar', which is not one of the allowed types: arrayref/, 'Invalid servers parameter' ); @@ -38,7 +38,7 @@ eval { like( $@, -qr/The 'prepare_message' parameter \("invalid"\) to Log::Handler::Output::Gearman::new was a 'scalar', which is not one of the allowed types: coderef/, +qr/The 'prepare_message' parameter \("invalid"\) to Log::Handler::Output::Gearman::.*? was a 'scalar', which is not one of the allowed types: coderef/, 'Invalid prepare_message parameter' ); t/01-validate.t ec5e9667bf0c8dfaf979b431d165d57f24707d00 Johannes Plunien johannes.plunien@xing.com http://github.com/plu/log-handler-output-gearman/commit/ca5b2f643257e6c5b0ff7ab23af6f2a1f96901c4 ca5b2f643257e6c5b0ff7ab23af6f2a1f96901c4 2009-10-31T14:58:11-07:00 2009-10-31T14:58:11-07:00 Refactored parameter validation bb7b53ca4b197bc3287af97da370a82f0236bf56 Johannes Plunien johannes.plunien@xing.com