From: André Walker <andre@andrewalker.net>
Date: Wed, 6 Jul 2011 15:24:15 +0000 (-0300)
Subject: merging gsoc_breadboard changes
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=63d30ea9142646891393d9d4e9c25f7672d4f653;hp=56089c3b1874315737efea071b798453dbb6c8eb;p=catagits%2FCatalyst-Runtime.git

merging gsoc_breadboard changes
---

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 12520e0..b8e62cf 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -536,34 +536,6 @@ sub clear_errors {
     $c->error(0);
 }
 
-sub _find_component_regexp {
-    my ( $c, $container, $name, $args ) = @_;
-
-    return
-        if $c->config->{disable_component_resolution_regex_fallback} && !ref $name;
-
-    my $appclass = ref $c || $c;
-    my $prefix   = ucfirst $container->name;
-    my $p        = substr $prefix, 0, 1;
-
-    my $query = ref $name ? $name : qr{$name}i;
-    $query =~ s/^${appclass}::($p|$prefix):://i;
-
-    my @comps  = $container->get_service_list;
-    my @result = map {
-        $container->resolve( service => $_, parameters => { context => $args } )
-    } grep { m/$query/ } @comps;
-
-    if (!ref $name && $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 $result[0];
-    }
-
-    return @result;
-}
-
 =head2 COMPONENT ACCESSORS
 
 =head2 $c->controller($name)
@@ -590,10 +562,10 @@ sub controller {
 
     if( $name ) {
         # Direct component hash lookup to avoid costly regexps
-        return $c->container->get_component('controller', $name, \@args)
+        return $container->get_component($name, \@args)
             if $container->has_service($name) && !ref $name;
 
-        return $c->_find_component_regexp( $container, $name, \@args );
+        return $container->get_component_regexp( $c, $name, \@args );
     }
 
     return $c->component( $c->action->class );
@@ -628,10 +600,10 @@ sub model {
 
     if( $name ) {
         # Direct component hash lookup to avoid costly regexps
-        return $c->container->get_component('model', $name, \@args)
+        return $container->get_component($name, \@args)
             if $container->has_service($name) && !ref $name;
 
-        return $c->_find_component_regexp( $container, $name, \@args );
+        return $container->get_component_regexp( $c, $name, \@args );
     }
 
     if (ref $c) {
@@ -654,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 => \@args } );
+    return $container->get_component( $comp, \@args );
 }
 
 
@@ -688,14 +660,14 @@ sub view {
     if( $name ) {
         if ( !ref $name ) { # Direct component hash lookup to avoid costly regexps
             if ( $container->has_service($name) ) {
-                return $c->container->get_component('view', $name, \@args);
+                return $container->get_component($name, \@args);
             }
             else {
                 $c->log->warn( "Attempted to use view '$name', but does not exist" );
             }
         }
 
-        return $c->_find_component_regexp( $container, $name, \@args );
+        return $container->get_component_regexp( $c, $name, \@args );
     }
 
     if (ref $c) {
@@ -717,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 => \@args } );
+    return $container->get_component( $comp, \@args );
 }
 
 =head2 $c->controllers
@@ -776,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);
@@ -784,23 +757,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
@@ -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 );
             }
         }
 
diff --git a/lib/Catalyst/Container.pm b/lib/Catalyst/Container.pm
index 3a790a1..85ccc22 100644
--- a/lib/Catalyst/Container.pm
+++ b/lib/Catalyst/Container.pm
@@ -43,7 +43,7 @@ has sub_container_class => (
     isa     => LoadableClass,
     is      => 'ro',
     coerce  => 1,
-    default => 'Bread::Board::Container',
+    default => 'Catalyst::SubContainer',
 );
 
 sub BUILD {
@@ -393,9 +393,4 @@ sub _config_substitutions {
     return $arg;
 }
 
-sub get_component {
-    my ( $self, $type, $name, $args ) = @_;
-    return $self->get_sub_container($type)->resolve( service => $name, parameters => { context => $args } );
-}
-
 1;
diff --git a/lib/Catalyst/SubContainer.pm b/lib/Catalyst/SubContainer.pm
new file mode 100644
index 0000000..8472fc1
--- /dev/null
+++ b/lib/Catalyst/SubContainer.pm
@@ -0,0 +1,41 @@
+package Catalyst::SubContainer;
+use Bread::Board;
+use Moose;
+use Catalyst::BlockInjection;
+
+extends 'Bread::Board::Container';
+
+sub get_component {
+    my ( $self, $name, $args ) = @_;
+    return $self->resolve( service => $name, parameters => { context => $args } );
+}
+
+sub get_component_regexp {
+    my ( $self, $c, $name, $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;
+
+    my $query = ref $name ? $name : qr{$name}i;
+    $query =~ s/^${appclass}::($p|$prefix):://i;
+
+    my @comps  = $self->get_service_list;
+    my @result = map {
+        $self->resolve( service => $_, parameters => { context => $args } )
+    } grep { m/$query/ } @comps;
+
+    if (!ref $name && $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 $result[0];
+    }
+
+    return @result;
+}
+
+1;