bumped version

[catagits/Catalyst-Plugin-ConfigLoader.git] / lib / Catalyst / Plugin / ConfigLoader.pm

diff --git a/lib/Catalyst/Plugin/ConfigLoader.pm b/lib/Catalyst/Plugin/ConfigLoader.pm
index edc69d4..f5c416b 100644 (file)
--- a/lib/Catalyst/Plugin/ConfigLoader.pm
+++ b/lib/Catalyst/Plugin/ConfigLoader.pm
@@ -10,7 +10,7 @@ use Module::Pluggable::Fast
     require => 1;\r
 use Data::Visitor::Callback;\r
 \r
-our $VERSION = '0.08';\r
+our $VERSION = '0.1';\r
 \r
 =head1 NAME\r
 \r
@@ -73,18 +73,6 @@ sub setup {
 \r
             _fix_syntax( $config );\r
             \r
-            # merge hashes 1 level down\r
-            for my $key ( keys %$config ) {\r
-                if( exists $c->config->{ $key } ) {\r
-                    my $isa_ref = ref $config->{ $key };\r
-\r
-                    next if !$isa_ref or $isa_ref ne 'HASH';\r
-\r
-                    my %temp = ( %{ $c->config->{ $key } }, %{ $config->{ $key } } );\r
-                    $config->{ $key } = \%temp;\r
-                }\r
-            }\r
-            \r
             $c->config( $config );\r
         }\r
     }\r
@@ -168,7 +156,11 @@ sub _fix_syntax {
         map +{\r
             prefix => $_ eq 'Component' ? '' : $_ . '::',\r
             values => delete $config->{ lc $_ } || delete $config->{ $_ }\r
-        }, qw( Component Model View Controller )\r
+        },\r
+        grep {\r
+            ref $config->{ lc $_ } || ref $config->{ $_ }\r
+        }\r
+        qw( Component Model M View V Controller C )\r
     );\r
 \r
     foreach my $comp ( @components ) {\r