use Tree::Simple qw/use_weak_refs/;
use Tree::Simple::Visitor::FindByUID;
use Class::C3::Adopt::NEXT;
-use Hash::Util qw/lock_hash/;
use List::MoreUtils qw/uniq/;
use attributes;
use utf8;
return $c->component_list;
}
- my ($type, $name) = _get_component_type_name($component);
-
- return $c->container->get_component_from_sub_container(
- $type, $name, $c, @args
- ) if $type;
-
my @result = $c->container->find_component( $component, $c, @args );
- # one last search for things like $c->comp(qr/::M::/)
- @result = $c->container->find_component_regexp(
- $c->components, $component, $c, @args
- ) if !@result and ref $component;
-
# list context for regexp searches
return @result if ref $component;
sub components {
my ( $class, $comps ) = @_;
- # FIXME: should this ugly kludge exist?
- $class->setup_config unless defined $class->container;
+ # people create components calling this sub directly, before setup
+ $class->setup_config unless $class->container;
- my $containers;
- $containers->{$_} = $class->container->get_sub_container($_)
- for qw(model view controller);
+ my $container = $class->container;
if ( $comps ) {
- for my $component ( keys %$comps ) {
- my ($type, $name) = _get_component_type_name($component);
-
- $containers->{$type}->add_service(
- Catalyst::IOC::BlockInjection->new(
- name => $name,
- block => sub { $class->setup_component($component) },
- )
- );
- }
+ $container->add_component(
+ $_, $class
+ ) for keys %$comps;
}
- my %components;
- for my $container (keys %$containers) {
- my @service_list = $containers->{$container}->get_service_list;
- for my $component (@service_list) {
- my $comp = $containers->{$container}->resolve(
- service => $component
- );
- my $comp_name = ref $comp || $comp;
- $components{$comp_name} = $comp;
- }
- }
-
- return lock_hash %components;
+ return $container->get_all_components();
}
=head2 $c->context_class
The C<setup_components> config option is passed to both of the above methods.
-Installation of each component is performed by the L<setup_component> method,
-below.
-
=cut
sub setup_components {
Catalyst::Utils::ensure_class_loaded( $component, { ignore_loaded => 1 } );
}
- my $containers;
- $containers->{$_} = $class->container->get_sub_container($_) for qw(model view controller);
+ my $container = $class->container;
for my $component (@comps) {
- my $instance = $class->setup_component($component);
- if ( my ($type, $name) = _get_component_type_name($component) ) {
- $containers->{$type}->add_service(Catalyst::IOC::BlockInjection->new( name => $name, block => sub { return $instance } ));
- }
- my @expanded_components = $instance->can('expand_modules')
- ? $instance->expand_modules( $component, $config )
- : $class->expand_component_module( $component, $config );
+ $container->add_component( $component, $class );
+# FIXME - $instance->expand_modules() is broken
+ my @expanded_components = $class->expand_component_module( $component, $config );
for my $component (@expanded_components) {
next if $comps{$component};
qq{Please switch your class names to ::Model::, ::View:: and ::Controller: as appropriate.\n}
) if $deprecatedcatalyst_component_names;
- if (my ($type, $name) = _get_component_type_name($component)) {
- $containers->{$type}->add_service(Catalyst::IOC::BlockInjection->new( name => $name, block => sub { return $class->setup_component($component) } ));
- }
+ $container->add_component( $component, $class );
}
}
- $containers->{model}->make_single_default;
- $containers->{view}->make_single_default;
+ $container->get_sub_container('model')->make_single_default;
+ $container->get_sub_container('view')->make_single_default;
}
-# FIXME: should this sub exist?
-# should it be moved to Catalyst::Utils,
-# or replaced by something already existing there?
-sub _get_component_type_name {
- my ( $component ) = @_;
-
- my @parts = split /::/, $component;
-
- while (my $type = shift @parts) {
- return ('controller', join '::', @parts)
- if $type =~ /^(c|controller)$/i;
-
- return ('model', join '::', @parts)
- if $type =~ /^(m|model)$/i;
-
- return ('view', join '::', @parts)
- if $type =~ /^(v|view)$/i;
- }
-
- return (undef, $component);
-}
=head2 $c->locate_components( $setup_component_config )
return Devel::InnerPackage::list_packages( $module );
}
-=head2 $c->setup_component
-
-=cut
-
-## FIXME - Why the hell do we try calling the ->COMPONENT method twice, this is madness!?!
-sub setup_component {
- my( $class, $component ) = @_;
-
- unless ( $component->can( 'COMPONENT' ) ) {
- return $component;
- }
-
- my $suffix = Catalyst::Utils::class2classsuffix( $component );
- my $config = $class->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;
-}
-
=head2 $c->setup_dispatcher
Sets up dispatcher.
projects / catagits/Catalyst-Runtime.git / blobdiff