Fix and test for issues when components import or define a meta method

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

diff --git a/lib/Catalyst/Component.pm b/lib/Catalyst/Component.pm
index 68dbcdb..36b0523 100644 (file)
--- a/lib/Catalyst/Component.pm
+++ b/lib/Catalyst/Component.pm
@@ -2,8 +2,10 @@ package Catalyst::Component;
 
 use Moose;
 use Class::MOP;
+use Class::MOP::Object;
 use MooseX::Adopt::Class::Accessor::Fast;
 use Catalyst::Utils;
+use Class::C3::Adopt::NEXT;
 use MRO::Compat;
 use mro 'c3';
 
@@ -57,17 +59,16 @@ component loader with config() support and a process() method placeholder.
 __PACKAGE__->mk_classdata('_plugins');
 __PACKAGE__->mk_classdata('_config');
 
-around new => sub {
-    my ( $orig, $self) = @_;
-
+sub BUILDARGS {
+    my ($self) = @_;
+    
     # Temporary fix, some components does not pass context to constructor
     my $arguments = ( ref( $_[-1] ) eq 'HASH' ) ? $_[-1] : {};
 
     my $args =  $self->merge_config_hashes( $self->config, $arguments );
-    $self->$orig( $args );
-};
-
-no Moose;
+    
+    return $args;
+}
 
 sub COMPONENT {
     my ( $self, $c ) = @_;
@@ -97,8 +98,8 @@ sub config {
         # work in a subclass. If we don't have the package symbol in the
         # current class we know we need to copy up to ours, which calling
         # the setter will do for us.
-
-        unless ($self->meta->has_package_symbol('$_config')) {
+        my $meta = $self->Class::MOP::Object::meta();
+        unless ($meta->has_package_symbol('$_config')) {
 
             $config = $self->merge_config_hashes( $config, {} );
             $self->_config( $config );
@@ -119,6 +120,7 @@ sub process {
           . " did not override Catalyst::Component::process" );
 }
 
+no Moose;
 
 __PACKAGE__->meta->make_immutable;
 1;
@@ -182,11 +184,9 @@ calling code in the application rather than the component itself.
 
 L<Catalyst>, L<Catalyst::Model>, L<Catalyst::View>, L<Catalyst::Controller>.
 
-=head1 AUTHOR
+=head1 AUTHORS
 
-Sebastian Riedel, C<sri@cpan.org>
-Marcus Ramberg, C<mramberg@cpan.org>
-Matt S Trout, C<mst@shadowcatsystems.co.uk>
+Catalyst Contributors, see Catalyst.pm
 
 =head1 COPYRIGHT