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);
+ 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;
+ grep { /$filter/ } @components;
# undef for a name will return all
return keys %eligible if !defined $name;
sub controller {
my ( $c, $name, @args ) = @_;
+ my $container = $c->container->get_sub_container('controller');
my $appclass = ref($c) || $c;
if( $name ) {
unless ( ref($name) ) { # Direct component hash lookup to avoid costly regexps
my $check = $appclass."::Controller::".$name;
- my $container = $c->container->get_sub_container('controller');
- return $c->_filter_component( $container->resolve(service => "$check"), @args )
+ return $container->resolve(service => "$check", parameters => { context => \@args } )
if $container->has_service($check);
}
my @result = $c->_comp_search_prefixes( $name, qw/Controller C/ );
- return map { $c->_filter_component( $_, @args ) } @result if ref $name;
- return $c->_filter_component( $result[ 0 ], @args );
+ return map { $container->resolve(service => "$_", parameters => { context => \@args } ) } @result if ref $name;
}
return $c->component( $c->action->class );
sub model {
my ( $c, $name, @args ) = @_;
my $appclass = ref($c) || $c;
+ my $container = $c->container->get_sub_container('model');
+
if( $name ) {
unless ( ref($name) ) { # Direct component hash lookup to avoid costly regexps
my $check = $appclass."::Model::".$name;
- my $container = $c->container->get_sub_container('model');
- return $c->_filter_component( $container->resolve(service => "$check"), @args )
+ return $container->resolve( service => "$check", parameters => { context => \@args } )
if $container->has_service($check);
}
my @result = $c->_comp_search_prefixes( $name, qw/Model M/ );
- return map { $c->_filter_component( $_, @args ) } @result if ref $name;
- return $c->_filter_component( $result[ 0 ], @args );
+ return map { $container->resolve( service => "$_", parameters => { context => \@args } ) } @result if ref $name;
}
if (ref $c) {
return $c->model( $appclass->config->{default_model} )
if $appclass->config->{default_model};
+# FIXME: will this still be mantained?
my( $comp, $rest ) = $c->_comp_search_prefixes( undef, qw/Model M/);
if( $rest ) {
$c->log->warn( 'NB: in version 5.81, the "random" behavior will not work at all.' );
}
- return $c->_filter_component( $comp );
+ return $container->resolve( service => ref $comp, parameters => { context => \@args } );
}
sub view {
my ( $c, $name, @args ) = @_;
-
my $appclass = ref($c) || $c;
+ my $container = $c->container->get_sub_container('view');
+
if( $name ) {
unless ( ref($name) ) { # Direct component hash lookup to avoid costly regexps
my $check = $appclass."::View::".$name;
- my $container = $c->container->get_sub_container('view');
if ($container->has_service($check)) {
-
- return $c->_filter_component( $container->get_service($check)->get, @args );
+ return $container->resolve(service => $check, parameters => { context => \@args } );
}
else {
$c->log->warn( "Attempted to use view '$check', but does not exist" );
}
}
my @result = $c->_comp_search_prefixes( $name, qw/View V/ );
- return map { $c->_filter_component( $_, @args ) } @result if ref $name;
- return $c->_filter_component( $result[ 0 ], @args );
+ return map { $container->resolve(service => "$_", parameters => { context => \@args } ) } @result if ref $name;
}
if (ref $c) {
$c->log->warn( 'NB: in version 5.81, the "random" behavior will not work at all.' );
}
- return $c->_filter_component( $comp );
+ return $container->resolve( service => ref $comp, parameters => { context => \@args } );
}
=head2 $c->controllers
return $c->_filter_component( $comp, @args ) if $comp;
}
+ return
+ if $c->config->{disable_component_resolution_regex_fallback};
+
# This is here so $c->comp( '::M::' ) works
my $query = ref $name ? $name : qr{$name}i;
around components => sub {
my $orig = shift;
- my $class = shift;
+ my $class = shift;
my $comps = shift;
return $class->$orig if ( !$comps );
+# FIXME: should this ugly kludge exist?
$class->setup_config unless defined $class->container;
-# should there be a warning here, not to use this accessor to create the components?
+# FIXME: should there be a warning here, not to use this accessor to create the components?
my $components = {};
my $containers;
for my $component ( keys %$comps ) {
$components->{ $component } = $comps->{$component};
- my $type = _get_component_type($component);
+ my ($type, $name) = _get_component_type_name($component);
- $containers->{$type}->add_service(Bread::Board::BlockInjection->new( name => $component, block => sub { return $class->setup_component($component) } ));
+# FIXME: shouldn't the service name be $name?
+ $containers->{$type}->add_service(Catalyst::BlockInjection->new( name => $component, block => sub { return $class->setup_component($component) } ));
}
return $class->$orig($components);
sub setup_config {
my $class = shift;
- my %args = %{$class->config || {} };
- my @container_classes = qw/MyApp::Container Catalyst::Container/;
+ my %args = %{ $class->config || {} };
+
+ my @container_classes = ( "${class}::Container", 'Catalyst::Container');
unshift @container_classes, delete $args{container_class} if exists $args{container_class};
my $container_class = Class::MOP::load_first_existing_class(@container_classes);
my $container = $container_class->new( %args, name => "$class" );
-
- $container->add_sub_container(Bread::Board::Container->new( name => $_ )) for qw(model controller view);
$class->container($container);
- my $config = $container->fetch('config')->get;
+ my $config = $container->resolve(service => 'config');
$class->config($config);
$class->finalize_config; # back-compat
}
for my $component (@comps) {
my $instance = $class->components->{ $component } = $class->setup_component($component);
- if ( my $type = _get_component_type($component) ) {
- $containers->{$type}->add_service(Bread::Board::BlockInjection->new( name => $component, block => sub { return $instance } ));
+ if ( my ($type, $name) = _get_component_type_name($component) ) {
+# FIXME: shouldn't the service name be $name?
+ $containers->{$type}->add_service(Catalyst::BlockInjection->new( name => $component, block => sub { return $instance } ));
}
my @expanded_components = $instance->can('expand_modules')
? $instance->expand_modules( $component, $config )
qq{Please switch your class names to ::Model::, ::View:: and ::Controller: as appropriate.\n}
) if $deprecatedcatalyst_component_names;
- if (my $type = _get_component_type($component)) {
- $containers->{$type}->add_service(Bread::Board::BlockInjection->new( name => $component, block => sub { return $class->setup_component($component) } ));
+ if (my ($type, $name) = _get_component_type_name($component)) {
+ $containers->{$type}->add_service(Catalyst::BlockInjection->new( name => $component, block => sub { return $class->setup_component($component) } ));
}
$class->components->{ $component } = $class->setup_component($component);
}
}
-sub _get_component_type {
+sub _get_component_type_name {
my $component = shift;
my @parts = split /::/, $component;
- for (@parts) {
- return 'controller' if /c|controller/i;
- return 'model' if /m|model/i;
- return 'view' if /v|view/i;
+ while (my $type = shift @parts) {
+ return ('controller', join '::', @parts)
+ if $type =~ /^(c|controller)$/i;
+
+ return ('model', join '::', @parts)
+ if $type =~ /^(m|model)$/i;
+
+ return ('view', join '::', @parts)
+ if $type =~ /^(v|view)$/i;
}
}
message => qq/Couldn't instantiate component "$component", "$error"/
);
}
-
- unless (blessed $instance) {
+ elsif (!blessed $instance) {
my $metaclass = Moose::Util::find_meta($component);
my $method_meta = $metaclass->find_method_by_name('COMPONENT');
my $component_method_from = $method_meta->associated_metaclass->name;
qq/Couldn't instantiate component "$component", COMPONENT() method (from $component_method_from) didn't return an object-like value (value was $value)./
);
}
+
return $instance;
}
my $class = ref $proto || $proto;
Class::MOP::load_class( $plugin );
- $class->log->warn( "$plugin inherits from 'Catalyst::Component' - this is decated and will not work in 5.81" )
+ $class->log->warn( "$plugin inherits from 'Catalyst::Component' - this is deprecated and will not work in 5.81" )
if $plugin->isa( 'Catalyst::Component' );
$proto->_plugins->{$plugin} = 1;
unless ($instant) {