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';
with 'MooseX::Emulate::Class::Accessor::Fast';
with 'Catalyst::ClassData';
=cut
-__PACKAGE__->mk_classdata($_) for qw/_config _plugins/;
-
-around new => sub {
- my $orig = shift;
- my ( $self, $c ) = @_;
+__PACKAGE__->mk_classdata('_plugins');
+__PACKAGE__->mk_classdata('_config');
+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 );
- return $self->$orig( $args );
-};
+
+ return $args;
+}
sub COMPONENT {
my ( $self, $c ) = @_;
# Temporary fix, some components does not pass context to constructor
my $arguments = ( ref( $_[-1] ) eq 'HASH' ) ? $_[-1] : {};
- $self->new($c, $arguments);
-
-# 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;
-# }
-# }
+ if( my $next = $self->next::can ){
+ my $class = blessed $self || $self;
+ my ($next_package) = Class::MOP::get_code_info($next);
+ warn "There is a COMPONENT method resolving after Catalyst::Component in ${next_package}. This behavior is deprecated and will stop working in future releases.";
+ return $next->($self, $arguments);
+ }
+ return $self->new($c, $arguments);
}
sub config {
my $self = shift;
- my $config_sub = $self->can('_config');
- my $config = $self->$config_sub() || {};
+ my $config = $self->_config || {};
if (@_) {
my $newconfig = { %{@_ > 1 ? {@_} : $_[0]} };
$self->_config(
} 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) {
+ # 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.
+ my $meta = $self->Class::MOP::Object::meta();
+ unless ($meta->has_package_symbol('$_config')) {
$config = $self->merge_config_hashes( $config, {} );
- $self->$config_sub_now( $config );
+ $self->_config( $config );
}
}
return $config;
. " did not override Catalyst::Component::process" );
}
+no Moose;
+
+__PACKAGE__->meta->make_immutable;
1;
__END__
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