X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=b8e62cf3830e126695f2d742f90b87cb27583daf;hb=63d30ea9142646891393d9d4e9c25f7672d4f653;hp=749d1777a94d961deab269c5ffdade3f3a9dedd3;hpb=3f5483b01e398279b55e4d0cf5d92e690cb1c98b;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 749d177..b8e62cf 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -558,29 +558,14 @@ If you want to search for controllers, pass in a regexp as the argument.
 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);
-        }
-        elsif ( ref $name eq 'Regexp' ) {
-            my @comps = $container->get_service_list;
-            my @result;
-            for (@comps) {
-                push @result, $container->resolve( service => $_, parameters => { context => [ $c, @args ] } )
-                    if m/$name/;
-            }
-            return @result;
-        }
-        else {
-            my $short_name = ref $name;
-            $short_name =~ s/^${appclass}::(C|Controller)//;
-            return $container->resolve( service => $short_name, parameters => { context => [ $c, @args ] } )
-                if $container->has_service($short_name);
-        }
-        return;
+        # Direct component hash lookup to avoid costly regexps
+        return $container->get_component($name, \@args)
+            if $container->has_service($name) && !ref $name;
+
+        return $container->get_component_regexp( $c, $name, \@args );
     }
 
     return $c->component( $c->action->class );
@@ -611,28 +596,14 @@ sub model {
     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 ) { # Direct component hash lookup to avoid costly regexps
-            return $container->resolve( service => $name, parameters => { context => [ $c, @args ] } )
-                if $container->has_service($name);
-        }
-        elsif ( ref $name eq 'Regexp' ) {
-            my @comps = $container->get_service_list;
-            my @result;
-            for (@comps) {
-                push @result, $container->resolve( service => $_, parameters => { context => [ $c, @args ] } )
-                    if m/$name/;
-            }
-            return @result;
-        }
-        else {
-            my $short_name = ref $name;
-            $short_name =~ s/^${appclass}::(M|Model)//;
-            return $container->resolve( service => $short_name, parameters => { context => [ $c, @args ] } )
-                if $container->has_service($short_name);
-        }
-        return;
+        # Direct component hash lookup to avoid costly regexps
+        return $container->get_component($name, \@args)
+            if $container->has_service($name) && !ref $name;
+
+        return $container->get_component_regexp( $c, $name, \@args );
     }
 
     if (ref $c) {
@@ -655,7 +626,7 @@ sub model {
         $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 );
 }
 
 
@@ -684,33 +655,19 @@ sub view {
     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 ] } );
+                return $container->get_component($name, \@args);
             }
             else {
                 $c->log->warn( "Attempted to use view '$name', but does not exist" );
             }
         }
-        elsif ( ref $name eq 'Regexp' ) {
-            my @comps = $container->get_service_list;
-            my @result;
-            for (@comps) {
-                push @result, $container->resolve( service => $_, parameters => { context => [ $c, @args ] } )
-                    if m/$name/;
-            }
-            return @result;
-        }
-        else {
-            my $short_name = ref $name;
-            $short_name =~ s/^${appclass}::(V|View)//;
-            return $container->resolve( service => $short_name, parameters => { context => [ $c, @args ] } )
-                if $container->has_service($short_name);
-        }
 
-        return;
+        return $container->get_component_regexp( $c, $name, \@args );
     }
 
     if (ref $c) {
@@ -732,7 +689,7 @@ sub view {
         $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
@@ -791,6 +748,7 @@ disable_component_resolution_regex_fallback to a true value.
 
 sub component {
     my ( $c, $component, @args ) = @_;
+    unshift @args, $c;
 
     if ( $component ) {
         my ($type, $name) = _get_component_type_name($component);
@@ -799,12 +757,14 @@ sub 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;
@@ -815,14 +775,14 @@ sub component {
             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 );
             }
         }