=cut
-sub controller {
- my ( $c, $name, @args ) = @_;
-
- $name ||= Catalyst::Utils::class2classshortsuffix( $c->action->class );
-
- return $c->container->get_component_from_sub_container( 'controller', $name, $c, @args);
-}
+sub controller { shift->_lookup_mvc('controller', @_) }
=head2 $c->model($name)
=cut
-sub model {
- my ( $c, $name, @args ) = @_;
-
- if (ref $c && !$name) {
- my $current_instance = $c->stash->{current_model_instance};
- return $current_instance
- if $current_instance;
-
- $name = $c->stash->{current_model};
- }
-
- return $c->container->get_component_from_sub_container( 'model', $name, $c, @args);
-}
-
+sub model { shift->_lookup_mvc('model', @_) }
=head2 $c->view($name)
=cut
-sub view {
- my ( $c, $name, @args ) = @_;
+sub view { shift->_lookup_mvc('view', @_) }
+
+sub _lookup_mvc {
+ my ( $c, $type, $name, @args ) = @_;
if (ref $c && !$name) {
- my $current_instance = $c->stash->{current_view_instance};
+ my $current_instance = $c->stash->{"current_${type}_instance"};
return $current_instance
- if $current_instance;
+ if $current_instance && $type ne 'controller';
- $name = $c->stash->{current_view};
+ $name = $type eq 'controller'
+ ? Catalyst::Utils::class2classshortsuffix($c->action->class)
+ : $c->stash->{"current_${type}"}
+ ;
}
- return $c->container->get_component_from_sub_container( 'view', $name, $c, @args);
+ return $c->container->get_component_from_sub_container($type, $name, $c, @args);
}
=head2 $c->controllers
if (
$class->debug and
- my @comps_names_types = $class->container->get_components_names_types
+ my %comps = $class->container->get_all_components
) {
my $column_width = Catalyst::Utils::term_width() - 8 - 9;
my $t = Text::SimpleTable->new( [ $column_width, 'Class' ], [ 8, 'Type' ] );
- $t->row( @$_ ) for @comps_names_types;
+ $t->row( $_ => ref($comps{$_}) ? 'instance' : 'class' ) for keys %comps;
$class->log->debug( "Loaded components:\n" . $t->draw . "\n" );
}
=cut
-sub setup_components {
- shift->container->setup_components();
-}
+sub setup_components { shift->container->setup_components }
=head2 locate_components