Merge branch 'master' into gsoc_breadboard

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Utils.pm

diff --git a/lib/Catalyst/Utils.pm b/lib/Catalyst/Utils.pm
index b053c6f..dc2adde 100644 (file)
--- a/lib/Catalyst/Utils.pm
+++ b/lib/Catalyst/Utils.pm
@@ -9,7 +9,6 @@ use Carp qw/croak/;
 use Cwd;
 use Class::MOP;
 use String::RewritePrefix;
-use List::MoreUtils qw/ any /;
 
 use namespace::clean;
 
@@ -85,6 +84,20 @@ sub class2classsuffix {
     return $class;
 }
 
+=head2 class2classshortsuffix($class)
+
+    MyApp::Controller::Foo::Bar becomes Foo::Bar
+
+=cut
+
+sub class2classshortsuffix {
+    my $class  = shift || '';
+    my $prefix = class2classprefix($class) || '';
+    $class =~ s/$prefix\:://;
+    return $class;
+}
+
+
 =head2 class2env($class);
 
 Returns the environment name for class.
@@ -155,22 +168,33 @@ sub class2tempdir {
     return $tmpdir->stringify;
 }
 
+=head2 home($class)
+
+Returns home directory for given class.
+
 =head2 dist_indicator_file_list
 
-Returns a list of files which can be tested to check if you're inside a checkout
+Returns a list of files which can be tested to check if you're inside
+a CPAN distribution which is not yet installed.
 
-=cut
+These are:
 
-sub dist_indicator_file_list {
-    qw/ Makefile.PL Build.PL dist.init /;
-}
+=over
 
-=head2 home($class)
+=item Makefile.PL
 
-Returns home directory for given class.
+=item Build.PL
+
+=item dist.ini
+
+=back
 
 =cut
 
+sub dist_indicator_file_list {
+    qw{Makefile.PL Build.PL dist.ini};
+}
+
 sub home {
     my $class = shift;
 
@@ -190,8 +214,7 @@ sub home {
             $home = $home->parent while $home =~ /b?lib$/;
 
             # only return the dir if it has a Makefile.PL or Build.PL or dist.ini
-            if (any { $_ } map { -f $home->file($_) } dist_indicator_file_list()) {
-
+            if (grep { -f $home->file($_) } dist_indicator_file_list()) {
                 # clean up relative path:
                 # MyApp/script/.. -> MyApp