changing get_component and get_component_args

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

diff --git a/lib/Catalyst/IOC/SubContainer.pm b/lib/Catalyst/IOC/SubContainer.pm
index 95bb8d3..11c6657 100644 (file)
--- a/lib/Catalyst/IOC/SubContainer.pm
+++ b/lib/Catalyst/IOC/SubContainer.pm
@@ -5,30 +5,34 @@ use Catalyst::IOC::BlockInjection;
 
 extends 'Bread::Board::Container';
 
+has disable_regex_fallback => (
+    is      => 'ro',
+    isa     => 'Bool',
+    default => 1,
+);
+
 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 $c->config->{disable_component_resolution_regex_fallback} && !ref $name;
-
-    my $appclass = ref $c || $c;
-    my $prefix   = ucfirst $self->name;
-    my $p        = substr $prefix, 0, 1;
+        if $self->disable_regex_fallback && !ref $name;
 
-    my $query = ref $name ? $name : qr{$name}i;
-    $query =~ s/^${appclass}::($p|$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]) {