oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test adjustments for WebGUI::Paths

Browse source
This commit is contained in:
Graham Knop 2010-03-11 07:27:01 -06:00
parent 65e858ff4d
commit 7afda00d9b
26 changed files with 127 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/Config.pm
View file

@ -164,7 +164,7 @@ sub new {
return $config{$filename};
}
else {
my $self = $class->SUPER::new($fullPath);
my $self = $class->SUPER::new($filename);
$config{$filename} = $self unless $noCache;
return $self;
}
@ -186,7 +186,7 @@ sub readAllConfigs {
my @configs = WebGUI::Paths->siteConfigs;
my %configs = map {
$_ => $class->new($_);
} @configs
} @configs;
return \%configs;
}

15
lib/WebGUI/Paths.pm
View file

@ -39,7 +39,7 @@ These methods are available from this class:
=cut
BEGIN {
use Sub::Name qw(subname);
use Class::MOP;
my $root = realpath(catdir(
catpath((splitpath(__FILE__))[0,1], ''), (updir) x 2
));
@ -47,18 +47,18 @@ BEGIN {
configBase => catdir($root, 'etc'),
logConfig => catfile($root, 'etc', 'log.conf'),
spectreConfig => catfile($root, 'etc', 'spectre.conf'),
upgrades => catfile($root, 'docs', 'upgrades'),
preloadCustom => catfile($root, 'etc', 'preload.custom'),
preloadExclusions => catfile($root, 'etc', 'preload.exclude'),
upgrades => catdir($root, 'docs', 'upgrades'),
extras => catdir($root, 'www', 'extras'),
defaultUploads => catdir($root, 'www', 'uploads'),
defaultCreateSQL => catdir($root, 'docs', 'create.sql'),
var => catdir($root, 'var'),
);
my $meta = Class::MOP::Class->initialize(__PACKAGE__);
for my $sub (keys %paths) {
my $path = $paths{$sub};
no strict 'refs';
*{$sub} = subname $sub => sub () { $path };
$meta->add_method( $sub, sub () { $path } );
}
}
@ -77,7 +77,7 @@ sub import {
}
}
if (@invalid) {
die 'Invalid options ' . join(', ', @invalid);
croak 'Invalid options ' . join(', ', @invalid);
}
}
@ -105,7 +105,8 @@ sub preloadPaths {
try {
@paths = grep {
(-d) ? 1 : do {
warn "WARNING: Not adding lib directory '$_' from @{[$class->preloadCustom]}: Directory does not exist.\n";
warn "WARNING: Not adding lib directory '$_' from "
. $class->preloadCustom . ": Directory does not exist.\n";
0;
}
} _readTextLines($class->preloadCustom);
@ -132,7 +133,7 @@ sub preloadAll {
WebGUI::Pluggable::findAndLoad( 'WebGUI', {
exclude => \( $class->preloadExclude ),
onLoadFail => sub { warn sprintf 'Error loading %s: %s', @_ },
onLoadFail => sub { warn sprintf "Error loading %s: %s\n", @_ },
});
}

2
lib/WebGUI/Session.pm
View file

@ -459,7 +459,7 @@ sub open {
my $request = shift;
my $server = shift;
my $config;
if (try { $configFile->isa('WebGUI::Config' }) {
if (eval { $configFile->isa('WebGUI::Config') } ) {
$config = $configFile;
}
else {