package Catalyst::Component;
-use strict;
-use base qw/Class::Accessor::Fast Class::Data::Inheritable/;
-use NEXT;
+use Class::C3;
+use Moose;
+use MooseX::Adopt::Class::Accessor::Fast;
use Catalyst::Utils;
+with 'MooseX::Emulate::Class::Accessor::Fast';
+with 'Catalyst::ClassData';
+
+no Moose;
+
=head1 NAME
Catalyst::Component - Catalyst Component Base Class
__PACKAGE__->mk_classdata($_) for qw/_config _plugins/;
-
-
sub new {
my ( $self, $c ) = @_;
# Temporary fix, some components does not pass context to constructor
my $arguments = ( ref( $_[-1] ) eq 'HASH' ) ? $_[-1] : {};
- return $self->NEXT::new(
- $self->merge_config_hashes( $self->config, $arguments ) );
+ my $args = $self->merge_config_hashes( $self->config, $arguments );
+ $self->next::method( $args );
}
sub COMPONENT {
# Temporary fix, some components does not pass context to constructor
my $arguments = ( ref( $_[-1] ) eq 'HASH' ) ? $_[-1] : {};
- if ( my $new = $self->NEXT::COMPONENT( $c, $arguments ) ) {
- return $new;
- }
- else {
- if ( my $new = $self->new( $c, $arguments ) ) {
- return $new;
- }
- else {
- my $class = ref $self || $self;
- my $new = $self->merge_config_hashes(
- $self->config, $arguments );
- return bless $new, $class;
- }
- }
+
+ #this is not the EXACT logic we had before, since the original tested
+ #for a true value before returning meaning that a subsequent COMPONENT
+ #call could return undef and that would trigger a try to new, which could
+ #again return undef, which would lead to a straight bless of the args and
+ #config. I did not mantain that behavior because it did not seemed sane
+ # please rip me a new one if you have reason to believe i am being stupid
+ # --groditi
+ return $self->next::can ?
+ $self->next::method($c, $arguments) : $self->new($c, $arguments);
}
sub config {
my $self = shift;
- my $config = $self->_config;
- unless ($config) {
- $self->_config( $config = {} );
- }
+ my $config_sub = $self->can('_config');
+ my $config = $self->$config_sub() || {};
if (@_) {
my $newconfig = { %{@_ > 1 ? {@_} : $_[0]} };
$self->_config(
$self->merge_config_hashes( $config, $newconfig )
);
+ } else {
+ # this is a bit of a kludge, required to make
+ # __PACKAGE__->config->{foo} = 'bar';
+ # work in a subclass. Calling the Class::Data::Inheritable setter
+ # will create a new _config method in the current class if it's
+ # currently inherited from the superclass. So, the can() call will
+ # return a different subref in that case and that means we know to
+ # copy and reset the value stored in the class data.
+
+ $self->_config( $config );
+
+ if ((my $config_sub_now = $self->can('_config')) ne $config_sub) {
+
+ $config = $self->merge_config_hashes( $config, {} );
+ $self->$config_sub_now( $config );
+ }
}
return $config;
}