fixed small stringification bug in Mojo::Path

mojolicious · May 12, 2012 · 0f12d1b · 0f12d1b
1 parent 56d0a5b
commit 0f12d1b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/Changes b/Changes
@@ -4,6 +4,7 @@ This file documents the revision history for Perl extension Mojolicious.
   - Added merge method to Mojo::Path.
   - Improved documentation.
   - Improved tests.
+  - Fixed small stringification bug in Mojo::Path.
 
 2.95  2012-05-10
   - Improved documentation.

diff --git a/lib/Mojo/Path.pm b/lib/Mojo/Path.pm
@@ -71,7 +71,7 @@ sub merge {
   pop @{$self->parts} unless $self->trailing_slash;
   $path = $self->new($path);
   push @{$self->parts}, @{$path->parts};
-  return $self->leading_slash(1)->trailing_slash($path->trailing_slash);
+  return $self->trailing_slash($path->trailing_slash);
 }
 
 sub parse {
@@ -86,8 +86,9 @@ sub parse {
 }
 
 sub to_abs_string {
-  my $self = shift;
-  return $self->leading_slash ? $self->to_string : ('/' . $self->to_string);
+  my $self   = shift;
+  my $string = $self->to_string;
+  return $self->leading_slash ? $string : $string ? "/$string" : '';
 }
 
 # "How is education supposed to make me feel smarter?

diff --git a/lib/Mojo/URL.pm b/lib/Mojo/URL.pm
@@ -221,7 +221,7 @@ sub to_string {
   $url .= $url ? $authority : $authority ? "//$authority" : '';
 
   # Path
-  $url .= $self->path;
+  $url .= $url ? $self->path->to_abs_string : $self->path->to_string;
 
   # Query
   my $query = join '', $self->query;

diff --git a/t/mojo/path.t b/t/mojo/path.t
@@ -196,10 +196,10 @@ $path->merge('/bar/baz/');
 is "$path", '/bar/baz/', 'right path';
 ok $path->leading_slash,  'has leading slash';
 ok $path->trailing_slash, 'has trailing slash';
-$path = Mojo::Path->new('/foo/bar');
-$path->merge(Mojo::Path->new('baz/yada'));
-is "$path", '/foo/baz/yada', 'right path';
-ok $path->leading_slash, 'has leading slash';
+$path = Mojo::Path->new('foo/bar');
+$path->merge('baz/yada');
+is "$path", 'foo/baz/yada', 'right path';
+ok !$path->leading_slash,  'no leading slash';
 ok !$path->trailing_slash, 'no trailing slash';
 
 # Empty path elements