my ( $c, $name, @args ) = @_;
if (ref $c && !$name) {
- return $c->stash->{current_model_instance}
- if $c->stash->{current_model_instance};
+ my $current_instance = $c->stash->{current_model_instance};
+ return $current_instance
+ if $current_instance;
- $name = $c->stash->{current_model}
- if $c->stash->{current_model};
+ $name = $c->stash->{current_model};
}
return $c->container->get_component_from_sub_container( 'model', $name, $c, @args);
my ( $c, $name, @args ) = @_;
if (ref $c && !$name) {
- return $c->stash->{current_view_instance}
- if $c->stash->{current_view_instance};
+ my $current_instance = $c->stash->{current_view_instance};
+ return $current_instance
+ if $current_instance;
- $name = $c->stash->{current_view}
- if $c->stash->{current_view};
+ $name = $c->stash->{current_view};
}
return $c->container->get_component_from_sub_container( 'view', $name, $c, @args);
my $container_class = Class::MOP::load_first_existing_class(@container_classes);
- my $container = $container_class->new( %args, name => "$class" );
+ my $container = $container_class->new( %args, application_name => "$class", name => "$class" );
$class->container($container);
my $config = $container->resolve(service => 'config');
=cut
sub setup_components {
- my $class = shift;
- my $container = $class->container;
-
- my $config = $class->config->{ setup_components };
-
- Catalyst::Exception->throw(
- qq{You are using search_extra config option. That option is\n} .
- qq{deprecated, please refer to the documentation for\n} .
- qq{other ways of achieving the same results.\n}
- ) if delete $config->{ search_extra };
-
- my @comps = $container->locate_components($class, $config);
- my %comps = map { $_ => 1 } @comps;
-
- my $deprecatedcatalyst_component_names = grep { /::[CMV]::/ } @comps;
- $class->log->warn(qq{Your application is using the deprecated ::[MVC]:: type naming scheme.\n}.
- qq{Please switch your class names to ::Model::, ::View:: and ::Controller: as appropriate.\n}
- ) if $deprecatedcatalyst_component_names;
-
- for my $component ( @comps ) {
-
- # We pass ignore_loaded here so that overlay files for (e.g.)
- # Model::DBI::Schema sub-classes are loaded - if it's in @comps
- # we know M::P::O found a file on disk so this is safe
-
- Catalyst::Utils::ensure_class_loaded( $component, { ignore_loaded => 1 } );
- }
-
- for my $component (@comps) {
- $container->add_component( $component, $class );
-# FIXME - $instance->expand_modules() is broken
- my @expanded_components = $container->expand_component_module( $component );
- for my $component (@expanded_components) {
- next if $comps{$component};
-
- # FIXME - Why is it inside the for loop? It makes no sense
- $deprecatedcatalyst_component_names = grep { /::[CMV]::/ } @expanded_components;
- $class->log->warn(qq{Your application is using the deprecated ::[MVC]:: type naming scheme.\n}.
- qq{Please switch your class names to ::Model::, ::View:: and ::Controller: as appropriate.\n}
- ) if $deprecatedcatalyst_component_names;
-
- $container->add_component( $component, $class );
- }
- }
-
- $container->get_sub_container('model')->make_single_default;
- $container->get_sub_container('view')->make_single_default;
+ shift->container->setup_components();
}
# FIXME - removed locate_components