X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FUtils.pm;h=53bf7957ac7dfb5c0cc4b995b57009a7a3c4579b;hb=e6c5b5486f448333cb47c4174804c72637b900db;hp=22675a9fbd519d875ff29d4bbe3f06ca40525579;hpb=db575fe81b23c74267b50495a881796f6cee7795;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Utils.pm b/lib/Catalyst/Utils.pm
index 22675a9..53bf795 100644
--- a/lib/Catalyst/Utils.pm
+++ b/lib/Catalyst/Utils.pm
@@ -8,8 +8,8 @@ use Path::Class;
 use URI;
 use Carp qw/croak/;
 use Cwd;
+
 use String::RewritePrefix;
-use Moose::Util qw/find_meta/;
 
 use namespace::clean;
 
@@ -49,19 +49,6 @@ sub appprefix {
 
 sub class2appclass {
     my $class = shift || '';
-
-    # Special move to deal with components which are anon classes.
-    # Specifically, CX::Component::Traits c072fb2
-    my $meta = find_meta($class);
-    if ($meta) {
-        while ($meta->is_anon_class) {
-            my @superclasses = $meta->superclasses;
-            return if scalar(@superclasses) > 1; # Fail silently, MI, can't deal..
-            $class = $superclasses[0];
-            $meta = find_meta($class);
-        }
-    }
-
     my $appname = '';
     if ( $class =~ /^(.+?)::([MVC]|Model|View|Controller)::.+$/ ) {
         $appname = $1;
@@ -137,7 +124,7 @@ sub class2prefix {
 Returns a tempdir for a class. If create is true it will try to create the path.
 
     My::App becomes /tmp/my/app
-    My::App::C::Foo::Bar becomes /tmp/my/app/c/foo/bar
+    My::App::Controller::Foo::Bar becomes /tmp/my/app/c/foo/bar
 
 =cut
 
@@ -185,8 +172,9 @@ sub home {
             # pop off /lib and /blib if they're there
             $home = $home->parent while $home =~ /b?lib$/;
 
-            # only return the dir if it has a Makefile.PL or Build.PL
-            if (-f $home->file("Makefile.PL") or -f $home->file("Build.PL")) {
+            # only return the dir if it has a Makefile.PL or Build.PL or dist.ini
+            if (-f $home->file("Makefile.PL") or -f $home->file("Build.PL")
+                or -f $home->file("dist.ini")) {
 
                 # clean up relative path:
                 # MyApp/script/.. -> MyApp