=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
sub setup_config {
my $class = shift;
- my $args = $class->config || {};
+ my %args = %{ $class->config || {} };
my @container_classes = ( "${class}::Container", 'Catalyst::IOC::Container');
- unshift @container_classes, delete $args->{container_class} if exists $args->{container_class};
+ unshift @container_classes, delete $args{container_class} if exists $args{container_class};
my $container_class = Class::MOP::load_first_existing_class(@container_classes);
- my $container = $container_class->new( application_name => "$class", name => "$class" );
+ my $container = $container_class->new( %args, application_name => "$class", name => "$class" );
$class->container($container);
my $config = $container->resolve( service => 'config' );