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);
- }
+ # Direct component hash lookup to avoid costly regexps
+ return $container->get_component($name, \@args)
+ if $container->has_service($name) && !ref $name;
- return
- if $c->config->{disable_component_resolution_regex_fallback} && !ref $name;
-
- my $query = ref $name ? $name : qr{$name};
- $query =~ s/^${appclass}::(C|Controller):://;
- my @comps = $container->get_service_list;
- my @result;
- for (@comps) {
- push @result, $container->resolve( service => $_, parameters => { context => [ $c, @args ] } )
- if m/$query/;
- }
-
- if (@result) {
- if (!ref $name) {
- $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;
- }
-
- return;
+ return $container->get_component_regexp( $c, $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 && $container->has_service($name)) { # Direct component hash lookup to avoid costly regexps
- return $container->resolve( service => $name, parameters => { context => [ $c, @args ] } );
- }
-
- return
- if $c->config->{disable_component_resolution_regex_fallback} && !ref $name;
-
- my $query = ref $name ? $name : qr{$name};
- $query =~ s/^${appclass}::(M|Model):://;
- my @comps = $container->get_service_list;
- my @result;
- for (@comps) {
- push @result, $container->resolve( service => $_, parameters => { context => [ $c, @args ] } )
- if m/$query/;
- }
-
- if (@result) {
- if (!ref $name) {
- $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;
- }
+ # Direct component hash lookup to avoid costly regexps
+ return $container->get_component($name, \@args)
+ if $container->has_service($name) && !ref $name;
- return;
+ return $container->get_component_regexp( $c, $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->get_component( $comp, \@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 ] } );
- }
- else {
- $c->log->warn( "Attempted to use view '$name', but does not exist" );
- }
- }
+ # Direct component hash lookup to avoid costly regexps
+ return $container->get_component($name, \@args)
+ if !ref $name && $container->has_service($name);
- return
- if $c->config->{disable_component_resolution_regex_fallback} && !ref $name;
-
- my $query = ref $name ? $name : qr{$name};
- $query =~ s/^${appclass}::(V|View):://;
- my @comps = $container->get_service_list;
- my @result;
- for (@comps) {
- push @result, $container->resolve( service => $_, parameters => { context => [ $c, @args ] } )
- if m/$query/;
- }
+ $c->log->warn( "Attempted to use view '$name', but does not exist" );
- if (@result) {
- if (!ref $name) {
- $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;
- }
-
- return;
+ return $container->get_component_regexp( $c, $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->get_component( $comp, \@args );
}
=head2 $c->controllers
sub component {
my ( $c, $component, @args ) = @_;
+ unshift @args, $c;
if ( $component ) {
my ($type, $name) = _get_component_type_name($component);
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 $container->get_component( $name, \@args );
}
+
+ return $container->get_component_regexp( $c, $name, \@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} } @components;
if (@result) {
- return map { $subcontainer->resolve( service => $_, parameters => { context => [$c, @args] } ) } @result
+ return map { $subcontainer->get_component( $_, \@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] } );
+ return $subcontainer->get_component( $result[0], \@args );
}
}
my ($type, $name) = _get_component_type_name($component);
# FIXME: shouldn't the service name be $name?
- $containers->{$type}->add_service(Catalyst::BlockInjection->new( name => $name, block => sub { return $class->setup_component($component) } ));
+ $containers->{$type}->add_service(Catalyst::IOC::BlockInjection->new( name => $name, block => sub { return $class->setup_component($component) } ));
}
return $class->$orig($components);
my %args = %{ $class->config || {} };
- my @container_classes = ( "${class}::Container", 'Catalyst::Container');
+ my @container_classes = ( "${class}::Container", 'Catalyst::IOC::Container');
unshift @container_classes, delete $args{container_class} if exists $args{container_class};
my $container_class = Class::MOP::load_first_existing_class(@container_classes);
$class->finalize_config; # back-compat
}
-=head $c->finalize_config
+=head2 $c->finalize_config
=cut
for my $component (@comps) {
my $instance = $class->components->{ $component } = $class->setup_component($component);
if ( my ($type, $name) = _get_component_type_name($component) ) {
- $containers->{$type}->add_service(Catalyst::BlockInjection->new( name => $name, block => sub { return $instance } ));
+ $containers->{$type}->add_service(Catalyst::IOC::BlockInjection->new( name => $name, block => sub { return $instance } ));
}
my @expanded_components = $instance->can('expand_modules')
? $instance->expand_modules( $component, $config )
) if $deprecatedcatalyst_component_names;
if (my ($type, $name) = _get_component_type_name($component)) {
- $containers->{$type}->add_service(Catalyst::BlockInjection->new( name => $name, block => sub { return $class->setup_component($component) } ));
+ $containers->{$type}->add_service(Catalyst::IOC::BlockInjection->new( name => $name, block => sub { return $class->setup_component($component) } ));
}
$class->components->{ $component } = $class->setup_component($component);
Andrew Ruthven
+André Walker
+
andyg: Andy Grundman <andy@hybridized.org>
audreyt: Audrey Tang