config wins, groditi loses. FUCK YOU FOR SUPPORTING THAT STUPID BEHAVIOR

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Component.pm

diff --git a/lib/Catalyst/Component.pm b/lib/Catalyst/Component.pm
index a66a7c2..2950f44 100644 (file)
--- a/lib/Catalyst/Component.pm
+++ b/lib/Catalyst/Component.pm
@@ -54,7 +54,7 @@ component loader with config() support and a process() method placeholder.
 
 =cut
 
-__PACKAGE__->mk_classdata($_) for qw/_config _plugins/;
+__PACKAGE__->mk_classdata('_plugins');
 
 around new => sub {
     my ( $orig, $self) = @_;
@@ -83,15 +83,39 @@ sub COMPONENT {
 }
 
 sub config {
-    my $self = shift;
-    my $config = $self->_config ||{};
-    if (@_) {
-        my $newconfig = { %{@_ > 1 ? {@_} : $_[0]} };
-        $self->_config(
-            $self->merge_config_hashes( $config, $newconfig )
-        );
+  my $self = shift;
+  my $class = blessed $self || $self;
+
+  my $config;
+  my $meta = $class->meta;
+  if( $meta->has_package_symbol('$config') ){
+      $config = ${ $meta->get_package_symbol('$config') };
+  } else {
+    foreach my $super ( $meta->linearized_isa ) {
+      my $super_meta = Moose::Meta::Class->initialize($super);
+      if( $super_meta->has_package_symbol('$config') ){
+        $config = ${ $super_meta->get_package_symbol('$config') };
+        unless( @_ ){ #don't copy and write it twice
+          $config = $class->merge_config_hashes( $config, {} );
+          $meta->add_package_symbol('$config', \ $config);
+        }
+        last;
+      }
     }
-    return $config;
+  }
+
+  unless( defined $config ){
+    $config = {};
+    $meta->add_package_symbol('$config', \ $config) unless @_;
+  }
+
+  if (@_) {
+    my $from_args = { %{@_ > 1 ? {@_} : $_[0]} };
+    my $new_config = $class->merge_config_hashes( $config, $from_args);
+    $meta->add_package_symbol('$config', \ $new_config);
+  }
+
+  return $config;
 }
 
 sub merge_config_hashes {
@@ -106,6 +130,8 @@ sub process {
           . " did not override Catalyst::Component::process" );
 }
 
+
+__PACKAGE__->meta->make_immutable;
 1;
 
 __END__