[Catalyst-commits] r13511 - in Catalyst-Plugin-ConfigLoader/trunk: . lib/Catalyst/Plugin t

[bricas at dev.catalyst.perl.org]

Author: bricas
Date: 2010-08-21 01:58:30 +0100 (Sat, 21 Aug 2010)
New Revision: 13511

Modified:
   Catalyst-Plugin-ConfigLoader/trunk/Changes
   Catalyst-Plugin-ConfigLoader/trunk/lib/Catalyst/Plugin/ConfigLoader.pm
   Catalyst-Plugin-ConfigLoader/trunk/t/24-mock-shortappname.t
Log:
Fix for Windows regarding changes from 0.29

Modified: Catalyst-Plugin-ConfigLoader/trunk/Changes
===================================================================
--- Catalyst-Plugin-ConfigLoader/trunk/Changes	2010-08-20 12:24:13 UTC (rev 13510)
+++ Catalyst-Plugin-ConfigLoader/trunk/Changes	2010-08-21 00:58:30 UTC (rev 13511)
@@ -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/)

Modified: Catalyst-Plugin-ConfigLoader/trunk/lib/Catalyst/Plugin/ConfigLoader.pm
===================================================================
--- Catalyst-Plugin-ConfigLoader/trunk/lib/Catalyst/Plugin/ConfigLoader.pm	2010-08-20 12:24:13 UTC (rev 13510)
+++ Catalyst-Plugin-ConfigLoader/trunk/lib/Catalyst/Plugin/ConfigLoader.pm	2010-08-21 00:58:30 UTC (rev 13511)
@@ -8,7 +8,7 @@
 use Data::Visitor::Callback;
 use Catalyst::Utils ();
 
-our $VERSION = '0.29';
+our $VERSION = '0.30';
 
 =head1 NAME
 
@@ -183,7 +183,7 @@
         || $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{[\/\\]$}{};

Modified: Catalyst-Plugin-ConfigLoader/trunk/t/24-mock-shortappname.t
===================================================================
--- Catalyst-Plugin-ConfigLoader/trunk/t/24-mock-shortappname.t	2010-08-20 12:24:13 UTC (rev 13510)
+++ Catalyst-Plugin-ConfigLoader/trunk/t/24-mock-shortappname.t	2010-08-21 00:58:30 UTC (rev 13511)
@@ -16,7 +16,7 @@
 
 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;