Changeset 11385 for lang/perl/Catalyst-Plugin-ConfigLoader-Multi/trunk

Timestamp:

05/11/08 11:28:08 (5 years ago)

Author:

tomyhero

Message:

lang/perl/Catalyst-Plugin-ConfigLoader?-Multi : fix bug

Location:

lang/perl/Catalyst-Plugin-ConfigLoader-Multi/trunk

Files:

• Changes (modified) (1 diff)
• lib/Catalyst/Plugin/ConfigLoader/Multi.pm (modified) (3 diffs)
• t/spelling.t (modified) (1 diff)

lang/perl/Catalyst-Plugin-ConfigLoader-Multi/trunk/Changes

@@ -1 +1 @@
 Revision history for Catalyst-Plugin-ConfigLoader-Multi
+
+0.06    2008-05-17/11:21
+        - loal only myapp_local.yaml insetad of myapp*_local.yaml. because the specific may generate bug for your application when you set same key in your each local files.
+        - fix POD
 
 0.05    2008-04-06/20:24

lang/perl/Catalyst-Plugin-ConfigLoader-Multi/trunk/lib/Catalyst/Plugin/ConfigLoader/Multi.pm

@@ -9 +9 @@
 use NEXT;
 
-our $VERSION = 0.05;
+our $VERSION = 0.06;
+
 
 sub find_files {
     my $c = shift;
+    my ( $path, $extension ) = $c->get_config_path;
+    my $suffix     = $c->get_config_local_suffix;
+    my @extensions = @{ Config::Any->extensions };
 
-    my @files    = $c->SUPER::find_files();
+    my $prefix = Catalyst::Utils::appprefix( ref $c || $c );
+    my $config_key_name = uc($prefix) . '_CONFIG_MULTI';
+
+    my @files;
+    if ( $extension ) {
+        die "Unable to handle files with the extension '${extension}'"
+            unless grep { $_ eq $extension } @extensions;
+        ( my $local = $path ) =~ s{\.$extension}{_$suffix.$extension};
+        push @files, $path, $local;
+    }
+    else {
+        # do not append lcoal suffix
+        if ($ENV{ $config_key_name } ) {
+            @files = map { ( "$path.$_" ) } @extensions;
+        }
+        else {
+            @files = map { ( "$path.$_", "${path}_${suffix}.$_" ) } @extensions;
+        }
+    }
     my @my_files = $c->_find_my_files();
 
-    return ( @files, @my_files );
+    push @my_files , $ENV{$config_key_name} if $ENV{$config_key_name} ;
+
+    return @my_files, @files;
 }
 
@@ -35 +59 @@
     my $dh         = DirHandle->new($path);
 
-    my $config_key_name = uc($prefix) . '_CONFIG_MULTI';
-
 
     while ( my $file = $dh->read() ) {
         next unless $file =~ /^$prefix\_(.+)\.\w+$/ && $suffix ne $1;
 
-
-        if ( $ENV{ $config_key_name } ) {
-            push @my_files, (
-                map {
-                    (   "${path_prefix}_${1}.$_",)
-                    } @extensions
-            );
-        }
-        else {
-            push @my_files, (
-                map {
-                    (   "${path_prefix}_${1}.$_",
-                        "${path_prefix}_${1}_${suffix}.$_"
-                        )
-                    } @extensions
-            );
-        }
+        push @my_files, ( map { ( "${path_prefix}_${1}.$_", ) } @extensions );
     }
 
-    push @my_files ,  $ENV{ $config_key_name } if $ENV{ $config_key_name };
 
     return @my_files;
@@ -134 +139 @@
 =head1 ENV
 
-you can specify local file with this setting.
+you can specify local file with this setting.( you must use local_sufix for the file name )
 
  $ENV{MYAPP_CONFIG_MULTI} = '/tmp/foo/your_own_local.yaml'

lang/perl/Catalyst-Plugin-ConfigLoader-Multi/trunk/t/spelling.t

@@ -2 +2 @@
 use Test::Spelling;
 $ENV{LANG} = 'C';
+
+$ENV{TEST_SPELLING} or  plan skip_all => "no test for spelling. you must set TEST_SPELLING env for activate this test";
 
 my $spell_cmd;