X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FUtils.pm;h=c3145d3f8d03e5b726ef2e5cd8c99678ca73d166;hb=e2cc89a98938400ae5953b6d0ee79742768ed7df;hp=e4c5db800c3d65320edfdf36d0923d2359f95589;hpb=d837e1a7eadff19ff04373ad19d22fa293e19db5;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Utils.pm b/lib/Catalyst/Utils.pm
index e4c5db8..c3145d3 100644
--- a/lib/Catalyst/Utils.pm
+++ b/lib/Catalyst/Utils.pm
@@ -1,7 +1,8 @@
 package Catalyst::Utils;
 
 use strict;
-use attributes ();
+use Catalyst::Exception;
+use File::Spec;
 use HTTP::Request;
 use Path::Class;
 use URI;
@@ -20,18 +21,21 @@ See L<Catalyst>.
 
 =over 4
 
-=item attrs($coderef)
+=item appprefix($class)
 
-Returns attributes for coderef in a arrayref
+	MyApp::Foo becomes myapp_foo
 
 =cut
 
-sub attrs { attributes::get( $_[0] ) || [] }
+sub appprefix {
+    my $class = shift;
+    $class =~ s/\:\:/_/g;
+    $class = lc($class);
+    return $class;
+}
 
 =item class2appclass($class);
 
-Returns the appclass for class.
-
     MyApp::C::Foo::Bar becomes MyApp
     My::App::C::Foo::Bar becomes My::App
 
@@ -48,8 +52,6 @@ sub class2appclass {
 
 =item class2classprefix($class);
 
-Returns the classprefix for class.
-
     MyApp::C::Foo::Bar becomes MyApp::C
     My::App::C::Foo::Bar becomes My::App::C
 
@@ -66,8 +68,6 @@ sub class2classprefix {
 
 =item class2classsuffix($class);
 
-Returns the classsuffix for class.
-
     MyApp::C::Foo::Bar becomes C::Foo::Bar
 
 =cut
@@ -79,24 +79,69 @@ sub class2classsuffix {
     return $class;
 }
 
-=item class2prefix($class);
+=item class2env($class);
 
-Returns the prefix for class.
+Returns the environment name for class.
 
-    My::App::C::Foo::Bar becomes /foo/bar
+    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 uri prefix for a class. If case is false the prefix is converted to lowercase.
+
+    My::App::C::Foo::Bar becomes foo/bar
 
 =cut
 
 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 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
+
+=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 +164,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;
 }
@@ -127,7 +179,7 @@ sub home {
 
 Returns a prefixed action.
 
-    MyApp::C::Foo::Bar, yada becomes /foo/bar/yada
+    MyApp::C::Foo::Bar, yada becomes foo/bar/yada
 
 =cut
 
@@ -138,33 +190,15 @@ sub prefix {
     return $name;
 }
 
-=item reflect_actions($class);
-
-Returns an arrayref containing all actions of a component class.
-
-=cut
-
-sub reflect_actions {
-    my $class   = shift;
-    my $actions = [];
-    eval '$actions = $class->_action_cache';
-    die qq/Couldn't reflect actions of component "$class", "$@"/ if $@;
-    return $actions;
-}
-
-=back
-
-=item request($string);
+=item request($uri)
 
-Returns an C<HTTP::Request> from a string.
+Returns an L<HTTP::Request> object for a uri.
 
 =cut
 
 sub request {
     my $request = shift;
-
     unless ( ref $request ) {
-
         if ( $request =~ m/http/i ) {
             $request = URI->new($request)->canonical;
         }
@@ -172,11 +206,9 @@ sub request {
             $request = URI->new( 'http://localhost' . $request )->canonical;
         }
     }
-
     unless ( ref $request eq 'HTTP::Request' ) {
         $request = HTTP::Request->new( 'GET', $request );
     }
-
     return $request;
 }