X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FUtils.pm;h=3a0974b2088c414aa43cdab0cdb873e3fea8efd7;hp=bbef4d5e943390c6111a03e40f8032abfdfd684f;hb=22247e54ccd3fbdaf286e77304b96e61ecc43a0f;hpb=4d60aa90da6f1ac4b9ce73c2fba59bbd7c182de0 diff --git a/lib/Catalyst/Utils.pm b/lib/Catalyst/Utils.pm index bbef4d5..3a0974b 100644 --- a/lib/Catalyst/Utils.pm +++ b/lib/Catalyst/Utils.pm @@ -1,7 +1,6 @@ package Catalyst::Utils; use strict; -use attributes (); use Catalyst::Exception; use File::Spec; use HTTP::Request; @@ -20,11 +19,9 @@ See L. =head1 METHODS -=over 4 +=head2 appprefix($class) -=item appprefix($class) - -Returns the application prefix for the class + MyApp::Foo becomes myapp_foo =cut @@ -35,17 +32,7 @@ sub appprefix { return $class; } -=item attrs($coderef) - -Returns attributes for coderef in a arrayref - -=cut - -sub attrs { attributes::get( $_[0] ) || [] } - -=item class2appclass($class); - -Returns the appclass for class. +=head2 class2appclass($class); MyApp::C::Foo::Bar becomes MyApp My::App::C::Foo::Bar becomes My::App @@ -61,9 +48,7 @@ sub class2appclass { return $appname; } -=item class2classprefix($class); - -Returns the classprefix for class. +=head2 class2classprefix($class); MyApp::C::Foo::Bar becomes MyApp::C My::App::C::Foo::Bar becomes My::App::C @@ -79,9 +64,7 @@ sub class2classprefix { return $prefix; } -=item class2classsuffix($class); - -Returns the classsuffix for class. +=head2 class2classsuffix($class); MyApp::C::Foo::Bar becomes C::Foo::Bar @@ -94,7 +77,7 @@ sub class2classsuffix { return $class; } -=item class2env($class); +=head2 class2env($class); Returns the environment name for class. @@ -109,11 +92,11 @@ sub class2env { return uc($class); } -=item class2prefix( $class, $case ); +=head2 class2prefix( $class, $case ); -Returns the prefix for class. +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 + My::App::C::Foo::Bar becomes foo/bar =cut @@ -128,9 +111,9 @@ sub class2prefix { return $prefix; } -=item class2tempdir( $class [, $create ] ); +=head2 class2tempdir( $class [, $create ] ); -Returns a tempdir for class. If create is true it will try to create the path. +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 @@ -157,7 +140,7 @@ sub class2tempdir { return $tmpdir->stringify; } -=item home($class) +=head2 home($class) Returns home directory for given class. @@ -190,11 +173,11 @@ sub home { return $home; } -=item prefix($class, $name); +=head2 prefix($class, $name); Returns a prefixed action. - MyApp::C::Foo::Bar, yada becomes /foo/bar/yada + MyApp::C::Foo::Bar, yada becomes foo/bar/yada =cut @@ -205,35 +188,16 @@ 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'; - - if ($@) { - Catalyst::Exception->throw( message => - qq/Couldn't reflect actions of component "$class", "$@"/ ); - } - - return $actions; -} - -=item request($request) +=head2 request($uri) -Returns a HTTP::Request object. +Returns an L object for a uri. =cut sub request { my $request = shift; unless ( ref $request ) { - if ( $request =~ m/http/i ) { + if ( $request =~ m/^http/i ) { $request = URI->new($request)->canonical; } else { @@ -243,15 +207,9 @@ sub request { unless ( ref $request eq 'HTTP::Request' ) { $request = HTTP::Request->new( 'GET', $request ); } - - $request->header( - 'Host' => sprintf( '%s:%d', $request->uri->host, $request->uri->port ) - ); return $request; } -=back - =head1 AUTHOR Sebastian Riedel, C