fixed a few boolean tests

mojolicious · Oct 23, 2011 · 9d8c327 · 9d8c327
1 parent 8c3e610
commit 9d8c327
Show file tree

Hide file tree

Showing 20 changed files with 200 additions and 244 deletions.
diff --git a/Changes b/Changes
@@ -2,6 +2,7 @@ This file documents the revision history for Perl extension Mojolicious.
 
 2.07    2011-10-23 00:00:00
         - Improved documentation.
+        - Fixed a few small test bugs.
 
 2.06    2011-10-23 00:00:00
         - Improved documentation.

diff --git a/lib/Mojo/Content.pm b/lib/Mojo/Content.pm
@@ -112,17 +112,12 @@ sub get_header_chunk {
 
 sub has_leftovers {
   my $self = shift;
-  return 1 if length $self->{buffer} || length $self->{pre_buffer};
-  return;
+  return length($self->{buffer}) || length($self->{pre_buffer});
 }
 
 sub header_size { length shift->build_headers }
 
-sub is_chunked {
-  my $self = shift;
-  my $encoding = $self->headers->transfer_encoding || '';
-  return $encoding =~ /chunked/i ? 1 : 0;
-}
+sub is_chunked { (shift->headers->transfer_encoding || '') =~ /chunked/i }
 
 # DEPRECATED in Leaf Fluttering In Wind!
 sub is_done {
@@ -134,21 +129,14 @@ EOF
 
 sub is_dynamic {
   my $self = shift;
-  return 1 if $self->{dynamic} && !defined $self->headers->content_length;
-  return;
+  return $self->{dynamic} && !defined $self->headers->content_length;
 }
 
-sub is_finished {
-  return 1 if (shift->{state} || '') eq 'finished';
-  return;
-}
+sub is_finished { (shift->{state} || '') eq 'finished' }
 
 sub is_multipart {undef}
 
-sub is_parsing_body {
-  return 1 if (shift->{state} || '') eq 'body';
-  return;
-}
+sub is_parsing_body { (shift->{state} || '') eq 'body' }
 
 sub leftovers {
   my $self = shift;

diff --git a/lib/Mojo/EventEmitter.pm b/lib/Mojo/EventEmitter.pm
@@ -15,10 +15,7 @@ use constant DEBUG => $ENV{MOJO_EVENTEMITTER_DEBUG} || 0;
 sub emit      { shift->_emit(0, @_) }
 sub emit_safe { shift->_emit(1, @_) }
 
-sub has_subscribers {
-  return 1 if @{shift->subscribers(shift)};
-  return;
-}
+sub has_subscribers { scalar @{shift->subscribers(shift)} }
 
 sub on {
   my ($self, $name, $cb) = @_;

diff --git a/lib/Mojo/IOLoop/Resolver.pm b/lib/Mojo/IOLoop/Resolver.pm
@@ -111,15 +111,9 @@ sub build {
   return $req;
 }
 
-sub is_ipv4 {
-  return 1 if pop =~ $IPV4_RE;
-  return;
-}
+sub is_ipv4 { pop =~ $IPV4_RE }
 
-sub is_ipv6 {
-  return 1 if pop =~ $IPV6_RE;
-  return;
-}
+sub is_ipv6 { pop =~ $IPV6_RE }
 
 sub lookup {
   my ($self, $name, $cb) = @_;

diff --git a/lib/Mojo/IOLoop/Stream.pm b/lib/Mojo/IOLoop/Stream.pm
@@ -34,9 +34,7 @@ sub handle { shift->{handle} }
 
 sub is_finished {
   my $self = shift;
-  return if length $self->{buffer};
-  return if @{$self->subscribers('drain')};
-  return 1;
+  return !length($self->{buffer}) && !@{$self->subscribers('drain')};
 }
 
 sub pause {

diff --git a/lib/Mojo/Message.pm b/lib/Mojo/Message.pm
@@ -291,16 +291,12 @@ EOF
 
 sub is_dynamic { shift->content->is_dynamic }
 
-sub is_finished {
-  return 1 if (shift->{state} || '') eq 'finished';
-  return;
-}
+sub is_finished { (shift->{state} || '') eq 'finished' }
 
 sub is_limit_exceeded {
   my $self = shift;
   return unless my $code = ($self->error)[1];
-  return unless $code ~~ [413, 431];
-  return 1;
+  return $code ~~ [413, 431];
 }
 
 sub is_multipart { shift->content->is_multipart }

diff --git a/lib/Mojo/Message/Request.pm b/lib/Mojo/Message/Request.pm
@@ -98,17 +98,12 @@ sub fix_headers {
 }
 
 sub is_secure {
-  my $self = shift;
-  my $url  = $self->url;
-  return 1 if ($url->scheme || $url->base->scheme || '') eq 'https';
-  return;
+  my $url = shift->url;
+  return ($url->scheme || $url->base->scheme || '') eq 'https';
 }
 
 sub is_xhr {
-  my $self = shift;
-  return unless my $with = $self->headers->header('X-Requested-With');
-  return 1 if $with =~ /XMLHttpRequest/i;
-  return;
+  (shift->headers->header('X-Requested-With') || '') =~ /XMLHttpRequest/i;
 }
 
 sub param {

diff --git a/lib/Mojo/Message/Response.pm b/lib/Mojo/Message/Response.pm
@@ -121,8 +121,7 @@ sub fix_headers {
 sub is_status_class {
   my ($self, $class) = @_;
   return unless my $code = $self->code;
-  return 1 if $code >= $class && $code < ($class + 100);
-  return;
+  return $code >= $class && $code < ($class + 100);
 }
 
 sub _build_start_line {

diff --git a/lib/Mojo/Transaction.pm b/lib/Mojo/Transaction.pm
@@ -29,17 +29,13 @@ EOF
   shift->is_finished;
 }
 
-sub is_finished {
-  return 1 if (shift->{state} || '') eq 'finished';
-  return;
-}
+sub is_finished { (shift->{state} || '') eq 'finished' }
 
 sub is_websocket {undef}
 
 sub is_writing {
   return 1 unless my $state = shift->{state};
-  return 1 if $state ~~ [qw/write write_start_line write_headers write_body/];
-  return;
+  return $state ~~ [qw/write write_start_line write_headers write_body/];
 }
 
 # DEPRECATED in Smiling Face With Sunglasses!

diff --git a/lib/Mojo/URL.pm b/lib/Mojo/URL.pm
@@ -125,8 +125,7 @@ sub ihost {
 
 sub is_abs {
   my $self = shift;
-  return 1 if $self->scheme && $self->authority;
-  return;
+  return $self->scheme && $self->authority;
 }
 
 sub parse {

diff --git a/lib/Mojolicious/Routes.pm b/lib/Mojolicious/Routes.pm
@@ -162,20 +162,17 @@ sub get { shift->_generate_route('get', @_) }
 sub has_conditions {
   my $self = shift;
   return 1 if @{$self->conditions};
-  if (my $parent = $self->parent) { return $parent->has_conditions }
-  return;
+  return unless my $parent = $self->parent;
+  return $parent->has_conditions;
 }
 
-sub has_custom_name {
-  return 1 if shift->{custom};
-  return;
-}
+sub has_custom_name { shift->{custom} }
 
 sub has_websocket {
   my $self = shift;
   return 1 if $self->is_websocket;
-  if (my $parent = $self->parent) { return $parent->is_websocket }
-  return;
+  return unless my $parent = $self->parent;
+  return $parent->is_websocket;
 }
 
 sub hide { push @{shift->hidden}, @_ }
@@ -184,14 +181,10 @@ sub is_endpoint {
   my $self = shift;
   return   if $self->inline;
   return 1 if $self->block;
-  return   if @{$self->children};
-  return 1;
+  return !@{$self->children};
 }
 
-sub is_websocket {
-  return 1 if shift->{websocket};
-  return;
-}
+sub is_websocket { shift->{websocket} }
 
 sub name {
   my $self = shift;

diff --git a/t/mojo/eventemitter.t b/t/mojo/eventemitter.t
@@ -121,9 +121,9 @@ $e->unsubscribe(foo => $cb);
 is scalar @{$e->subscribers('foo')}, 2, 'two subscribers';
 $e->emit('foo');
 is $counter, 5, 'event was emitted two times';
-is $e->has_subscribers('foo'), 1, 'has subscribers';
+ok $e->has_subscribers('foo'), 'has subscribers';
 $e->unsubscribe_all('foo');
-is $e->has_subscribers('foo'), undef, 'no subscribers';
+ok !$e->has_subscribers('foo'), 'no subscribers';
 is scalar @{$e->subscribers('foo')}, 0, 'no subscribers';
 $e->emit('foo');
 is $counter, 5, 'event was not emitted again';