sub controller {
my ( $c, $name, @args ) = @_;
- my $container = $c->container->get_sub_container('controller');
- unshift @args, $c;
- if( $name ) {
- # Direct component hash lookup to avoid costly regexps
- return $container->get_component($name, \@args)
- if $container->has_service($name) && !ref $name;
+# FIXME: should this be a Catalyst::Utils method?
+ if (!$name) {
+ my $class = $c->action->class;
- return $container->get_component_regexp( $c, $name, \@args );
+ my $prefix = length Catalyst::Utils::class2classprefix($class);
+
+ # MyApp::Controller::Foo becomes Foo
+ # the + 2 is because of the ::
+ $name = substr $class, $prefix + 2;
}
- return $c->component( $c->action->class );
+ return $c->container->get_component_from_sub_container( 'controller', $name, $c, @args);
}
=head2 $c->model($name)
sub model {
my ( $c, $name, @args ) = @_;
- my $appclass = ref($c) || $c;
- my $container = $c->container->get_sub_container('model');
- unshift @args, $c;
- if( $name ) {
- # Direct component hash lookup to avoid costly regexps
- return $container->get_component($name, \@args)
- if $container->has_service($name) && !ref $name;
-
- return $container->get_component_regexp( $c, $name, \@args );
- }
-
- if (ref $c) {
+ if (ref $c && !$name) {
return $c->stash->{current_model_instance}
- if $c->stash->{current_model_instance};
- return $c->model( $c->stash->{current_model} )
- if $c->stash->{current_model};
- }
- return $c->model( $appclass->config->{default_model} )
- if $appclass->config->{default_model};
-
-# FIXME: will this still be mantained?
- my( $comp, $rest ) = $container->get_service_list;
+ if $c->stash->{current_model_instance};
- if( $rest ) {
- $c->log->warn( Carp::shortmess('Calling $c->model() will return a random model unless you specify one of:') );
- $c->log->warn( '* $c->config(default_model => "the name of the default model to use")' );
- $c->log->warn( '* $c->stash->{current_model} # the name of the model to use for this request' );
- $c->log->warn( '* $c->stash->{current_model_instance} # the instance of the model to use for this request' );
- $c->log->warn( 'NB: in version 5.81, the "random" behavior will not work at all.' );
+ $name = $c->stash->{current_model}
+ if $c->stash->{current_model};
}
- return $container->get_component( $comp, \@args );
+ return $c->container->get_component_from_sub_container( 'model', $name, $c, @args);
}
sub view {
my ( $c, $name, @args ) = @_;
- my $appclass = ref($c) || $c;
- my $container = $c->container->get_sub_container('view');
- unshift @args, $c;
-
- if( $name ) {
- # Direct component hash lookup to avoid costly regexps
- return $container->get_component($name, \@args)
- if !ref $name && $container->has_service($name);
-
- $c->log->warn( "Attempted to use view '$name', but does not exist" );
- return $container->get_component_regexp( $c, $name, \@args );
- }
-
- if (ref $c) {
+ if (ref $c && !$name) {
return $c->stash->{current_view_instance}
- if $c->stash->{current_view_instance};
- return $c->view( $c->stash->{current_view} )
- if $c->stash->{current_view};
- }
- return $c->view( $appclass->config->{default_view} )
- if $appclass->config->{default_view};
+ if $c->stash->{current_view_instance};
- my( $comp, $rest ) = $container->get_service_list;
-
- if( $rest ) {
- $c->log->warn( 'Calling $c->view() will return a random view unless you specify one of:' );
- $c->log->warn( '* $c->config(default_view => "the name of the default view to use")' );
- $c->log->warn( '* $c->stash->{current_view} # the name of the view to use for this request' );
- $c->log->warn( '* $c->stash->{current_view_instance} # the instance of the view to use for this request' );
- $c->log->warn( 'NB: in version 5.81, the "random" behavior will not work at all.' );
+ $name = $c->stash->{current_view}
+ if $c->stash->{current_view};
}
- return $container->get_component( $comp, \@args );
+ return $c->container->get_component_from_sub_container( 'view', $name, $c, @args);
}
=head2 $c->controllers
If C<$name> is a regexp, a list of components matched against the full
component name will be returned.
-If Catalyst can't find a component by name, it will fallback to regex
-matching by default. To disable this behaviour set
-disable_component_resolution_regex_fallback to a true value.
-
- __PACKAGE__->config( disable_component_resolution_regex_fallback => 1 );
-
=cut
sub component {
my ( $c, $component, @args ) = @_;
- unshift @args, $c;
if ( $component ) {
+ # FIXME: I probably shouldn't be doing this
+ return $c->components->{$component}
+ if exists $c->components->{$component};
+
my ($type, $name) = _get_component_type_name($component);
if ($type && $c->container->has_sub_container($type)) {
my $container = $c->container->get_sub_container($type);
if( !ref $component && $container->has_service($name) ) {
- return $container->get_component( $name, \@args );
+ return $container->get_component( $name, $c, @args );
}
- return $container->get_component_regexp( $c, $name, \@args );
+ return $container->get_component_regexp( $name, $c, @args );
}
- return
- if $c->config->{disable_component_resolution_regex_fallback} && !ref $component;
-
- # This is here so $c->comp( '::M::' ) works
- my $query = ref $component ? $component : qr{$component}i;
-
- for my $subcontainer_name (qw/model view controller/) {
- my $subcontainer = $c->container->get_sub_container($subcontainer_name);
- my @components = $subcontainer->get_service_list;
- my @result = grep { m{$query} } @components;
-
- if (@result) {
- return map { $subcontainer->get_component( $_, \@args ) } @result
- if ref $component;
+ if (ref $component) {
+ for my $subcontainer_name (qw/model view controller/) {
+ my $subcontainer = $c->container->get_sub_container($subcontainer_name);
+ my @components = $subcontainer->get_service_list;
+ my @result = grep { m{$component} } @components;
- $c->log->warn( Carp::shortmess(qq(Found results for "${component}" using regexp fallback)) );
- $c->log->warn( 'Relying on the regexp fallback behavior for component resolution' );
- $c->log->warn( 'is unreliable and unsafe. You have been warned' );
-
- return $subcontainer->get_component( $result[0], \@args );
+ return map { $subcontainer->get_component( $_, $c, @args ) } @result;
}
}
+ $c->log->warn("Looking for '$component', but nothing was found.");
+
# I would expect to return an empty list here, but that breaks back-compat
}
my $container_class = Class::MOP::load_first_existing_class(@container_classes);
- my $container = $container_class->new( %args,
- name => "$class",
- disable_regex_fallback =>
- $class->config->{disable_component_resolution_regex_fallback},
- );
+ my $container = $container_class->new( %args, name => "$class" );
$class->container($container);
my $config = $container->resolve(service => 'config');
=item *
-C<disable_component_resolution_regex_fallback> - Turns
-off the deprecated component resolution functionality so
-that if any of the component methods (e.g. C<< $c->controller('Foo') >>)
-are called then regex search will not be attempted on string values and
-instead C<undef> will be returned.
-
-=item *
-
C<home> - The application home directory. In an uninstalled application,
this is the top level application directory. In an installed application,
this will be the directory containing C<< MyApp.pm >>.
projects / catagits/Catalyst-Runtime.git / blobdiff