sub appprefix {
my $class = shift;
- $class =~ s/\:\:/_/g;
+ $class =~ s/::/_/g;
$class = lc($class);
return $class;
}
=head2 class2appclass($class);
- MyApp::C::Foo::Bar becomes MyApp
- My::App::C::Foo::Bar becomes My::App
+ MyApp::Controller::Foo::Bar becomes MyApp
+ My::App::Controller::Foo::Bar becomes My::App
=cut
sub class2appclass {
my $class = shift || '';
my $appname = '';
- if ( $class =~ /^(.*)::([MVC]|Model|View|Controller)?::.*$/ ) {
+ if ( $class =~ /^(.+?)::([MVC]|Model|View|Controller)::.+$/ ) {
$appname = $1;
}
return $appname;
=head2 class2classprefix($class);
- MyApp::C::Foo::Bar becomes MyApp::C
- My::App::C::Foo::Bar becomes My::App::C
+ MyApp::Controller::Foo::Bar becomes MyApp::Controller
+ My::App::Controller::Foo::Bar becomes My::App::Controller
=cut
sub class2classprefix {
my $class = shift || '';
my $prefix;
- if ( $class =~ /^(.*::[MVC]|Model|View|Controller)?::.*$/ ) {
+ if ( $class =~ /^(.+?::([MVC]|Model|View|Controller))::.+$/ ) {
$prefix = $1;
}
return $prefix;
=head2 class2classsuffix($class);
- MyApp::C::Foo::Bar becomes C::Foo::Bar
+ MyApp::Controller::Foo::Bar becomes Controller::Foo::Bar
=cut
sub class2classsuffix {
my $class = shift || '';
my $prefix = class2appclass($class) || '';
- $class =~ s/$prefix\:\://;
+ $class =~ s/$prefix\:://;
return $class;
}
sub class2env {
my $class = shift || '';
- $class =~ s/\:\:/_/g;
+ $class =~ s/::/_/g;
return uc($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::Controller::Foo::Bar becomes foo/bar
=cut
my $class = shift || '';
my $case = shift || 0;
my $prefix;
- if ( $class =~ /^.*::([MVC]|Model|View|Controller)?::(.*)$/ ) {
+ if ( $class =~ /^.+?::([MVC]|Model|View|Controller)::(.+)$/ ) {
$prefix = $case ? $2 : lc $2;
- $prefix =~ s/\:\:/\//g;
+ $prefix =~ s{::}{/}g;
}
return $prefix;
}
=cut
sub home {
- my $name = shift;
- $name =~ s/\:\:/\//g;
- my $home = 0;
- if ( my $path = $INC{"$name.pm"} ) {
- $home = file($path)->absolute->dir;
- $name =~ /(\w+)$/;
- my $append = $1;
- 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' )
- && !-f file( $home, 'Build.PL' ) )
+ my $class = shift;
+
+ # make an $INC{ $key } style string from the class name
+ (my $file = "$class.pm") =~ s{::}{/}g;
+
+ if ( my $inc_entry = $INC{$file} ) {
{
- $home = $subdir;
+ # look for an uninstalled Catalyst app
+
+ # find the @INC entry in which $file was found
+ (my $path = $inc_entry) =~ s/$file$//;
+ my $home = dir($path)->absolute->cleanup;
+
+ # 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")) {
+
+ # clean up relative path:
+ # MyApp/script/.. -> MyApp
+
+ my ($lastdir) = $home->dir_list( -1, 1 );
+ if ( $lastdir eq '..' ) {
+ $home = dir($home)->parent->parent;
+ }
+
+ return $home->stringify;
+ }
}
- # clean up relative path:
- # MyApp/script/.. -> MyApp
- my ($lastdir) = $home->dir_list( -1, 1 );
- if ( $lastdir eq '..' ) {
- $home = dir($home)->parent->parent;
+ {
+ # look for an installed Catalyst app
+
+ # trim the .pm off the thing ( Foo/Bar.pm -> Foo/Bar/ )
+ ( my $path = $inc_entry) =~ s/\.pm$//;
+ my $home = dir($path)->absolute->cleanup;
+
+ # return if if it's a valid directory
+ return $home->stringify if -d $home;
}
}
- return $home;
+
+ # we found nothing
+ return 0;
}
=head2 prefix($class, $name);
Returns a prefixed action.
- MyApp::C::Foo::Bar, yada becomes foo/bar/yada
+ MyApp::Controller::Foo::Bar, yada becomes foo/bar/yada
=cut
sub ensure_class_loaded {
my $class = shift;
+ my $opts = shift;
- return if Class::Inspector->loaded( $class ); # if a symbol entry exists we don't load again
+ return if !$opts->{ ignore_loaded }
+ && Class::Inspector->loaded( $class ); # if a symbol entry exists we don't load again
# this hack is so we don't overwrite $@ if the load did not generate an error
my $error;
return $lefthash unless defined $righthash;
my %merged = %$lefthash;
- for my $key ( keys %$righthash ) {\r
- my $right_ref = ( ref $righthash->{ $key } || '' ) eq 'HASH';\r
- my $left_ref = ( ( exists $lefthash->{ $key } && ref $lefthash->{ $key } ) || '' ) eq 'HASH';\r
- if( $right_ref and $left_ref ) {\r
+ for my $key ( keys %$righthash ) {
+ my $right_ref = ( ref $righthash->{ $key } || '' ) eq 'HASH';
+ my $left_ref = ( ( exists $lefthash->{ $key } && ref $lefthash->{ $key } ) || '' ) eq 'HASH';
+ if( $right_ref and $left_ref ) {
$merged{ $key } = merge_hashes(
$lefthash->{ $key }, $righthash->{ $key }
- );\r
+ );
}
else {
$merged{ $key } = $righthash->{ $key };
- }\r
+ }
}
return \%merged;