moving _find_component to the container as find_component

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

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 95614c6..ef446fb 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -67,7 +67,7 @@ our $GO        = Catalyst::Exception::Go->new;
 
 #I imagine that very few of these really need to be class variables. if any.
 #maybe we should just make them attributes with a default?
-__PACKAGE__->mk_classdata($_)
+__PACKAGE__->mk_classdata($_) # XXX FIXME - components remove from here
   for qw/container components arguments dispatcher engine log dispatcher_class
   engine_class context_class request_class response_class stats_class
   setup_finished/;
@@ -93,10 +93,12 @@ sub import {
     return if $caller eq 'main';
 
     my $meta = Moose::Meta::Class->initialize($caller);
-    unless ( $caller->isa('Catalyst') ) {
-        my @superclasses = ($meta->superclasses, $class, 'Catalyst::Controller');
-        $meta->superclasses(@superclasses);
-    }
+
+    unless ( $caller->isa('Catalyst') ) { # XXX - Remove!
+        my @superclasses = ($meta->superclasses, $class, 'Catalyst::Controller'); # XXX - Remove!
+        $meta->superclasses(@superclasses); # XXX - Remove!
+    } # XXX - Remove!
+
     # Avoid possible C3 issues if 'Moose::Object' is already on RHS of MyApp
     $meta->superclasses(grep { $_ ne 'Moose::Object' } $meta->superclasses);
 
@@ -678,28 +680,6 @@ sub views {
     return $c->container->get_sub_container('view')->get_service_list;
 }
 
-sub _find_component {
-    my ($c, $component, @args) = @_;
-    my @result;
-
-    my $query = ref $component
-              ? $component
-              : qr{^$component$}
-              ;
-
-    for my $subcontainer_name (qw/model view controller/) {
-        my $subcontainer = $c->container->get_sub_container($subcontainer_name);
-        my @components   = $subcontainer->get_service_list;
-        @result          = grep { m{$component} } @components;
-
-        return map { $subcontainer->get_component( $_, $c, @args ) } @result
-            if @result;
-    }
-
-    # it expects an empty list on failed searches
-    return @result;
-}
-
 =head2 $c->comp($name)
 
 =head2 $c->component($name)
@@ -717,8 +697,12 @@ component name will be returned.
 sub component {
     my ( $c, $component, @args ) = @_;
 
-    return sort keys %{ $c->components }
-        unless $component;
+    unless ($component) {
+        $c->log->warn('Calling $c->component with no args is deprecated and ');
+        $c->log->warn('will be removed in a future release.');
+        $c->log->warn('Use $c->component_list instead.');
+        return $c->component_list;
+    }
 
     my ($type, $name) = _get_component_type_name($component);
 
@@ -726,7 +710,7 @@ sub component {
         $type, $name, $c, @args
     ) if $type;
 
-    my @result = $c->_find_component( $component, @args );
+    my @result = $c->container->find_component( $component, $c, @args );
 
     # list context for regexp searches
     return @result if ref $component;
@@ -742,13 +726,22 @@ sub component {
     $c->log->warn("Looking for '$component', but nothing was found.");
 
     # I would expect to return an empty list here, but that breaks back-compat
-    $c->log->warn("Component not found, returning the list of existing");
-    $c->log->warn("components. This behavior is going to be deprecated");
-    $c->log->warn("in future releases.");
+    $c->log->warn('Component not found, returning the list of existing');
+    $c->log->warn('components. This behavior is deprecated and will be');
+    $c->log->warn('removed in a future release. Use $c->component_list');
+    $c->log->warn('instead.');
 
-    return sort keys %{ $c->components };
+    return $c->component_list;
 }
 
+=head2 $c->component_list
+
+Returns the sorted list of the component names of the application.
+
+=cut
+
+sub component_list { sort keys %{ shift->components } }
+
 =head2 CLASS DATA AND HELPER CLASSES
 
 =head2 $c->config
@@ -913,7 +906,7 @@ Please do not use this functionality in new code.
 sub plugin {
     my ( $class, $name, $plugin, @args ) = @_;
 
-    # See block comment in t/unit_core_plugin.t
+    # See block comment in t/aggregate/unit_core_plugin.t
     $class->log->warn(qq/Adding plugin using the ->plugin method is deprecated, and will be removed in Catalyst 5.81/);
 
     $class->_register_plugin( $plugin, 1 );
@@ -1043,11 +1036,11 @@ EOF
     }
 
     # Initialize our data structure
-    $class->components( {} );
+    $class->components( {} ); # XXX - Remove!
 
     $class->setup_components;
 
-    if ( $class->debug ) {
+    if ( $class->debug ) { # XXX - Fixme to be a method on the container? (Or at least get a) data structure back from the container!!
         my $column_width = Catalyst::Utils::term_width() - 8 - 9;
         my $t = Text::SimpleTable->new( [ $column_width, 'Class' ], [ 8, 'Type' ] );
         for my $comp ( sort keys %{ $class->components } ) {
@@ -1460,6 +1453,10 @@ Returns a hash of components.
 
 =cut
 
+# FIXME - We deal with ->components({'Foo' => 'Bar'})
+#         however we DO NOT deal with ->components->{Foo} = 'Bar'
+#         We should return a locked hash back to the user? So that if they try the latter, they
+#         get breakage, rather than their addition being silently ignored?
 around components => sub {
     my $orig  = shift;
     my $class = shift;
@@ -2398,6 +2395,7 @@ sub setup_components {
                 $containers->{$type}->add_service(Catalyst::IOC::BlockInjection->new( name => $name, block => sub { return $class->setup_component($component) } ));
             }
 
+            # FIXME - Remove this!!
             $class->components->{ $component } = $class->setup_component($component);
         }
     }
@@ -2491,6 +2489,7 @@ sub expand_component_module {
 
 =cut
 
+## FIXME - Why the hell do we try calling the ->COMPONENT method twice, this is madness!?!
 sub setup_component {
     my( $class, $component ) = @_;