Merging of gsoc_breadboard

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

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index c66345c..15181e3 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -558,38 +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);
-        }
-
-        return
-            if $c->config->{disable_component_resolution_regex_fallback} && !ref $name;
-
-        my $query = ref $name ? $name : qr{$name}i;
-        $query =~ s/^${appclass}::(C|Controller):://;
-        my @comps = $container->get_service_list;
-        my @result;
-        for (@comps) {
-            push @result, $container->resolve( service => $_, parameters => { context => [ $c, @args ] } )
-                if m/$query/;
-        }
-
-        if (@result) {
-            if (!ref $name) {
-                $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 shift @result;
-            }
-
-            return @result;
-        }
+        # Direct component hash lookup to avoid costly regexps
+        return $container->get_component($name, \@args)
+            if $container->has_service($name) && !ref $name;
 
-        return;
+        return $container->get_component_regexp( $c, $name, \@args );
     }
 
     return $c->component( $c->action->class );
@@ -620,36 +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 && $container->has_service($name)) { # Direct component hash lookup to avoid costly regexps
-            return $container->resolve( service => $name, parameters => { context => [ $c, @args ] } );
-        }
-
-        return
-            if $c->config->{disable_component_resolution_regex_fallback} && !ref $name;
-
-        my $query = ref $name ? $name : qr{$name}i;
-        $query =~ s/^${appclass}::(M|Model):://;
-        my @comps = $container->get_service_list;
-        my @result;
-        for (@comps) {
-            push @result, $container->resolve( service => $_, parameters => { context => [ $c, @args ] } )
-                if m/$query/;
-        }
-
-        if (@result) {
-            if (!ref $name) {
-                $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 shift @result;
-            }
-
-            return @result;
-        }
+        # Direct component hash lookup to avoid costly regexps
+        return $container->get_component($name, \@args)
+            if $container->has_service($name) && !ref $name;
 
-        return;
+        return $container->get_component_regexp( $c, $name, \@args );
     }
 
     if (ref $c) {
@@ -672,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 );
 }
 
 
@@ -701,41 +655,16 @@ 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 ] } );
-            }
-            else {
-                $c->log->warn( "Attempted to use view '$name', but does not exist" );
-            }
-        }
-
-        return
-            if $c->config->{disable_component_resolution_regex_fallback} && !ref $name;
-
-        my $query = ref $name ? $name : qr{$name}i;
-        $query =~ s/^${appclass}::(V|View):://;
-        my @comps = $container->get_service_list;
-        my @result;
-        for (@comps) {
-            push @result, $container->resolve( service => $_, parameters => { context => [ $c, @args ] } )
-                if m/$query/;
-        }
-
-        if (@result) {
-            if (!ref $name) {
-                $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 shift @result;
-            }
+        # Direct component hash lookup to avoid costly regexps
+        return $container->get_component($name, \@args)
+            if !ref $name && $container->has_service($name);
 
-            return @result;
-        }
+        $c->log->warn( "Attempted to use view '$name', but does not exist" );
 
-        return;
+        return $container->get_component_regexp( $c, $name, \@args );
     }
 
     if (ref $c) {
@@ -757,7 +686,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
@@ -816,6 +745,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);
@@ -824,23 +754,10 @@ 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
-                if $c->config->{disable_component_resolution_regex_fallback};
-
-            my $query      = qr{$name}i;
-            my @components = $container->get_service_list;
-            my @result     = grep { m{$query} } @components;
-
-            if (@result) {
-                $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 $container->resolve( service => $result[0], parameters => { context => [$c, @args] } );
-            }
+            return $container->get_component_regexp( $c, $name, \@args );
         }
 
         return
@@ -855,14 +772,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 );
             }
         }
 
@@ -2456,7 +2373,7 @@ sub setup_config {
     $class->finalize_config; # back-compat
 }
 
-=head $c->finalize_config
+=head2 $c->finalize_config
 
 =cut