$c->error(0);
}
-sub _comp_search_prefixes {
- my $c = shift;
- return map $c->components->{ $_ }, $c->_comp_names_search_prefixes(@_);
-}
-
-# search components given a name and some prefixes
-sub _comp_names_search_prefixes {
- my ( $c, $name, @prefixes ) = @_;
- my $appclass = ref $c || $c;
- my $filter = "^${appclass}::(" . join( '|', @prefixes ) . ')::';
- $filter = qr/$filter/; # Compile regex now rather than once per loop
-
- my @components = map { $c->container->get_sub_container($_)->get_service_list } qw(controller view model);
-
- # map the original component name to the sub part that we will search against
- my %eligible = map { my $n = $_; $n =~ s{^$appclass\::[^:]+::}{}; $_ => $n; }
- grep { /$filter/ } @components;
-
- # undef for a name will return all
- return keys %eligible if !defined $name;
+sub _find_component_regexp {
+ my ( $c, $container, $name, $args ) = @_;
- my $query = ref $name ? $name : qr/^$name$/i;
- my @result = grep { $eligible{$_} =~ m{$query} } keys %eligible;
-
- return @result if @result;
-
- # if we were given a regexp to search against, we're done.
- return if ref $name;
-
- # skip regexp fallback if configured
return
- if $appclass->config->{disable_component_resolution_regex_fallback};
-
- # regexp fallback
- $query = qr/$name/i;
- @result = grep { $eligible{ $_ } =~ m{$query} } keys %eligible;
-
- # no results? try against full names
- if( !@result ) {
- @result = grep { m{$query} } keys %eligible;
- }
-
- # don't warn if we didn't find any results, it just might not exist
- if( @result ) {
- # Disgusting hack to work out correct method name
- my $warn_for = lc $prefixes[0];
- my $msg = "Used regexp fallback for \$c->${warn_for}('${name}'), which found '" .
- (join '", "', @result) . "'. Relying on regexp fallback behavior for " .
- "component resolution is unreliable and unsafe.";
- my $short = $result[0];
- # remove the component namespace prefix
- $short =~ s/.*?(Model|Controller|View):://;
- my $shortmess = Carp::shortmess('');
- if ($shortmess =~ m#Catalyst/Plugin#) {
- $msg .= " You probably need to set '$short' instead of '${name}' in this " .
- "plugin's config";
- } elsif ($shortmess =~ m#Catalyst/lib/(View|Controller)#) {
- $msg .= " You probably need to set '$short' instead of '${name}' in this " .
- "component's config";
- } else {
- $msg .= " You probably meant \$c->${warn_for}('$short') instead of \$c->${warn_for}('${name}'), " .
- "but if you really wanted to search, pass in a regexp as the argument " .
- "like so: \$c->${warn_for}(qr/${name}/)";
- }
- $c->log->warn( "${msg}$shortmess" );
- }
+ if $c->config->{disable_component_resolution_regex_fallback} && !ref $name;
- return @result;
-}
-
-# Find possible names for a prefix
-sub _comp_names {
- my ( $c, @prefixes ) = @_;
my $appclass = ref $c || $c;
+ my $prefix = ucfirst $container->name;
+ my $p = substr $prefix, 0, 1;
- my $filter = "^${appclass}::(" . join( '|', @prefixes ) . ')::';
-
- my @names = map { s{$filter}{}; $_; }
- $c->_comp_names_search_prefixes( undef, @prefixes );
+ my $query = ref $name ? $name : qr{$name}i;
+ $query =~ s/^${appclass}::($p|$prefix):://i;
- return @names;
-}
-
-# Filter a component before returning by calling ACCEPT_CONTEXT if available
-sub _filter_component {
- my ( $c, $comp, @args ) = @_;
+ my @comps = $container->get_service_list;
+ my @result = map {
+ $container->resolve( service => $_, parameters => { context => $args } )
+ } grep { m/$query/ } @comps;
- if ( eval { $comp->can('ACCEPT_CONTEXT'); } ) {
- return $comp->ACCEPT_CONTEXT( $c, @args );
+ if (!ref $name && $result[0]) {
+ $c->log->warn( Carp::shortmess(qq(Found results for "${name}" 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 $result[0];
}
- return $comp;
+ return @result;
}
=head2 COMPONENT ACCESSORS
sub controller {
my ( $c, $name, @args ) = @_;
my $container = $c->container->get_sub_container('controller');
+ unshift @args, $c;
- my $appclass = ref $c || $c;
if( $name ) {
- if ( !ref $name ) { # Direct component hash lookup to avoid costly regexps
- return $container->resolve(service => $name, parameters => { context => [ $c, @args ] } )
- if $container->has_service($name);
- }
- elsif ( ref $name eq 'Regexp' ) {
- my @comps = $container->get_service_list;
- my @result;
- for (@comps) {
- push @result, $container->resolve( service => $_, parameters => { context => [ $c, @args ] } )
- if m/$name/;
- }
- return @result;
- }
- else {
- my $short_name = ref $name;
- $short_name =~ s/^${appclass}::(C|Controller)//;
- return $container->resolve( service => $short_name, parameters => { context => [ $c, @args ] } )
- if $container->has_service($short_name);
- }
- return;
+ # Direct component hash lookup to avoid costly regexps
+ return $c->container->get_component('controller', $name, \@args)
+ if $container->has_service($name) && !ref $name;
+
+ return $c->_find_component_regexp( $container, $name, \@args );
}
return $c->component( $c->action->class );
my ( $c, $name, @args ) = @_;
my $appclass = ref($c) || $c;
my $container = $c->container->get_sub_container('model');
+ unshift @args, $c;
if( $name ) {
- if ( !ref $name ) { # Direct component hash lookup to avoid costly regexps
- return $container->resolve( service => $name, parameters => { context => [ $c, @args ] } )
- if $container->has_service($name);
- }
- elsif ( ref $name eq 'Regexp' ) {
- my @comps = $container->get_service_list;
- my @result;
- for (@comps) {
- push @result, $container->resolve( service => $_, parameters => { context => [ $c, @args ] } )
- if m/$name/;
- }
- return @result;
- }
- else {
- my $short_name = ref $name;
- $short_name =~ s/^${appclass}::(M|Model)//;
- return $container->resolve( service => $short_name, parameters => { context => [ $c, @args ] } )
- if $container->has_service($short_name);
- }
- return;
+ # Direct component hash lookup to avoid costly regexps
+ return $c->container->get_component('model', $name, \@args)
+ if $container->has_service($name) && !ref $name;
+
+ return $c->_find_component_regexp( $container, $name, \@args );
}
if (ref $c) {
$c->log->warn( 'NB: in version 5.81, the "random" behavior will not work at all.' );
}
- return $container->resolve( service => $comp, parameters => { context => [ $c, @args ] } );
+ return $container->resolve( service => $comp, parameters => { context => \@args } );
}
my ( $c, $name, @args ) = @_;
my $appclass = ref($c) || $c;
my $container = $c->container->get_sub_container('view');
+ unshift @args, $c;
if( $name ) {
if ( !ref $name ) { # Direct component hash lookup to avoid costly regexps
if ( $container->has_service($name) ) {
- return $container->resolve( service => $name, parameters => { context => [ $c, @args ] } );
+ return $c->container->get_component('view', $name, \@args);
}
else {
$c->log->warn( "Attempted to use view '$name', but does not exist" );
}
}
- elsif ( ref $name eq 'Regexp' ) {
- my @comps = $container->get_service_list;
- my @result;
- for (@comps) {
- push @result, $container->resolve( service => $_, parameters => { context => [ $c, @args ] } )
- if m/$name/;
- }
- return @result;
- }
- else {
- my $short_name = ref $name;
- $short_name =~ s/^${appclass}::(V|View)//;
- return $container->resolve( service => $short_name, parameters => { context => [ $c, @args ] } )
- if $container->has_service($short_name);
- }
- return;
+ return $c->_find_component_regexp( $container, $name, \@args );
}
if (ref $c) {
$c->log->warn( 'NB: in version 5.81, the "random" behavior will not work at all.' );
}
- return $container->resolve( service => $comp, parameters => { context => [ $c, @args ] } );
+ return $container->resolve( service => $comp, parameters => { context => \@args } );
}
=head2 $c->controllers
sub component {
my ( $c, $component, @args ) = @_;
- my ($type, $name) = _get_component_type_name($component);
- my $container = $c->container->get_sub_container($type);
+ if ( $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->resolve( service => $name, parameters => { context => [ $c, @args ] } );
+ }
+
+ return
+ if $c->config->{disable_component_resolution_regex_fallback};
+
+ my $query = qr{$name}i;
+ my @components = $container->get_service_list;
+ my @result = grep { m{$query} } @components;
- if( $component ) {
- my $comps = $c->components;
+ if (@result) {
+ $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' );
- if( !ref $component ) {
- return $container->resolve( service => $name, parameters => { context => [ $c, @args ] } )
- if $container->has_service( $name );
+ return $container->resolve( service => $result[0], parameters => { context => [$c, @args] } );
+ }
}
return
- if $c->config->{disable_component_resolution_regex_fallback};
+ 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;
- my @result = grep { m{$query} } keys %{ $c->components };
- return map { $c->_filter_component( $_, @args ) } @result 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{$query} } @components;
- if( $result[ 0 ] ) {
- $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 $c->_filter_component( $result[ 0 ], @args );
+ if (@result) {
+ return map { $subcontainer->resolve( service => $_, parameters => { context => [$c, @args] } ) } @result
+ if ref $component;
+
+ $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->resolve( service => $result[0], parameters => { context => [$c, @args] } );
+ }
}
# I would expect to return an empty list here, but that breaks back-compat