$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;
-
- 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" );
- }
-
- return @result;
-}
-
-# Find possible names for a prefix
-sub _comp_names {
- my ( $c, @prefixes ) = @_;
- my $appclass = ref $c || $c;
-
- my $filter = "^${appclass}::(" . join( '|', @prefixes ) . ')::';
-
- my @names = map { s{$filter}{}; $_; }
- $c->_comp_names_search_prefixes( undef, @prefixes );
-
- return @names;
-}
-
-# Filter a component before returning by calling ACCEPT_CONTEXT if available
-sub _filter_component {
- my ( $c, $comp, @args ) = @_;
-
- if ( eval { $comp->can('ACCEPT_CONTEXT'); } ) {
- return $comp->ACCEPT_CONTEXT( $c, @args );
- }
-
- return $comp;
-}
-
=head2 COMPONENT ACCESSORS
=head2 $c->controller($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 )
- 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 );
+ # Direct component hash lookup to avoid costly regexps
+ return $container->get_component( $name, $c, @args )
+ if $container->has_service($name) && !ref $name;
+
+ return $container->get_component_regexp( $name, $c, @args );
}
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 )
- 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 );
+ # Direct component hash lookup to avoid costly regexps
+ return $container->get_component( $name, $c, @args )
+ if $container->has_service($name) && !ref $name;
+
+ return $container->get_component_regexp( $name, $c, @args );
}
if (ref $c) {
return $c->model( $appclass->config->{default_model} )
if $appclass->config->{default_model};
- my( $comp, $rest ) = $c->_comp_search_prefixes( undef, qw/Model M/);
+# FIXME: will this still be mantained?
+ my( $comp, $rest ) = $container->get_service_list;
if( $rest ) {
$c->log->warn( Carp::shortmess('Calling $c->model() will return a random model unless you specify one of:') );
$c->log->warn( 'NB: in version 5.81, the "random" behavior will not work at all.' );
}
- return $c->_filter_component( $comp );
+ return $container->get_component( $comp, $c, @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)) {
+ # Direct component hash lookup to avoid costly regexps
+ return $container->get_component( $name, $c, @args )
+ if !ref $name && $container->has_service($name);
- return $c->_filter_component( $container->resolve(service => $check), @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 );
+ $c->log->warn( "Attempted to use view '$name', but does not exist" );
+
+ return $container->get_component_regexp( $name, $c, @args );
}
if (ref $c) {
return $c->view( $appclass->config->{default_view} )
if $appclass->config->{default_view};
- my( $comp, $rest ) = $c->_comp_search_prefixes( undef, qw/View V/);
+ 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( 'NB: in version 5.81, the "random" behavior will not work at all.' );
}
- return $c->_filter_component( $comp );
+ return $container->get_component( $comp, $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, $name, @args ) = @_;
+ my ( $c, $component, @args ) = @_;
- if( $name ) {
- my $comps = $c->components;
+ if ( $component ) {
+ # FIXME: I probably shouldn't be doing this
+ return $c->components->{$component}
+ if exists $c->components->{$component};
- if( !ref $name ) {
- # is it the exact name?
- return $c->_filter_component( $comps->{ $name }, @args )
- if exists $comps->{ $name };
+ my ($type, $name) = _get_component_type_name($component);
- # perhaps we just omitted "MyApp"?
- my $composed = ( ref $c || $c ) . "::${name}";
- return $c->_filter_component( $comps->{ $composed }, @args )
- if exists $comps->{ $composed };
+ if ($type && $c->container->has_sub_container($type)) {
+ my $container = $c->container->get_sub_container($type);
- # search all of the models, views and controllers
- my( $comp ) = $c->_comp_search_prefixes( $name, qw/Model M Controller C View V/ );
- return $c->_filter_component( $comp, @args ) if $comp;
- }
+ if( !ref $component && $container->has_service($name) ) {
+ return $container->get_component( $name, $c, @args );
+ }
- # This is here so $c->comp( '::M::' ) works
- my $query = ref $name ? $name : qr{$name}i;
+ return $container->get_component_regexp( $name, $c, @args );
+ }
- my @result = grep { m{$query} } keys %{ $c->components };
- return map { $c->_filter_component( $_, @args ) } @result if ref $name;
+ 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;
- if( $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 $c->_filter_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
}
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::IOC::BlockInjection->new( name => $name, 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::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);
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
}
-=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 = _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) ) {
+ $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 )
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::IOC::BlockInjection->new( name => $name, 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) {
=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 >>.
Andrew Ruthven
+André Walker
+
andyg: Andy Grundman <andy@hybridized.org>
audreyt: Audrey Tang
projects / catagits/Catalyst-Runtime.git / blobdiff