use Catalyst::Utils ();
use Hash::Util qw/lock_hash/;
use MooseX::Types::LoadableClass qw/ LoadableClass /;
+use Moose::Util;
use Catalyst::IOC::BlockInjection;
use namespace::autoclean;
}
sub add_component {
-# FIXME I'm aware it shouldn't be getting $instance as an argument
-# and that setup_component should be removed. This is temporary
- my ( $self, $component, $instance ) = @_;
+ my ( $self, $component, $class ) = @_;
my ( $type, $name ) = _get_component_type_name($component);
return unless $type;
$self->get_sub_container($type)->add_service(
Catalyst::IOC::BlockInjection->new(
name => $name,
- block => sub { $instance },
+ block => sub { $self->setup_component( $component, $class ) },
)
);
}
return (undef, $component);
}
+# FIXME ugly and temporary
+# Just moved it here the way it was, so we can work on it here in the container
+sub setup_component {
+ my ( $self, $component, $class ) = @_;
+
+ unless ( $component->can( 'COMPONENT' ) ) {
+ return $component;
+ }
+
+ # FIXME I know this isn't the "Dependency Injection" way of doing things,
+ # its just temporary
+ my $suffix = Catalyst::Utils::class2classsuffix( $component );
+ my $config = $self->resolve(service => 'config')->{ $suffix } || {};
+
+ # Stash catalyst_component_name in the config here, so that custom COMPONENT
+ # methods also pass it. local to avoid pointlessly shitting in config
+ # for the debug screen, as $component is already the key name.
+ local $config->{catalyst_component_name} = $component;
+
+ my $instance = eval { $component->COMPONENT( $class, $config ); };
+
+ if ( my $error = $@ ) {
+ chomp $error;
+ Catalyst::Exception->throw(
+ message => qq/Couldn't instantiate component "$component", "$error"/
+ );
+ }
+ elsif (!blessed $instance) {
+ my $metaclass = Moose::Util::find_meta($component);
+ my $method_meta = $metaclass->find_method_by_name('COMPONENT');
+ my $component_method_from = $method_meta->associated_metaclass->name;
+ my $value = defined($instance) ? $instance : 'undef';
+ Catalyst::Exception->throw(
+ message =>
+ qq/Couldn't instantiate component "$component", COMPONENT() method (from $component_method_from) didn't return an object-like value (value was $value)./
+ );
+ }
+
+ return $instance;
+}
+
+
1;
__END__
Finds components that match a given regexp. Used internally, by find_component.
+=head2 setup_component
+
=head2 _fix_syntax
=head2 _config_substitutions