X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FUtils.pm;h=c4d9ca8d1a6a94509dca1db0c3668dffe995ed9b;hb=26e731318112842b5a605bec2092ccae3369c5e4;hp=e1b6440b3b1d5ebff338f06fe726999c9c7bb0a6;hpb=812a28c90c5b43bdf5ce87f1b2a688725e552429;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Utils.pm b/lib/Catalyst/Utils.pm index e1b6440..c4d9ca8 100644 --- a/lib/Catalyst/Utils.pm +++ b/lib/Catalyst/Utils.pm @@ -2,7 +2,11 @@ package Catalyst::Utils; use strict; use attributes (); +use Catalyst::Exception; +use File::Spec; +use HTTP::Request; use Path::Class; +use URI; =head1 NAME @@ -77,7 +81,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. @@ -87,14 +106,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. @@ -112,7 +161,18 @@ sub home { my $subdir = dir($home)->subdir($append); for ( split '/', $name ) { $home = dir($home)->parent } if ( $home =~ /blib$/ ) { $home = dir($home)->parent } - elsif ( !-f file( $home, 'Makefile.PL' ) ) { $home = $subdir } + elsif (!-f file( $home, 'Makefile.PL' ) + && !-f file( $home, 'Build.PL' ) ) + { + $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; } @@ -142,10 +202,41 @@ 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; } +=item request($string); + +Returns an C from a string. + +=cut + +sub request { + my $request = shift; + + unless ( ref $request ) { + + if ( $request =~ m/http/i ) { + $request = URI->new($request)->canonical; + } + else { + $request = URI->new( 'http://localhost' . $request )->canonical; + } + } + + unless ( ref $request eq 'HTTP::Request' ) { + $request = HTTP::Request->new( 'GET', $request ); + } + + return $request; +} + =back =head1 AUTHOR