small optimizations

mojolicious · Jun 23, 2012 · acd645f · acd645f
1 parent 4e7318a
commit acd645f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 19 deletions.
diff --git a/lib/Mojo/Home.pm b/lib/Mojo/Home.pm
@@ -11,7 +11,6 @@ use File::Find 'find';
 use File::Spec::Functions qw(abs2rel catdir catfile splitdir);
 use FindBin;
 use Mojo::Asset::File;
-use Mojo::Loader;
 use Mojo::Util 'class_to_path';
 
 has app_class => 'Mojo::HelloWorld';
@@ -35,25 +34,13 @@ sub detect {
 
   # Try to find home from lib directory
   if ($class) {
-
-    # Load
     my $file = class_to_path $class;
-    unless ($INC{$file}) {
-      if (my $e = Mojo::Loader->new->load($class)) { die $e if ref $e }
-    }
-
-    # Detect
     if (my $path = $INC{$file}) {
-
-      # Directory
       $path =~ s/$file$//;
       my @home = splitdir $path;
 
       # Remove "lib" and "blib"
-      while (@home) {
-        last unless $home[-1] =~ /^b?lib$/ || $home[-1] eq '';
-        pop @home;
-      }
+      pop @home while @home && ($home[-1] =~ /^b?lib$/ || $home[-1] eq '');
 
       # Turn into absolute path
       $self->{parts} = [splitdir(abs_path(catdir(@home) || '.'))];

diff --git a/t/mojo/cookiejar.t b/t/mojo/cookiejar.t
@@ -6,8 +6,8 @@ use Test::More tests => 85;
 #  Okay Mr. Burns, what's your first name.
 #  I don't know."
 use Mojo::Cookie::Response;
-use Mojo::UserAgent::CookieJar;
 use Mojo::URL;
+use Mojo::UserAgent::CookieJar;
 
 # Session cookie
 my $jar = Mojo::UserAgent::CookieJar->new;

diff --git a/t/mojo/home.t b/t/mojo/home.t
@@ -5,12 +5,12 @@ BEGIN { $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll' }
 
 use Test::More tests => 15;
 
+# "Uh, no, you got the wrong number. This is 9-1... 2"
 use Cwd qw(cwd realpath);
 use File::Spec::Functions qw(canonpath catdir splitdir);
 use FindBin;
 use List::Util 'first';
-
-# "Uh, no, you got the wrong number. This is 9-1... 2"
+use Mojo::HelloWorld;
 use Mojo::Home;
 
 # ENV detection

diff --git a/t/mojo/psgi.t b/t/mojo/psgi.t
@@ -5,8 +5,8 @@ use Test::More tests => 19;
 # "We need some more secret sauce. Put the mayonnaise in the sun."
 use Mojo::JSON;
 use Mojo::Server::PSGI;
-use Mojolicious::Lite;
 use Mojolicious::Command::psgi;
+use Mojolicious::Lite;
 
 # Silence
 app->log->level('fatal');

diff --git a/t/mojolicious/dispatch.t b/t/mojolicious/dispatch.t
@@ -27,9 +27,9 @@ use utf8;
 
 use Test::More tests => 85;
 
+use Mojo::Transaction::HTTP;
 use Mojo::Upload;
 use Mojolicious;
-use Mojo::Transaction::HTTP;
 use Mojolicious::Controller;
 use Mojolicious::Routes;