use Class::C3::Adopt::NEXT;
use MRO::Compat;
use mro 'c3';
+use Scalar::Util 'blessed';
+use namespace::clean -except => 'meta';
with 'MooseX::Emulate::Class::Accessor::Fast';
with 'Catalyst::ClassData';
__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 );
+ my $class = shift;
+ my $args = {};
+
+ if (@_ == 1) {
+ $args = $_[0] if ref($_[0]) eq 'HASH';
+ } elsif (@_ == 2) { # is it ($app, $args) or foo => 'bar' ?
+ if (blessed($_[0])) {
+ $args = $_[1] if ref($_[1]) eq 'HASH';
+ } elsif (Class::MOP::is_class_loaded($_[0]) &&
+ $_[0]->isa('Catalyst') && ref($_[1]) eq 'HASH') {
+ $args = $_[1];
+ } elsif ($_[0] == $_[1]) {
+ $args = $_[1];
+ } else {
+ $args = +{ @_ };
+ }
+ } elsif (@_ % 2 == 0) {
+ $args = +{ @_ };
+ }
- return $args;
+ return $class->merge_config_hashes( $class->config, $args );
}
sub COMPONENT {
# this is a bit of a kludge, required to make
# __PACKAGE__->config->{foo} = 'bar';
# work in a subclass.
+ # TODO maybe this should be a ClassData option?
my $class = blessed($self) || $self;
my $meta = Class::MOP::get_metaclass_by_name($class);
unless ($meta->has_package_symbol('$_config')) {
-
- $config = $self->merge_config_hashes( $config, {} );
- $self->_config( $config );
+ # Call merge_hashes to ensure we deep copy the parent
+ # config onto the subclass
+ $self->_config( Catalyst::Utils::merge_hashes($config, {}) );
}
}
- return $config;
+ return $self->_config;
}
sub merge_config_hashes {
. " did not override Catalyst::Component::process" );
}
-no Moose;
-
__PACKAGE__->meta->make_immutable;
+
1;
__END__
Called by COMPONENT to instantiate the component; should return an object
to be stored in the application's component hash.
-=head2 COMPONENT($c, $arguments)
+=head2 COMPONENT
+
+C<< my $component_instance = $component->COMPONENT($app, $arguments); >>
If this method is present (as it is on all Catalyst::Component subclasses,
it is called by Catalyst during setup_components with the application class
hashref and are merged with the __PACKAGE__->config hashref before calling
->new to instantiate the component.
+You can override it in your components to do custom instantiation, using
+something like this:
+
+ sub COMPONENT {
+ my ($class, $app, $args) = @_;
+ $args = $self->merge_config_hashes($self->config, $args);
+ return $class->new($app, $args);
+ }
+
=head2 $c->config
=head2 $c->config($hashref)
=head1 COPYRIGHT
-This program is free software, you can redistribute it and/or modify it under
+This library is free software. You can redistribute it and/or modify it under
the same terms as Perl itself.
=cut