X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FUtils.pm;h=3a9a908a8df7ce163e3564cde34ca89de49a483d;hb=b14151e76ebbd0a776e7955238ce1afbc1985a33;hp=e4c5db800c3d65320edfdf36d0923d2359f95589;hpb=d837e1a7eadff19ff04373ad19d22fa293e19db5;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Utils.pm b/lib/Catalyst/Utils.pm index e4c5db8..3a9a908 100644 --- a/lib/Catalyst/Utils.pm +++ b/lib/Catalyst/Utils.pm @@ -2,6 +2,8 @@ package Catalyst::Utils; use strict; use attributes (); +use Catalyst::Exception; +use File::Spec; use HTTP::Request; use Path::Class; use URI; @@ -20,6 +22,19 @@ See L. =over 4 +=item appprefix($class) + +Returns the application prefix for the class + +=cut + +sub appprefix { + my $class = shift; + $class =~ s/\:\:/_/g; + $class = lc($class); + return $class; +} + =item attrs($coderef) Returns attributes for coderef in a arrayref @@ -79,7 +94,22 @@ sub class2classsuffix { return $class; } -=item class2prefix($class); +=item class2env($class); + +Returns the environment name for class. + + MyApp becomes MYAPP + My::App becomes MY_APP + +=cut + +sub class2env { + my $class = shift || ''; + $class =~ s/\:\:/_/g; + return uc($class); +} + +=item class2prefix( $class, $case ); Returns the prefix for class. @@ -89,14 +119,44 @@ Returns the prefix for class. sub class2prefix { my $class = shift || ''; + my $case = shift || 0; my $prefix; if ( $class =~ /^.*::([MVC]|Model|View|Controller)?::(.*)$/ ) { - $prefix = lc $2; + $prefix = $case ? $2 : lc $2; $prefix =~ s/\:\:/\//g; } return $prefix; } +=item class2tempdir( $class [, $create ] ); + +Returns a tempdir for 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 + +=cut + +sub class2tempdir { + my $class = shift || ''; + my $create = shift || 0; + my @parts = split '::', lc $class; + + my $tmpdir = dir( File::Spec->tmpdir, @parts )->cleanup; + + if ( $create && !-e $tmpdir ) { + + eval { $tmpdir->mkpath }; + + if ($@) { + Catalyst::Exception->throw( + message => qq/Couldn't create tmpdir '$tmpdir', "$@"/ ); + } + } + + return $tmpdir->stringify; +} + =item home($class) Returns home directory for given class. @@ -119,6 +179,13 @@ sub home { { $home = $subdir; } + + # clean up relative path: + # MyApp/script/.. -> MyApp + my ($lastdir) = $home->dir_list( -1, 1 ); + if ( $lastdir eq '..' ) { + $home = dir($home)->parent->parent; + } } return $home; } @@ -148,23 +215,24 @@ sub reflect_actions { my $class = shift; my $actions = []; eval '$actions = $class->_action_cache'; - die qq/Couldn't reflect actions of component "$class", "$@"/ if $@; + + if ($@) { + Catalyst::Exception->throw( message => + qq/Couldn't reflect actions of component "$class", "$@"/ ); + } + return $actions; } -=back - -=item request($string); +=item request($request) -Returns an C from a string. +Returns a HTTP::Request object. =cut sub request { my $request = shift; - unless ( ref $request ) { - if ( $request =~ m/http/i ) { $request = URI->new($request)->canonical; } @@ -172,11 +240,9 @@ sub request { $request = URI->new( 'http://localhost' . $request )->canonical; } } - unless ( ref $request eq 'HTTP::Request' ) { $request = HTTP::Request->new( 'GET', $request ); } - return $request; }