better empty element test case

mojolicious · Nov 4, 2011 · aabd046 · aabd046
1 parent b7ea220
commit aabd046
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 28 deletions.
diff --git a/lib/Mojo/Home.pm b/lib/Mojo/Home.pm
@@ -18,11 +18,7 @@ has app_class => 'Mojo::HelloWorld';
 
 # "I'm normally not a praying man, but if you're up there,
 #  please save me Superman."
-sub new {
-  my $self = shift->SUPER::new();
-  $self->parse(@_) if @_;
-  return $self;
-}
+sub new { shift->SUPER::new()->parse(@_) }
 
 sub detect {
   my ($self, $class) = @_;
@@ -109,6 +105,7 @@ sub mojo_lib_dir { File::Spec->catdir(dirname(__FILE__), '..') }
 
 sub parse {
   my ($self, $path) = @_;
+  return $self unless defined $path;
   $self->{parts} = [File::Spec->splitdir($path)];
   return $self;
 }

diff --git a/lib/Mojo/URL.pm b/lib/Mojo/URL.pm
@@ -19,11 +19,7 @@ our $PCHAR      = "$UNRESERVED$SUBDELIM\%\:\@";
 
 # "Homer, it's easy to criticize.
 #  Fun, too."
-sub new {
-  my $self = shift->SUPER::new();
-  $self->parse(@_);
-  return $self;
-}
+sub new { shift->SUPER::new()->parse(@_) }
 
 sub authority {
   my ($self, $authority) = @_;

diff --git a/lib/Mojolicious/Routes.pm b/lib/Mojolicious/Routes.pm
@@ -36,11 +36,7 @@ sub AUTOLOAD {
 
 sub DESTROY { }
 
-sub new {
-  my $self = shift->SUPER::new();
-  $self->parse(@_);
-  return $self;
-}
+sub new { shift->SUPER::new()->parse(@_) }
 
 sub add_child {
   my ($self, $route) = @_;

diff --git a/lib/Mojolicious/Routes/Pattern.pm b/lib/Mojolicious/Routes/Pattern.pm
@@ -14,11 +14,7 @@ has tree           => sub { [] };
 has wildcard_start => '*';
 
 # "This is the worst kind of discrimination. The kind against me!"
-sub new {
-  my $self = shift->SUPER::new();
-  $self->parse(@_);
-  return $self;
-}
+sub new { shift->SUPER::new()->parse(@_) }
 
 sub match {
   my ($self, $path) = @_;

diff --git a/t/mojo/path.t b/t/mojo/path.t
@@ -3,7 +3,7 @@ use Mojo::Base -strict;
 
 use utf8;
 
-use Test::More tests => 173;
+use Test::More tests => 175;
 
 # "This is the greatest case of false advertising I’ve seen since I sued the
 #  movie 'The Never Ending Story.'"
@@ -203,15 +203,17 @@ is $path->parts->[4], '23',  'right part';
 is $path->parts->[5], undef, 'no part';
 ok $path->leading_slash,  'has leading slash';
 ok $path->trailing_slash, 'has trailing slash';
-$path = Mojo::Path->new('///foo/bar/23///');
-is "$path", '///foo/bar/23///';
+$path = Mojo::Path->new('///foo///bar/23///');
+is "$path", '///foo///bar/23///';
 is $path->parts->[0], '',    'right part';
 is $path->parts->[1], '',    'right part';
 is $path->parts->[2], 'foo', 'right part';
-is $path->parts->[3], 'bar', 'right part';
-is $path->parts->[4], '23',  'right part';
-is $path->parts->[5], '',    'right part';
-is $path->parts->[6], '',    'right part';
-is $path->parts->[7], undef, 'no part';
+is $path->parts->[3], '',    'right part';
+is $path->parts->[4], '',    'right part';
+is $path->parts->[5], 'bar', 'right part';
+is $path->parts->[6], '23',  'right part';
+is $path->parts->[7], '',    'right part';
+is $path->parts->[8], '',    'right part';
+is $path->parts->[9], undef, 'no part';
 ok $path->leading_slash,  'has leading slash';
 ok $path->trailing_slash, 'has trailing slash';