From fc9c60f707f33a0169e25513d626a7be6f197e0d Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Tue, 5 Sep 2017 19:28:38 +0100 Subject: [PATCH] rename ok to is_ok and change slot names to avoid conflict with creators --- lib/App/Netdisco/Worker/Runner.pm | 2 +- lib/App/Netdisco/Worker/Status.pm | 25 +++++++++++++------------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/lib/App/Netdisco/Worker/Runner.pm b/lib/App/Netdisco/Worker/Runner.pm index ce9b967f..1d2a6e72 100644 --- a/lib/App/Netdisco/Worker/Runner.pm +++ b/lib/App/Netdisco/Worker/Runner.pm @@ -53,7 +53,7 @@ sub _run_first { }; $retval ||= Status->done('no status supplied'); - return $retval if $retval->ok; + return $retval if $retval->is_ok; } return Status->error('no worker was successful'); diff --git a/lib/App/Netdisco/Worker/Status.pm b/lib/App/Netdisco/Worker/Status.pm index 335d9aaf..e732e8ec 100644 --- a/lib/App/Netdisco/Worker/Status.pm +++ b/lib/App/Netdisco/Worker/Status.pm @@ -7,9 +7,9 @@ use Moo; use namespace::clean; foreach my $slot (qw/ - done - error - defer + done_slot + error_slot + defer_slot /) { has $slot => ( @@ -31,17 +31,18 @@ Shorthand for new() with setting param, accepts log as arg. =cut -sub done { return (shift)->new({done => 1, log => shift}) } -sub error { return (shift)->new({error => 1, log => shift}) } -sub defer { return (shift)->new({defer => 1, log => shift}) } +sub done { return (shift)->new({done_slot => 1, log => shift}) } +sub error { return (shift)->new({error_slot => 1, log => shift}) } +sub defer { return (shift)->new({defer_slot => 1, log => shift}) } -=head2 ok +=head2 is_ok Returns true if C is true and C and C have not been set. =cut -sub ok { return ($_[0]->done and not $_[0]->error and not $_[0]->defer) } +sub is_ok { return ($_[0]->done_slot + and not $_[0]->error_slot and not $_[0]->defer_slot) } =head2 not_ok @@ -49,7 +50,7 @@ Returns the logical inversion of C. =cut -sub not_ok { return (not $_[0]->ok) } +sub not_ok { return (not $_[0]->is_ok) } =head2 status @@ -60,9 +61,9 @@ Returns text equivalent of C, C, or C. sub status { my $self = shift; return ( - $self->done ? 'done' - : $self->defer ? 'defer' - : 'error'; + $self->done_slot ? 'done' + : $self->defer_slot ? 'defer' + : 'error'; ); }