canonicalize in-place

mojolicious · Sep 8, 2014 · 2f15c69 · 2f15c69
1 parent d57b910
commit 2f15c69
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 25 deletions.
diff --git a/examples/connect-proxy.pl b/examples/connect-proxy.pl
@@ -1,7 +1,4 @@
-use FindBin;
-use lib "$FindBin::Bin/../lib";
 use Mojo::Base -strict;
-
 use Mojo::IOLoop;
 
 # Minimal CONNECT proxy server to test TLS tunneling

diff --git a/examples/entities.pl b/examples/entities.pl
@@ -1,7 +1,4 @@
-use FindBin;
-use lib "$FindBin::Bin/../lib";
 use Mojo::Base -strict;
-
 use Mojo::ByteStream 'b';
 use Mojo::UserAgent;
 

diff --git a/examples/fast.pl b/examples/fast.pl
@@ -1,5 +1,3 @@
-use FindBin;
-use lib "$FindBin::Bin/../lib";
 use Mojo::Base 'Mojolicious';
 
 sub handler {

diff --git a/examples/hello-template.pl b/examples/hello-template.pl
@@ -1,5 +1,3 @@
-use FindBin;
-use lib "$FindBin::Bin/../lib";
 use Mojolicious::Lite;
 
 get '/hello';

diff --git a/examples/hello.pl b/examples/hello.pl
@@ -1,5 +1,3 @@
-use FindBin;
-use lib "$FindBin::Bin/../lib";
 use Mojolicious::Lite;
 
 get '/' => {data => 'Hello World!'};

diff --git a/examples/microhttpd.pl b/examples/microhttpd.pl
@@ -1,7 +1,4 @@
-use FindBin;
-use lib "$FindBin::Bin/../lib";
 use Mojo::Base -strict;
-
 use Mojo::IOLoop;
 
 # Minimal ioloop example demonstrating how to cheat at HTTP benchmarks :)

diff --git a/examples/websocket.pl b/examples/websocket.pl
@@ -1,5 +1,3 @@
-use FindBin;
-use lib "$FindBin::Bin/../lib";
 use Mojolicious::Lite;
 
 websocket '/test' => sub {

diff --git a/lib/Mojo/Path.pm b/lib/Mojo/Path.pm
@@ -13,16 +13,14 @@ has charset => 'UTF-8';
 sub canonicalize {
   my $self = shift;
 
-  my @parts;
-  for my $part (grep { $_ ne '.' && $_ ne '' } @{$self->parts}) {
-    if ($part ne '..') { push @parts, $part }
-
-    # ".."
-    else { @parts && $parts[-1] ne '..' ? pop @parts : push @parts, '..' }
+  my $parts = $self->parts;
+  for (my $i = 0; $i <= $#$parts;) {
+    if ($parts->[$i] eq '.' || $parts->[$i] eq '') { splice @$parts, $i, 1 }
+    elsif ($i < 1 || $parts->[$i] ne '..' || $parts->[$i - 1] eq '..') { $i++ }
+    else { splice @$parts, --$i, 2 }
   }
-  $self->trailing_slash(undef) unless @parts;
 
-  return $self->parts(\@parts);
+  return @$parts ? $self : $self->trailing_slash(undef);
 }
 
 sub clone {