From: Brian Cassidy Date: Sat, 21 Aug 2010 00:58:30 +0000 (+0000) Subject: Fix for Windows regarding changes from 0.29 X-Git-Tag: v0.30^0 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1c7a221c25a49654c2eaf5fe2b362077904e930c;p=catagits%2FCatalyst-Plugin-ConfigLoader.git Fix for Windows regarding changes from 0.29 --- diff --git a/Changes b/Changes index 9fcf373..0d60371 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,8 @@ Revision history for Perl extension Catalyst::Plugin::ConfigLoader. +0.30 Fri Aug 20 2010 + - Fix for Windows regarding changes from 0.29 + 0.29 Fri Aug 20 2010 - Fix issue with 2 character app names that are kept in versioned directories (e.g. app called QX in QX-2.1.5/) diff --git a/lib/Catalyst/Plugin/ConfigLoader.pm b/lib/Catalyst/Plugin/ConfigLoader.pm index 3c4f0dc..aad30f3 100644 --- a/lib/Catalyst/Plugin/ConfigLoader.pm +++ b/lib/Catalyst/Plugin/ConfigLoader.pm @@ -8,7 +8,7 @@ use MRO::Compat; use Data::Visitor::Callback; use Catalyst::Utils (); -our $VERSION = '0.29'; +our $VERSION = '0.30'; =head1 NAME @@ -183,7 +183,7 @@ sub get_config_path { || $c->config->{ 'Plugin::ConfigLoader' }->{ file } || $c->path_to( $prefix ); - my ( $extension ) = ( $path =~ m{\.([^/\.]{1,4})$} ); + my ( $extension ) = ( $path =~ m{\.([^\/\\.]{1,4})$} ); if ( -d $path ) { $path =~ s{[\/\\]$}{}; diff --git a/t/24-mock-shortappname.t b/t/24-mock-shortappname.t index 87fa57a..f7abc17 100644 --- a/t/24-mock-shortappname.t +++ b/t/24-mock-shortappname.t @@ -16,7 +16,7 @@ use Test::More; my $app = bless {}, 'QX'; my ($path, $extension) = $app->get_config_path; -is $path, '/home/foo/QX-0.9.5/qx'; +is $path, Path::Class::dir( '/home/foo/QX-0.9.5/qx' )->stringify; is $extension, undef; done_testing;