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)
+ return $container->get_component( $name, $c, @args )
if $container->has_service($name) && !ref $name;
- return $container->get_component_regexp( $c, $name, \@args );
+ return $container->get_component_regexp( $name, $c, @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 ) {
# Direct component hash lookup to avoid costly regexps
- return $container->get_component($name, \@args)
+ return $container->get_component( $name, $c, @args )
if $container->has_service($name) && !ref $name;
- return $container->get_component_regexp( $c, $name, \@args );
+ return $container->get_component_regexp( $name, $c, @args );
}
if (ref $c) {
$c->log->warn( 'NB: in version 5.81, the "random" behavior will not work at all.' );
}
- return $container->get_component( $comp, \@args );
+ return $container->get_component( $comp, $c, @args );
}
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)
+ return $container->get_component( $name, $c, @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 );
+ return $container->get_component_regexp( $name, $c, @args );
}
if (ref $c) {
$c->log->warn( 'NB: in version 5.81, the "random" behavior will not work at all.' );
}
- return $container->get_component( $comp, \@args );
+ return $container->get_component( $comp, $c, @args );
}
=head2 $c->controllers
use Bread::Board;
use Moose;
use Catalyst::IOC::BlockInjection;
-use Catalyst::Utils;
extends 'Bread::Board::Container';
);
sub get_component {
- my ( $self, $name, $args ) = @_;
+ my ( $self, $name, @args ) = @_;
return $self->resolve(
service => $name,
- parameters => { accept_context_args => $args },
+ parameters => { accept_context_args => \@args },
);
}
sub get_component_regexp {
- my ( $self, $c, $name, $args ) = @_;
+ my ( $self, $name, $c, @args ) = @_;
return
if $self->disable_regex_fallback && !ref $name;
- my $query = ref $name ? $name : qr{$name}i;
- my $prefix = Catalyst::Utils::class2classprefix($query) // '';
- $query =~ s/^${prefix}:://i;
+ my $query = ref $name ? $name : qr{$name}i;
+ my $appname = $self->parent->name;
+ $query =~ s/^${appname}:://i;
+ $query =~ s/[MVC]|(Model|View|Controller):://i;
my @result = map {
- $self->get_component( $_, $args )
+ $self->get_component( $_, $c, @args )
} grep { m/$query/ } $self->get_service_list;
if (!ref $name && $result[0]) {