X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FUtils.pm;h=1a0dd41df0dc0b6b40d07cef7323f53afd246bbb;hb=0fcf9a5122c7b09cc534e82e4862049a8f94adb7;hp=22675a9fbd519d875ff29d4bbe3f06ca40525579;hpb=db575fe81b23c74267b50495a881796f6cee7795;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Utils.pm b/lib/Catalyst/Utils.pm index 22675a9..1a0dd41 100644 --- a/lib/Catalyst/Utils.pm +++ b/lib/Catalyst/Utils.pm @@ -1,15 +1,14 @@ package Catalyst::Utils; use strict; -use Catalyst::Exception; use File::Spec; use HTTP::Request; use Path::Class; use URI; use Carp qw/croak/; use Cwd; +use Class::MOP; use String::RewritePrefix; -use Moose::Util qw/find_meta/; use namespace::clean; @@ -49,19 +48,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; @@ -98,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. @@ -137,7 +137,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 @@ -153,6 +153,13 @@ sub class2tempdir { eval { $tmpdir->mkpath }; if ($@) { + # don't load Catalyst::Exception as a BEGIN in Utils, + # because Utils often gets loaded before MyApp.pm, and if + # Catalyst::Exception is loaded before MyApp.pm, it does + # not honor setting + # $Catalyst::Exception::CATALYST_EXCEPTION_CLASS in + # MyApp.pm + require Catalyst::Exception; Catalyst::Exception->throw( message => qq/Couldn't create tmpdir '$tmpdir', "$@"/ ); } @@ -185,8 +192,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