making $c->comp(qr/::M::/) work

[catagits/Catalyst-Runtime.git] / lib / Catalyst / IOC / Container.pm

diff --git a/lib/Catalyst/IOC/Container.pm b/lib/Catalyst/IOC/Container.pm
index a456596..ffee749 100644 (file)
--- a/lib/Catalyst/IOC/Container.pm
+++ b/lib/Catalyst/IOC/Container.pm
@@ -77,15 +77,19 @@ sub BUILD {
         $self->build_controller_subcontainer
     );
 
+    my $config        = $self->resolve( service => 'config' );
+    my $default_view  = $params->{default_view}  || $config->{default_view};
+    my $default_model = $params->{default_model} || $config->{default_model};
+
     $self->add_sub_container(
         $self->build_view_subcontainer(
-            default_component => $params->{default_view},
+            default_component => $default_view,
         )
     );
 
     $self->add_sub_container(
         $self->build_model_subcontainer(
-            default_component => $params->{default_model},
+            default_component => $default_model,
         )
     );
 }
@@ -426,6 +430,48 @@ sub get_component_from_sub_container {
     return;
 }
 
+sub find_component {
+    my ( $self, $component, @args ) = @_;
+    my @result;
+
+    my $query = ref $component
+              ? $component
+              : qr{^$component$}
+              ;
+
+    for my $subcontainer_name (qw/model view controller/) {
+        my $subcontainer = $self->get_sub_container($subcontainer_name);
+        my @components   = $subcontainer->get_service_list;
+        @result          = grep { m{$component} } @components;
+
+        return map { $subcontainer->get_component( $_, @args ) } @result
+            if @result;
+    }
+
+    # it expects an empty list on failed searches
+    return @result;
+}
+
+sub find_component_regexp {
+    my ( $self, $components, $component, @args ) = @_;
+    my @result;
+
+    my @components = grep { m{$component} } keys %{ $components };
+
+    for (@components) {
+        # FIXME this is naughty enough being called inside Catalyst.pm
+        # find some alternative for this sub and remember to delete here
+        my ($type, $name) = Catalyst::_get_component_type_name($_);
+
+        push @result, $self->get_component_from_sub_container(
+            $type, $name, @args
+        ) if $type;
+    }
+
+    return @result;
+}
+
+
 1;
 
 __END__
@@ -476,6 +522,10 @@ Catalyst::Container - IOC for Catalyst components
 
 =head2 get_component_from_sub_container
 
+=head2 find_component
+
+=head2 find_component_regexp
+
 =head2 _fix_syntax
 
 =head2 _config_substitutions